Skip to content

Commit

Permalink
Skip po2vlan usecase for backend (sonic-net#12736)
Browse files Browse the repository at this point in the history
Signed-off-by: Neetha John <[email protected]>
  • Loading branch information
neethajohn authored May 7, 2024
1 parent 1e330e5 commit 7c5644f
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions tests/common/helpers/portchannel_to_vlan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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)

Expand All @@ -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

Expand Down Expand Up @@ -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 -----------------------
Expand Down

0 comments on commit 7c5644f

Please sign in to comment.