Add queuestat changes for aggregate VOQ counters

scripts/queuestat

@@ -15,7 +15,9 @@ import sys
 from collections import namedtuple, OrderedDict
 from natsort import natsorted
 from tabulate import tabulate
-from sonic_py_common import multi_asic
+from sonic_py_common import multi_asic, device_info
+from redis import Redis, exceptions
+from swsscommon import swsscommon
 
 # mock the redis for unit test purposes #
 try:
@@ -25,6 +27,11 @@ try:
         sys.path.insert(0, modules_path)
         sys.path.insert(0, tests_path)
         import mock_tables.dbconnector # lgtm [py/unused-import]
+
+        if os.environ["UTILITIES_UNIT_TESTING_IS_SUP"] == "1":
+            import mock
+            device_info.is_supervisor = mock.MagicMock(return_value=True)
+
     if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic":
         import mock_tables.mock_multi_asic
         mock_tables.dbconnector.load_namespace_config()
@@ -82,6 +89,39 @@ cnstat_dir = 'N/A'
 cnstat_fqn_file = 'N/A'
 
 
+def get_redis_ips(db):
+    db.connect(db.STATE_DB)
+    redis_ips = []
+    chassis_midplane_table = db.keys(db.STATE_DB, "CHASSIS_MIDPLANE_TABLE*")
+    lc_metadata = []
+    for lc in chassis_midplane_table:
+        lc_metadata.append(db.get_all(db.STATE_DB, lc))
+
+    db.connect(db.CHASSIS_STATE_DB)
+    for lc in lc_metadata:
+        # skip if LC is offline
+        if lc['access'] == "False":
+            continue
+
+        slot_id = int(lc['ip_address'].split(".")[2]) - 1
+        num_asics = db.get(db.CHASSIS_STATE_DB, f"CHASSIS_MODULE_TABLE|LINE-CARD{slot_id}", 'num_asics')
+
+        # Skip if pmon hasn't started on LC yet
+        if num_asics == None:
+            continue
+
+        # No namespace in single ASIC LC
+        if num_asics == "1":
+            redis_ips.append(lc['ip_address'])
+        else:
+            prefix, _ = lc['ip_address'].rsplit(".", maxsplit=1)
+            for i in range(int(num_asics)):
+                prefix, _, _ = lc['ip_address'].rpartition(".")
+                redis_ips.append(f"{prefix}.{10+i}")
+
+    return redis_ips
+
+
 def build_json(port, cnstat, all=False, trim=False, voq=False):
     def ports_stats(k):
         p = {}
@@ -120,6 +160,18 @@ def build_json(port, cnstat, all=False, trim=False, voq=False):
         out.update(ports_stats(k))
     return out
 
+def run_queuestat(save_fresh_stats, port_to_show_stats, json_opt, non_zero, ns, db, voq, trim, all_):
+    queuestat = Queuestat(ns, db, all_, trim, voq)
+    if save_fresh_stats:
+        queuestat.save_fresh_stats()
+        return
+
+    if port_to_show_stats != None:
+        queuestat.get_print_port_stat(port_to_show_stats, json_opt, non_zero)
+    else:
+        queuestat.get_print_all_stat(json_opt, non_zero)
+
+
 class QueuestatWrapper(object):
     """A wrapper to execute queuestat cmd over the correct namespaces"""
     def __init__(self, namespace, all, trim, voq):
@@ -134,24 +186,20 @@ class QueuestatWrapper(object):
 
     @multi_asic_util.run_on_multi_asic
     def run(self, save_fresh_stats, port_to_show_stats, json_opt, non_zero):
-        queuestat = Queuestat(self.multi_asic.current_namespace, self.db, self.all, self.trim, self.voq)
-        if save_fresh_stats:
-            queuestat.save_fresh_stats()
-            return
-
-        if port_to_show_stats != None:
-            queuestat.get_print_port_stat(port_to_show_stats, json_opt, non_zero)
-        else:
-            queuestat.get_print_all_stat(json_opt, non_zero)
-
+        run_queuestat(save_fresh_stats, port_to_show_stats, json_opt, non_zero, \
+                      self.multi_asic.current_namespace, self.db, self.voq, self.trim, self.all)
 
 class Queuestat(object):
     def __init__(self, namespace, db, all=False, trim=False, voq=False):
         self.db = db
         self.all = all
         self.trim = trim
         self.voq = voq
+        self.voq_stats = {}
         self.namespace = namespace
+        if namespace is None:
+            self.db = SonicV2Connector(use_unix_socket_path=False)
+            self.db.connect(self.db.COUNTERS_DB)
         self.namespace_str = f" for {namespace}" if namespace else ''
 
         def get_queue_port(table_id):
@@ -164,7 +212,9 @@ class Queuestat(object):
 
         # Get all ports
         if voq:
-            self.counter_port_name_map = self.db.get_all(self.db.COUNTERS_DB, COUNTERS_SYSTEM_PORT_NAME_MAP)
+            # counter_port_name_map is assigned later for supervisor as a list
+            self.counter_port_name_map = [] if device_info.is_supervisor() else \
+                self.db.get_all(self.db.COUNTERS_DB, COUNTERS_SYSTEM_PORT_NAME_MAP)
         else:
             self.counter_port_name_map = self.db.get_all(self.db.COUNTERS_DB, COUNTERS_PORT_NAME_MAP)
 
@@ -179,6 +229,16 @@ class Queuestat(object):
             self.port_queues_map[port] = {}
             self.port_name_map[self.counter_port_name_map[port]] = port
 
+        if self.voq:
+            counter_bucket_dict.update(voq_counter_bucket_dict)
+        else:
+            counter_bucket_dict.update(trim_counter_bucket_dict)
+
+        if device_info.is_supervisor():
+            self.aggregate_voq_stats()
+            self.counter_port_name_map = self.voq_stats.keys()
+            return
+
         counter_queue_name_map = None
         # Get Queues for each port
         if voq:
@@ -194,6 +254,44 @@ class Queuestat(object):
             port = self.port_name_map[get_queue_port(counter_queue_name_map[queue])]
             self.port_queues_map[port][queue] = counter_queue_name_map[queue]
 
+    def aggregate_voq_stats(self):
+        redis_ips = get_redis_ips(self.db)
+        self.voq_stats = {}
+
+        for ip in redis_ips:
+            asic_counters_db = swsscommon.DBConnector(swsscommon.COUNTERS_DB, ip, 6379, 0)
+            try:
+                counters_voq_name_map = asic_counters_db.hgetall(COUNTERS_VOQ_NAME_MAP)
+                if counters_voq_name_map is None:
+                    continue
+                for voq in counters_voq_name_map:
+                    # key LINECARD|ASIC|EthernetXXX:INDEX
+                    sysPort, idx = voq.split(":")
+                    for counter_name in counter_bucket_dict:
+                        self.voq_stats.setdefault(sysPort, {}).setdefault(idx, {}).setdefault(counter_name, 0)
+                        oid = counters_voq_name_map[voq]
+                        counter_data = asic_counters_db.hget("COUNTERS:"+oid, counter_name)
+                        if counter_data is not None:
+                            self.voq_stats[sysPort][idx][counter_name] += int(counter_data)
+
+            except exceptions.ConnectionError as e:
+                # Skip further operations for this redis-instance
+                continue
+
+    def get_aggregate_port_stats(self, port):
+        # Build a dictionary of stats
+        cnstat_dict = OrderedDict()
+        cnstat_dict['time'] = datetime.datetime.now()
+        for idx in sorted(self.voq_stats[port].keys()):
+            fields = ["0"]*len(voq_header)
+            fields[0] = idx
+            fields[1] = QUEUE_TYPE_VOQ
+            for counter_name, pos in counter_bucket_dict.items():
+                fields[pos] = str(self.voq_stats[port][idx][counter_name])
+            cntr = VoqStats._make(fields)._asdict()
+            cnstat_dict[port+":"+idx] = cntr
+        return cnstat_dict
+
     def get_cnstat(self, queue_map):
         """
             Get the counters info from database.
@@ -230,11 +328,6 @@ class Queuestat(object):
             counter_dict = { **counter_bucket_dict }
             fields = [ get_queue_index(table_id), get_queue_type(table_id) ]
 
-            if self.voq:
-                counter_dict.update(voq_counter_bucket_dict)
-            else:
-                counter_dict.update(trim_counter_bucket_dict)
-
             # Layout is per QueueStats/VoqStats type definition
             fields.extend(["0"]*len(counter_dict))
 
@@ -325,7 +418,8 @@ class Queuestat(object):
                 hdr = std_header
 
             if table:
-                print(f"For namespace {self.namespace}:")
+                if not device_info.is_supervisor():
+                    print(f"For namespace {self.namespace}:")
                 print(tabulate(table, hdr, tablefmt='simple', stralign='right'))
                 print()
 
@@ -428,7 +522,11 @@ class Queuestat(object):
         json_output = {}
         for port in natsorted(self.counter_port_name_map):
             json_output[port] = {}
-            cnstat_dict = self.get_cnstat(self.port_queues_map[port])
+            if self.voq and device_info.is_supervisor():
+                cnstat_dict = self.get_aggregate_port_stats(port)
+            else:
+                cnstat_dict = self.get_cnstat(self.port_queues_map[port])
+
             cache_ns = ''
             if self.voq and self.namespace is not None:
                 cache_ns = '-' + self.namespace + '-'
@@ -457,12 +555,16 @@ class Queuestat(object):
         Get stat for the port
         If JSON option is True  print data in JSON format
         """
-        if not port in self.port_queues_map:
+        if port not in self.port_queues_map and port not in self.voq_stats:
             print("Port doesn't exist!", port)
             sys.exit(1)
 
         # Get stat for the port queried
-        cnstat_dict = self.get_cnstat(self.port_queues_map[port])
+
+        if self.voq and device_info.is_supervisor():
+            cnstat_dict = self.get_aggregate_port_stats(port)
+        else:
+            cnstat_dict = self.get_cnstat(self.port_queues_map[port])
         cache_ns = ''
         if self.voq and self.namespace is not None:
             cache_ns = '-' + self.namespace + '-'
@@ -542,8 +644,13 @@ def main(port, clear, delete, json_opt, all, trim, voq, non_zero, namespace):
     if delete_stats:
         cache.remove()
 
-    queuestat_wrapper = QueuestatWrapper(namespace, all, trim, voq)
-    queuestat_wrapper.run(save_fresh_stats, port_to_show_stats, json_opt, non_zero)
+
+    if device_info.is_supervisor() and namespace is None:
+        run_queuestat(save_fresh_stats, port_to_show_stats, json_opt, non_zero, namespace, None, voq, trim, all)
+    else:
+        queuestat_wrapper = QueuestatWrapper(namespace, all, trim, voq)
+        queuestat_wrapper.run(save_fresh_stats, port_to_show_stats, json_opt, non_zero)
+
 
     sys.exit(0)
 

tests/chassis_modules_test.py

@@ -46,11 +46,12 @@
 """
 
 show_chassis_midplane_output="""\
-      Name     IP-Address    Reachability
-----------  -------------  --------------
-LINE-CARD0  192.168.1.100            True
-LINE-CARD1    192.168.1.2           False
-LINE-CARD2    192.168.1.1            True
+      Name    IP-Address    Reachability
+----------  ------------  --------------
+LINE-CARD0   192.168.3.1            True
+LINE-CARD1   192.168.4.1           False
+LINE-CARD2   192.168.5.1            True
+LINE-CARD3   192.168.6.1            True
 """
 
 show_chassis_system_ports_output_asic0="""\
@@ -346,7 +347,7 @@ def test_midplane_show_all_count_lines(self):
         result = runner.invoke(show.cli.commands["chassis"].commands["modules"].commands["midplane-status"], [])
         print(result.output)
         result_lines = result.output.strip('\n').split('\n')
-        modules = ["LINE-CARD0", "LINE-CARD1", "LINE-CARD2"]
+        modules = ["LINE-CARD0", "LINE-CARD1", "LINE-CARD2", "LINE-CARD3"]
         for i, module in enumerate(modules):
             assert module in result_lines[i + warning_lines + header_lines]
         assert len(result_lines) == warning_lines + header_lines + len(modules)

tests/mock_tables/asic0/counters_db.json

@@ -2788,5 +2788,23 @@
     "PERSISTENT_WATERMARKS:oid:100000000b0ff": {
         "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "507",
         "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "507"
+    },
+    "COUNTERS_VOQ_NAME_MAP": {
+        "sonic-lc1|asic0|Ethernet0:0": "oid:0x150000000005c2",
+        "sonic-lc2|asic0|Ethernet4:1": "oid:0x1500000000047a"
+    },
+    "COUNTERS:oid:0x150000000005c2": {
+        "SAI_QUEUE_STAT_DROPPED_BYTES": "122",
+        "SAI_QUEUE_STAT_DROPPED_PACKETS": "1",
+        "SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS": "0",
+        "SAI_QUEUE_STAT_BYTES": "122",
+        "SAI_QUEUE_STAT_PACKETS": "1"
+    },
+    "COUNTERS:oid:0x1500000000047a": {
+        "SAI_QUEUE_STAT_DROPPED_BYTES": "244",
+        "SAI_QUEUE_STAT_DROPPED_PACKETS": "2",
+        "SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS": "0",
+        "SAI_QUEUE_STAT_BYTES": "366",
+        "SAI_QUEUE_STAT_PACKETS": "3"
     }
 }

tests/mock_tables/asic1/counters_db.json

@@ -1675,5 +1675,23 @@
     },
     "USER_WATERMARKS:oid:0x100000000b115": {
         "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2"
+    },
+    "COUNTERS_VOQ_NAME_MAP": {
+        "sonic-lc1|asic0|Ethernet0:0": "oid:0x1500000000059d",
+        "sonic-lc2|asic0|Ethernet4:1": "oid:0x15000000000571"
+    },
+    "COUNTERS:oid:0x1500000000059d": {
+        "SAI_QUEUE_STAT_DROPPED_BYTES": "1098",
+        "SAI_QUEUE_STAT_DROPPED_PACKETS": "9",
+        "SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS": "0",
+        "SAI_QUEUE_STAT_BYTES": "854",
+        "SAI_QUEUE_STAT_PACKETS": "7"
+    },
+    "COUNTERS:oid:0x15000000000571": {
+        "SAI_QUEUE_STAT_DROPPED_BYTES": "732",
+        "SAI_QUEUE_STAT_DROPPED_PACKETS": "6",
+        "SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS": "0",
+        "SAI_QUEUE_STAT_BYTES": "610",
+        "SAI_QUEUE_STAT_PACKETS": "5"
     }
 }

tests/mock_tables/asic2/counters_db.json

@@ -1699,5 +1699,23 @@
     },
     "COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP": {
         "DEBUG_1": "SAI_SWITCH_STAT_IN_DROP_REASON_RANGE_BASE"
+    },
+    "COUNTERS_VOQ_NAME_MAP": {
+        "sonic-lc1|asic0|Ethernet0:0": "oid:0x15000000000532",
+        "sonic-lc2|asic0|Ethernet4:1": "oid:0x15000000000521"
+    },
+    "COUNTERS:oid:0x15000000000532": {
+        "SAI_QUEUE_STAT_DROPPED_BYTES": "0",
+        "SAI_QUEUE_STAT_DROPPED_PACKETS": "0",
+        "SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS": "0",
+        "SAI_QUEUE_STAT_BYTES": "0",
+        "SAI_QUEUE_STAT_PACKETS": "0"
+    },
+    "COUNTERS:oid:0x15000000000521": {
+        "SAI_QUEUE_STAT_DROPPED_BYTES": "976",
+        "SAI_QUEUE_STAT_DROPPED_PACKETS": "8",
+        "SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS": "0",
+        "SAI_QUEUE_STAT_BYTES": "1220",
+        "SAI_QUEUE_STAT_PACKETS": "10"
     }
 }