summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2018-06-19 07:29:13 -0400
committerGitHub <noreply@github.com>2018-06-19 07:29:13 -0400
commitfc89ac98463e7dea00e8ab8c35fa63523450d714 (patch)
treef6df35e93a0980ed3f03f5256511934f4dc9c4c0
parentefd1d76673fd62247c0e28ee206eddd26829a951 (diff)
parent99b4e972b59ef5ad1cef41541954faedfd7d7ab5 (diff)
Merge pull request #2470 from chiragshah6/mdev
zebra: Hide default vrf instance of l3vni cmd
-rw-r--r--bgpd/bgp_evpn_vty.c1
-rw-r--r--zebra/zebra_vty.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 8556a325bb..cb71e06149 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -1829,6 +1829,7 @@ static void evpn_unconfigure_vrf_rd(struct bgp *bgp_vrf)
/* fall back to default RD */
bgp_evpn_derive_auto_rd_for_vrf(bgp_vrf);
+ UNSET_FLAG(bgp_vrf->vrf_flags, BGP_VRF_RD_CFGD);
/* We have a new RD for VRF.
* Advertise all type-5 routes again with the new RD
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 9ce8c74220..55c4f6e916 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -2898,7 +2898,7 @@ DEFUN (show_vrf,
return CMD_SUCCESS;
}
-DEFUN (default_vrf_vni_mapping,
+DEFUN_HIDDEN (default_vrf_vni_mapping,
default_vrf_vni_mapping_cmd,
"vni " CMD_VNI_RANGE "[prefix-routes-only]",
"VNI corresponding to the DEFAULT VRF\n"
@@ -2928,7 +2928,7 @@ DEFUN (default_vrf_vni_mapping,
return CMD_SUCCESS;
}
-DEFUN (no_default_vrf_vni_mapping,
+DEFUN_HIDDEN (no_default_vrf_vni_mapping,
no_default_vrf_vni_mapping_cmd,
"no vni " CMD_VNI_RANGE,
NO_STR