Merge remote-tracking branch 'upstream/master'

anilkpan · Dec 6, 2024 · 0a82207 · 0a82207
2 parents b88757b + 881341f
commit 0a82207
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -2641,7 +2641,7 @@ bool RouteOrch::removeRoutePost(const RouteBulkContext& ctx)
     return true;
 }
 
-bool RouteOrch::hasBgpRoute(const IpPrefix& prefix)
+bool RouteOrch::isRouteExists(const IpPrefix& prefix)
 {
     SWSS_LOG_ENTER();
 

diff --git a/orchagent/routeorch.h b/orchagent/routeorch.h
@@ -215,7 +215,7 @@ class RouteOrch : public Orch, public Subject
     const NextHopGroupKey getSyncdRouteNhgKey(sai_object_id_t vrf_id, const IpPrefix& ipPrefix);
     bool createFineGrainedNextHopGroup(sai_object_id_t &next_hop_group_id, vector<sai_attribute_t> &nhg_attrs);
     bool removeFineGrainedNextHopGroup(sai_object_id_t &next_hop_group_id);
-    bool hasBgpRoute(const IpPrefix& prefix);
+    bool isRouteExists(const IpPrefix& prefix);
     bool removeRoutePrefix(const IpPrefix& prefix);
 
     void addLinkLocalRouteToMe(sai_object_id_t vrf_id, IpPrefix linklocal_prefix);

diff --git a/orchagent/vnetorch.cpp b/orchagent/vnetorch.cpp
@@ -1155,7 +1155,7 @@ bool VNetRouteOrch::doRouteTask<VNetVrfObject>(const string& vnet, IpPrefix& ipP
                     prefixToRemove = adv_prefix;                        
                 }
                 auto prefixSubnet = prefixToRemove.getSubnet();
-                if(gRouteOrch && gRouteOrch->hasBgpRoute(prefixSubnet))
+                if(gRouteOrch && gRouteOrch->isRouteExists(prefixSubnet))
                 {
                     if (!gRouteOrch->removeRoutePrefix(prefixSubnet))
                     {
@@ -2366,7 +2366,7 @@ void VNetRouteOrch::updateVnetTunnel(const BfdUpdate& update)
                                 ipPrefixsubnet = adv_prefix.getSubnet();
                             }
                         }
-                        if(gRouteOrch && gRouteOrch->hasBgpRoute(ipPrefixsubnet))
+                        if(gRouteOrch && gRouteOrch->isRouteExists(ipPrefixsubnet))
                         {
                             if (!gRouteOrch->removeRoutePrefix(ipPrefixsubnet))
                             {
@@ -2611,7 +2611,7 @@ void VNetRouteOrch::updateVnetTunnelCustomMonitor(const MonitorUpdate& update)
                         }
                     }
                     auto prefixsubnet = prefixToUse.getSubnet();
-                    if (gRouteOrch && gRouteOrch->hasBgpRoute(prefixsubnet))
+                    if (gRouteOrch && gRouteOrch->isRouteExists(prefixsubnet))
                     {
                         if (!gRouteOrch->removeRoutePrefix(prefixsubnet))
                         {