Skip to content

Commit

Permalink
Enable scale cacl cases (sonic-net#8592)
Browse files Browse the repository at this point in the history
Signed-off-by: Zhaohui Sun <[email protected]>

Approach
What is the motivation for this PR?
Since sonic-net/sonic-buildimage#10883 was fixed, enable scale cacl test cases.

How did you do it?
Remove skipped section of scale cases from conditional mark file.
There is one more status column, that's why increase table length from 6 to 7.

admin@str-e1031-acs-1:~$ show acl rule
Table    Rule    Priority    Action    Match    Status
-------  ------  ----------  --------  -------  --------
admin@str-e1031-acs-1:~$ 

How did you verify/test it?
Run tests/cacl/test_cacl_application.py
  • Loading branch information
ZhaohuiS authored and AharonMalkin committed Jan 25, 2024
1 parent 9bc1aec commit 4ba0f47
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion tests/cacl/test_cacl_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def get_cacl_tables_and_rules(duthost):
stdout_lines = stdout_lines[2:]
for line in stdout_lines:
tokens = line.strip().split()
if len(tokens) == 6 and tokens[0] == table["name"]:
if len(tokens) == 7 and tokens[0] == table["name"]:
table["rules"].append({"name": tokens[1], "priority": tokens[2], "action": tokens[3]})
# Strip the trailing colon from the key name
key = tokens[4][:-1]
Expand Down
10 changes: 0 additions & 10 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ cacl/test_cacl_application.py::test_cacl_application_nondualtor:
conditions:
- "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120']"

cacl/test_cacl_application.py::test_cacl_scale_rules_ipv4:
skip:
reason: "caclmgrd may crash after loading scale ipv4 cacl rules."
conditions: https://github.com/sonic-net/sonic-buildimage/issues/10883

cacl/test_cacl_application.py::test_cacl_scale_rules_ipv6:
skip:
reason: "caclmgrd may crash after loading scale ipv6 cacl rules."
conditions: https://github.com/sonic-net/sonic-buildimage/issues/10883

cacl/test_cacl_application.py::test_multiasic_cacl_application:
skip:
reason: "test_multiasic_cacl_application is only supported on multi-ASIC platform"
Expand Down

0 comments on commit 4ba0f47

Please sign in to comment.