diff --git a/config/main.py b/config/main.py index 10035cdc3f03..b38221b012fc 100644 --- a/config/main.py +++ b/config/main.py @@ -669,6 +669,9 @@ def _get_disabled_services_list(config_db): def _stop_services(): + click.echo("Disabling container monitoring ...") + clicommon.run_command("sudo monit unmonitor container_checker") + click.echo("Stopping SONiC target ...") clicommon.run_command("sudo systemctl stop sonic.target") @@ -692,6 +695,9 @@ def _restart_services(): click.echo("Reloading Monit configuration ...") clicommon.run_command("sudo monit reload") + click.echo("Enabling container monitoring ...") + clicommon.run_command("sudo monit monitor container_checker") + def interface_is_in_vlan(vlan_member_table, interface_name): """ Check if an interface is in a vlan """ diff --git a/tests/config_test.py b/tests/config_test.py index 89d8313d53a8..21200a6ecd9e 100644 --- a/tests/config_test.py +++ b/tests/config_test.py @@ -12,12 +12,14 @@ from utilities_common.db import Db load_minigraph_command_output="""\ +Disabling container monitoring ... Stopping SONiC target ... Running command: /usr/local/bin/sonic-cfggen -H -m --write-to-db Running command: pfcwd start_default Running command: config qos reload --no-dynamic-buffer Restarting SONiC target ... Reloading Monit configuration ... +Enabling container monitoring ... Please note setting loaded from minigraph will be lost after system reboot. To preserve setting, run `config save`. """ @@ -49,7 +51,7 @@ def test_load_minigraph(self, get_cmd_module, setup_single_broadcom_asic): traceback.print_tb(result.exc_info[2]) assert result.exit_code == 0 assert "\n".join([l.rstrip() for l in result.output.split('\n')]) == load_minigraph_command_output - assert mock_run_command.call_count == 7 + assert mock_run_command.call_count == 9 @classmethod def teardown_class(cls):