[syncd] Create base class SaiSwitchInterface (#786)

This class will be needed for future asic compare.
sonic-net · Feb 6, 2021 · 3663e30 · 3663e30
1 parent 3360b0f
commit 3663e30
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 118 deletions.
diff --git a/syncd/BestCandidateFinder.cpp b/syncd/BestCandidateFinder.cpp
@@ -14,7 +14,7 @@ using namespace syncd;
 BestCandidateFinder::BestCandidateFinder(
         _In_ const AsicView& currentView,
         _In_ const AsicView& temporaryView,
-        _In_ std::shared_ptr<const SaiSwitch> sw):
+        _In_ std::shared_ptr<const SaiSwitchInterface> sw):
     m_currentView(currentView),
     m_temporaryView(temporaryView),
     m_switch(sw)
@@ -2792,7 +2792,7 @@ bool BestCandidateFinder::hasEqualAttribute(
 
 std::shared_ptr<SaiAttr> BestCandidateFinder::getSaiAttrFromDefaultValue(
         _In_ const AsicView &currentView,
-        _In_ std::shared_ptr<const SaiSwitch> sw,
+        _In_ std::shared_ptr<const SaiSwitchInterface> sw,
         _In_ const sai_attr_metadata_t &meta)
 {
     SWSS_LOG_ENTER();

diff --git a/syncd/BestCandidateFinder.h b/syncd/BestCandidateFinder.h
@@ -2,7 +2,7 @@
 
 #include "SaiObj.h"
 #include "AsicView.h"
-#include "SaiSwitch.h"
+#include "SaiSwitchInterface.h"
 
 #include <memory>
 
@@ -25,7 +25,7 @@ namespace syncd
             BestCandidateFinder(
                     _In_ const AsicView &currentView,
                     _In_ const AsicView &temporaryView,
-                    _In_ std::shared_ptr<const SaiSwitch> sw);
+                    _In_ std::shared_ptr<const SaiSwitchInterface> sw);
 
 
             virtual ~BestCandidateFinder() = default;
@@ -176,7 +176,7 @@ namespace syncd
 
             static std::shared_ptr<SaiAttr> getSaiAttrFromDefaultValue(
                     _In_ const AsicView &currentView,
-                    _In_ std::shared_ptr<const SaiSwitch> sw,
+                    _In_ std::shared_ptr<const SaiSwitchInterface> sw,
                     _In_ const sai_attr_metadata_t &meta);
 
             static bool hasEqualQosMapList(
@@ -188,7 +188,7 @@ namespace syncd
 
             const AsicView& m_temporaryView;
 
-            std::shared_ptr<const SaiSwitch> m_switch;
+            std::shared_ptr<const SaiSwitchInterface> m_switch;
 
             std::shared_ptr<const SaiObj> m_temporaryObj;
 

diff --git a/syncd/ComparisonLogic.cpp b/syncd/ComparisonLogic.cpp
@@ -24,7 +24,7 @@ using namespace saimeta;
 
 ComparisonLogic::ComparisonLogic(
         _In_ std::shared_ptr<sairedis::SaiInterface> vendorSai,
-        _In_ std::shared_ptr<SaiSwitch> sw,
+        _In_ std::shared_ptr<SaiSwitchInterface> sw,
         _In_ std::shared_ptr<NotificationHandler> handler,
         _In_ std::set<sai_object_id_t> initViewRemovedVids,
         _In_ std::shared_ptr<AsicView> current,

diff --git a/syncd/ComparisonLogic.h b/syncd/ComparisonLogic.h
@@ -6,7 +6,7 @@ extern "C"{
 
 #include "AsicView.h"
 #include "VendorSai.h"
-#include "SaiSwitch.h"
+#include "SaiSwitchInterface.h"
 #include "VirtualOidTranslator.h"
 #include "NotificationHandler.h"
 #include "BreakConfig.h"
@@ -21,7 +21,7 @@ namespace syncd
 
             ComparisonLogic(
                 _In_ std::shared_ptr<sairedis::SaiInterface> vendorSai,
-                _In_ std::shared_ptr<SaiSwitch> sw,
+                _In_ std::shared_ptr<SaiSwitchInterface> sw,
                 _In_ std::shared_ptr<NotificationHandler> handler,
                 _In_ std::set<sai_object_id_t> initViewRemovedVids,
                 _In_ std::shared_ptr<AsicView> current,
@@ -230,7 +230,7 @@ namespace syncd
 
             std::shared_ptr<sairedis::SaiInterface> m_vendorSai;
 
-            std::shared_ptr<SaiSwitch> m_switch;
+            std::shared_ptr<SaiSwitchInterface> m_switch;
 
             std::set<sai_object_id_t> m_initViewRemovedVids;
 

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -16,11 +16,13 @@ endif
 
 noinst_LIBRARIES = libSyncd.a libSyncdRequestShutdown.a
 libSyncd_a_SOURCES = \
+				SaiSwitchInterface.cpp \
 				ZeroMQSelectableChannel.cpp \
 				RedisSelectableChannel.cpp \
 				SelectableChannel.cpp \
 				ZeroMQNotificationProducer.cpp \
 				RedisNotificationProducer.cpp \
+				ComparisonLogic.cpp \
 				Syncd.cpp \
 				BreakConfig.cpp \
 				BreakConfigParser.cpp \
@@ -32,7 +34,6 @@ libSyncd_a_SOURCES = \
 				Workaround.cpp \
 				ServiceMethodTable.cpp \
 				SwitchNotifications.cpp \
-				ComparisonLogic.cpp \
 				VirtualOidTranslator.cpp \
 				NotificationProcessor.cpp \
 				NotificationHandler.cpp \

diff --git a/syncd/SaiSwitch.cpp b/syncd/SaiSwitch.cpp
@@ -27,6 +27,7 @@ SaiSwitch::SaiSwitch(
         _In_ std::shared_ptr<VirtualOidTranslator> translator,
         _In_ std::shared_ptr<sairedis::SaiInterface> vendorSai,
         _In_ bool warmBoot):
+    SaiSwitchInterface(switch_vid, switch_rid),
     m_vendorSai(vendorSai),
     m_warmBoot(warmBoot),
     m_translator(translator),
@@ -36,9 +37,6 @@ SaiSwitch::SaiSwitch(
 
     SWSS_LOG_TIMER("constructor");
 
-    m_switch_rid = switch_rid;
-    m_switch_vid = switch_vid;
-
     GlobalSwitchId::setSwitchId(m_switch_rid);
 
     m_hardware_info = saiGetHardwareInfo();
@@ -341,20 +339,6 @@ void SaiSwitch::redisSetDummyAsicStateForRealObjectId(
     m_client->setDummyAsicStateObject(vid);
 }
 
-sai_object_id_t SaiSwitch::getVid() const
-{
-    SWSS_LOG_ENTER();
-
-    return m_switch_vid;
-}
-
-sai_object_id_t SaiSwitch::getRid() const
-{
-    SWSS_LOG_ENTER();
-
-    return m_switch_rid;
-}
-
 std::string SaiSwitch::getHardwareInfo() const
 {
     SWSS_LOG_ENTER();
@@ -550,25 +534,6 @@ sai_object_id_t SaiSwitch::helperGetSwitchAttrOid(
     return rid;
 }
 
-sai_object_id_t SaiSwitch::getSwitchDefaultAttrOid(
-        _In_ sai_attr_id_t attr_id) const
-{
-    SWSS_LOG_ENTER();
-
-    auto it = m_default_rid_map.find(attr_id);
-
-    if (it == m_default_rid_map.end())
-    {
-        auto meta = sai_metadata_get_attr_metadata(SAI_OBJECT_TYPE_SWITCH, attr_id);
-
-        const char* name = (meta) ? meta->attridname : "UNKNOWN";
-
-        SWSS_LOG_THROW("attribute %s (%d) not found in default RID map", name, attr_id);
-    }
-
-    return it->second;
-}
-
 bool SaiSwitch::isColdBootDiscoveredRid(
         _In_ sai_object_id_t rid) const
 {