From e2063df358308bf505db0561fbae344185e8bd8d Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Fri, 16 Feb 2018 11:00:01 +0100 Subject: [PATCH] bgpd: prevent from configuring vrf-policy when in BGP VRF instance Under a BGP VRF instance, prevent from entering in vrf-policy mode. This mode is reserved for non VRF instances that want to handle several VRF at the same time. Signed-off-by: Philippe Guibert --- bgpd/rfapi/bgp_rfapi_cfg.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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); } -- 2.39.5