From 5ce106b72bac1c45567159c4dfcc9276164bd18b Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Fri, 9 Oct 2020 09:02:49 +0300 Subject: [PATCH] bgpd: Use default VRF name if using `router bgp` command When we enter `router bgp` it enters non-VRF instance which is default. No need to check for VRF/VIEW name, kinda dead code. Signed-off-by: Donatas Abraitis --- bgpd/bgp_vty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 38dad59e60..6b04168304 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -1227,7 +1227,7 @@ DEFUN_YANG_NOSH(router_bgp, UNSET_FLAG(bgp->vrf_flags, BGP_VRF_AUTO); snprintf(base_xpath, sizeof(base_xpath), FRR_BGP_GLOBAL_XPATH, - "frr-bgp:bgp", "bgp", name ? name : VRF_DEFAULT_NAME); + "frr-bgp:bgp", "bgp", VRF_DEFAULT_NAME); nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL); snprintf(as_str, 12, "%d", bgp->as); -- 2.39.5