Skip to content

Commit b1cd519

Browse files
committed
Fix argument in test_multiasic_cacl_application
Signed-off-by: Wenyi Zhang <[email protected]>
1 parent 2e40f50 commit b1cd519

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

tests/cacl/test_cacl_application.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ def duthost_dualtor(request, upper_tor_host, lower_tor_host, toggle_all_simulato
4545

4646
@pytest.fixture
4747
def expected_dhcp_rules_for_standby(duthost_dualtor, lower_tor_host):
48-
if duthost_dualtor.hostname == lower_tor_host.hostname:
49-
expected_dhcp_rules = []
48+
expected_dhcp_rules = []
49+
if duthost_dualtor.hostname == lower_tor_host.hostname:
5050
mark_keys = duthost_dualtor.shell('/usr/bin/redis-cli -n 6 --raw keys "DHCP_PACKET_MARK*"', module_ignore_errors=True)['stdout']
5151
mark_keys = mark_keys.split("\n")
5252
for key in mark_keys:
@@ -55,9 +55,7 @@ def expected_dhcp_rules_for_standby(duthost_dualtor, lower_tor_host):
5555
continue
5656
rule = "-A DHCP -m mark --mark {} -j DROP".format(mark)
5757
expected_dhcp_rules.append(rule)
58-
return expected_dhcp_rules
59-
else:
60-
return
58+
return expected_dhcp_rules
6159

6260
@pytest.fixture(scope="module")
6361
def docker_network(duthost):
@@ -823,12 +821,12 @@ def test_cacl_application_dualtor(duthost_dualtor, tbinfo, localhost, creds, doc
823821
"""
824822
verify_cacl(duthost_dualtor, tbinfo, localhost, creds, docker_network, expected_dhcp_rules_for_standby)
825823

826-
def test_multiasic_cacl_application(duthosts, tbinfo, rand_one_dut_hostname, localhost, creds,docker_network, enum_frontend_asic_index):
824+
def test_multiasic_cacl_application(duthosts, tbinfo, rand_one_dut_hostname, localhost, creds, docker_network, expected_dhcp_rules_for_standby, enum_frontend_asic_index):
827825
"""
828826
Test case to ensure caclmgrd is applying control plane ACLs properly on multi-ASIC platform.
829827
"""
830828
duthost = duthosts[rand_one_dut_hostname]
831-
verify_cacl(duthost, tbinfo, localhost, creds, docker_network, enum_frontend_asic_index)
829+
verify_cacl(duthost, tbinfo, localhost, creds, docker_network, expected_dhcp_rules_for_standby, enum_frontend_asic_index)
832830
verify_nat_cacl(duthost, localhost, creds, docker_network, enum_frontend_asic_index)
833831

834832
def test_cacl_scale_rules_ipv4(duthosts, rand_one_dut_hostname, collect_ignored_rules, clean_scale_rules):

0 commit comments

Comments
 (0)