From 0f0a5c2aed2c5752973129d446f408f9cb49bd74 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Fri, 14 May 2021 01:38:33 +0300 Subject: [PATCH] Revert "bgpd: vrf route leaking, fix the bgp instance delete and re-add" This reverts commit ef7c53e244d5d0cd7c0ba2536fc931abf28df656. --- bgpd/bgp_nb_config.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c index bfc117e487..3aa26aceef 100644 --- a/bgpd/bgp_nb_config.c +++ b/bgpd/bgp_nb_config.c @@ -125,12 +125,7 @@ int bgp_router_create(struct nb_cb_create_args *args) if (is_new_bgp && inst_type == BGP_INSTANCE_TYPE_DEFAULT) vpn_leak_postchange_all(); - /* - * Check if we need to export to other VRF(s). - * Leak the routes to importing bgp vrf instances, - * only when new bgp vrf instance is configured. - */ - if (ret != BGP_INSTANCE_EXISTS) + if (inst_type == BGP_INSTANCE_TYPE_VRF) bgp_vpn_leak_export(bgp); UNSET_FLAG(bgp->vrf_flags, BGP_VRF_AUTO);