From 5742e42b987b979da057e39a764b4d4225d15ad8 Mon Sep 17 00:00:00 2001 From: Don Slice Date: Fri, 20 Jul 2018 15:02:15 +0000 Subject: bgpd: make name of default vrf/bgp instance consistent Problems were reported with the name of the default vrf and the default bgp instance being different, creating confusion. This fix changes both to "default" for consistency. Ticket: CM-21791 Signed-off-by: Don Slice Reviewed-by: CCR-7658 Testing: manual testing and automated tests before pushing --- bgpd/bgp_mplsvpn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bgpd/bgp_mplsvpn.c') diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 385716970..d4204126e 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1492,7 +1492,7 @@ void vrf_import_from_vrf(struct bgp *to_bgp, struct bgp *from_bgp, struct ecommunity *ecom; bool first_export = false; - export_name = to_bgp->name ? to_bgp->name : BGP_DEFAULT_NAME; + export_name = to_bgp->name ? to_bgp->name : VRF_DEFAULT_NAME; idir = BGP_VPN_POLICY_DIR_FROMVPN; edir = BGP_VPN_POLICY_DIR_TOVPN; @@ -1501,7 +1501,7 @@ void vrf_import_from_vrf(struct bgp *to_bgp, struct bgp *from_bgp, * any VRF is importing from "import_vrf". */ vname = (from_bgp->name ? XSTRDUP(MTYPE_TMP, from_bgp->name) - : XSTRDUP(MTYPE_TMP, BGP_DEFAULT_NAME)); + : XSTRDUP(MTYPE_TMP, VRF_DEFAULT_NAME)); listnode_add(to_bgp->vpn_policy[afi].import_vrf, vname); @@ -1557,8 +1557,8 @@ void vrf_unimport_from_vrf(struct bgp *to_bgp, struct bgp *from_bgp, struct ecommunity *ecom; struct listnode *node; - export_name = to_bgp->name ? to_bgp->name : BGP_DEFAULT_NAME; - tmp_name = from_bgp->name ? from_bgp->name : BGP_DEFAULT_NAME; + export_name = to_bgp->name ? to_bgp->name : VRF_DEFAULT_NAME; + tmp_name = from_bgp->name ? from_bgp->name : VRF_DEFAULT_NAME; idir = BGP_VPN_POLICY_DIR_FROMVPN; edir = BGP_VPN_POLICY_DIR_TOVPN; -- cgit v1.2.3