From 4ba0f473e4c7f4dd9a30e21c3691ba9460bc0502 Mon Sep 17 00:00:00 2001 From: Zhaohui Sun <94606222+ZhaohuiS@users.noreply.github.com> Date: Wed, 14 Jun 2023 16:25:26 +0800 Subject: [PATCH] Enable scale cacl cases (#8592) Signed-off-by: Zhaohui Sun 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 --- tests/cacl/test_cacl_application.py | 2 +- .../conditional_mark/tests_mark_conditions.yaml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/cacl/test_cacl_application.py b/tests/cacl/test_cacl_application.py index 49985a6a7b0..cc44fb32557 100644 --- a/tests/cacl/test_cacl_application.py +++ b/tests/cacl/test_cacl_application.py @@ -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] diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 2b934f5dcdc..19612df7c1a 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -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"