Revert "sonic-sairedis: Add support to sonic-sairedis for gearbox phys (sonic-net#624)" (sonic-net#630)

This reverts commit 2772f15.

Author: daall

lib/src/context_config.json

@@ -21,10 +21,10 @@
         {
             "guid" : 1,
             "name" : "syncd1",
-            "dbAsic" : "GB_ASIC_DB",
-            "dbCounters" : "GB_COUNTERS_DB",
-            "dbFlex": "GB_FLEX_COUNTER_DB",
-            "dbState" : "STATE_DB",
+            "dbAsic" : "ASIC_DB2",
+            "dbCounters" : "COUNTERS_DB2",
+            "dbFlex": "FLEX_COUNTER_DB2",
+            "dbState" : "STATE_DB2",
             "switches": [
                 {
                     "index" : 0,

lib/src/sai_redis_switch.cpp

@@ -1,29 +1,5 @@
 #include "sai_redis.h"
 
-sai_status_t redis_switch_mdio_read(
-        _In_ sai_object_id_t switch_id,
-        _In_ uint32_t device_addr,
-        _In_ uint32_t start_reg_addr,
-        _In_ uint32_t number_of_registers,
-        _Out_ uint32_t *reg_val)
-{
-    SWSS_LOG_ENTER();
-
-    return SAI_STATUS_NOT_IMPLEMENTED;
-}
-
-sai_status_t redis_switch_mdio_write(
-        _In_ sai_object_id_t switch_id,
-        _In_ uint32_t device_addr,
-        _In_ uint32_t start_reg_addr,
-        _In_ uint32_t number_of_registers,
-        _In_ const uint32_t *reg_val)
-{
-    SWSS_LOG_ENTER();
-
-    return SAI_STATUS_NOT_IMPLEMENTED;
-}
-
 REDIS_GENERIC_QUAD(SWITCH,switch);
 REDIS_GENERIC_STATS(SWITCH,switch);
 

syncd/SaiSwitch.cpp

@@ -59,19 +59,13 @@ SaiSwitch::SaiSwitch(
 
     helperInternalOids();
 
-    if (getSwitchType() == SAI_SWITCH_TYPE_NPU) 
-    {
-        helperCheckLaneMap();
-    }
+    helperCheckLaneMap();
 
     helperLoadColdVids();
 
     helperPopulateWarmBootVids();
 
-    if (getSwitchType() == SAI_SWITCH_TYPE_NPU) 
-    {
-        saiGetMacAddress(m_default_mac_address);
-    }
+    saiGetMacAddress(m_default_mac_address);
 
     if (warmBoot)
     {
@@ -137,26 +131,6 @@ void SaiSwitch::getDefaultMacAddress(
     memcpy(mac, m_default_mac_address, sizeof(sai_mac_t));
 }
 
-sai_switch_type_t SaiSwitch::getSwitchType() const
-{
-    SWSS_LOG_ENTER();
-
-    sai_attribute_t attr;
-
-    attr.id = SAI_SWITCH_ATTR_TYPE;
-
-    sai_status_t status = m_vendorSai->get(SAI_OBJECT_TYPE_SWITCH, m_switch_rid, 1, &attr);
-
-    if (status != SAI_STATUS_SUCCESS)
-    {
-        SWSS_LOG_THROW("failed to get switch type");
-    }
-
-    SWSS_LOG_ERROR("switch type: '%s'", (attr.value.s32 == SAI_SWITCH_TYPE_NPU ? "SAI_SWITCH_TYPE_NPU" : "SAI_SWITCH_TYPE_PHY"));
-
-    return (sai_switch_type_t) attr.value.s32;
-}
-
 #define MAX_HARDWARE_INFO_LENGTH 0x1000
 
 std::string SaiSwitch::saiGetHardwareInfo() const
@@ -911,7 +885,7 @@ void SaiSwitch::helperPopulateWarmBootVids()
     {
         sai_object_id_t vid = m_translator->translateRidToVid(rid, m_switch_vid);
 
-        m_warmBootDiscoveredVids.insert(vid);
+       m_warmBootDiscoveredVids.insert(vid);
     }
 }
 

syncd/SaiSwitch.h

@@ -41,7 +41,6 @@ namespace syncd
             sai_object_id_t getVid() const;
             sai_object_id_t getRid() const;
 
-            sai_switch_type_t getSwitchType() const;
             std::string getHardwareInfo() const;
 
             std::unordered_map<sai_object_id_t, sai_object_id_t> getVidToRidMap() const;

syncd/scripts/physyncd_start.sh

@@ -19,4 +19,4 @@ if SAITHRIFT
 vssyncd_LDADD += -lrpcserver -lthrift
 endif
 
-TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh BCM56850.pl MLNX2700.pl
+TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh brcm.pl mlnx.pl