Merge branch 'master' into issue_18844

sonic-net · Sep 24, 2024 · 00dde9a · 00dde9a
2 parents ecd9726 + 971dfc1
commit 00dde9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -122,6 +122,7 @@ static acl_packet_action_lookup_t aclPacketActionLookup =
 {
     { PACKET_ACTION_FORWARD, SAI_PACKET_ACTION_FORWARD },
     { PACKET_ACTION_DROP,    SAI_PACKET_ACTION_DROP },
+    { PACKET_ACTION_COPY,    SAI_PACKET_ACTION_COPY },
 };
 
 static acl_dtel_flow_op_type_lookup_t aclDTelFlowOpTypeLookup =

diff --git a/orchagent/aclorch.h b/orchagent/aclorch.h
@@ -72,6 +72,7 @@
 
 #define PACKET_ACTION_FORWARD     "FORWARD"
 #define PACKET_ACTION_DROP        "DROP"
+#define PACKET_ACTION_COPY        "COPY"
 #define PACKET_ACTION_REDIRECT    "REDIRECT"
 #define PACKET_ACTION_DO_NOT_NAT  "DO_NOT_NAT"
 

diff --git a/tests/mock_tests/aclorch_ut.cpp b/tests/mock_tests/aclorch_ut.cpp
@@ -889,6 +889,13 @@ namespace aclorch_test
                         return false;
                     }
                 }
+                else if (attr_value == PACKET_ACTION_COPY)
+                {
+                    if (it->second.getSaiAttr().value.aclaction.parameter.s32 != SAI_PACKET_ACTION_COPY)
+                    {
+                        return false;
+                    }
+                }
                 else
                 {
                     // unknown attr_value