Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions tests/acl/test_acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,8 @@ def post_setup_hook(self, dut, localhost, populate_vlan_arp_entries, tbinfo):

"""
dut.command("config save -y")
if dut.is_supervisor_node and dut.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this . this should not get call for supervisor.

reboot(dut, localhost, wait=240)
# We need some additional delay on e1031
if dut.facts["platform"] == "x86_64-cel_e1031-r0":
Expand Down
2 changes: 2 additions & 0 deletions tests/mvrf/test_mgmtvrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ def test_warmboot(self, duthosts, rand_one_dut_hostname, localhost, ptfhost, cre
@pytest.mark.disable_loganalyzer
def test_reboot(self, duthosts, rand_one_dut_hostname, localhost, ptfhost, creds):
duthost = duthosts[rand_one_dut_hostname]
if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
duthost.command("sudo config save -y") # This will override config_db.json with mgmt vrf config
reboot(duthost, localhost)
pytest_assert(wait_until(300, 20, 0, duthost.critical_services_fully_started), "Not all critical services are fully started")
Expand Down
4 changes: 4 additions & 0 deletions tests/platform_tests/test_link_down.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ def test_link_down_on_sup_reboot(duthosts, localhost, enum_supervisor_dut_hostna
pytest.skip("Skip single-host dut for this test")

duthost = duthosts[enum_supervisor_dut_hostname]
if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
hostname = duthost.hostname
# Before test, check all interfaces and services are up on all linecards
check_interfaces_and_services_all_LCs(duthosts, conn_graph_facts, xcvr_skip_list)
Expand Down Expand Up @@ -173,6 +175,8 @@ def test_link_status_on_host_reboot(duthosts, localhost, enum_frontend_dut_hostn
duts_running_config_facts, conn_graph_facts,
fanouthosts, xcvr_skip_list, tbinfo):
duthost = duthosts[enum_frontend_dut_hostname]
if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
hostname = duthost.hostname

# Before test, check all interfaces and services are up
Expand Down
7 changes: 6 additions & 1 deletion tests/platform_tests/test_reboot.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ def test_cold_reboot(duthosts, enum_rand_one_per_hwsku_hostname, localhost, conn
@summary: This test case is to perform cold reboot and check platform status
"""
duthost = duthosts[enum_rand_one_per_hwsku_hostname]
if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
reboot_and_check(localhost, duthost, conn_graph_facts["device_conn"][duthost.hostname], xcvr_skip_list, reboot_type=REBOOT_TYPE_COLD)


Expand Down Expand Up @@ -263,7 +265,8 @@ def test_watchdog_reboot(duthosts, enum_rand_one_per_hwsku_hostname, localhost,
@summary: This test case is to perform reboot via watchdog and check platform status
"""
duthost = duthosts[enum_rand_one_per_hwsku_hostname]

if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
watchdogutil_status_result = duthost.command("watchdogutil status", module_ignore_errors=True)
if "" != watchdogutil_status_result["stderr"] or "" == watchdogutil_status_result["stdout"]:
pytest.skip("Watchdog is not supported on this DUT, skip this test case")
Expand All @@ -276,6 +279,8 @@ def test_continuous_reboot(duthosts, enum_rand_one_per_hwsku_hostname, localhost
@summary: This test case is to perform 3 cold reboot in a row
"""
duthost = duthosts[enum_rand_one_per_hwsku_hostname]
if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
ls_starting_out = set(duthost.shell("ls /dev/C0-*", module_ignore_errors=True)["stdout"].split())
for i in range(3):
reboot_and_check(localhost, duthost, conn_graph_facts["device_conn"][duthost.hostname], xcvr_skip_list, reboot_type=REBOOT_TYPE_COLD)
Expand Down
3 changes: 2 additions & 1 deletion tests/platform_tests/test_reload_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ def test_reload_configuration_checks(duthosts, rand_one_dut_hostname, localhost,
@summary: This test case is to test various system checks in config reload
"""
duthost = duthosts[rand_one_dut_hostname]

if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
if not config_force_option_supported(duthost):
return

Expand Down
2 changes: 2 additions & 0 deletions tests/tacacs/test_ro_disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ def test_ro_disk(localhost, ptfhost, duthosts, enum_rand_one_per_hwsku_hostname,
"""test tacacs rw user
"""
duthost = duthosts[enum_rand_one_per_hwsku_hostname]
if duthost.is_supervisor_node and duthost.facts['platform'] in ['x86_64-8800_rp_o-r0']:
pytest.skip("Skip reboot for Supervisor card in Cisco 8000 distributed chassis")
skip_release(duthost, ["201911", "201811"])

dutip = duthost.mgmt_ip
Expand Down