From 12fbc81bc0c14156af20fb00df8a3f8d2d4ce6c3 Mon Sep 17 00:00:00 2001 From: Yaqiang Zhu Date: Wed, 13 Mar 2024 09:35:09 +0800 Subject: [PATCH] [dhcp_relay] Fix faillure in test_dhcp_relay_default[single] (#11935) What is the motivation for this PR? DHCP broadcast flooding was resolved by this PR: sonic-net/sonic-buildimage#18064. Hence interfaces under Vlan would not received broadcast flooding packets. Remove this verification. How did you do it? Removed verification of receiving of DHCP broadcast flooding packets in other_client_ports. How did you verify/test it? Run tests. --- ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py | 2 -- tests/dhcp_relay/test_dhcp_relay.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py b/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py index 1826a67e8a..e5f6d66476 100644 --- a/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py +++ b/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py @@ -795,7 +795,5 @@ def runTest(self): # Below verification will be done only when client port is set in ptf_runner if not self.dual_tor and 'other_client_port' in self.test_params: - self.verify_dhcp_relay_pkt_on_other_client_port_with_no_padding( - self.dest_mac_address, self.client_udp_src_port) self.verify_dhcp_relay_pkt_on_server_port_with_no_padding( self.dest_mac_address, self.client_udp_src_port) diff --git a/tests/dhcp_relay/test_dhcp_relay.py b/tests/dhcp_relay/test_dhcp_relay.py index ba9ea7a564..4372605781 100644 --- a/tests/dhcp_relay/test_dhcp_relay.py +++ b/tests/dhcp_relay/test_dhcp_relay.py @@ -336,8 +336,8 @@ def test_dhcp_relay_default(ptfhost, dut_dhcp_relay_data, validate_dut_routes_ex expected_agg_counter_message = ( r".*dhcp_relay#dhcpmon\[[0-9]+\]: " r"\[\s*Agg-%s\s*-[\sA-Za-z0-9]+\s*rx/tx\] " - r"Discover: +1/ +%d, Offer: +1/ +1, Request: +3/ +%d, ACK: +1/ +1+" - ) % (dhcp_relay['downlink_vlan_iface']['name'], dhcp_server_num, dhcp_server_num * 3) + r"Discover: +1/ +%d, Offer: +1/ +1, Request: +2/ +%d, ACK: +1/ +1+" + ) % (dhcp_relay['downlink_vlan_iface']['name'], dhcp_server_num, dhcp_server_num * 2) loganalyzer = LogAnalyzer(ansible_host=duthost, marker_prefix="dhcpmon counter") marker = loganalyzer.init() loganalyzer.expect_regex = [expected_agg_counter_message]