From 15b8941cefac57ed54e3e086762a84c233964ccb Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Tue, 28 Jan 2025 17:11:58 +0200 Subject: [PATCH] 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 --- bgpd/bgp_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 535d2fc5f434..ccd05335d125 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);