From 41da53d271361e351f2f1b0365236e43c5ba562a Mon Sep 17 00:00:00 2001 From: Mai Bui Date: Mon, 5 Jun 2023 05:08:13 -0400 Subject: [PATCH] modify commands using utilities_common.cli.run_command and advance sonic-utilities submodule on master (#15193) Dependency: sonic-net/sonic-utilities#2718 Why I did it This PR sonic-net/sonic-utilities#2718 reduce shell=True usage in utilities_common.cli.run_command() function. Work item tracking Microsoft ADO (number only): 15022050 How I did it Replace strings commands using utilities_common.cli.run_command() function to list of strings due to circular dependency, advance sonic-utilities submodule 72ca4848 (HEAD -> master, upstream/master, upstream/HEAD) Add CLI configuration options for teamd retry count feature (sonic-net/sonic-utilities#2642) 359dfc0c [Clock] Implement clock CLI (sonic-net/sonic-utilities#2793) b316fc27 Add transceiver status CLI to show output from TRANSCEIVER_STATUS table (sonic-net/sonic-utilities#2772) dc59dbd2 Replace pickle by json (sonic-net/sonic-utilities#2849) a66f41c4 [show] replace shell=True, replace xml by lxml, replace exit by sys.exit (sonic-net/sonic-utilities#2666) 57500572 [utilities_common] replace shell=True (sonic-net/sonic-utilities#2718) 6e0ee3e7 [CRM][DASH] Extend CRM utility to support DASH resources. (sonic-net/sonic-utilities#2800) b2c29b0b [config] Generate sysinfo in single asic (sonic-net/sonic-utilities#2856) --- dockers/docker-dhcp-relay/cli/config/plugins/dhcp_relay.py | 6 +++--- .../docker-macsec/cli/clear/plugins/clear_macsec_counter.py | 2 +- src/sonic-utilities | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dockers/docker-dhcp-relay/cli/config/plugins/dhcp_relay.py b/dockers/docker-dhcp-relay/cli/config/plugins/dhcp_relay.py index aea8e491f05b..1423a8580ae9 100644 --- a/dockers/docker-dhcp-relay/cli/config/plugins/dhcp_relay.py +++ b/dockers/docker-dhcp-relay/cli/config/plugins/dhcp_relay.py @@ -39,9 +39,9 @@ def restart_dhcp_relay_service(): Restart dhcp_relay service """ click.echo("Restarting DHCP relay service...") - clicommon.run_command("systemctl stop dhcp_relay", display_cmd=False) - clicommon.run_command("systemctl reset-failed dhcp_relay", display_cmd=False) - clicommon.run_command("systemctl start dhcp_relay", display_cmd=False) + clicommon.run_command(['systemctl', 'stop', 'dhcp_relay'], display_cmd=False) + clicommon.run_command(['systemctl', 'reset-failed', 'dhcp_relay'], display_cmd=False) + clicommon.run_command(['systemctl', 'start', 'dhcp_relay'], display_cmd=False) def add_dhcp_relay(vid, dhcp_relay_ips, db, ip_version): diff --git a/dockers/docker-macsec/cli/clear/plugins/clear_macsec_counter.py b/dockers/docker-macsec/cli/clear/plugins/clear_macsec_counter.py index b47a576f9ed2..15a1be94b2ff 100644 --- a/dockers/docker-macsec/cli/clear/plugins/clear_macsec_counter.py +++ b/dockers/docker-macsec/cli/clear/plugins/clear_macsec_counter.py @@ -25,7 +25,7 @@ def macsec_clear_counters(clean_cache): print("Cleaned cache") return - clicommon.run_command("show macsec --dump-file") + clicommon.run_command(['show', 'macsec', '--dump-file']) print("Clear MACsec counters") def register(cli): diff --git a/src/sonic-utilities b/src/sonic-utilities index b5c1032573d7..72ca48481645 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit b5c1032573d7db53b6b9f896250f1d8867374ec0 +Subproject commit 72ca48481645edc3437d7899e2fa754d16eff02e