From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Tue, 28 Jan 2025 15:11:58 +0000 (+0200)
Subject: bgpd: Do not ignore auto generated VRF instances when deleting
X-Git-Tag: docker/10.1.3~28^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0a923af56dbe43fdb4e9184c3525d0537740aef9;p=matthieu%2Ffrr.git

bgpd: Do not ignore auto generated VRF instances when deleting

When VRF instance is going to be deleted inside bgp_vrf_disable(), it uses
a helper method that skips auto created VRF instances and that leads to STALE
issue.

When creating a VNI for a particular VRF vrfX with e.g. `advertise-all-vni`,
auto VRF instance is created, and then we do `router bgp ASN vrf vrfX`.

But when we do a reload bgp_vrf_disable() is called, and we miss previously
created auto instance.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 35600edee3..9fba1604bf 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -325,7 +325,7 @@ static int bgp_vrf_disable(struct vrf *vrf)
 	if (BGP_DEBUG(zebra, ZEBRA))
 		zlog_debug("VRF disable %s id %d", vrf->name, vrf->vrf_id);
 
-	bgp = bgp_lookup_by_name(vrf->name);
+	bgp = bgp_lookup_by_name_filter(vrf->name, false);
 	if (bgp) {
 
 		vpn_leak_zebra_vrf_label_withdraw(bgp, AFI_IP);