Skip to content

[masic] Fix argument issue in verify_cacl, test_cacl_application #6169

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

Closed
wenyiz2021 wants to merge 4 commits into from
+4 −6
Closed

[masic] Fix argument issue in verify_cacl, test_cacl_application #6169

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5740228
Fix argument issue in verify_cacl
Aug 15, 2022
67d60d4
Revert "Fix argument issue in verify_cacl"
wenyiz2021 Aug 15, 2022
55db27c
Fix test_multiasic_cacl_application argument mismatch
wenyiz2021 Aug 15, 2022
d396f1d
Fix space
wenyiz2021 Aug 15, 2022
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
10 changes: 4 additions & 6 deletions tests/cacl/test_cacl_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def duthost_dualtor(request, upper_tor_host, lower_tor_host, toggle_all_simulato

@pytest.fixture
def expected_dhcp_rules_for_standby(duthost_dualtor, lower_tor_host):
expected_dhcp_rules = []
if duthost_dualtor.hostname == lower_tor_host.hostname:
expected_dhcp_rules = []
mark_keys = duthost_dualtor.shell('/usr/bin/redis-cli -n 6 --raw keys "DHCP_PACKET_MARK*"', module_ignore_errors=True)['stdout']
mark_keys = mark_keys.split("\n")
for key in mark_keys:
Expand All @@ -55,9 +55,7 @@ def expected_dhcp_rules_for_standby(duthost_dualtor, lower_tor_host):
continue
rule = "-A DHCP -m mark --mark {} -j DROP".format(mark)
expected_dhcp_rules.append(rule)
return expected_dhcp_rules
else:
return
return expected_dhcp_rules

@pytest.fixture(scope="module")
def docker_network(duthost):
Expand Down Expand Up @@ -823,13 +821,13 @@ def test_cacl_application_dualtor(duthost_dualtor, tbinfo, localhost, creds, doc
"""
verify_cacl(duthost_dualtor, tbinfo, localhost, creds, docker_network, expected_dhcp_rules_for_standby)

def test_multiasic_cacl_application(duthosts, tbinfo, rand_one_dut_hostname, localhost, creds,docker_network, enum_frontend_asic_index):
def test_multiasic_cacl_application(duthosts, tbinfo, rand_one_dut_hostname, localhost, creds, docker_network, expected_dhcp_rules_for_standby, enum_frontend_asic_index):
"""
Test case to ensure caclmgrd is applying control plane ACLs properly on multi-ASIC platform.
"""
duthost = duthosts[rand_one_dut_hostname]
verify_cacl(duthost, tbinfo, localhost, creds, docker_network, enum_frontend_asic_index)
verify_nat_cacl(duthost, localhost, creds, docker_network, enum_frontend_asic_index)
verify_nat_cacl(duthost, localhost, creds, docker_network, expected_dhcp_rules_for_standby, enum_frontend_asic_index)

def test_cacl_scale_rules_ipv4(duthosts, rand_one_dut_hostname, collect_ignored_rules, clean_scale_rules):
"""
Expand Down