summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLou Berger <lberger@labn.net>2018-02-16 12:58:32 -0600
committerGitHub <noreply@github.com>2018-02-16 12:58:32 -0600
commitfb8b7ce7dd53a6d3cea19a818f3afcd1c8c50522 (patch)
tree186629d39932ac68338de3c3e8b586500bcc6450
parentdf82650c67132b63a75c5daee504c164c16ba546 (diff)
parente2063df358308bf505db0561fbae344185e8bd8d (diff)
Merge pull request #1761 from pguibert6WIND/issue_1760
bgpd: prevent from configuring vrf-policy when in BGP VRF instance
-rw-r--r--bgpd/rfapi/bgp_rfapi_cfg.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 15e09c639e..f28b8a2ced 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -2977,6 +2977,11 @@ DEFUN_NOSH (vnc_vrf_policy,
struct rfapi_nve_group_cfg *rfg;
VTY_DECLVAR_CONTEXT(bgp, bgp);
+ if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF) {
+ vty_out(vty, "Can't configure vrf-policy within a BGP VRF instance\n");
+ return CMD_WARNING_CONFIG_FAILED;
+ }
+
/* Search for name */
rfg = bgp_rfapi_cfg_match_byname(bgp, argv[1]->arg,
RFAPI_GROUP_CFG_VRF);
@@ -3007,6 +3012,10 @@ DEFUN (vnc_no_vrf_policy,
{
VTY_DECLVAR_CONTEXT(bgp, bgp);
+ /* silently return */
+ if (bgp->inst_type == BGP_INSTANCE_TYPE_VRF)
+ return CMD_SUCCESS;
+
return bgp_rfapi_delete_named_nve_group(vty, bgp, argv[2]->arg,
RFAPI_GROUP_CFG_VRF);
}