[vs] Initialization of VOQ switch objects (sonic-net#702)

VOQ switch objects are initialized during switch create. This VOQ objects are initialized after regular switch objects are initialized. This PR depends on sonic-net#701 for switch state initialization
Metaswitch · Nov 13, 2020 · fc50cf5 · fc50cf5
1 parent e2f76cf
commit fc50cf5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/vslib/inc/SwitchBCM81724.h b/vslib/inc/SwitchBCM81724.h
@@ -97,8 +97,14 @@ namespace saivs
 
         protected:
 
-            virtual sai_status_t refresh_read_only( _In_ const sai_attr_metadata_t *meta, _In_ sai_object_id_t object_id) override;
+            virtual sai_status_t refresh_read_only(
+                    _In_ const sai_attr_metadata_t *meta,
+                    _In_ sai_object_id_t object_id) override;
+
             virtual sai_status_t set_switch_default_attributes();
-            virtual sai_status_t initialize_default_objects() override;
+
+            virtual sai_status_t initialize_default_objects(
+                    _In_ uint32_t attr_count,
+                    _In_ const sai_attribute_t *attr_list) override;
     };
 }
diff --git a/vslib/inc/SwitchStateBase.h b/vslib/inc/SwitchStateBase.h
@@ -98,7 +98,9 @@ namespace saivs
 
         public:
 
-            virtual sai_status_t initialize_default_objects();
+            virtual sai_status_t initialize_default_objects(
+                    _In_ uint32_t attr_count,
+                    _In_ const sai_attribute_t *attr_list);
 
             virtual sai_status_t create_port_dependencies(
                     _In_ sai_object_id_t port_id);

diff --git a/vslib/inc/VirtualSwitchSaiInterface.h b/vslib/inc/VirtualSwitchSaiInterface.h
@@ -339,7 +339,10 @@ namespace saivs
                     _In_ sai_object_id_t switch_id,
                     _In_ std::shared_ptr<SwitchConfig> config,
                     _In_ std::shared_ptr<WarmBootState> warmBootState,
-                    _In_ std::weak_ptr<saimeta::Meta> meta);
+                    _In_ std::weak_ptr<saimeta::Meta> meta,
+                    _In_ uint32_t attr_count,
+                    _In_ const sai_attribute_t *attr_list);
+
         private:
 
             static bool doesFdbEntryNotMatchFlushAttr(

diff --git a/vslib/src/SwitchBCM81724.cpp b/vslib/src/SwitchBCM81724.cpp
@@ -62,7 +62,9 @@ sai_status_t SwitchBCM81724::create_port_dependencies(
     return SAI_STATUS_SUCCESS;
 }
 
-sai_status_t SwitchBCM81724::initialize_default_objects()
+sai_status_t SwitchBCM81724::initialize_default_objects(
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
 {
     SWSS_LOG_ENTER();
 

diff --git a/vslib/src/SwitchStateBase.cpp b/vslib/src/SwitchStateBase.cpp
@@ -1429,7 +1429,9 @@ sai_status_t SwitchStateBase::set_number_of_ecmp_groups()
     return set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr);
 }
 
-sai_status_t SwitchStateBase::initialize_default_objects()
+sai_status_t SwitchStateBase::initialize_default_objects(
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
 {
     SWSS_LOG_ENTER();
 
@@ -1454,6 +1456,10 @@ sai_status_t SwitchStateBase::initialize_default_objects()
     CHECK_STATUS(create_scheduler_groups());
     CHECK_STATUS(set_static_crm_values());
 
+    // Initialize switch for VOQ attributes
+
+    CHECK_STATUS(initialize_voq_switch_objects(attr_count, attr_list));
+
     return SAI_STATUS_SUCCESS;
 }
 

diff --git a/vslib/src/VirtualSwitchSaiInterface.cpp b/vslib/src/VirtualSwitchSaiInterface.cpp
@@ -540,7 +540,9 @@ std::shared_ptr<SwitchStateBase> VirtualSwitchSaiInterface::init_switch(
         _In_ sai_object_id_t switch_id,
         _In_ std::shared_ptr<SwitchConfig> config,
         _In_ std::shared_ptr<WarmBootState> warmBootState,
-        _In_ std::weak_ptr<saimeta::Meta> meta)
+        _In_ std::weak_ptr<saimeta::Meta> meta,
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
 {
     SWSS_LOG_ENTER();
 
@@ -595,7 +597,7 @@ std::shared_ptr<SwitchStateBase> VirtualSwitchSaiInterface::init_switch(
     }
     else
     {
-        sai_status_t status = ss->initialize_default_objects(); // TODO move to constructor
+        sai_status_t status = ss->initialize_default_objects(attr_count, attr_list); // TODO move to constructor
 
         if (status != SAI_STATUS_SUCCESS)
         {
@@ -652,7 +654,7 @@ sai_status_t VirtualSwitchSaiInterface::create(
             }
         }
 
-        auto ss = init_switch(switchId, config, warmBootState, m_meta);
+        auto ss = init_switch(switchId, config, warmBootState, m_meta, attr_count, attr_list);
 
         if (!ss)
         {