Prevent route deletion in default vrf upon creating tunnel route in non default vnet

anish-n · anish-n · commit 75c8874664e8 · 2025-11-18T13:37:07.000-08:00
diff --git a/orchagent/vnetorch.cpp b/orchagent/vnetorch.cpp
@@ -1192,7 +1192,7 @@ bool VNetRouteOrch::doRouteTask<VNetVrfObject>(const string& vnet, IpPrefix& ipP
                     prefixToRemove = adv_prefix;
                 }
                 auto prefixSubnet = prefixToRemove.getSubnet();
-                if(gRouteOrch && gRouteOrch->isRouteExists(prefixSubnet))
+                if(gRouteOrch && gRouteOrch->isRouteExists(vr_id, prefixSubnet))
                 {
                     if (!gRouteOrch->removeRoutePrefix(prefixSubnet))
                     {
@@ -2501,7 +2501,9 @@ void VNetRouteOrch::updateVnetTunnel(const BfdUpdate& update)
                                 ipPrefixsubnet = adv_prefix.getSubnet();
                             }
                         }
-                        if(gRouteOrch && gRouteOrch->isRouteExists(ipPrefixsubnet))
+
+                        sai_object_id_t vr_id = vrf_obj->getVRidIngress();
+                        if(gRouteOrch && gRouteOrch->isRouteExists(vr_id, ipPrefixsubnet))
                         {
                             if (!gRouteOrch->removeRoutePrefix(ipPrefixsubnet))
                             {
@@ -2749,7 +2751,7 @@ void VNetRouteOrch::updateVnetTunnelCustomMonitor(const MonitorUpdate& update)
                         }
                     }
                     auto prefixsubnet = prefixToUse.getSubnet();
-                    if (gRouteOrch && gRouteOrch->isRouteExists(prefixsubnet))
+                    if (gRouteOrch && gRouteOrch->isRouteExists(vr_id, prefixsubnet))
                     {
                         if (!gRouteOrch->removeRoutePrefix(prefixsubnet))
                         {

Original file line number	Diff line number	Diff line change
`@@ -1192,7 +1192,7 @@ bool VNetRouteOrch::doRouteTask<VNetVrfObject>(const string& vnet, IpPrefix& ipP`
`1192`	`1192`	`prefixToRemove = adv_prefix;`
`1193`	`1193`	`}`
`1194`	`1194`	`auto prefixSubnet = prefixToRemove.getSubnet();`
`1195`		`- if(gRouteOrch && gRouteOrch->isRouteExists(prefixSubnet))`
	`1195`	`+ if(gRouteOrch && gRouteOrch->isRouteExists(vr_id, prefixSubnet))`
`1196`	`1196`	`{`
`1197`	`1197`	`if (!gRouteOrch->removeRoutePrefix(prefixSubnet))`
`1198`	`1198`	`{`
`@@ -2501,7 +2501,9 @@ void VNetRouteOrch::updateVnetTunnel(const BfdUpdate& update)`
`2501`	`2501`	`ipPrefixsubnet = adv_prefix.getSubnet();`
`2502`	`2502`	`}`
`2503`	`2503`	`}`
`2504`		`- if(gRouteOrch && gRouteOrch->isRouteExists(ipPrefixsubnet))`
	`2504`	`+`
	`2505`	`+ sai_object_id_t vr_id = vrf_obj->getVRidIngress();`
	`2506`	`+ if(gRouteOrch && gRouteOrch->isRouteExists(vr_id, ipPrefixsubnet))`
`2505`	`2507`	`{`
`2506`	`2508`	`if (!gRouteOrch->removeRoutePrefix(ipPrefixsubnet))`
`2507`	`2509`	`{`
`@@ -2749,7 +2751,7 @@ void VNetRouteOrch::updateVnetTunnelCustomMonitor(const MonitorUpdate& update)`
`2749`	`2751`	`}`
`2750`	`2752`	`}`
`2751`	`2753`	`auto prefixsubnet = prefixToUse.getSubnet();`
`2752`		`- if (gRouteOrch && gRouteOrch->isRouteExists(prefixsubnet))`
	`2754`	`+ if (gRouteOrch && gRouteOrch->isRouteExists(vr_id, prefixsubnet))`
`2753`	`2755`	`{`
`2754`	`2756`	`if (!gRouteOrch->removeRoutePrefix(prefixsubnet))`
`2755`	`2757`	`{`