diff --git a/tests/snappi_tests/pfc/test_lossless_response_to_throttling_pause_storms.py b/tests/snappi_tests/pfc/test_lossless_response_to_throttling_pause_storms.py index 77f74c02220..fa4613fb457 100644 --- a/tests/snappi_tests/pfc/test_lossless_response_to_throttling_pause_storms.py +++ b/tests/snappi_tests/pfc/test_lossless_response_to_throttling_pause_storms.py @@ -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 @@ -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 @@ -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) diff --git a/tests/snappi_tests/pfc/test_m2o_fluctuating_lossless.py b/tests/snappi_tests/pfc/test_m2o_fluctuating_lossless.py index 6565d846c1d..dc356346ab4 100644 --- a/tests/snappi_tests/pfc/test_m2o_fluctuating_lossless.py +++ b/tests/snappi_tests/pfc/test_m2o_fluctuating_lossless.py @@ -4,11 +4,10 @@ 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 @@ -16,21 +15,21 @@ 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 @@ -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 @@ -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) diff --git a/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless.py b/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless.py index 9c12508c7fa..5bdf9bd17c3 100644 --- a/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless.py +++ b/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless.py @@ -4,7 +4,7 @@ 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 @@ -12,27 +12,26 @@ 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 @@ -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 @@ -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) diff --git a/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless_lossy.py b/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless_lossy.py index 88293ba5704..3deb13600c6 100644 --- a/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless_lossy.py +++ b/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossless_lossy.py @@ -4,7 +4,7 @@ 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 @@ -12,28 +12,27 @@ 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 @@ -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 @@ -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) diff --git a/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossy.py b/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossy.py index 6f053a16f30..48f70860930 100644 --- a/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossy.py +++ b/tests/snappi_tests/pfc/test_m2o_oversubscribe_lossy.py @@ -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.pfc.files.m2o_oversubscribe_lossy_helper import run_pfc_m2o_oversubscribe_lossy_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')] -@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_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 + 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 oversubscription lossy test under many to one traffic pattern Args: @@ -58,7 +57,7 @@ def test_m2o_oversubscribe_lossy(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() bg_prio_list = lossless_prio_list @@ -68,16 +67,20 @@ def test_m2o_oversubscribe_lossy(snappi_api, # snappi_extra_params = SnappiTestParams() snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports - run_pfc_m2o_oversubscribe_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) + try: + run_pfc_m2o_oversubscribe_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) + finally: + cleanup_config(duthosts, snappi_ports)