Skip to content

[action] [PR:13483] [Snappi] - fixing swss service restart logic for basic PFCWD testcases in multi-asic environment #13519

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
mssonicbld merged 1 commit into from
Jul 2, 2024
Merged

[action] [PR:13483] [Snappi] - fixing swss service restart logic for basic PFCWD testcases in multi-asic environment #13519

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
74 changes: 60 additions & 14 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,8 @@
import pytest
import random
import logging
import re
from collections import defaultdict
from tests.common.helpers.assertions import pytest_require, pytest_assert
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts # noqa: F401
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
Expand Down Expand Up @@ -405,13 +407,35 @@ def test_pfcwd_basic_single_lossless_prio_service_restart(snappi_api,
_, lossless_prio = rand_one_dut_lossless_prio.split('|')
lossless_prio = int(lossless_prio)

for duthost in dut_list:
logger.info("Issuing a restart of service {} on the dut {}".format(restart_service, duthost.hostname))
duthost.command("systemctl reset-failed {}".format(restart_service))
duthost.command("systemctl restart {}".format(restart_service))
logger.info("Wait until the system is stable")
pytest_assert(wait_until(300, 20, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
if (duthost1.is_multi_asic):
ports_dict = defaultdict(list)
for port in snappi_ports:
ports_dict[port['peer_device']].append(port['asic_value'])

for k in ports_dict.keys():
ports_dict[k] = list(set(ports_dict[k]))

logger.info('Line Card Choice:{}'.format(line_card_choice))
logger.info('Port dictionary:{}'.format(ports_dict))
for duthost in dut_list:
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(300, 20, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
else:
for duthost in dut_list:
logger.info("Issuing a restart of service {} on the dut {}".format(restart_service, duthost.hostname))
duthost.command("systemctl reset-failed {}".format(restart_service))
duthost.command("systemctl restart {}".format(restart_service))
logger.info("Wait until the system is stable")
pytest_assert(wait_until(300, 20, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")

snappi_extra_params = SnappiTestParams()
snappi_extra_params.multi_dut_params.duthost1 = duthost1
Expand Down Expand Up @@ -489,13 +513,35 @@ def test_pfcwd_basic_multi_lossless_prio_restart_service(snappi_api,
snappi_ports,
snappi_api)

for duthost in dut_list:
logger.info("Issuing a restart of service {} on the dut {}".format(restart_service, duthost.hostname))
duthost.command("systemctl reset-failed {}".format(restart_service))
duthost.command("systemctl restart {}".format(restart_service))
logger.info("Wait until the system is stable")
pytest_assert(wait_until(300, 20, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
if (duthost1.is_multi_asic):
ports_dict = defaultdict(list)
for port in snappi_ports:
ports_dict[port['peer_device']].append(port['asic_value'])

for k in ports_dict.keys():
ports_dict[k] = list(set(ports_dict[k]))

logger.info('Line Card Choice:{}'.format(line_card_choice))
logger.info('Port dictionary:{}'.format(ports_dict))
for duthost in dut_list:
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(300, 20, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")
else:
for duthost in dut_list:
logger.info("Issuing a restart of service {} on the dut {}".format(restart_service, duthost.hostname))
duthost.command("systemctl reset-failed {}".format(restart_service))
duthost.command("systemctl restart {}".format(restart_service))
logger.info("Wait until the system is stable")
pytest_assert(wait_until(300, 20, 0, duthost.critical_services_fully_started),
"Not all critical services are fully started")

snappi_extra_params = SnappiTestParams()
snappi_extra_params.multi_dut_params.duthost1 = duthost1
Expand Down