Revert "bgpd: Use default VRF name if using `router bgp` command"

This reverts commit 5ce106b72bac1c45567159c4dfcc9276164bd18b.

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index cfa63a292481c9b5700e5107e9a8cc54d83f5240..1cdda1b13409feaed26a7fadd56d721fa32c2083 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1323,7 +1323,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", VRF_DEFAULT_NAME);
+                        "frr-bgp:bgp", "bgp", name ? name : VRF_DEFAULT_NAME);
 
                nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
                snprintf(as_str, 12, "%d", bgp->as);