From d7e23fb36f310fca7cca5a07cd06e9fad655e322 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Sun, 16 Jan 2022 07:18:40 +0000 Subject: [PATCH] Revert "[config reload] Fixing config reload when timer based delayed services are disabled (#1967)" This reverts commit 055ed4fafeaece1f00e4dcb20631805a5e621fb6. --- config/main.py | 11 ++--------- tests/config_test.py | 4 +--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/config/main.py b/config/main.py index f5ecd70048..3dfc146b44 100644 --- a/config/main.py +++ b/config/main.py @@ -732,15 +732,8 @@ def _get_sonic_services(): def _get_delayed_sonic_services(): - rc1 = clicommon.run_command("systemctl list-dependencies --plain sonic-delayed.target | sed '1d'", return_cmd=True) - rc2 = clicommon.run_command("systemctl is-enabled {}".format(rc1.replace("\n", " ")), return_cmd=True) - timer = [line.strip() for line in rc1.splitlines()] - state = [line.strip() for line in rc2.splitlines()] - services = [] - for unit in timer: - if state[timer.index(unit)] == "enabled": - services.append(unit.rstrip(".timer")) - return services + out = clicommon.run_command("systemctl list-dependencies --plain sonic-delayed.target | sed '1d'", return_cmd=True) + return (unit.strip().rstrip('.timer') for unit in out.splitlines()) def _reset_failed_services(): diff --git a/tests/config_test.py b/tests/config_test.py index 72110f805e..58360703f8 100644 --- a/tests/config_test.py +++ b/tests/config_test.py @@ -84,8 +84,6 @@ def mock_run_command_side_effect(*args, **kwargs): return 'snmp.timer' elif command == "systemctl list-dependencies --plain sonic.target | sed '1d'": return 'swss' - elif command == "systemctl is-enabled snmp.timer": - return 'enabled' else: return '' @@ -166,7 +164,7 @@ def test_load_minigraph(self, get_cmd_module, setup_single_broadcom_asic): mock_run_command.assert_any_call('systemctl reset-failed swss') # Verify "systemctl reset-failed" is called for services under sonic-delayed.target mock_run_command.assert_any_call('systemctl reset-failed snmp') - assert mock_run_command.call_count == 11 + assert mock_run_command.call_count == 10 def test_load_minigraph_with_port_config_bad_format(self, get_cmd_module, setup_single_broadcom_asic): with mock.patch(