[portsorch] fix crash when number of PGs returned 0

Signed-off-by: Stepan Blyschak <[email protected]>

Author: stepanblyschak

orchagent/portsorch.cpp

@@ -6435,10 +6435,16 @@ void PortsOrch::initializePriorityGroupsBulk(std::vector<Port>& ports)
 
         bulker.executeGet();
 
-        for (size_t idx = 0; idx < portCount; idx++)
+        size_t idx = 0;
+        for (const auto& port: ports)
         {
-            const auto& port = ports[idx];
+            if (port.m_priority_group_ids.size() == 0)
+            {
+                continue;
+            }
+
             const auto status = bulker.statuses[idx];
+            idx++;
 
             if (status != SAI_STATUS_SUCCESS)
             {
@@ -6513,10 +6519,16 @@ void PortsOrch::initializeQueuesBulk(std::vector<Port>& ports)
 
         bulker.executeGet();
 
-        for (size_t idx = 0; idx < portCount; idx++)
+        size_t idx = 0;
+        for (const auto& port: ports)
         {
-            const auto& port = ports[idx];
+            if (port.m_queue_ids.size() == 0)
+            {
+                continue;
+            }
+
             const auto status = bulker.statuses[idx];
+            idx++;
 
             if (status != SAI_STATUS_SUCCESS)
             {
@@ -6593,10 +6605,17 @@ void PortsOrch::initializeSchedulerGroupsBulk(std::vector<Port>& ports)
 
         bulker.executeGet();
 
+        size_t bulkIdx = 0;
         for (size_t idx = 0; idx < portCount; idx++)
         {
             const auto& port = ports[idx];
-            const auto status = bulker.statuses[idx];
+            if (scheduler_group_ids[idx].size() == 0)
+            {
+                continue;
+            }
+
+            const auto status = bulker.statuses[bulkIdx];
+            bulkIdx++;
 
             if (status != SAI_STATUS_SUCCESS)
             {

tests/mock_tests/portsorch_ut.cpp

@@ -2964,6 +2964,74 @@ namespace portsorch_test
         ASSERT_FALSE(port.m_init);
     }
 
+    TEST_F(PortsOrchTest, PortsWithNoPGsQueuesSchedulerGroups)
+    {
+        Table portTable = Table(m_app_db.get(), APP_PORT_TABLE_NAME);
+
+        auto original_api = sai_port_api->get_ports_attribute;
+        // Mock SAI port API to return 0 number of PGs, queues and scheduler groups
+        auto spy = SpyOn<SAI_API_PORT, SAI_OBJECT_TYPE_PORT>(&sai_port_api->get_ports_attribute);
+        spy->callFake([&](
+                    uint32_t object_count,
+                    const sai_object_id_t *object_id,
+                    const uint32_t *attr_count,
+                    sai_attribute_t **attr_list,
+                    sai_bulk_op_error_mode_t mode,
+                    sai_status_t *object_statuses) -> sai_status_t
+            {
+                assert(object_count > 1);
+                assert(attr_count[0] > 1);
+                switch (attr_list[0]->id)
+                {
+                case SAI_PORT_ATTR_NUMBER_OF_INGRESS_PRIORITY_GROUPS:
+                case SAI_PORT_ATTR_QOS_NUMBER_OF_QUEUES:
+                case SAI_PORT_ATTR_QOS_NUMBER_OF_SCHEDULER_GROUPS:
+                    for (size_t i = 0; i < object_count; i++)
+                    {
+                        attr_list[i]->value.u32 = 0;
+                        object_statuses[i] = SAI_STATUS_SUCCESS;
+                    }
+                    return SAI_STATUS_SUCCESS;
+                }
+                return original_api(
+                        object_count,
+                        object_id,
+                        attr_count,
+                        attr_list,
+                        mode,
+                        object_statuses);
+            }
+        );
+
+        // Get SAI default ports to populate DB
+
+        auto ports = ut_helper::getInitialSaiPorts();
+
+        // Populate pot table with SAI ports
+        for (const auto &it : ports)
+        {
+            portTable.set(it.first, it.second);
+        }
+
+        // Set PortConfigDone
+        portTable.set("PortConfigDone", { { "count", to_string(ports.size()) } });
+
+        gPortsOrch->addExistingData(&portTable);
+
+        // Apply configuration :
+        //  create ports
+
+        static_cast<Orch *>(gPortsOrch)->doTask();
+
+        Port port;
+        gPortsOrch->getPort("Ethernet0", port);
+
+        ASSERT_TRUE(port.m_init);
+        ASSERT_EQ(port.m_priority_group_ids.size(), 0);
+        ASSERT_EQ(port.m_queue_ids.size(), 0);
+    }
+
+
     TEST_F(PortsOrchTest, PfcDlrHandlerCallingDlrInitAttribute)
     {
         _hook_sai_port_api();

tests/mock_tests/saispy.h

@@ -118,3 +118,13 @@ std::shared_ptr<SaiSpyFunctor<n, objtype, sai_status_t, sai_object_id_t, uint32_
 
     return std::make_shared<SaiSpyGetAttrFunctor>(fn_ptr);
 }
+
+// get bulk entry attribute
+template <int n, int objtype>
+std::shared_ptr<SaiSpyFunctor<n, objtype, sai_status_t, uint32_t, const sai_object_id_t*, const uint32_t*, sai_attribute_t**, sai_bulk_op_error_mode_t, sai_status_t*>>
+    SpyOn(sai_status_t (**fn_ptr)(uint32_t, const sai_object_id_t*, const uint32_t*, sai_attribute_t**, sai_bulk_op_error_mode_t, sai_status_t*))
+{
+    using SaiSpyGetAttrFunctor = SaiSpyFunctor<n, objtype, sai_status_t, uint32_t, const sai_object_id_t*, const uint32_t*, sai_attribute_t**, sai_bulk_op_error_mode_t, sai_status_t*>;
+
+    return std::make_shared<SaiSpyGetAttrFunctor>(fn_ptr);
+}