From 6d82fedbef2e73198eb65fc5399f3998e1575861 Mon Sep 17 00:00:00 2001
From: divyagayathri-hcl <divyagayathri.s@hcl.com>
Date: Wed, 4 Sep 2024 05:41:11 -0700
Subject: [PATCH] Add function ActionSchemaByNameAndObjectType to allow
 different ActionSchema formats.

---
 common/saiaclschema.cpp   | 27 +++++++++++++++++++++++++++
 common/saiaclschema.h     |  4 ++++
 tests/saiaclschema_ut.cpp | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/common/saiaclschema.cpp b/common/saiaclschema.cpp
index 6fd32214d..88c6f5175 100644
--- a/common/saiaclschema.cpp
+++ b/common/saiaclschema.cpp
@@ -328,5 +328,32 @@ const ActionSchema &ActionSchemaByName(const std::string &action_name)
     return lookup->second;
 }
 
+const ActionSchema& ActionSchemaByNameAndObjectType(
+    const std::string& action_name, const std::string& object_type) {
+  static const auto* const kRedirectObjectTypes =
+      new std::unordered_map<std::string, ActionSchema>({
+          {"SAI_OBJECT_TYPE_IPMC_GROUP",
+           {.format = Format::kHexString, .bitwidth = 16}},
+          {"SAI_OBJECT_TYPE_L2MC_GROUP",
+           {.format = Format::kHexString, .bitwidth = 16}},
+          // SAI_OBJECT_TYPE_BRIDGE_PORT
+          // SAI_OBJECT_TYPE_LAG
+          // SAI_OBJECT_TYPE_NEXT_HOP
+          // SAI_OBJECT_TYPE_NEXT_HOP_GROUP
+          // SAI_OBJECT_TYPE_PORT
+          // SAI_OBJECT_TYPE_SYSTEM_PORT
+      });
+
+  if (action_name == "SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT") {
+    auto lookup = kRedirectObjectTypes->find(object_type);
+    if (lookup != kRedirectObjectTypes->end()) {
+      return lookup->second;
+    }
+  }
+  // If we haven't defined the object type, fall through to the default
+  // SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT format.
+  return ActionSchemaByName(action_name);
+}
+
 } // namespace acl
 } // namespace swss
diff --git a/common/saiaclschema.h b/common/saiaclschema.h
index 156148b14..88e664232 100644
--- a/common/saiaclschema.h
+++ b/common/saiaclschema.h
@@ -83,6 +83,10 @@ const MatchFieldSchema &MatchFieldSchemaByName(const std::string &match_field_na
 // Throws std::invalid_argument for unknown actions and actions without schemas.
 const ActionSchema &ActionSchemaByName(const std::string &action_name);
 
+// Allow further format differentiation based on a SAI object type.
+const ActionSchema& ActionSchemaByNameAndObjectType(
+    const std::string& action_name, const std::string& object_type);
+
 } // namespace acl
 } // namespace swss
 
diff --git a/tests/saiaclschema_ut.cpp b/tests/saiaclschema_ut.cpp
index fff9158d5..1f828f77b 100644
--- a/tests/saiaclschema_ut.cpp
+++ b/tests/saiaclschema_ut.cpp
@@ -60,6 +60,37 @@ TEST(SaiAclSchemaTest, ActionSchemaByNameSucceeds)
                 AllOf(Field(&ActionSchema::format, Format::kHexString), Field(&ActionSchema::bitwidth, 12)));
 }
 
+TEST(SaiAclSchemaTest, ActionSchemaByNameAndObjectTypeSucceeds) {
+  EXPECT_THAT(
+      ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT",
+                                      "SAI_OBJECT_TYPE_IPMC_GROUP"),
+      AllOf(Field(&ActionSchema::format, Format::kHexString),
+            Field(&ActionSchema::bitwidth, 16)));
+  EXPECT_THAT(
+      ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT",
+                                      "SAI_OBJECT_TYPE_L2MC_GROUP"),
+      AllOf(Field(&ActionSchema::format, Format::kHexString),
+            Field(&ActionSchema::bitwidth, 16)));
+  EXPECT_THAT(
+      ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT",
+                                      "SAI_OBJECT_TYPE_NEXT_HOP"),
+      AllOf(Field(&ActionSchema::format, Format::kString),
+            Field(&ActionSchema::bitwidth, 0)));
+  EXPECT_THAT(ActionSchemaByNameAndObjectType(
+                  "SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT", "SAI_OBJECT_TYPE_PORT"),
+              AllOf(Field(&ActionSchema::format, Format::kString),
+                    Field(&ActionSchema::bitwidth, 0)));
+}
+
+TEST(SaiAclSchemaTest,
+     ActionSchemaByNameAndObjectTypeWithNonRedirectActionSucceeds) {
+  EXPECT_THAT(
+      ActionSchemaByNameAndObjectType("SAI_ACL_ENTRY_ATTR_ACTION_DECREMENT_TTL",
+                                      "SAI_OBJECT_TYPE_UNKNOWN"),
+      AllOf(Field(&ActionSchema::format, Format::kHexString),
+            Field(&ActionSchema::bitwidth, 1)));
+}
+
 // Invalid Lookup Tests
 
 TEST(SaiAclSchemaTest, InvalidFormatNameThrowsException)
@@ -82,6 +113,11 @@ TEST(SaiAclSchemaTest, InvalidActionNameThrowsException)
     EXPECT_THROW(ActionSchemaByName("Foo"), std::invalid_argument);
 }
 
+TEST(SaiAclSchemaTest, InvalidActionNameAndObjectTypeThrowsException) {
+  EXPECT_THROW(ActionSchemaByNameAndObjectType("Foo", "unknown"),
+               std::invalid_argument);
+}
+
 } // namespace
 } // namespace acl
 } // namespace swss