Skip to content

[acl][mx] Fix test_stress_acl failed on mx #7378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaqiangz merged 1 commit into from
Feb 2, 2023
Merged

[acl][mx] Fix test_stress_acl failed on mx #7378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions tests/acl/test_stress_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,20 @@


@pytest.fixture(scope='module')
def setup_stress_acl_table(rand_selected_dut, tbinfo):
def setup_stress_acl_table(rand_selected_dut, tbinfo, duthost):
mg_facts = rand_selected_dut.get_extended_minigraph_facts(tbinfo)
pc = list(mg_facts['minigraph_portchannels'].keys())[0]
if not pc:
if tbinfo["topo"]["type"] == "mx":
table_port = duthost.acl_facts()["ansible_facts"]["ansible_acl_facts"]["DATAACL"]["ports"][0]
else:
table_port = list(mg_facts['minigraph_portchannels'].keys())[0]
if not table_port:
pytest.skip('No portchannels found')

# Define a custom table type CUSTOM_TYPE by loading a json configuration
rand_selected_dut.template(src=STRESS_ACL_TABLE_TEMPLATE, dest=STRESS_ACL_TABLE_JSON_FILE)
rand_selected_dut.shell("sonic-cfggen -j {} -w".format(STRESS_ACL_TABLE_JSON_FILE))
# Create an ACL table and bind to Vlan1000 interface
cmd_create_table = "config acl add table STRESS_ACL L3 -s ingress -p {}".format(pc)
cmd_create_table = "config acl add table STRESS_ACL L3 -s ingress -p {}".format(table_port)
cmd_remove_table = "config acl remove table STRESS_ACL"
loganalyzer = LogAnalyzer(ansible_host=rand_selected_dut, marker_prefix="stress_acl")
loganalyzer.load_common_config()
Expand Down