set refcount to 0 if calculated as negative.

added a ip neigh flush to NH route test. Signed-off-by: Nikola Dancejic <[email protected]>
sonic-net · Jan 10, 2023 · 8815c35 · 8815c35
1 parent c6b99cb
commit 8815c35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp
@@ -595,6 +595,8 @@ void NeighOrch::decreaseNextHopRefCount(const NextHopKey &nexthop, uint32_t coun
         {
             SWSS_LOG_ERROR("Ref count cannot be negative for next_hop_id: 0x%" PRIx64 " with ip: %s and alias: %s",
                    m_syncdNextHops[nexthop].next_hop_id, nexthop.ip_address.to_string().c_str(), nexthop.alias.c_str());
+            // Reset refcount to 0 to match expected value
+            m_syncdNextHops[nexthop].ref_count = 0;
             return;
         }
         m_syncdNextHops[nexthop].ref_count -= count;

diff --git a/tests/test_mux.py b/tests/test_mux.py
@@ -584,6 +584,12 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
         self.add_neighbor(dvs, neigh_ipv6, mac)
         self.check_nexthop_in_asic_db(asicdb, rtkeys[0])
         self.check_nexthop_in_asic_db(asicdb, rtkeys_ipv6[0])
+        dvs.runcmd(
+            "ip neigh flush " + neigh_ip
+        )
+        dvs.runcmd(
+            "ip neigh flush " + neigh_ipv6
+        )
 
         # Cleanup
         dvs.runcmd(