From 7c5644fdaa572c3310c15341b4ee6a0c8d814214 Mon Sep 17 00:00:00 2001 From: Neetha John Date: Mon, 6 May 2024 22:01:45 -0700 Subject: [PATCH] Skip po2vlan usecase for backend (#12736) Signed-off-by: Neetha John --- tests/common/helpers/portchannel_to_vlan.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/common/helpers/portchannel_to_vlan.py b/tests/common/helpers/portchannel_to_vlan.py index b135aaa26dc..0322781727a 100644 --- a/tests/common/helpers/portchannel_to_vlan.py +++ b/tests/common/helpers/portchannel_to_vlan.py @@ -11,7 +11,7 @@ from tests.common.fixtures.duthost_utils import ports_list # noqa F401 from tests.common.fixtures.duthost_utils import utils_vlan_intfs_dict_orig # noqa F401 from tests.common.fixtures.duthost_utils import utils_vlan_intfs_dict_add -from tests.common.helpers.backend_acl import apply_acl_rules, bind_acl_table +from tests.common.helpers.backend_acl import bind_acl_table from tests.common.checkpoint import create_checkpoint, rollback from tests.common.utilities import check_skip_release @@ -361,7 +361,7 @@ def acl_rule_cleanup(duthost, tbinfo): """Cleanup all the existing DATAACL rules""" # remove all rules under the ACL_RULE table if "t0-backend" in tbinfo["topo"]["name"]: - duthost.shell('acl-loader delete') + duthost.shell('acl-loader delete DATAACL') yield @@ -375,7 +375,6 @@ def setup_acl_table(duthost, tbinfo, acl_rule_cleanup): yield if "t0-backend" in tbinfo["topo"]["name"]: - duthost.command('config acl remove table DATAACL') # rebind with new set of ports bind_acl_table(duthost, tbinfo) @@ -384,7 +383,7 @@ def setup_acl_table(duthost, tbinfo, acl_rule_cleanup): def setup_po2vlan(duthosts, ptfhost, rand_one_dut_hostname, rand_selected_dut, ptfadapter, ports_list, tbinfo, vlan_intfs_dict, setup_acl_table, fanouthosts): # noqa F811 - if "dualtor" in tbinfo["topo"]["name"]: + if any(topo in tbinfo["topo"]["name"] for topo in ["dualtor", "t0-backend"]): yield return @@ -417,8 +416,6 @@ def setup_po2vlan(duthosts, ptfhost, rand_one_dut_hostname, rand_selected_dut, p vp_list = running_vlan_ports_list(duthosts, rand_one_dut_hostname, rand_selected_dut, tbinfo, ports_list) populate_fdb(ptfadapter, vp_list, vlan_intfs_dict) - bind_acl_table(duthost, tbinfo) - apply_acl_rules(duthost, tbinfo) # --------------------- Testing ----------------------- yield # --------------------- Teardown -----------------------