Skip to content

[Snappi] - Test Changes to support Infra changes for dynamic port selection from the setup replacing variables.py file #18091

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
yejianquan merged 19 commits into from
Jun 9, 2025
Merged

[Snappi] - Test Changes to support Infra changes for dynamic port selection from the setup replacing variables.py file #18091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8868b8a
Changes to support RDMA Tests for VOQ Chassis
yatishkoul Mar 31, 2025
eea612b
Merge branch 'sonic-net:master' into snappi_tests_fixes
YatishSVC Apr 2, 2025
cd1eab4
Enhancements
yatishkoul Apr 2, 2025
d876bc1
Merge branch 'sonic-net:master' into snappi_tests_fixes
YatishSVC Apr 17, 2025
d0cff24
Added changes to separate voq and non-voq chassis checks
yatishkoul Apr 17, 2025
2894678
Updating some limits for loss %ages
yatishkoul Apr 17, 2025
65a68a0
Adding some more changes
yatishkoul Apr 17, 2025
79b904b
Merge branch 'sonic-net:master' into snappi_tests_fixes
YatishSVC Apr 22, 2025
b4e472d
Merge branch 'sonic-net:master' into snappi_tests_fixes
YatishSVC Apr 22, 2025
d58b50c
Adding New infra Changes for testcases
YatishSVC Apr 22, 2025
9cb17fd
Adding New infra Changes for testcases:pre-commit hooks
YatishSVC Apr 23, 2025
73130a5
Update snappi_fixtures.py
YatishSVC Apr 23, 2025
6c1834c
Update test_pretest.py
YatishSVC Apr 23, 2025
7765b2e
Update conftest.py
YatishSVC Apr 23, 2025
dd8ac2c
Merge branch 'sonic-net:master' into snappi_tests_fixes
YatishSVC Apr 23, 2025
c0781da
Adding new Changes to resolve review comments
yatishkoul Jun 4, 2025
b24b0c5
Resolving Merge Conflicts 01
yatishkoul Jun 6, 2025
889c27d
resolve merge conflicts
yatishkoul Jun 6, 2025
6e818cf
Merge branch 'master' into snappi_tests_fixes
YatishSVC Jun 6, 2025
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: 25 additions & 22 deletions tests/snappi_tests/pfc/test_lossless_response_to_throttling_pause_storms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,34 @@
fanout_graph_facts_multidut # noqa: F401
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
get_snappi_ports_single_dut, snappi_testbed_config, \
get_snappi_ports_multi_dut, is_snappi_multidut, \
get_snappi_ports_multi_dut, is_snappi_multidut, snappi_port_selection, tgen_port_info, \
snappi_api, snappi_dut_base_config, get_snappi_ports, get_snappi_ports_for_rdma, cleanup_config # noqa: F401
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, \
lossless_prio_list, disable_pfcwd # noqa: F401
from tests.snappi_tests.pfc.files.lossless_response_to_throttling_pause_storms_helper import (
run_lossless_response_to_throttling_pause_storms_test)
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams
from tests.snappi_tests.files.helper import setup_ports_and_dut, multidut_port_info # noqa: F401
from tests.common.snappi_tests.variables import pfcQueueGroupSize, pfcQueueValueDict # noqa: F401
from tests.snappi_tests.cisco.helper import disable_voq_watchdog # noqa: F401
logger = logging.getLogger(__name__)
pytestmark = [pytest.mark.topology('multidut-tgen', 'tgen')]


@pytest.fixture(autouse=True)
@pytest.fixture(autouse=True, scope='module')
def number_of_tx_rx_ports():
yield (2, 1)
yield (1, 2)


def test_lossless_response_to_throttling_pause_storms(snappi_api, # noqa: F811
conn_graph_facts, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
duthosts,
prio_dscp_map, # noqa: F811
lossless_prio_list, # noqa: F811
get_snappi_ports, # noqa: F811
tbinfo, # noqa: F811
disable_pfcwd, # noqa: F811
setup_ports_and_dut): # noqa: F811
get_snappi_ports, # noqa: F811
tbinfo, # noqa: F811
disable_pfcwd, # noqa: F811
tgen_port_info): # noqa: F811

"""
Run PFC lossless response to throttling pause storms
Expand Down Expand Up @@ -64,7 +63,7 @@ def test_lossless_response_to_throttling_pause_storms(snappi_api,
Returns:
N/A
"""
testbed_config, port_config_list, snappi_ports = setup_ports_and_dut
testbed_config, port_config_list, snappi_ports = tgen_port_info

all_prio_list = prio_dscp_map.keys()
test_prio_list = lossless_prio_list
Expand All @@ -74,15 +73,19 @@ def test_lossless_response_to_throttling_pause_storms(snappi_api,
snappi_extra_params = SnappiTestParams()
snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports

run_lossless_response_to_throttling_pause_storms_test(api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params)
cleanup_config(duthosts, snappi_ports)
try:
run_lossless_response_to_throttling_pause_storms_test(
api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params
)
finally:
cleanup_config(duthosts, snappi_ports)
53 changes: 28 additions & 25 deletions tests/snappi_tests/pfc/test_m2o_fluctuating_lossless.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,32 @@
fanout_graph_facts_multidut # noqa: F401
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
get_snappi_ports_single_dut, snappi_testbed_config, \
get_snappi_ports_multi_dut, is_snappi_multidut, \
get_snappi_ports_multi_dut, is_snappi_multidut, snappi_port_selection, tgen_port_info, \
snappi_api, snappi_dut_base_config, get_snappi_ports, get_snappi_ports_for_rdma, cleanup_config # noqa: F401
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, \
lossless_prio_list, disable_pfcwd # noqa: F401
from tests.snappi_tests.files.helper import multidut_port_info, setup_ports_and_dut # noqa: F401
lossless_prio_list, disable_pfcwd # noqa: F401
from tests.snappi_tests.pfc.files.m2o_fluctuating_lossless_helper import run_m2o_fluctuating_lossless_test
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams
from tests.snappi_tests.cisco.helper import disable_voq_watchdog # noqa: F401
logger = logging.getLogger(__name__)
pytestmark = [pytest.mark.topology('multidut-tgen')]


@pytest.fixture(autouse=True)
@pytest.fixture(autouse=True, scope='module')
def number_of_tx_rx_ports():
yield (2, 1)
yield (1, 2)


def test_m2o_fluctuating_lossless(snappi_api, # noqa: F811
conn_graph_facts, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
def test_m2o_fluctuating_lossless(snappi_api, # noqa: F811
conn_graph_facts, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
duthosts,
prio_dscp_map, # noqa: F811
lossless_prio_list, # noqa: F811
get_snappi_ports, # noqa: F811
tbinfo, # noqa: F811
disable_pfcwd, # noqa: F811
setup_ports_and_dut): # noqa: F811
get_snappi_ports, # noqa: F811
tbinfo, # noqa: F811
disable_pfcwd, # noqa: F811
tgen_port_info): # noqa: F811

"""
Run PFC Fluctuating Lossless Traffic Congestion with many to one traffic pattern
Expand Down Expand Up @@ -61,7 +60,7 @@ def test_m2o_fluctuating_lossless(snappi_api, # noqa: F811
Returns:
N/A
"""
testbed_config, port_config_list, snappi_ports = setup_ports_and_dut
testbed_config, port_config_list, snappi_ports = tgen_port_info

all_prio_list = prio_dscp_map.keys()
test_prio_list = lossless_prio_list
Expand All @@ -71,15 +70,19 @@ def test_m2o_fluctuating_lossless(snappi_api, # noqa: F811
snappi_extra_params = SnappiTestParams()
snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports

run_m2o_fluctuating_lossless_test(api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params)
cleanup_config(duthosts, snappi_ports)
try:
run_m2o_fluctuating_lossless_test(
api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params
)
finally:
cleanup_config(duthosts, snappi_ports)
45 changes: 24 additions & 21 deletions tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,34 @@
fanout_graph_facts_multidut # noqa: F401
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
get_snappi_ports_single_dut, snappi_testbed_config, \
get_snappi_ports_multi_dut, is_snappi_multidut, \
get_snappi_ports_multi_dut, is_snappi_multidut, snappi_port_selection, tgen_port_info, \
snappi_api, snappi_dut_base_config, get_snappi_ports, get_snappi_ports_for_rdma, cleanup_config # noqa: F401
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, \
lossless_prio_list, disable_pfcwd # noqa: F401
from tests.snappi_tests.pfc.files.m2o_oversubscribe_lossless_helper import (
run_m2o_oversubscribe_lossless_test
)
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams
from tests.snappi_tests.files.helper import setup_ports_and_dut, multidut_port_info # noqa: F401
from tests.snappi_tests.cisco.helper import disable_voq_watchdog # noqa: F401
logger = logging.getLogger(__name__)
pytestmark = [pytest.mark.topology('multidut-tgen', 'tgen')]


@pytest.fixture(autouse=True)
@pytest.fixture(autouse=True, scope='module')
def number_of_tx_rx_ports():
yield (2, 1)
yield (1, 2)


def test_m2o_oversubscribe_lossless(snappi_api, # noqa: F811
conn_graph_facts, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
duthosts,
prio_dscp_map, # noqa: F811
lossless_prio_list, # noqa: F811
get_snappi_ports, # noqa: F811
get_snappi_ports, # noqa: F811
tbinfo,
disable_pfcwd, # noqa: F811
setup_ports_and_dut): # noqa: F811
disable_pfcwd, # noqa: F811
tgen_port_info): # noqa: F811

"""
Run PFC oversubsription lossless for many to one traffic pattern
Expand Down Expand Up @@ -61,7 +60,7 @@ def test_m2o_oversubscribe_lossless(snappi_api, # n
Returns:
N/A
"""
testbed_config, port_config_list, snappi_ports = setup_ports_and_dut
testbed_config, port_config_list, snappi_ports = tgen_port_info

all_prio_list = prio_dscp_map.keys()
test_prio_list = lossless_prio_list
Expand All @@ -71,15 +70,19 @@ def test_m2o_oversubscribe_lossless(snappi_api, # n
snappi_extra_params = SnappiTestParams()
snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports

run_m2o_oversubscribe_lossless_test(api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params)
cleanup_config(duthosts, snappi_ports)
try:
run_m2o_oversubscribe_lossless_test(
api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params
)
finally:
cleanup_config(duthosts, snappi_ports)
41 changes: 22 additions & 19 deletions tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless_lossy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,35 @@
fanout_graph_facts_multidut # noqa: F401
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
get_snappi_ports_single_dut, snappi_testbed_config, \
get_snappi_ports_multi_dut, is_snappi_multidut, \
get_snappi_ports_multi_dut, is_snappi_multidut, snappi_port_selection, tgen_port_info, \
snappi_api, snappi_dut_base_config, get_snappi_ports, get_snappi_ports_for_rdma, cleanup_config # noqa: F401
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, \
lossless_prio_list, disable_pfcwd # noqa: F401
from tests.snappi_tests.pfc.files.m2o_oversubscribe_lossless_lossy_helper import (
run_pfc_m2o_oversubscribe_lossless_lossy_test
) # noqa: F401
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams # noqa: F401
from tests.snappi_tests.files.helper import setup_ports_and_dut, multidut_port_info # noqa: F401
from tests.common.snappi_tests.variables import pfcQueueGroupSize, pfcQueueValueDict # noqa: F401
from tests.snappi_tests.cisco.helper import disable_voq_watchdog # noqa: F401
logger = logging.getLogger(__name__)
pytestmark = [pytest.mark.topology('multidut-tgen', 'tgen')]


@pytest.fixture(autouse=True)
@pytest.fixture(autouse=True, scope='module')
def number_of_tx_rx_ports():
yield (2, 1)
yield (1, 2)


def test_m2o_oversubscribe_lossless_lossy(snappi_api, # noqa: F811
conn_graph_facts, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
fanout_graph_facts_multidut, # noqa: F811
duthosts,
prio_dscp_map, # noqa: F811
lossless_prio_list, # noqa: F811
get_snappi_ports, # noqa: F811
tbinfo,
disable_pfcwd, # noqa: F811
setup_ports_and_dut): # noqa: F811
tgen_port_info): # noqa: F811

"""
Run PFC Oversubscribe Lossless Lossy for many to one traffic pattern
Expand Down Expand Up @@ -63,7 +62,7 @@ def test_m2o_oversubscribe_lossless_lossy(snappi_api, # noqa:
Returns:
N/A
"""
testbed_config, port_config_list, snappi_ports = setup_ports_and_dut
testbed_config, port_config_list, snappi_ports = tgen_port_info

all_prio_list = prio_dscp_map.keys()
test_prio_list = lossless_prio_list
Expand All @@ -73,15 +72,19 @@ def test_m2o_oversubscribe_lossless_lossy(snappi_api, # noqa:
snappi_extra_params = SnappiTestParams()
snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports

run_pfc_m2o_oversubscribe_lossless_lossy_test(api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params)
cleanup_config(duthosts, snappi_ports)
try:
run_pfc_m2o_oversubscribe_lossless_lossy_test(
api=snappi_api,
testbed_config=testbed_config,
port_config_list=port_config_list,
conn_data=conn_graph_facts,
fanout_data=fanout_graph_facts_multidut,
dut_port=snappi_ports[0]['peer_port'],
pause_prio_list=pause_prio_list,
test_prio_list=test_prio_list,
bg_prio_list=bg_prio_list,
prio_dscp_map=prio_dscp_map,
snappi_extra_params=snappi_extra_params
)
finally:
cleanup_config(duthosts, snappi_ports)
Loading
Loading