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

Jump to bottom

Fixing service-restart testcases. #15560

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing service-restart testcases. #15560

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
63 changes: 52 additions & 11 deletions tests/snappi_tests/multidut/pfcwd/test_multidut_pfcwd_basic_with_snappi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
import random
import logging
import time
import re
from collections import defaultdict
from tests.common.helpers.assertions import pytest_require, pytest_assert # noqa: F401
Expand All @@ -13,6 +14,8 @@
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, lossless_prio_list # noqa F401
from tests.common.reboot import reboot # noqa: F401
from tests.common.utilities import wait_until # noqa: F401
from tests.common.config_reload import config_reload
from tests.common.platform.interface_utils import check_interface_status_of_up_ports
from tests.snappi_tests.multidut.pfcwd.files.pfcwd_multidut_basic_helper import run_pfcwd_basic_test
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams
from tests.snappi_tests.files.helper import skip_pfcwd_test, reboot_duts, \
Expand All @@ -29,6 +32,26 @@ def number_of_tx_rx_ports():
yield (1, 1)


@pytest.fixture(autouse=False)
def save_restore_config(setup_ports_and_dut):
testbed_config, port_config_list, snappi_ports = setup_ports_and_dut
timestamp = time.time()
dest = f'~/{timestamp}'

for duthost in list(set([snappi_ports[0]['duthost'], snappi_ports[1]['duthost']])):
duthost.shell(f"sudo mkdir {dest}; sudo cp /etc/sonic/config*.json {dest}")
duthost.shell("sudo config save -y")

yield

for duthost in list(set([snappi_ports[0]['duthost'], snappi_ports[1]['duthost']])):
duthost.shell(f"sudo cp {dest}/config_db*json /etc/sonic/")
duthost.shell("sudo config save -y")

for duthost in list(set([snappi_ports[0]['duthost'], snappi_ports[1]['duthost']])):
config_reload(duthost)


@pytest.mark.parametrize("trigger_pfcwd", [True, False])
def test_pfcwd_basic_single_lossless_prio(snappi_api, # noqa: F811
conn_graph_facts, # noqa: F811
Expand Down Expand Up @@ -221,7 +244,8 @@ def test_pfcwd_basic_single_lossless_prio_service_restart(snappi_api,
prio_dscp_map, # noqa: F811
restart_service,
trigger_pfcwd,
setup_ports_and_dut): # noqa: F811
setup_ports_and_dut, # noqa: F811
save_restore_config):
"""
Verify PFC watchdog basic test works on a single lossless priority after various service restarts

Expand Down Expand Up @@ -264,6 +288,12 @@ def test_pfcwd_basic_single_lossless_prio_service_restart(snappi_api,
logger.info("Wait until the system is stable")
pytest_assert(wait_until(WAIT_TIME, INTERVAL, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
pytest_assert(wait_until(WAIT_TIME, INTERVAL, 0, check_interface_status_of_up_ports, duthost),
"Not all interfaces are up.")

# Wait for internal bgp to come up.
time.sleep(100)

else:
for duthost in list(set([snappi_ports[0]['duthost'], snappi_ports[1]['duthost']])):
logger.info("Issuing a restart of service {} on the dut {}".format(restart_service, duthost.hostname))
Expand Down Expand Up @@ -300,7 +330,8 @@ def test_pfcwd_basic_multi_lossless_prio_restart_service(snappi_api,
prio_dscp_map, # noqa F811
restart_service,
setup_ports_and_dut, # noqa: F811
trigger_pfcwd):
trigger_pfcwd,
save_restore_config):
"""
Verify PFC watchdog basic test works on multiple lossless priorities after various service restarts

Expand Down Expand Up @@ -330,16 +361,26 @@ def test_pfcwd_basic_multi_lossless_prio_restart_service(snappi_api,

logger.info('Port dictionary:{}'.format(ports_dict))
for duthost in list(set([snappi_ports[0]['duthost'], snappi_ports[1]['duthost']])):
# Record current state of critical services.
duthost.critical_services_fully_started()

asic_list = ports_dict[duthost.hostname]
for asic in asic_list:
asic_id = re.match(r"(asic)(\d+)", asic).group(2)
proc = 'swss@' + asic_id
logger.info("Issuing a restart of service {} on the dut {}".format(proc, duthost.hostname))
duthost.command("sudo systemctl reset-failed {}".format(proc))
duthost.command("sudo systemctl restart {}".format(proc))
logger.info("Wait until the system is stable")
pytest_assert(wait_until(WAIT_TIME, INTERVAL, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
asic = random.sample(asic_list, 1)[0]
asic_id = re.match(r"(asic)(\d+)", asic).group(2)
proc = 'swss@' + asic_id

logger.info("Issuing a restart of service {} on the dut {}".format(proc, duthost.hostname))
duthost.command("sudo systemctl reset-failed {}".format(proc))
duthost.command("sudo systemctl restart {}".format(proc))
logger.info("Wait until the system is stable")
pytest_assert(wait_until(WAIT_TIME, INTERVAL, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
pytest_assert(wait_until(WAIT_TIME, INTERVAL, 0, check_interface_status_of_up_ports, duthost),
"Not all interfaces are up.")

# Wait for internal bgp to come up.
time.sleep(100)

else:
for duthost in list(set([snappi_ports[0]['duthost'], snappi_ports[1]['duthost']])):
logger.info("Issuing a restart of service {} on the dut {}".format(restart_service, duthost.hostname))
Expand Down
Loading