diff options
| author | Sri Mohana Singamsetty <srimohans@gmail.com> | 2019-03-22 09:49:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 09:49:00 -0700 |
| commit | d31fd899e66af99901f61ca057fd4bd932b82c6f (patch) | |
| tree | f5b8af8c7afe1e7d5e23d2fcefbb2b8e6f3e5d9e | |
| parent | 6b38a03312d0e5602436c18a0077cffd17a69451 (diff) | |
| parent | 9e97ff0308d3ac642f73503de825075770099d50 (diff) | |
Merge pull request #3978 from chiragshah6/evpn_dev2
bgpd: l3vni add-del handle non-defualt rd
| -rw-r--r-- | bgpd/bgp_evpn.c | 3 | ||||
| -rw-r--r-- | bgpd/bgp_evpn_vty.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c index 6ced286dde..3a61c0cd74 100644 --- a/bgpd/bgp_evpn.c +++ b/bgpd/bgp_evpn.c @@ -5081,6 +5081,9 @@ void bgp_evpn_derive_auto_rt_export(struct bgp *bgp, struct bgpevpn *vpn) */ void bgp_evpn_derive_auto_rd_for_vrf(struct bgp *bgp) { + if (is_vrf_rd_configured(bgp)) + return; + form_auto_rd(bgp->router_id, bgp->vrf_rd_id, &bgp->vrf_prd); } diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index fb2d9da533..ba72761003 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -5212,7 +5212,7 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi, vty_out(vty, " default-originate ipv6\n"); if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_RD_CFGD)) - vty_out(vty, " rd %s\n", + vty_out(vty, " rd %s\n", prefix_rd2str(&bgp->vrf_prd, buf1, sizeof(buf1))); /* import route-target */ |