diff options
| author | Don Slice <dslice@cumulusnetworks.com> | 2018-04-08 15:35:21 +0000 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-04-25 12:39:17 -0400 |
| commit | 0fb8d6e6394dff0178f567a3eb059297d3db5113 (patch) | |
| tree | 10d85520eb401e4b01163220b336bb211ab50dbd | |
| parent | a8dadcf6ccde25eaa739010e83ba9b5a580bdc96 (diff) | |
bgpd: fix incorrect config when importing vrf default
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>
| -rw-r--r-- | bgpd/bgp_vty.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 95abfcb9cb..4c4178495f 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -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", |