Test that two ACL entries may share a priority

Summary: Covers the `(priority, name)` handle key: two entries at one priority program as distinct SAI objects, each reachable by its own name, and removing one leaves the other. Before the re-key the second `addAclEntry` threw.

Reviewed By: shri-khare

Differential Revision: D116378074

fbshipit-source-id: f8a17988620c7f8c1ffd256f79ab1b9c61cefa65

Author: Ron He

fboss/agent/hw/sai/switch/tests/AclTableManagerTest.cpp

@@ -232,6 +232,54 @@ TEST_F(AclTableManagerTest, addDupAclEntry) {
       FbossError);
 }
 
+TEST_F(AclTableManagerTest, addTwoAclEntriesSamePriority) {
+  // 1. Two entries at one priority, told apart only by name.
+  auto aclEntry =
+      std::make_shared<AclEntry>(kPriority(), std::string("AclEntry1"));
+  aclEntry->setDscp(kDscp());
+  aclEntry->setActionType(kActionType());
+
+  auto aclEntry2 =
+      std::make_shared<AclEntry>(kPriority(), std::string("AclEntry2"));
+  aclEntry2->setDscp(kDscp2());
+  aclEntry2->setActionType(kActionType());
+
+  // 2. Both program.
+  AclEntrySaiId aclEntryId = saiManagerTable->aclTableManager().addAclEntry(
+      aclEntry,
+      cfg::switch_config_constants::DEFAULT_INGRESS_ACL_TABLE(),
+      nullptr /*state*/);
+  AclEntrySaiId aclEntryId2 = saiManagerTable->aclTableManager().addAclEntry(
+      aclEntry2,
+      cfg::switch_config_constants::DEFAULT_INGRESS_ACL_TABLE(),
+      nullptr /*state*/);
+
+  // 3. They are distinct SAI objects, each reachable by its own name.
+  EXPECT_NE(aclEntryId, aclEntryId2);
+  auto* aclTableHandle = saiManagerTable->aclTableManager().getAclTableHandle(
+      cfg::switch_config_constants::DEFAULT_INGRESS_ACL_TABLE());
+  auto* handle1 = saiManagerTable->aclTableManager().getAclEntryHandle(
+      aclTableHandle, kPriority(), std::string("AclEntry1"));
+  auto* handle2 = saiManagerTable->aclTableManager().getAclEntryHandle(
+      aclTableHandle, kPriority(), std::string("AclEntry2"));
+  ASSERT_NE(handle1, nullptr);
+  ASSERT_NE(handle2, nullptr);
+  EXPECT_EQ(handle1->aclEntry->adapterKey(), aclEntryId);
+  EXPECT_EQ(handle2->aclEntry->adapterKey(), aclEntryId2);
+
+  // 4. Removing one leaves the other programmed.
+  saiManagerTable->aclTableManager().removeAclEntry(
+      aclEntry, cfg::switch_config_constants::DEFAULT_INGRESS_ACL_TABLE());
+  EXPECT_EQ(
+      saiManagerTable->aclTableManager().getAclEntryHandle(
+          aclTableHandle, kPriority(), std::string("AclEntry1")),
+      nullptr);
+  EXPECT_NE(
+      saiManagerTable->aclTableManager().getAclEntryHandle(
+          aclTableHandle, kPriority(), std::string("AclEntry2")),
+      nullptr);
+}
+
 TEST_F(AclTableManagerTest, getAclEntry) {
   auto aclEntry =
       std::make_shared<AclEntry>(kPriority(), std::string("AclEntry1"));