Fix egress queue counters in voq systems. (sonic-net#2706)

* swss: Fix egress queue counters in voq systems.
 * In voq systems, the buffer profiles are defined on sysports.So the
   phy ports do not have buffer queue config and queuesStateVector
   built by getQueueConfigurations in flexcounterorch never has phy
   ports in voq systems. So in voq systems, always enable egress
   queue counters.

Author: skbarista

orchagent/portsorch.cpp

@@ -6158,7 +6158,7 @@ void PortsOrch::generateQueueMapPerPort(const Port& port, FlexCounterQueueStates
         {
 	    /* voq counters are always enabled. There is no mechanism to disable voq
 	     * counters in a voq system. */
-            if (!voq && !queuesState.isQueueCounterEnabled(queueRealIndex))
+            if ((gMySwitchType != "voq")  && !queuesState.isQueueCounterEnabled(queueRealIndex))
             {
                 continue;
             }
@@ -6177,6 +6177,16 @@ void PortsOrch::generateQueueMapPerPort(const Port& port, FlexCounterQueueStates
         }
         else
         {
+            // In voq systems, always install a flex counter for this egress queue
+            // to track stats. In voq systems, the buffer profiles are defined on
+            // sysports. So the phy ports do not have buffer queue config. Hence
+            // queuesStateVector built by getQueueConfigurations in flexcounterorch
+            // never has phy ports in voq systems. So always enabled egress queue
+            // counter on voq systems.
+            if (gMySwitchType == "voq")
+            {
+               addQueueFlexCountersPerPortPerQueueIndex(port, queueIndex, false);
+            }
             queuePortVector.emplace_back(id, sai_serialize_object_id(port.m_port_id));
         }
     }

tests/test_virtual_chassis.py

@@ -913,6 +913,33 @@ def test_chassis_add_remove_ports(self, vct):
 
             buffer_model.disable_dynamic_buffer(dvs.get_config_db(), dvs.runcmd)
 
+    def test_voq_egress_queue_counter(self, vct):
+        if vct is None:
+            return
+        dvss = vct.dvss
+        dvs = None
+        for name in dvss.keys():
+            if "supervisor" in name:
+                continue
+            dvs = dvss[name]
+            break
+        assert dvs
+        _, _ = dvs.runcmd("counterpoll queue enable")
+
+        num_voqs_per_port = 8
+        # vs-switch creates 20 queues per port.
+        num_queues_per_local_port = 20
+        num_ports_per_linecard = 32
+        num_local_ports = 32
+        num_linecards = 3
+        num_sysports =  num_ports_per_linecard * num_linecards
+        num_egress_queues = num_local_ports * num_queues_per_local_port
+        num_voqs = ( num_ports_per_linecard * num_voqs_per_port * num_linecards )
+        num_queues_to_be_polled = num_voqs + num_egress_queues
+
+        flex_db = dvs.get_flex_db()
+        flex_db.wait_for_n_keys("FLEX_COUNTER_TABLE:QUEUE_STAT_COUNTER", num_queues_to_be_polled)
+ 
 # Add Dummy always-pass test at end as workaroud
 # for issue when Flaky fail on final test it invokes module tear-down before retrying
 def test_nonflaky_dummy():