improve unit test coverage

Signed-off-by: Lawrence Lee <[email protected]>
sonic-net · May 24, 2024 · 7f75606 · 7f75606
1 parent c3e0624
commit 7f75606
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp
@@ -959,9 +959,12 @@ bool NeighOrch::addNeighbor(const NeighborEntry &neighborEntry, const MacAddress
             }
             if (existing_vlan.m_vr_id == new_vlan.m_vr_id)
             {
-                if (existing_vlan.m_vr_id != 0)
+                std::string vrf_name = gDirectory.get<VRFOrch*>()->getVRFname(existing_vlan.m_vr_id);
+                if (vrf_name.empty())
+                {
+                    SWSS_LOG_NOTICE("Neighbor %s already learned on %s, removing before adding new neighbor", ip_address.to_string().c_str(), vlan_port.c_str());
+                }
                 {
-                    std::string vrf_name = gDirectory.get<VRFOrch*>()->getVRFname(existing_vlan.m_vr_id);
                     SWSS_LOG_NOTICE("Neighbor %s already learned on %s in VRF %s, removing before adding new neighbor", ip_address.to_string().c_str(), vlan_port.c_str(), vrf_name.c_str());
                 }
                 if (!removeNeighbor(temp_entry))

diff --git a/tests/mock_tests/neighorch_ut.cpp b/tests/mock_tests/neighorch_ut.cpp
@@ -189,7 +189,7 @@ namespace neighorch_test
         }
     };
 
-    TEST_F(NeighOrchTest, MultiVlanIpLearning)
+    TEST_F(NeighOrchTest, MultiVlanDuplicateNeighbor)
     {
         EXPECT_CALL(*mock_sai_neighbor_api, create_neighbor_entry);
         LearnNeighbor(VLAN_1000, TEST_IP, MAC1);
@@ -248,4 +248,24 @@ namespace neighorch_test
         ASSERT_EQ(gNeighOrch->m_syncdNeighbors.count(VLAN3000_NEIGH), 0);
         ASSERT_EQ(gNeighOrch->m_syncdNeighbors.count(VLAN4000_NEIGH), 1);
     }
+
+    TEST_F(NeighOrchTest, MultiVlanDuplicateNeighborMissingExistingVlanPort)
+    {
+        LearnNeighbor(VLAN_1000, TEST_IP, MAC1);
+
+        EXPECT_CALL(*mock_sai_neighbor_api, create_neighbor_entry).Times(0);
+        EXPECT_CALL(*mock_sai_neighbor_api, remove_neighbor_entry).Times(0);
+        gPortsOrch->m_portList.erase(VLAN_1000);
+        LearnNeighbor(VLAN_2000, TEST_IP, MAC2);
+    }
+
+    TEST_F(NeighOrchTest, MultiVlanDuplicateNeighborMissingNewVlanPort)
+    {
+        LearnNeighbor(VLAN_1000, TEST_IP, MAC1);
+
+        EXPECT_CALL(*mock_sai_neighbor_api, create_neighbor_entry).Times(0);
+        EXPECT_CALL(*mock_sai_neighbor_api, remove_neighbor_entry).Times(0);
+        gPortsOrch->m_portList.erase(VLAN_2000);
+        LearnNeighbor(VLAN_2000, TEST_IP, MAC2);
+    }
 }