Skip to content

Fix test_fbd.py flaky result #10682

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
wsycqyz merged 2 commits into from
Nov 9, 2023
Merged

Fix test_fbd.py flaky result #10682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
919a18e
first commit
wsycqyz Nov 8, 2023
c97c884
fix pre-commit failure
wsycqyz Nov 8, 2023
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
28 changes: 20 additions & 8 deletions tests/bfd/test_bfd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,20 @@ def check_ptf_bfd_status(ptfhost, neighbor_addr, local_addr, expected_state):
assert expected_state in line.split('=')[1].strip()


def check_dut_bfd_status(duthost, neighbor_addr, expected_state):
bfd_state = duthost.shell("sonic-db-cli STATE_DB HGET 'BFD_SESSION_TABLE|default|default|{}' 'state'"
.format(neighbor_addr), module_ignore_errors=False)['stdout_lines']
assert expected_state in bfd_state[0]
def check_dut_bfd_status(duthost, neighbor_addr, expected_state, max_attempts=12, retry_interval=10):
for i in range(max_attempts + 1):
bfd_state = duthost.shell("sonic-db-cli STATE_DB HGET 'BFD_SESSION_TABLE|default|default|{}' 'state'"
.format(neighbor_addr), module_ignore_errors=False)['stdout_lines']
logger.info("BFD state check: {} - {}".format(neighbor_addr, bfd_state[0]))

if expected_state in bfd_state[0]:
return # Success, no need to retry

logger.error("BFD state check failed: {} - {}".format(neighbor_addr, bfd_state[0]))
if i < max_attempts:
time.sleep(retry_interval)

assert expected_state in bfd_state[0] # If all attempts fail, raise an assertion error


def create_bfd_sessions(ptfhost, duthost, local_addrs, neighbor_addrs, dut_init_first, scale_test=False):
Expand Down Expand Up @@ -304,7 +314,9 @@ def create_bfd_sessions_multihop(ptfhost, duthost, loopback_addr, ptf_intf, neig
ptfhost.template(src='templates/bfd_responder.conf.j2', dest='/etc/supervisor/conf.d/bfd_responder.conf')
ptfhost.command('supervisorctl reread')
ptfhost.command('supervisorctl update')
ptfhost.command('supervisorctl start bfd_responder')
ptfhost.command('supervisorctl restart bfd_responder')
logger.info("Waiting for bfd session to be in Up state")
time.sleep(30)
temp = duthost.shell('show bfd summary')
logger.info("BFD Summary dump: {}".format(temp['stdout']))

Expand Down Expand Up @@ -454,13 +466,13 @@ def test_bfd_multihop(request, rand_selected_dut, ptfhost, tbinfo,

create_bfd_sessions_multihop(ptfhost, duthost, loopback_addr, ptf_intf, neighbor_addrs)

time.sleep(1)
for neighbor_addr in neighbor_addrs:
check_dut_bfd_status(duthost, neighbor_addr, "Up")
duthost.shell("sonic-clear queuecounters")
# sleep for 10 seconds to check queue counters
time.sleep(10)
verify_bfd_queue_counters(duthost, dut_intf)

for neighbor_addr in neighbor_addrs:
check_dut_bfd_status(duthost, neighbor_addr, "Up")
finally:
remove_bfd_sessions(duthost, neighbor_addrs)
cmd_buffer = ""
Expand Down