Address review comments

sonic-net · Jun 19, 2020 · 8695a23 · 8695a23
1 parent 4942ac1
commit 8695a23
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/lib/src/RedisChannel.cpp b/lib/src/RedisChannel.cpp
@@ -175,7 +175,7 @@ sai_status_t RedisChannel::wait(
 
         swss::Selectable *sel;
 
-        int result = s.select(&sel, REDIS_ASIC_STATE_COMMAND_GETRESPONSE_TIMEOUT_MS * 10);
+        int result = s.select(&sel, REDIS_ASIC_STATE_COMMAND_GETRESPONSE_TIMEOUT_MS);
 
         if (result == swss::Select::OBJECT)
         {

diff --git a/syncd/SaiSwitch.cpp b/syncd/SaiSwitch.cpp
@@ -61,7 +61,7 @@ SaiSwitch::SaiSwitch(
 
     if (getSwitchType() == SAI_SWITCH_TYPE_NPU) 
     {
-      helperCheckLaneMap();
+        helperCheckLaneMap();
     }
 
     helperLoadColdVids();
@@ -70,7 +70,7 @@ SaiSwitch::SaiSwitch(
 
     if (getSwitchType() == SAI_SWITCH_TYPE_NPU) 
     {
-      saiGetMacAddress(m_default_mac_address);
+        saiGetMacAddress(m_default_mac_address);
     }
 
     if (warmBoot)
@@ -149,7 +149,7 @@ sai_switch_type_t SaiSwitch::getSwitchType() const
 
     if (status != SAI_STATUS_SUCCESS)
     {
-        SWSS_LOG_ERROR("failed to get switch type");
+        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"));
@@ -911,7 +911,7 @@ void SaiSwitch::helperPopulateWarmBootVids()
     {
         sai_object_id_t vid = m_translator->translateRidToVid(rid, m_switch_vid);
 
-       m_warmBootDiscoveredVids.insert(vid);
+        m_warmBootDiscoveredVids.insert(vid);
     }
 }
 

diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -45,7 +45,7 @@ libSaiVS_a_SOURCES = \
 					  SelectableFd.cpp \
 					  SwitchState.cpp \
 					  SwitchBCM56850.cpp \
-            SwitchBCM81724.cpp \
+					  SwitchBCM81724.cpp \
 					  SwitchMLNX2700.cpp
 
 libsaivs_la_SOURCES = \

diff --git a/vslib/src/Sai.cpp b/vslib/src/Sai.cpp
@@ -101,9 +101,10 @@ sai_status_t Sai::initialize(
     {
         SWSS_LOG_NOTICE("failed to obtain service method table value: %s", SAI_KEY_VS_SAI_SWITCH_TYPE);
         saiSwitchType = SAI_SWITCH_TYPE_NPU;
-    } else if (!SwitchConfig::parseSaiSwitchType(sai_switch_type, saiSwitchType))
+    } 
+    else if (!SwitchConfig::parseSaiSwitchType(sai_switch_type, saiSwitchType))
     {
-      return SAI_STATUS_FAILURE;
+        return SAI_STATUS_FAILURE;
     }
 
     auto *laneMapFile = service_method_table->profile_get_value(0, SAI_KEY_VS_INTERFACE_LANE_MAP_FILE);
@@ -176,8 +177,7 @@ sai_status_t Sai::initialize(
 
     if (saiSwitchType == SAI_SWITCH_TYPE_NPU) 
     {
-
-      startFdbAgingThread();
+        startFdbAgingThread();
     }
 
     m_apiInitialized = true;

diff --git a/vslib/src/SwitchConfig.cpp b/vslib/src/SwitchConfig.cpp
@@ -70,7 +70,7 @@ bool SwitchConfig::parseSwitchType(
     }
     else
     {
-        SWSS_LOG_ERROR("unknown switch type: '%s', expected (%s|%s)(%s)",
+        SWSS_LOG_ERROR("unknown switch type: '%s', expected (%s|%s|%s)",
                 switchTypeStr,
                 SAI_VALUE_VS_SWITCH_TYPE_BCM81724,
                 SAI_VALUE_VS_SWITCH_TYPE_BCM56850,