resolve conflict

Signed-off-by: Mai Bui <maibui@microsoft.com>
sonic-net · Mar 21, 2023 · 52f6d03 · 52f6d03
2 parents 9a857d9 + 05fa751
commit 52f6d03
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/scripts/portstat b/scripts/portstat
@@ -330,16 +330,17 @@ class Portstat(object):
                               format_number_with_comma(data.tx_ok),
                               format_brate(rates.tx_bps),
                               format_util(rates.tx_bps, port_speed),
+
                               format_number_with_comma(data.tx_err),
                               format_number_with_comma(data.tx_drop),
                               format_number_with_comma(data.tx_ovr)))
-
-        if use_json:
-            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():
-                print("\nReminder: Please execute 'show interface counters -d all' to include internal links\n")
+        if table:
+            if use_json:
+                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:
+            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):
         """
@@ -551,13 +552,13 @@ class Portstat(object):
                               format_number_with_comma(cntr.tx_err),
                               format_number_with_comma(cntr.tx_drop),
                               format_number_with_comma(cntr.tx_ovr)))
-
-        if use_json:
-            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():
-                print("\nReminder: Please execute 'show interface counters -d all' to include internal links\n")
+        if table:
+            if use_json:
+                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:
+            print("\nReminder: Please execute 'show interface counters -d all' to include internal links\n")
 
 def main():
     parser  = argparse.ArgumentParser(description='Display the ports state and counters',