[VS] Fix context config guid on RealObjectIdManager (sonic-net#847)

Will help using multiple switches in VS with multiple contextes.
Metaswitch · Jul 13, 2021 · 8123e32 · 8123e32
1 parent 6fe1e75
commit 8123e32
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/vslib/inc/VirtualSwitchSaiInterface.h b/vslib/inc/VirtualSwitchSaiInterface.h
@@ -2,12 +2,12 @@
 
 #include "SwitchStateBase.h"
 #include "WarmBootState.h"
-#include "SwitchConfigContainer.h"
 #include "RealObjectIdManager.h"
 #include "SwitchStateBase.h"
 #include "EventQueue.h"
 #include "EventPayloadPacket.h"
 #include "EventPayloadNetLinkMsg.h"
+#include "ContextConfig.h"
 
 #include "lib/inc/SaiInterface.h"
 
@@ -70,7 +70,7 @@ namespace saivs
  public:
 
  VirtualSwitchSaiInterface(
- _In_ const std::shared_ptr<SwitchConfigContainer> scc);
+ _In_ std::shared_ptr<ContextConfig> contextConfig);
 
  virtual ~VirtualSwitchSaiInterface();
 
@@ -394,7 +394,7 @@ namespace saivs
 
  std::map<sai_object_id_t, WarmBootState> m_warmBootState;
 
- std::shared_ptr<SwitchConfigContainer> m_switchConfigContainer;
+ std::shared_ptr<ContextConfig> m_contextConfig;
 
  std::shared_ptr<RealObjectIdManager> m_realObjectIdManager;
 

diff --git a/vslib/src/Sai.cpp b/vslib/src/Sai.cpp
@@ -232,7 +232,7 @@ sai_status_t Sai::initialize(
 
  // TODO move to Context class
 
- m_vsSai = std::make_shared<VirtualSwitchSaiInterface>(scc);
+ m_vsSai = std::make_shared<VirtualSwitchSaiInterface>(contextConfig);
 
  m_meta = std::make_shared<saimeta::Meta>(m_vsSai);
 

diff --git a/vslib/src/VirtualSwitchSaiInterface.cpp b/vslib/src/VirtualSwitchSaiInterface.cpp
@@ -30,13 +30,14 @@ using namespace saimeta;
 using namespace sairediscommon;
 
 VirtualSwitchSaiInterface::VirtualSwitchSaiInterface(
- _In_ const std::shared_ptr<SwitchConfigContainer> scc)
+ _In_ std::shared_ptr<ContextConfig> contextConfig):
+ m_contextConfig(contextConfig)
 {
  SWSS_LOG_ENTER();
 
- m_realObjectIdManager = std::make_shared<RealObjectIdManager>(0, scc); // TODO fix global context
-
- m_switchConfigContainer = scc;
+ m_realObjectIdManager = std::make_shared<RealObjectIdManager>(
+ m_contextConfig->m_guid,
+  m_contextConfig->m_scc);
 }
 
 VirtualSwitchSaiInterface::~VirtualSwitchSaiInterface()
@@ -625,7 +626,7 @@ sai_status_t VirtualSwitchSaiInterface::create(
  {
  auto switchIndex = RealObjectIdManager::getSwitchIndex(switchId);
 
- auto config = m_switchConfigContainer->getConfig(switchIndex);
+ auto config = m_contextConfig->m_scc->getConfig(switchIndex);
 
  if (config == nullptr)
  {