Skip to content

[manual] [PR:16428] refactor: optimize qos sai test #16474

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

Closed
cyw233 wants to merge 1 commit into from
Closed

[manual] [PR:16428] refactor: optimize qos sai test #16474

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
47 changes: 32 additions & 15 deletions tests/qos/qos_sai_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

from tests.common.fixtures.ptfhost_utils import ptf_portmap_file # noqa F401
from tests.common.helpers.assertions import pytest_assert, pytest_require
from tests.common.helpers.multi_thread_utils import SafeThreadPoolExecutor
from tests.common.mellanox_data import is_mellanox_device as isMellanoxDevice
from tests.common.cisco_data import is_cisco_device
from tests.common.dualtor.dual_tor_utils import upper_tor_host, lower_tor_host, dualtor_ports, is_tunnel_qos_remap_enabled # noqa F401
Expand Down Expand Up @@ -590,13 +591,18 @@ def swapSyncd_on_selected_duts(self, request, duthosts, creds, tbinfo, lower_tor
new_creds['docker_registry_password'] = ''
else:
new_creds = creds
for duthost in dut_list:
docker.swap_syncd(duthost, new_creds)

with SafeThreadPoolExecutor(max_workers=8) as executor:
for duthost in dut_list:
executor.submit(docker.swap_syncd, duthost, new_creds)

yield

finally:
if swapSyncd:
for duthost in dut_list:
docker.restore_default_syncd(duthost, new_creds)
with SafeThreadPoolExecutor(max_workers=8) as executor:
for duthost in dut_list:
executor.submit(docker.restore_default_syncd, duthost, new_creds)

@pytest.fixture(scope='class', name="select_src_dst_dut_and_asic",
params=["single_asic", "single_dut_multi_asic",
Expand Down Expand Up @@ -1415,19 +1421,26 @@ def updateDockerService(host, docker="", action="", service=""): # noqa: F811
upper_tor_host, testcase="test_qos_sai", feature_list=feature_list)

disable_container_autorestart(src_dut, testcase="test_qos_sai", feature_list=feature_list)
for service in src_services:
updateDockerService(src_dut, action="stop", **service)
with SafeThreadPoolExecutor(max_workers=8) as executor:
for service in src_services:
executor.submit(updateDockerService, src_dut, action="stop", **service)

if src_asic != dst_asic:
disable_container_autorestart(dst_dut, testcase="test_qos_sai", feature_list=feature_list)
for service in dst_services:
updateDockerService(dst_dut, action="stop", **service)
with SafeThreadPoolExecutor(max_workers=8) as executor:
for service in dst_services:
executor.submit(updateDockerService, dst_dut, action="stop", **service)

yield

for service in src_services:
updateDockerService(src_dut, action="start", **service)
with SafeThreadPoolExecutor(max_workers=8) as executor:
for service in src_services:
executor.submit(updateDockerService, src_dut, action="start", **service)

if src_asic != dst_asic:
for service in dst_services:
updateDockerService(dst_dut, action="start", **service)
with SafeThreadPoolExecutor(max_workers=8) as executor:
for service in dst_services:
executor.submit(updateDockerService, dst_dut, action="start", **service)

""" Start mux conatiner for dual ToR """
if 'dualtor' in tbinfo['topo']['name']:
Expand Down Expand Up @@ -1905,9 +1918,13 @@ def dut_disable_ipv6(self, duthosts, tbinfo, lower_tor_host, swapSyncd_on_select
logger.info("Adding docker0's IPv6 address since it was removed when disabing IPv6")
duthost.shell("ip -6 addr add {} dev docker0".format(all_docker0_ipv6_addrs[duthost.hostname]))

# TODO: parallelize this step.. Do we really need this ?
for duthost in dut_list:
config_reload(duthost, config_source='config_db', safe_reload=True, check_intf_up_ports=True)
# TODO: Do we really need this ?
with SafeThreadPoolExecutor(max_workers=8) as executor:
for duthost in dut_list:
executor.submit(
config_reload,
duthost, config_source='config_db', safe_reload=True, check_intf_up_ports=True,
)

@pytest.fixture(scope='class', autouse=True)
def sharedHeadroomPoolSize(
Expand Down