From 7dcc9b4a551d28ffeeb69fde575d22dea1b167cf Mon Sep 17 00:00:00 2001 From: yaqiangz Date: Mon, 5 Dec 2022 03:06:16 +0000 Subject: [PATCH 1/2] [dhcp_server] Skip dhcp_relay check in pretest if dhcp_server is enabled --- tests/test_pretest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_pretest.py b/tests/test_pretest.py index 8bfcb3678fe..9d06d893197 100644 --- a/tests/test_pretest.py +++ b/tests/test_pretest.py @@ -157,9 +157,14 @@ def test_disable_rsyslog_rate_limit(duthosts, enum_dut_hostname): # We don't want to fail here because it's an util logging.warn("Failed to retrieve feature status") return + config_facts = duthost.config_facts(host=duthost.hostname, source="running") + is_dhcp_server_enable = config_facts["ansible_facts"]["DEVICE_METADATA"]["localhost"]["dhcp_server"] for feature_name, state in features_dict.items(): if 'enabled' not in state: continue + # Skip dhcp_relay check if dhcp_server is enabled + if "enabled" in is_dhcp_server_enable and feature_name == "dhcp_relay": + continue duthost.modify_syslog_rate_limit(feature_name, rl_option='disable') From faef07c7e9ad4acd4665ee7bb74b175b886bd75b Mon Sep 17 00:00:00 2001 From: yaqiangz Date: Mon, 5 Dec 2022 03:27:51 +0000 Subject: [PATCH 2/2] Fix comments --- tests/test_pretest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/test_pretest.py b/tests/test_pretest.py index 9d06d893197..0867765907d 100644 --- a/tests/test_pretest.py +++ b/tests/test_pretest.py @@ -158,12 +158,15 @@ def test_disable_rsyslog_rate_limit(duthosts, enum_dut_hostname): logging.warn("Failed to retrieve feature status") return config_facts = duthost.config_facts(host=duthost.hostname, source="running") - is_dhcp_server_enable = config_facts["ansible_facts"]["DEVICE_METADATA"]["localhost"]["dhcp_server"] + try: + is_dhcp_server_enable = config_facts["ansible_facts"]["DEVICE_METADATA"]["localhost"]["dhcp_server"] + except KeyError: + is_dhcp_server_enable = None for feature_name, state in features_dict.items(): if 'enabled' not in state: continue # Skip dhcp_relay check if dhcp_server is enabled - if "enabled" in is_dhcp_server_enable and feature_name == "dhcp_relay": + if is_dhcp_server_enable is not None and "enabled" in is_dhcp_server_enable and feature_name == "dhcp_relay": continue duthost.modify_syslog_rate_limit(feature_name, rl_option='disable')