proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-03 16:24:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: fix incorrect config when importing vrf default

Browse Source 
Found that when doing "import vrf default" in another vrf, an
extra line was added to the configuration in error.   This fix
resolves that incorrect configuration. Manual testing will be
attached to the defect.

Ticket: CM-20467
Signed-off-by: Don Slice <dslice@cumulustnetworks.com>
Reviewed by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Don Slice 2018-04-08 15:35:21 +00:00 committed by Donald Sharp
parent a8dadcf6cc
commit 0fb8d6e639
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bgpd/bgp_vty.c
View File

@ -6676,20 +6676,18 @@ DEFPY (bgp_imexport_vrf,
vrf_bgp = bgp_lookup_by_name(import_name);
if (!vrf_bgp) {
int32_t ret;
int32_t ret = 0;
as_t as = bgp->as;
if (strcmp(import_name, BGP_DEFAULT_NAME) == 0) {
vrf_bgp = bgp_get_default();
if (!vrf_bgp) {
bgp_type = BGP_INSTANCE_TYPE_DEFAULT;
import_name = NULL;
}
if (!vrf_bgp)
ret = bgp_get(&vrf_bgp, &as, NULL, BGP_INSTANCE_TYPE_DEFAULT);
} else {
/* Auto-create assuming the same AS */
ret = bgp_get(&vrf_bgp, &as, import_name, bgp_type);
}
/* Auto-create assuming the same AS */
ret = bgp_get(&vrf_bgp, &as, import_name, bgp_type);
if (ret) {
vty_out(vty,
"VRF %s is not configured as a bgp instance\n",