Skip to content

Commit 70d563e

Browse files
deepak-singhal0408deepak-singhal0408
authored
[T2-Snappi-Conv]: Added back removed imports (sonic-net#17251)
1. In PR T2-Snappi-Route-Conv: Initial DUT Config Automation, Remove T1 from DUTList sonic-net#17195 some imports were incorrectly removed from a couple of test files.Placing them back. 2. Create its own local list of multi_dut_ports from the fixture multidut_snappi_ports_for_bgp, to avoid incorrect references 3. for ungraceful restart, execute TSB on all DUTs.
1 parent 5d09f4c commit 70d563e

9 files changed

+25
-20
lines changed

‎tests/snappi_tests/multidut/bgp/files/bgp_outbound_helper.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1589,8 +1589,9 @@ def get_convergence_for_ungraceful_restart(duthosts,
15891589
avg_pld2.append(pkt_loss_duration)
15901590

15911591
for duthost in duthosts:
1592-
if duthost.hostname == device_name:
1593-
duthost.command("sudo TSB")
1592+
# For Sup ungraceful restart, all LCs will also reboot, and hence need TSB to stop startup_tsa_tsb service
1593+
logger.info('Issuing TSB on {}'.format(duthost.hostname))
1594+
duthost.command("sudo TSB")
15941595
logger.info('Stopping Traffic')
15951596
ts = api.transmit_state()
15961597
ts.state = ts.STOP

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_downlink_port_flap.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from tests.common.helpers.assertions import pytest_require # noqa: F401
44
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, \
55
fanout_graph_facts_multidut # noqa: F401
6-
from tests.common.snappi_tests.snappi_fixtures import snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
6+
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
7+
snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
78
from tests.snappi_tests.variables import t1_side_interconnected_port, t1_t2_device_hostnames, \
89
t1_dut_info, t1_snappi_ports # noqa: F401
910
from tests.snappi_tests.multidut.bgp.files.bgp_outbound_helper import (
@@ -85,7 +86,7 @@ def test_bgp_outbound_downlink_port_flap(snappi_api,
8586
'port_name': t1_side_interconnected_port[hw_platform]
8687
}
8788
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
88-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
89+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
8990
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
9091
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
9192
run_bgp_outbound_link_flap_test(api=snappi_api,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_downlink_process_crash.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test_bgp_outbound_downlink_process_crash(snappi_api,
8282
continue
8383
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
8484
snappi_extra_params.multi_dut_params.host_name = t1_t2_device_hostnames[hw_platform][2]
85-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
85+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
8686
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
8787
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
8888
run_bgp_outbound_process_restart_test(api=snappi_api,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_tsa.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_bgp_outbound_uplink_tsa(snappi_api,
8383
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
8484
snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][1]
8585
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
86-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
86+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
8787
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
8888

8989
run_bgp_outbound_tsa_tsb_test(api=snappi_api,
@@ -138,7 +138,7 @@ def test_bgp_outbound_downlink_tsa(snappi_api,
138138
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
139139
snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][2]
140140
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
141-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
141+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
142142
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
143143
run_bgp_outbound_tsa_tsb_test(api=snappi_api,
144144
snappi_extra_params=snappi_extra_params,
@@ -191,7 +191,7 @@ def test_bgp_outbound_supervisor_tsa(snappi_api,
191191
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
192192
snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][3]
193193
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
194-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
194+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
195195
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
196196
run_bgp_outbound_tsa_tsb_test(api=snappi_api,
197197
snappi_extra_params=snappi_extra_params,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_ungraceful_restart.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def test_bgp_outbound_uplink_ungraceful_restart(snappi_api,
7272
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
7373
snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][1]
7474
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
75-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
75+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
7676
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
7777

7878
run_bgp_outbound_ungraceful_restart(api=snappi_api,
@@ -127,7 +127,7 @@ def test_bgp_outbound_downlink_ungraceful_restart(snappi_api,
127127
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
128128
snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][2]
129129
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
130-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
130+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
131131
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
132132

133133
run_bgp_outbound_ungraceful_restart(api=snappi_api,
@@ -182,7 +182,7 @@ def test_bgp_outbound_supervisor_ungraceful_restart(snappi_api,
182182
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
183183
snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][3]
184184
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
185-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
185+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
186186
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
187187

188188
run_bgp_outbound_ungraceful_restart(api=snappi_api,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_multi_po_flap.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def test_bgp_outbound_uplink_complete_blackout(snappi_api,
8181

8282
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
8383
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
84-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
84+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
8585
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
8686
run_bgp_outbound_uplink_blackout_test(api=snappi_api,
8787
creds=creds,
@@ -131,7 +131,7 @@ def test_bgp_outbound_uplink_partial_blackout(snappi_api,
131131
continue
132132
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
133133
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
134-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
134+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
135135
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
136136
run_bgp_outbound_uplink_blackout_test(api=snappi_api,
137137
creds=creds,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_po_flap.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from tests.common.helpers.assertions import pytest_require # noqa: F401
44
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, \
55
fanout_graph_facts_multidut # noqa: F401
6-
from tests.common.snappi_tests.snappi_fixtures import snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
6+
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
7+
snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
78
from tests.snappi_tests.variables import t1_t2_device_hostnames, t1_dut_info, t1_snappi_ports # noqa: F401
89
from tests.snappi_tests.multidut.bgp.files.bgp_outbound_helper import (
910
get_hw_platform, run_bgp_outbound_link_flap_test) # noqa: F401
@@ -83,7 +84,7 @@ def test_bgp_outbound_uplink_po_flap(snappi_api,
8384
else:
8485
continue
8586
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
86-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
87+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
8788
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
8889
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
8990
run_bgp_outbound_link_flap_test(api=snappi_api,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_po_member_flap.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from tests.common.helpers.assertions import pytest_require # noqa: F401
44
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, \
55
fanout_graph_facts_multidut # noqa: F401
6-
from tests.common.snappi_tests.snappi_fixtures import snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
6+
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
7+
snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
78
from tests.snappi_tests.variables import t1_t2_device_hostnames, t2_uplink_portchannel_members, \
89
t1_snappi_ports # noqa: F401
910
from tests.snappi_tests.multidut.bgp.files.bgp_outbound_helper import (
@@ -96,7 +97,7 @@ def test_bgp_outbound_uplink_po_member_flap(snappi_api,
9697
else:
9798
continue
9899
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
99-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
100+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
100101
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
101102
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
102103
run_bgp_outbound_link_flap_test(api=snappi_api,

‎tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_process_crash.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
import logging
33
from tests.common.helpers.assertions import pytest_require # noqa: F401
44
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts_multidut # noqa: F401
5-
from tests.common.snappi_tests.snappi_fixtures import snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
6-
from tests.snappi_tests.variables import t1_t2_device_hostnames, t1_snappi_ports # noqa: F401
5+
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
6+
snappi_api, multidut_snappi_ports_for_bgp # noqa: F401
7+
from tests.snappi_tests.variables import t1_t2_device_hostnames, t1_snappi_ports # noqa: F401
78
from tests.snappi_tests.multidut.bgp.files.bgp_outbound_helper import (
89
get_hw_platform, run_bgp_outbound_process_restart_test) # noqa: F401
910
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams # noqa: F401
@@ -82,7 +83,7 @@ def test_bgp_outbound_uplink_process_crash(snappi_api,
8283

8384
snappi_extra_params.multi_dut_params.t1_hostname = t1_t2_device_hostnames[hw_platform][0]
8485
snappi_extra_params.multi_dut_params.host_name = t1_t2_device_hostnames[hw_platform][1]
85-
snappi_extra_params.multi_dut_params.multi_dut_ports = multidut_snappi_ports_for_bgp
86+
snappi_extra_params.multi_dut_params.multi_dut_ports = list(multidut_snappi_ports_for_bgp)
8687
snappi_extra_params.multi_dut_params.multi_dut_ports.extend(t1_snappi_ports[hw_platform])
8788
snappi_extra_params.multi_dut_params.hw_platform = hw_platform
8889
run_bgp_outbound_process_restart_test(api=snappi_api,

0 commit comments

Comments
 (0)