diff --git a/show/muxcable.py b/show/muxcable.py index c52dfa6d0e81..41a3c7c4d52d 100644 --- a/show/muxcable.py +++ b/show/muxcable.py @@ -6,6 +6,8 @@ import re import utilities_common.cli as clicommon from natsort import natsorted +from collections import OrderedDict +from operator import itemgetter from sonic_py_common import multi_asic from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector from swsscommon import swsscommon @@ -1003,11 +1005,12 @@ def metrics(db, port, json_output): metrics_dict[asic_index] = per_npu_statedb[asic_index].get_all( per_npu_statedb[asic_index].STATE_DB, 'MUX_METRICS_TABLE|{}'.format(port)) + ordered_dict = OrderedDict(sorted(metrics_dict[asic_index].items(), key=itemgetter(1))) if json_output: - click.echo("{}".format(json.dumps(metrics_dict[asic_index], indent=4))) + click.echo("{}".format(json.dumps(ordered_dict, indent=4))) else: print_data = [] - for key, val in metrics_dict[asic_index].items(): + for key, val in ordered_dict.items(): print_port_data = [] print_port_data.append(port) print_port_data.append(key) diff --git a/tests/muxcable_test.py b/tests/muxcable_test.py index 2d63a5d4823b..fc04fcc0754b 100644 --- a/tests/muxcable_test.py +++ b/tests/muxcable_test.py @@ -209,17 +209,17 @@ PORT EVENT TIME --------- ---------------------------- --------------------------- Ethernet0 linkmgrd_switch_active_start 2021-May-13 10:00:21.420898 -Ethernet0 linkmgrd_switch_standby_end 2021-May-13 10:01:15.696728 -Ethernet0 xcvrd_switch_standby_end 2021-May-13 10:01:15.696051 Ethernet0 xcvrd_switch_standby_start 2021-May-13 10:01:15.690835 +Ethernet0 xcvrd_switch_standby_end 2021-May-13 10:01:15.696051 +Ethernet0 linkmgrd_switch_standby_end 2021-May-13 10:01:15.696728 """ show_muxcable_metrics_expected_output_json = """\ { "linkmgrd_switch_active_start": "2021-May-13 10:00:21.420898", - "linkmgrd_switch_standby_end": "2021-May-13 10:01:15.696728", + "xcvrd_switch_standby_start": "2021-May-13 10:01:15.690835", "xcvrd_switch_standby_end": "2021-May-13 10:01:15.696051", - "xcvrd_switch_standby_start": "2021-May-13 10:01:15.690835" + "linkmgrd_switch_standby_end": "2021-May-13 10:01:15.696728" } """