Skip to content

Moving check for reboot cause after interface status check #6721

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
abdosi merged 1 commit into from
Nov 30, 2022
Merged

Moving check for reboot cause after interface status check #6721

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
29 changes: 14 additions & 15 deletions tests/platform_tests/test_reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,6 @@ def check_interfaces_and_services(dut, interfaces, xcvr_skip_list, reboot_type =
logging.info("Wait until all critical services are fully started")
wait_critical_processes(dut)

if reboot_type is not None:
logging.info("Check reboot cause")
assert wait_until(MAX_WAIT_TIME_FOR_REBOOT_CAUSE, 20, 30, check_reboot_cause, dut, reboot_type), \
"got reboot-cause failed after rebooted by %s" % reboot_type

if "201811" in dut.os_version or "201911" in dut.os_version:
logging.info("Skip check reboot-cause history for version before 202012")
else:
logger.info("Check reboot-cause history")
assert wait_until(MAX_WAIT_TIME_FOR_REBOOT_CAUSE, 20, 0, check_reboot_cause_history, dut,
REBOOT_TYPE_HISTOYR_QUEUE), "Check reboot-cause history failed after rebooted by %s" % reboot_type
if reboot_ctrl_dict[reboot_type]["test_reboot_cause_only"]:
logging.info("Further checking skipped for %s test which intends to verify reboot-cause only" % reboot_type)
return

if dut.is_supervisor_node():
logging.info("skipping interfaces related check for supervisor")
else:
Expand Down Expand Up @@ -124,6 +109,20 @@ def check_interfaces_and_services(dut, interfaces, xcvr_skip_list, reboot_type =
logging.info("Check sysfs")
check_sysfs(dut)

if reboot_type is not None:
logging.info("Check reboot cause")
assert wait_until(MAX_WAIT_TIME_FOR_REBOOT_CAUSE, 20, 30, check_reboot_cause, dut, reboot_type), \
"got reboot-cause failed after rebooted by %s" % reboot_type

if "201811" in dut.os_version or "201911" in dut.os_version:
logging.info("Skip check reboot-cause history for version before 202012")
else:
logger.info("Check reboot-cause history")
assert wait_until(MAX_WAIT_TIME_FOR_REBOOT_CAUSE, 20, 0, check_reboot_cause_history, dut,
REBOOT_TYPE_HISTOYR_QUEUE), "Check reboot-cause history failed after rebooted by %s" % reboot_type
if reboot_ctrl_dict[reboot_type]["test_reboot_cause_only"]:
logging.info("Further checking skipped for %s test which intends to verify reboot-cause only" % reboot_type)
return

def test_cold_reboot(duthosts, enum_rand_one_per_hwsku_hostname, localhost, conn_graph_facts, xcvr_skip_list):
"""
Expand Down