Fixed show interface counters on supervisor for packet chassis (#3703)

* Added support to display only nonzero queue counter. Signed-off-by: Abhishek Dosi <[email protected]> * Update port2alias * For Config reload/minigraph stop and re-enable routeCheck because with large route scale of 70K+ routes this can log monit error Transiently which can also fail in sonic-mgmt. Signed-off-by: Abhishek Dosi <[email protected]> * Updated UT Signed-off-by: Abhishek Dosi <[email protected]> * Update portstat.py * Update portstat * Fix Signed-off-by: Abhishek Dosi <[email protected]> * Fix Signed-off-by: Abhishek Dosi <[email protected]> --------- Signed-off-by: Abhishek Dosi <[email protected]>
sonic-net · Jan 4, 2025 · 3aec519 · 3aec519
1 parent 428d6da
commit 3aec519
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/scripts/portstat b/scripts/portstat
@@ -27,6 +27,7 @@ try:
             import sonic_py_common
             from swsscommon.swsscommon import SonicV2Connector
             sonic_py_common.device_info.is_supervisor = mock.MagicMock(return_value=True)
+            sonic_py_common.device_info.is_voq_chassis = mock.MagicMock(return_value=True)
             SonicV2Connector.delete_all_by_pattern = mock.MagicMock()
     if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic":
         import mock_tables.mock_multi_asic

diff --git a/utilities_common/portstat.py b/utilities_common/portstat.py
@@ -122,6 +122,8 @@
 class Portstat(object):
     def __init__(self, namespace, display_option):
         self.db = None
+        self.namespace = namespace
+        self.display_option = display_option
         self.multi_asic = multi_asic_util.MultiAsic(display_option, namespace)
         if device_info.is_supervisor():
             self.db = SonicV2Connector(use_unix_socket_path=False)
@@ -132,7 +134,8 @@ def get_cnstat_dict(self):
         self.cnstat_dict['time'] = datetime.datetime.now()
         self.ratestat_dict = OrderedDict()
         if device_info.is_supervisor():
-            self.collect_stat_from_lc()
+            if device_info.is_voq_chassis() or (self.namespace is None and self.display_option != 'all'):
+                self.collect_stat_from_lc()
         else:
             self.collect_stat()
         return self.cnstat_dict, self.ratestat_dict
@@ -405,7 +408,9 @@ def cnstat_print(self, cnstat_dict, ratestat_dict, intf_list, use_json, print_al
                 print(table_as_json(table, header))
             else:
                 print(tabulate(table, header, tablefmt='simple', stralign='right'))
-        if (multi_asic.is_multi_asic() or device_info.is_chassis()) and not use_json:
+        if device_info.is_voq_chassis():
+            return
+        elif (multi_asic.is_multi_asic() or device_info.is_packet_chassis()) and not use_json:
             print("\nReminder: Please execute 'show interface counters -d all' to include internal links\n")
 
     def cnstat_intf_diff_print(self, cnstat_new_dict, cnstat_old_dict, intf_list):
@@ -668,5 +673,7 @@ def cnstat_diff_print(self, cnstat_new_dict, cnstat_old_dict,
                 print(table_as_json(table, header))
             else:
                 print(tabulate(table, header, tablefmt='simple', stralign='right'))
-        if (multi_asic.is_multi_asic() or device_info.is_chassis()) and not use_json:
+        if device_info.is_voq_chassis():
+            return
+        elif (multi_asic.is_multi_asic() or device_info.is_packet_chassis()) and not use_json:
             print("\nReminder: Please execute 'show interface counters -d all' to include internal links\n")