Skip to content
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

[manual] [PR:16542] feat: add wait_for_bgp option to reboot #16563

Merged
merged 1 commit into from
Jan 17, 2025
Merged

[manual] [PR:16542] feat: add wait_for_bgp option to reboot #16563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions tests/acl/test_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,8 +1314,7 @@ def post_setup_hook(self, dut, localhost, populate_vlan_arp_entries, tbinfo, con

"""
dut.command("config save -y")
up_bgp_neighbors = dut.get_bgp_neighbors_per_asic("established")
reboot(dut, localhost, safe_reboot=True, check_intf_up_ports=True)
reboot(dut, localhost, safe_reboot=True, check_intf_up_ports=True, wait_for_bgp=True)
# We need some additional delay on e1031
if dut.facts["platform"] == "x86_64-cel_e1031-r0":
time.sleep(240)
Expand All @@ -1331,9 +1330,6 @@ def post_setup_hook(self, dut, localhost, populate_vlan_arp_entries, tbinfo, con
assert result, "Not all transceivers are detected or interfaces are up in {} seconds".format(
MAX_WAIT_TIME_FOR_INTERFACES)

pytest_assert(
wait_until(300, 10, 0, dut.check_bgp_session_state_all_asics, up_bgp_neighbors, "established"),
"All BGP sessions are not up after reboot, no point in continuing the test")
# Delay 10 seconds for route convergence
time.sleep(10)

Expand Down
14 changes: 12 additions & 2 deletions tests/common/reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def execute_reboot_helper():
def reboot(duthost, localhost, reboot_type='cold', delay=10,
timeout=0, wait=0, wait_for_ssh=True, wait_warmboot_finalizer=False, warmboot_finalizer_timeout=0,
reboot_helper=None, reboot_kwargs=None, plt_reboot_ctrl_overwrite=True,
safe_reboot=False, check_intf_up_ports=False):
safe_reboot=False, check_intf_up_ports=False, wait_for_bgp=False):
"""
reboots DUT
:param duthost: DUT host object
Expand All @@ -233,11 +233,14 @@ def reboot(duthost, localhost, reboot_type='cold', delay=10,
:param timeout: timeout for waiting ssh port state change
:param wait: time to wait for DUT to initialize
:param wait_for_ssh: Wait for SSH startup
:param wait_warmboot_finalizer=True: Wait for WARMBOOT_FINALIZER done
:param wait_warmboot_finalizer: Wait for WARMBOOT_FINALIZER done
:param warmboot_finalizer_timeout: Timeout for waiting WARMBOOT_FINALIZER
:param reboot_helper: helper function to execute the power toggling
:param reboot_kwargs: arguments to pass to the reboot_helper
:param plt_reboot_ctrl_overwrite: arguments to overwrite plt reboot control
:param safe_reboot: arguments to wait DUT ready after reboot
:param check_intf_up_ports: arguments to check interface after reboot
:param wait_for_bgp: arguments to wait for BGP after reboot
:return:
"""
pool = ThreadPool()
Expand Down Expand Up @@ -325,6 +328,13 @@ def reboot(duthost, localhost, reboot_type='cold', delay=10,
assert float(dut_uptime.strftime("%s")) > float(dut_datetime.strftime("%s")), "Device {} did not reboot". \
format(hostname)

if wait_for_bgp:
bgp_neighbors = duthost.get_bgp_neighbors_per_asic(state="all")
pytest_assert(
wait_until(wait + 300, 10, 0, duthost.check_bgp_session_state_all_asics, bgp_neighbors),
"Not all bgp sessions are established after reboot",
)


def positive_uptime(duthost, dut_datetime):
dut_uptime = duthost.get_up_time()
Expand Down
Loading