Skip to content

Commit 83a219f

Browse files
authored
support t1-isolated-d56u2 in test_acl.py, test_stress_acl.py and test_qos_sai (sonic-net#18444)
What is the motivation for this PR? Add t1-isolated-d56u2 topo support into test_acl.py, test_stress_acl.py and test_qos_sai How did you do it? Add t1-isolated-d56u2 topo support into test_acl.py, test_stress_acl.py and test_qos_sai How did you verify/test it? Ran on physical testbed. Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
1 parent e245354 commit 83a219f

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

tests/acl/test_acl.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -412,19 +412,18 @@ def setup(duthosts, ptfhost, rand_selected_dut, rand_selected_front_end_dut, ran
412412
# TODO: We should make this more robust (i.e. bind all active front-panel ports)
413413
acl_table_ports = defaultdict(list)
414414

415-
if topo in ["t0", "mx", "m0_vlan", "m0_l3"] or tbinfo["topo"]["name"] in ("t1", "t1-lag", "t1-28-lag",
416-
"t1-isolated-d28u1", "t1-isolated-d28",
417-
"t1-isolated-d128"):
415+
if (topo in ["t0", "mx", "m0_vlan", "m0_l3"]
416+
or tbinfo["topo"]["name"] in ("t1", "t1-lag", "t1-28-lag")
417+
or 't1-isolated' in tbinfo["topo"]["name"]):
418418
for namespace, port in list(downstream_ports.items()):
419419
acl_table_ports[namespace] += port
420420
# In multi-asic we need config both in host and namespace.
421421
if namespace:
422422
acl_table_ports[''] += port
423-
if len(port_channels) and topo in ["t0", "m0_vlan", "m0_l3"] or tbinfo["topo"]["name"] in ("t1-lag", "t1-64-lag",
424-
"t1-64-lag-clet",
425-
"t1-56-lag",
426-
"t1-28-lag",
427-
"t1-32-lag"):
423+
if len(port_channels) and (topo in ["t0", "m0_vlan", "m0_l3"]
424+
or tbinfo["topo"]["name"] in ("t1-lag", "t1-64-lag", "t1-64-lag-clet",
425+
"t1-56-lag", "t1-28-lag", "t1-32-lag")
426+
or 't1-isolated' in tbinfo["topo"]["name"]):
428427

429428
for k, v in list(port_channels.items()):
430429
acl_table_ports[v['namespace']].append(k)

tests/acl/test_stress_acl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def prepare_test_port(rand_selected_dut, tbinfo):
202202
upstream_port_neighbor_ips[interface] = ipv4_addr
203203

204204
dst_ip_addr = None
205-
if tbinfo["topo"]['name'] == "t1-isolated-d28u1":
205+
if tbinfo["topo"]['name'] in ["t1-isolated-d28u1", "t1-isolated-d56u2", "t1-isolated-d448u16"]:
206206
dst_ip_addr = random.choices(list(upstream_port_neighbor_ips.values()))
207207
return ptf_src_port, upstream_port_ids, dut_port, dst_ip_addr
208208

tests/qos/qos_sai_base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ class QosBase:
4949
"t0-standalone-256", "t0-28", "t0-isolated-d16u16s1", "t0-isolated-d16u16s2"
5050
]
5151
SUPPORTED_T1_TOPOS = ["t1-lag", "t1-64-lag", "t1-56-lag", "t1-backend", "t1-28-lag", "t1-32-lag",
52-
"t1-isolated-d28u1"]
52+
"t1-isolated-d28u1", "t1-isolated-v6-d28u1", "t1-isolated-d56u2", "t1-isolated-v6-d56u2",
53+
"t1-isolated-d448u16", "t1-isolated-v6-d448u16"]
5354
SUPPORTED_PTF_TOPOS = ['ptf32', 'ptf64']
5455
SUPPORTED_ASIC_LIST = ["pac", "gr", "gr2", "gb", "td2", "th", "th2", "spc1", "spc2", "spc3", "spc4", "td3", "th3",
5556
"j2c+", "jr2", "th5"]

0 commit comments

Comments
 (0)