Add check for empty m_priority_group_ids in initializePriorityGroupsBulk

Author: arista-hpandya

orchagent/portsorch.cpp

@@ -6467,6 +6467,10 @@ void PortsOrch::initializePriorityGroupsBulk(std::vector<Port>& ports)
         for (size_t idx = 0; idx < portCount; idx++)
         {
             const auto& port = ports[idx];
+            if (port.m_priority_group_ids.size() == 0)
+            {
+                continue;
+            }
             const auto status = bulker.statuses[idx];
 
             if (status != SAI_STATUS_SUCCESS)

tests/mock_tests/portsorch_ut.cpp

@@ -3860,6 +3860,36 @@ namespace portsorch_test
         ASSERT_FALSE(bridgePortCalledBeforeLagMember); // bridge port created on lag before lag member was created
     }
 
+    // Mock variables for zero priority groups test
+    bool mock_zero_priority_groups = false;
+    sai_object_id_t mock_zero_pg_port_id = 0;
+
+    sai_status_t _ut_stub_sai_get_port_attribute_zero_pg(
+        _In_ sai_object_id_t port_id,
+        _In_ uint32_t attr_count,
+        _Inout_ sai_attribute_t *attr_list)
+    {
+        if (attr_list != nullptr &&
+            mock_zero_priority_groups &&
+            port_id == mock_zero_pg_port_id &&
+            attr_count == 1 &&
+            attr_list[0].id == SAI_PORT_ATTR_NUMBER_OF_INGRESS_PRIORITY_GROUPS)
+        {
+            attr_list[0].value.u32 = 0;  // Return 0 priority groups
+            return SAI_STATUS_SUCCESS;
+        }
+        return pold_sai_port_api->get_port_attribute(port_id, attr_count, attr_list);
+    }
+
+    void _hook_sai_port_api_zero_pg()
+    {
+        ut_sai_port_api = *sai_port_api;
+        pold_sai_port_api = sai_port_api;
+        ut_sai_port_api.get_port_attribute = _ut_stub_sai_get_port_attribute_zero_pg;
+        ut_sai_port_api.set_port_attribute = _ut_stub_sai_set_port_attribute;
+        sai_port_api = &ut_sai_port_api;
+    }
+
     struct PostPortInitTests : PortsOrchTest
     {
     };
@@ -3907,5 +3937,36 @@ namespace portsorch_test
         // Now the field "max_priority_groups" is set
         stateDbSet = stateTable.hget("Ethernet0", "max_priority_groups", value);
         ASSERT_TRUE(stateDbSet);
+
+        // Test case for port with zero priority groups
+        Port port_with_zero_pg;
+        Port port_with_normal_pg;
+
+        ASSERT_TRUE(gPortsOrch->getPort("Ethernet4", port_with_zero_pg));
+        ASSERT_TRUE(gPortsOrch->getPort("Ethernet8", port_with_normal_pg));
+
+        // Clear the priority group IDs to simulate fresh ports
+        port_with_zero_pg.m_priority_group_ids.clear();
+        port_with_normal_pg.m_priority_group_ids.clear();
+
+        // Hook SAI API to return 0 priority groups for Ethernet4 only
+        mock_zero_pg_port_id = port_with_zero_pg.m_port_id;
+        mock_zero_priority_groups = true;
+        _hook_sai_port_api_zero_pg();
+
+        // Create a vector with both ports to test mixed scenario and initialize in bulk
+        std::vector<Port> test_ports = {port_with_zero_pg, port_with_normal_pg};
+        ASSERT_NO_THROW(gPortsOrch->initializePriorityGroupsBulk(test_ports));
+
+        // Verify that the port with zero priority groups has empty m_priority_group_ids
+        ASSERT_EQ(test_ports[0].m_priority_group_ids.size(), 0);
+
+        // Verify that the port with normal priority groups has non-empty m_priority_group_ids
+        ASSERT_GT(test_ports[1].m_priority_group_ids.size(), 0);
+
+        // Cleanup: unhook SAI API and reset mock variables
+        _unhook_sai_port_api();
+        mock_zero_priority_groups = false;
+        mock_zero_pg_port_id = 0;
     }
 }