diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-09-20 07:54:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 07:54:19 -0400 |
| commit | a691ffc998ad5ae014b32a9bb6cd75a46d2b9b10 (patch) | |
| tree | f2e0c5f03e3baf0c54551d6fde798192bea176ce | |
| parent | 74fae3ffdec023f2ab0dbb505f76e33cc6533f29 (diff) | |
| parent | d2d080f52e156b4d7290bcd634e59291465f877e (diff) | |
Merge pull request #1202 from LabNConsulting/working/master/patch/rfapi-rd.family
bgpd: rfapi - fix 'add vnc' command not picking up RD from vrf-policy
| -rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.c | 2 | ||||
| -rw-r--r-- | bgpd/rfapi/rfapi_vty.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index a39fe068bd..91a3744315 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -4093,7 +4093,7 @@ int bgp_rfapi_cfg_write(struct vty *vty, struct bgp *bgp) } } - if (hc->default_rd.family || hc->default_response_lifetime + if (hc->default_rd.prefixlen || hc->default_response_lifetime || hc->default_rt_import_list || hc->default_rt_export_list || hc->nve_groups_sequential->count) { diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index e7314d2983..8d1b2b974e 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -4671,7 +4671,7 @@ static int vnc_add_vrf_prefix(struct vty *vty, const char *arg_vrf, arg_vrf); return CMD_WARNING_CONFIG_FAILED; } - if (!rfg->rd.family && !arg_rd) { + if (!rfg->rd.prefixlen && !arg_rd) { vty_out(vty, "VRF \"%s\" isn't configured with an RD, so RD must be provided.\n", arg_vrf); |