Skip to content

Commit e201a9f

Browse files
selldineshselldinesh
committed
multidut folder move and refactoring
1 parent 0e1c4cf commit e201a9f

2 files changed

Lines changed: 43 additions & 27 deletions

File tree

tests/snappi/pfc/files/lossless_response_to_external_pause_storms_helper.py renamed to tests/snappi_tests/multidut/pfc/files/lossless_response_to_external_pause_storms_helper.py

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
# Embedded file name: /var/johnar/sonic-mgmt/tests/snappi/multi_dut_rdma/files/rdma_helper.py
55
# Compiled at: 2023-02-10 09:15:26
66
import time
7-
from math import ceil # noqa: F401
8-
import logging # noqa: F401
9-
from tests.common.helpers.assertions import pytest_assert, pytest_require # noqa: F401
10-
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts # noqa: F401
11-
from tests.common.snappi.snappi_helpers import get_dut_port_id # noqa: F401
12-
from tests.common.snappi.common_helpers import pfc_class_enable_vector, stop_pfcwd,\
13-
disable_packet_aging # noqa: F401
14-
from tests.common.snappi.port import select_ports # noqa: F401
15-
from tests.common.snappi.snappi_helpers import wait_for_arp
7+
from math import ceil # noqa: F401
8+
import logging # noqa: F401
9+
from tests.common.helpers.assertions import pytest_assert, pytest_require # noqa: F401
10+
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts # noqa: F401
11+
from tests.common.snappi_tests.snappi_helpers import get_dut_port_id # noqa: F401
12+
from tests.common.snappi_tests.common_helpers import pfc_class_enable_vector, stop_pfcwd,\
13+
disable_packet_aging # noqa: F401
14+
from tests.common.snappi_tests.port import select_ports # noqa: F401
15+
from tests.common.snappi_tests.snappi_helpers import wait_for_arp
16+
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams
17+
1618
logger = logging.getLogger(__name__)
1719

1820
TEST_FLOW_NAME = 'Test Flow'
@@ -33,16 +35,12 @@ def run_pfcwd_multi_node_test(api,
3335
port_config_list,
3436
conn_data,
3537
fanout_data,
36-
duthost1,
37-
rx_port,
38-
rx_port_id_list,
39-
duthost2, tx_port,
40-
tx_port_id_list,
4138
dut_port,
4239
pause_prio_list,
4340
test_prio_list,
4441
bg_prio_list,
45-
prio_dscp_map):
42+
prio_dscp_map,
43+
snappi_extra_params=None):
4644
"""
4745
Run PFC watchdog test in a multi-node (>=3) topoology
4846
@@ -57,10 +55,21 @@ def run_pfcwd_multi_node_test(api,
5755
pause_prio_list (list): priorities to pause for PFC pause storm
5856
test_prio_list (list): priorities of test flows
5957
bg_prio_list (list): priorities of background flows
60-
prio_dscp_map (dict): Priority vs. DSCP map (key = priority).
58+
prio_dscp_map (dict): Priority vs. DSCP map (key = priority)
59+
snappi_extra_params (SnappiTestParams obj): additional parameters for Snappi traffic
6160
Returns:
6261
N/A
6362
"""
63+
if snappi_extra_params is None:
64+
snappi_extra_params = SnappiTestParams()
65+
66+
duthost1 = snappi_extra_params.duthost1
67+
rx_port = snappi_extra_params.rx_port
68+
duthost2 = snappi_extra_params.duthost2
69+
tx_port = snappi_extra_params.tx_port
70+
rx_port_id_list = snappi_extra_params.rx_port_id
71+
tx_port_id_list = snappi_extra_params.tx_port_id
72+
6473
pytest_assert(testbed_config is not None, 'Fail to get L2/3 testbed config')
6574
stop_pfcwd(duthost1, rx_port['asic_value'])
6675
disable_packet_aging(duthost1)

tests/snappi/pfc/test_lossless_response_to_external_pause_storms.py renamed to tests/snappi_tests/multidut/pfc/test_lossless_response_to_external_pause_storms.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
import random
33
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
44
fanout_graph_facts # noqa: F401
5-
from tests.common.snappi.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
5+
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
66
snappi_api, snappi_dut_base_config, get_tgen_peer_ports, get_multidut_snappi_ports,\
77
get_multidut_tgen_peer_port_set, cleanup_config # noqa: F401
8-
from tests.common.snappi.qos_fixtures import prio_dscp_map,\
8+
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map,\
99
lossless_prio_list # noqa: F401
10-
from tests.snappi.variables import config_set, line_card_choice
11-
from files.lossless_response_to_external_pause_storms_helper import run_pfcwd_multi_node_test
10+
from tests.snappi_tests.variables import config_set, line_card_choice
11+
from tests.snappi_tests.multidut.pfc.files.lossless_response_to_external_pause_storms_helper import (
12+
run_pfcwd_multi_node_test,
13+
)
14+
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams
1215

1316
pytestmark = [pytest.mark.topology('snappi')]
1417

@@ -67,21 +70,25 @@ def test_pfcwd_many_to_one(snappi_api, # noqa: F811
6770
test_prio_list = lossless_prio_list
6871
pause_prio_list = test_prio_list
6972
bg_prio_list = [x for x in all_prio_list if x not in pause_prio_list]
73+
74+
snappi_extra_params = SnappiTestParams()
75+
snappi_extra_params.duthost1 = duthost1
76+
snappi_extra_params.rx_port = snappi_ports[0]
77+
snappi_extra_params.rx_port_id = [snappi_ports[0]["port_id"]]
78+
snappi_extra_params.duthost2 = duthost2
79+
snappi_extra_params.tx_port = [snappi_ports[1], snappi_ports[2]]
80+
snappi_extra_params.tx_port_id = [snappi_ports[1]["port_id"], snappi_ports[2]["port_id"]]
81+
7082
run_pfcwd_multi_node_test(api=snappi_api,
7183
testbed_config=testbed_config,
7284
port_config_list=port_config_list,
7385
conn_data=conn_graph_facts,
7486
fanout_data=fanout_graph_facts,
75-
duthost1=duthost1,
76-
rx_port=snappi_ports[0],
77-
rx_port_id_list=[snappi_ports[0]["port_id"]],
78-
duthost2=duthost2,
79-
tx_port=[snappi_ports[1], snappi_ports[2]],
80-
tx_port_id_list=[snappi_ports[1]["port_id"], snappi_ports[2]["port_id"]],
8187
dut_port=snappi_ports[0]['peer_port'],
8288
pause_prio_list=pause_prio_list,
8389
test_prio_list=test_prio_list,
8490
bg_prio_list=bg_prio_list,
85-
prio_dscp_map=prio_dscp_map,)
91+
prio_dscp_map=prio_dscp_map,
92+
snappi_extra_params=snappi_extra_params)
8693

8794
cleanup_config(dut_list, snappi_ports)

0 commit comments

Comments
 (0)