diff --git a/tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py b/tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py index afd64152aec..1fec87ee448 100644 --- a/tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py +++ b/tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py @@ -9,7 +9,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 # noqa: F401 from tests.common.reboot import reboot # noqa: F401 @@ -18,7 +18,7 @@ from tests.common.platform.interface_utils import check_interface_status_of_up_ports from tests.snappi_tests.pfcwd.files.pfcwd_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, \ +from tests.snappi_tests.files.helper import reboot_duts, \ setup_ports_and_dut, multidut_port_info # noqa: F401 logger = logging.getLogger(__name__) pytestmark = [pytest.mark.topology('multidut-tgen', 'tgen')] @@ -27,14 +27,14 @@ INTERVAL = 40 -@pytest.fixture(autouse=True) +@pytest.fixture(autouse=True, scope='module') def number_of_tx_rx_ports(): yield (1, 1) @pytest.fixture(autouse=False) -def save_restore_config(setup_ports_and_dut): # noqa: F811 - testbed_config, port_config_list, snappi_ports = setup_ports_and_dut +def save_restore_config(tgen_port_info): # noqa: F811 + testbed_config, port_config_list, snappi_ports = tgen_port_info timestamp = time.time() dest = f'~/{timestamp}' @@ -59,7 +59,7 @@ def test_pfcwd_basic_single_lossless_prio(snappi_api, # noqa: lossless_prio_list, # noqa: F811 tbinfo, # noqa: F811 prio_dscp_map, # noqa: F811 - setup_ports_and_dut, # noqa: F811 + tgen_port_info, # noqa: F811 trigger_pfcwd, # noqa: F811 ): """ @@ -76,7 +76,8 @@ def test_pfcwd_basic_single_lossless_prio(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 + logger.info('Peer Ports: {}'.format([port['peer_port'] for port in snappi_ports])) lossless_prio = random.sample(lossless_prio_list, 1) lossless_prio = int(lossless_prio[0]) @@ -104,7 +105,7 @@ def test_pfcwd_basic_multi_lossless_prio(snappi_api, # noqa: F811 lossless_prio_list, # noqa: F811 tbinfo, # noqa: F811 prio_dscp_map, # noqa: F811 - setup_ports_and_dut, # noqa: F811 + tgen_port_info, # noqa: F811 trigger_pfcwd): """ Run PFC watchdog basic test on multiple lossless priorities @@ -121,7 +122,8 @@ def test_pfcwd_basic_multi_lossless_prio(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 + logger.info('Ports:{}'.format(snappi_ports)) snappi_extra_params = SnappiTestParams() snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports @@ -148,7 +150,7 @@ def test_pfcwd_basic_single_lossless_prio_reboot(snappi_api, # no enum_dut_lossless_prio_with_completeness_level, # noqa: F811 get_snappi_ports, # noqa: F811 prio_dscp_map, # noqa: F811 - setup_ports_and_dut, # noqa: F811 + tgen_port_info, # noqa: F811 reboot_duts, # noqa: F811 trigger_pfcwd): """ @@ -167,7 +169,8 @@ def test_pfcwd_basic_single_lossless_prio_reboot(snappi_api, # no N/A """ - testbed_config, port_config_list, snappi_ports = setup_ports_and_dut + testbed_config, port_config_list, snappi_ports = tgen_port_info + logger.info('Ports:{}'.format(snappi_ports)) _, lossless_prio = enum_dut_lossless_prio_with_completeness_level.split('|') lossless_prio = int(lossless_prio) @@ -195,7 +198,7 @@ def test_pfcwd_basic_multi_lossless_prio_reboot(snappi_api, # no lossless_prio_list, # noqa: F811 tbinfo, # noqa: F811 prio_dscp_map, # noqa: F811 - setup_ports_and_dut, # noqa: F811 + tgen_port_info, # noqa: F811 reboot_duts, # noqa: F811 trigger_pfcwd): """ @@ -214,7 +217,8 @@ def test_pfcwd_basic_multi_lossless_prio_reboot(snappi_api, # no Returns: N/A """ - testbed_config, port_config_list, snappi_ports = setup_ports_and_dut + testbed_config, port_config_list, snappi_ports = tgen_port_info + logger.info('Ports:{}'.format(snappi_ports)) snappi_extra_params = SnappiTestParams() snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports @@ -243,7 +247,7 @@ 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 + tgen_port_info, # noqa: F811 save_restore_config): """ Verify PFC watchdog basic test works on a single lossless priority after various service restarts @@ -260,7 +264,9 @@ def test_pfcwd_basic_single_lossless_prio_service_restart(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 + logger.info('Ports:{}'.format(snappi_ports)) + lossless_prio = random.sample(lossless_prio_list, 1) lossless_prio = int(lossless_prio[0]) @@ -328,7 +334,7 @@ def test_pfcwd_basic_multi_lossless_prio_restart_service(snappi_api, tbinfo, # noqa: F811 prio_dscp_map, # noqa: F811 restart_service, - setup_ports_and_dut, # noqa: F811 + tgen_port_info, # noqa: F811 trigger_pfcwd, save_restore_config): """ @@ -348,7 +354,8 @@ def test_pfcwd_basic_multi_lossless_prio_restart_service(snappi_api, N/A """ - testbed_config, port_config_list, snappi_ports = setup_ports_and_dut + testbed_config, port_config_list, snappi_ports = tgen_port_info + logger.info('Ports:{}'.format(snappi_ports)) if (snappi_ports[0]['duthost'].is_multi_asic): ports_dict = defaultdict(list)