From e7ef920c131b4606acc118fad2445564db19ca75 Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Mon, 25 Sep 2023 19:37:35 +0000 Subject: [PATCH 1/2] Run test after monit config change --- tests/telemetry/events/host_events.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/telemetry/events/host_events.py b/tests/telemetry/events/host_events.py index 238922b9ffe..0c2e941ce7f 100644 --- a/tests/telemetry/events/host_events.py +++ b/tests/telemetry/events/host_events.py @@ -15,11 +15,6 @@ def test_event(duthost, gnxi_path, ptfhost, data_dir, validate_yang): logger.info("Beginning to test host events") run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, trigger_kernel_event, "event_kernel.json", "sonic-events-host:event-kernel", tag, False) - run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, restart_container, - "event_stopped_ctr.json", "sonic-events-host:event-stopped-ctr", tag, False) - run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, mask_container, - "event_down_ctr.json", "sonic-events-host:event-down-ctr", tag, False) - backup_monit_config(duthost) customize_monit_config( duthost, @@ -37,6 +32,10 @@ def test_event(duthost, gnxi_path, ptfhost, data_dir, validate_yang): "cpu_usage.json", "sonic-events-host:cpu-usage", tag, False) run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, trigger_mem_threshold_exceeded_alert, "mem_threshold_exceeded.json", "sonic-events-host:mem-threshold-exceeded", tag) + run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, restart_container, + "event_stopped_ctr.json", "sonic-events-host:event-stopped-ctr", tag, False) + run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, mask_container, + "event_down_ctr.json", "sonic-events-host:event-down-ctr", tag, False) finally: restore_monit_config(duthost) From edb9352677eaf14921b82eb52c44d429d9f5ff96 Mon Sep 17 00:00:00 2001 From: Zain Budhwani Date: Mon, 25 Sep 2023 19:50:03 +0000 Subject: [PATCH 2/2] Fix precommit check errs --- tests/telemetry/events/host_events.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/telemetry/events/host_events.py b/tests/telemetry/events/host_events.py index 0c2e941ce7f..4fd2da85f46 100644 --- a/tests/telemetry/events/host_events.py +++ b/tests/telemetry/events/host_events.py @@ -33,9 +33,9 @@ def test_event(duthost, gnxi_path, ptfhost, data_dir, validate_yang): run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, trigger_mem_threshold_exceeded_alert, "mem_threshold_exceeded.json", "sonic-events-host:mem-threshold-exceeded", tag) run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, restart_container, - "event_stopped_ctr.json", "sonic-events-host:event-stopped-ctr", tag, False) + "event_stopped_ctr.json", "sonic-events-host:event-stopped-ctr", tag, False) run_test(duthost, gnxi_path, ptfhost, data_dir, validate_yang, mask_container, - "event_down_ctr.json", "sonic-events-host:event-down-ctr", tag, False) + "event_down_ctr.json", "sonic-events-host:event-down-ctr", tag, False) finally: restore_monit_config(duthost)