From c6dce6600a4378b37fc330f9831dbd5bfe8eb076 Mon Sep 17 00:00:00 2001 From: vaibhav-dahiya Date: Wed, 28 Jul 2021 02:03:11 +0000 Subject: [PATCH 1/4] [show] fix show muxcable metrics for sorted output Signed-off-by: vaibhav-dahiya --- show/muxcable.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/show/muxcable.py b/show/muxcable.py index c52dfa6d0e..ee32d1df80 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 @@ -1007,7 +1009,8 @@ def metrics(db, port, json_output): click.echo("{}".format(json.dumps(metrics_dict[asic_index], indent=4))) else: print_data = [] - for key, val in metrics_dict[asic_index].items(): + ordered_dict = OrderedDict(sorted(metrics_dict[asic_index].items(), key=itemgetter(1))) + for key, val in ordered_dict.items(): print_port_data = [] print_port_data.append(port) print_port_data.append(key) From 1df9bf4553e6a8e26f454f2a8de143063f2f5e63 Mon Sep 17 00:00:00 2001 From: vaibhav-dahiya Date: Wed, 28 Jul 2021 02:24:38 +0000 Subject: [PATCH 2/4] fix json Signed-off-by: vaibhav-dahiya --- show/muxcable.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/show/muxcable.py b/show/muxcable.py index ee32d1df80..41a3c7c4d5 100644 --- a/show/muxcable.py +++ b/show/muxcable.py @@ -1005,11 +1005,11 @@ 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 = [] - ordered_dict = OrderedDict(sorted(metrics_dict[asic_index].items(), key=itemgetter(1))) for key, val in ordered_dict.items(): print_port_data = [] print_port_data.append(port) From f3c808a288b96da6c2140069c3963aca0f31310d Mon Sep 17 00:00:00 2001 From: vaibhav-dahiya Date: Wed, 28 Jul 2021 02:36:45 +0000 Subject: [PATCH 3/4] fix unit Signed-off-by: vaibhav-dahiya --- tests/muxcable_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/muxcable_test.py b/tests/muxcable_test.py index 2d63a5d482..a4cd5e50ac 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_end": "2021-May-13 10:01:15.696051", "xcvrd_switch_standby_start": "2021-May-13 10:01:15.690835" + "xcvrd_switch_standby_end": "2021-May-13 10:01:15.696051", + "linkmgrd_switch_standby_end": "2021-May-13 10:01:15.696728", } """ From 22c9582e9db283338f5f91e5b6a5fac43a572c38 Mon Sep 17 00:00:00 2001 From: vaibhav-dahiya Date: Wed, 28 Jul 2021 05:26:57 +0000 Subject: [PATCH 4/4] fix CLI Signed-off-by: vaibhav-dahiya --- tests/muxcable_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/muxcable_test.py b/tests/muxcable_test.py index a4cd5e50ac..fc04fcc075 100644 --- a/tests/muxcable_test.py +++ b/tests/muxcable_test.py @@ -217,9 +217,9 @@ show_muxcable_metrics_expected_output_json = """\ { "linkmgrd_switch_active_start": "2021-May-13 10:00:21.420898", - "xcvrd_switch_standby_start": "2021-May-13 10:01:15.690835" + "xcvrd_switch_standby_start": "2021-May-13 10:01:15.690835", "xcvrd_switch_standby_end": "2021-May-13 10:01:15.696051", - "linkmgrd_switch_standby_end": "2021-May-13 10:01:15.696728", + "linkmgrd_switch_standby_end": "2021-May-13 10:01:15.696728" } """