From 309df59701ff77cd3be22917bd581207506c15c9 Mon Sep 17 00:00:00 2001 From: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com> Date: Sat, 4 Mar 2023 10:04:40 +0800 Subject: [PATCH] Revert "[aclorch] Fixed issue #2204.Support IN_PORTS qualifer in MIRRORV6 table. (#2668)" (#2687) Reverts #2668 which cause ACL creation failure on Mellanox platform with below err msg. 2023-03-02T11:25:00.2743784Z E Mar 2 11:22:51.042274 str2-msn2700-spy-2 ERR syncd#SDK: [ACL.ERR] Failed calculating key blocks - too many keys selected. 2023-03-02T11:25:00.2744673Z E 2023-03-02T11:25:00.2745732Z E Mar 2 11:22:51.043026 str2-msn2700-spy-2 ERR swss#orchagent: :- create: create status: SAI_STATUS_FAILURE 2023-03-02T11:25:00.2746583Z E 2023-03-02T11:25:00.2747724Z E Mar 2 11:22:51.043196 str2-msn2700-spy-2 ERR swss#orchagent: :- addAclTable: Failed to create ACL table EVERFLOWV6 2023-03-02T11:25:00.2748625Z E 2023-03-02T11:25:00.2749932Z E Mar 2 11:22:51.043384 str2-msn2700-spy-2 ERR syncd#SDK: [SAI_ACL.ERR] mlnx_sai_acl.c[13937]- mlnx_create_acl_table: Failed to create flex key - Internal Error. --- orchagent/aclorch.cpp | 3 +-- tests/test_mirror_ipv6_separate.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp index 89f77ab9dccd..5780ae4683d0 100644 --- a/orchagent/aclorch.cpp +++ b/orchagent/aclorch.cpp @@ -3217,7 +3217,7 @@ void AclOrch::initDefaultTableTypes() * | -----------------------------------------------------------------| * | MATCH_ETHERTYPE | √ | √ | | * |------------------------------------------------------------------| - * | MATCH_IN_PORTS | √ | √ | √ | + * | MATCH_IN_PORTS | √ | √ | | * |------------------------------------------------------------------| */ @@ -3278,7 +3278,6 @@ void AclOrch::initDefaultTableTypes() .withMatch(make_shared(SAI_ACL_TABLE_ATTR_FIELD_L4_SRC_PORT)) .withMatch(make_shared(SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT)) .withMatch(make_shared(SAI_ACL_TABLE_ATTR_FIELD_TCP_FLAGS)) - .withMatch(make_shared(SAI_ACL_TABLE_ATTR_FIELD_IN_PORTS)) .withMatch(make_shared(SAI_ACL_TABLE_ATTR_FIELD_DSCP)) .withMatch(make_shared(set{ {SAI_ACL_RANGE_TYPE_L4_SRC_PORT_RANGE, SAI_ACL_RANGE_TYPE_L4_DST_PORT_RANGE}})) diff --git a/tests/test_mirror_ipv6_separate.py b/tests/test_mirror_ipv6_separate.py index 3509619d3804..6711c345c5d0 100644 --- a/tests/test_mirror_ipv6_separate.py +++ b/tests/test_mirror_ipv6_separate.py @@ -237,7 +237,6 @@ def test_MirrorV6TableCreation(self, dvs, testlog): "SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT", "SAI_ACL_TABLE_ATTR_FIELD_TCP_FLAGS", "SAI_ACL_TABLE_ATTR_FIELD_DSCP", - "SAI_ACL_TABLE_ATTR_FIELD_IN_PORTS", "SAI_ACL_TABLE_ATTR_FIELD_OUTER_VLAN_ID" ]