Skip to content

[dhcp_relay] Increase wait time for default route check in dhcp_relay test #15976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxin merged 2 commits into from
Dec 11, 2024
Merged

[dhcp_relay] Increase wait time for default route check in dhcp_relay test #15976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07c6f60
[dhcp_relay] Increase wait time for default route check in dhcp_relay…
yaqiangz Dec 10, 2024
d20fa7f
Add pc
yaqiangz Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/dhcp_relay/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def dut_dhcp_relay_data(duthosts, rand_one_dut_hostname, ptfhost, tbinfo):
def validate_dut_routes_exist(duthosts, rand_one_dut_hostname, dut_dhcp_relay_data):
"""Fixture to valid a route to each DHCP server exist
"""
py_assert(wait_until(120, 5, 0, check_routes_to_dhcp_server, duthosts[rand_one_dut_hostname],
py_assert(wait_until(360, 5, 0, check_routes_to_dhcp_server, duthosts[rand_one_dut_hostname],
dut_dhcp_relay_data),
"Packets relayed to DHCP server should go through default route via upstream neighbor, but now it's" +
" going through mgmt interface, which means device is in an unhealthy status")
Expand Down
4 changes: 4 additions & 0 deletions tests/dhcp_relay/dhcp_relay_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
def check_routes_to_dhcp_server(duthost, dut_dhcp_relay_data):
"""Validate there is route on DUT to each DHCP server
"""
output = duthost.shell("show ip bgp sum", module_ignore_errors=True)
logger.info("bgp state: {}".format(output["stdout"]))
output = duthost.shell("show int po", module_ignore_errors=True)
logger.info("portchannel state: {}".format(output["stdout"]))
default_gw_ip = dut_dhcp_relay_data[0]['default_gw_ip']
dhcp_servers = set()
for dhcp_relay in dut_dhcp_relay_data:
Expand Down