From 798467a2006206712052024eaa40769428a89ccd Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 1 Jun 2018 14:56:15 -0400 Subject: [PATCH] bgpd: Hide and deprecate `bgp config-type cisco` command This command needs to be deprecated. It sets a small variety of options via the BGP_OPT_CONFIG_CISCO flag. Set for removal in 1 year. Signed-off-by: Donald Sharp --- bgpd/bgp_vty.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 257adda3f3..182ca68637 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -799,31 +799,38 @@ DEFUN (no_bgp_multiple_instance, return CMD_SUCCESS; } -DEFUN (bgp_config_type, - bgp_config_type_cmd, - "bgp config-type ", - BGP_STR - "Configuration type\n" - "cisco\n" - "zebra\n") +#if defined(VERSION_TYPE_DEV) && (CONFDATE > 20190601) +CPP_NOTICE("bgpd: time to remove deprecated cli bgp config-type cisco") +CPP_NOTICE("This includes BGP_OPT_CISCO_CONFIG") +#endif +DEFUN_HIDDEN (bgp_config_type, + bgp_config_type_cmd, + "bgp config-type ", + BGP_STR + "Configuration type\n" + "cisco\n" + "zebra\n") { int idx = 0; - if (argv_find(argv, argc, "cisco", &idx)) + if (argv_find(argv, argc, "cisco", &idx)) { + vty_out(vty, "This config option is deprecated, and is scheduled for removal.\n"); + vty_out(vty, "if you are using this please let the developers know!\n"); + zlog_warn("Deprecated option: `bgp config-type cisco` being used"); bgp_option_set(BGP_OPT_CONFIG_CISCO); - else + } else bgp_option_unset(BGP_OPT_CONFIG_CISCO); return CMD_SUCCESS; } -DEFUN (no_bgp_config_type, - no_bgp_config_type_cmd, - "no bgp config-type []", - NO_STR - BGP_STR - "Display configuration type\n" - "cisco\n" - "zebra\n") +DEFUN_HIDDEN (no_bgp_config_type, + no_bgp_config_type_cmd, + "no bgp config-type []", + NO_STR + BGP_STR + "Display configuration type\n" + "cisco\n" + "zebra\n") { bgp_option_unset(BGP_OPT_CONFIG_CISCO); return CMD_SUCCESS; -- 2.39.5