Skip to content

[show] fix show muxcable metrics <port> for sorted output #1731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vdahiya12 merged 4 commits into from
Jul 28, 2021
Merged

[show] fix show muxcable metrics <port> for sorted output #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6dce66
[show] fix show muxcable metrics <port> for sorted output
vdahiya12 Jul 28, 2021
1df9bf4
fix json
vdahiya12 Jul 28, 2021
f3c808a
fix unit
vdahiya12 Jul 28, 2021
22c9582
fix CLI
vdahiya12 Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions show/muxcable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions tests/muxcable_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
"""

Expand Down