Skip to content

Commit

Permalink
[dhcp_relay] Increase wait time for default route check in dhcp_relay…
Browse files Browse the repository at this point in the history
… test (#15976)

What is the motivation for this PR?
There is flaky failure in this case because default route missing

How did you do it?
Increase wait time for it.
Add log for triage

How did you verify/test it?
Run test
  • Loading branch information
yaqiangz authored and mssonicbld committed Dec 13, 2024
1 parent 2746d58 commit 2aa5140
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tests/dhcp_relay/conftest.py
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
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

0 comments on commit 2aa5140

Please sign in to comment.