From fc8adabfd7554f0fb47f838d75ddb1e1712cbc33 Mon Sep 17 00:00:00 2001 From: Zhaohui Sun Date: Fri, 3 Jan 2025 02:15:47 +0000 Subject: [PATCH] Support 2 vlan config in topology for test_acl Signed-off-by: Zhaohui Sun --- tests/acl/test_acl.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/acl/test_acl.py b/tests/acl/test_acl.py index 39e1e6783f3..ad6d94de920 100644 --- a/tests/acl/test_acl.py +++ b/tests/acl/test_acl.py @@ -302,7 +302,7 @@ def setup(duthosts, ptfhost, rand_selected_dut, rand_unselected_dut, tbinfo, ptf DOWNSTREAM_DST_IP = DOWNSTREAM_DST_IP_M0_L3 DOWNSTREAM_IP_TO_ALLOW = DOWNSTREAM_IP_TO_ALLOW_M0_L3 DOWNSTREAM_IP_TO_BLOCK = DOWNSTREAM_IP_TO_BLOCK_M0_L3 - if topo in ["t0", "mx", "m0_vlan"]: + if topo in ["mx", "m0_vlan"]: vlan_ports = [mg_facts["minigraph_ptf_indices"][ifname] for ifname in mg_facts["minigraph_vlans"][vlan_name]["members"]] @@ -310,7 +310,14 @@ def setup(duthosts, ptfhost, rand_selected_dut, rand_unselected_dut, tbinfo, ptf vlan_table = config_facts["VLAN"] if "mac" in vlan_table[vlan_name]: vlan_mac = vlan_table[vlan_name]["mac"] - + elif topo in ["t0"]: + vlan_ports = [mg_facts["minigraph_ptf_indices"][ifname] + for ifname in list(mg_facts["minigraph_vlans"].values())[0]["members"]] + config_facts = rand_selected_dut.get_running_config_facts() + vlan_table = config_facts["VLAN"] + vlan_name = list(vlan_table.keys())[0] + if "mac" in vlan_table[vlan_name]: + vlan_mac = vlan_table[vlan_name]["mac"] # Get the list of upstream/downstream ports downstream_ports = defaultdict(list) upstream_ports = defaultdict(list)