From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Mon, 11 Apr 2022 07:12:18 +0000 (+0300)
Subject: lib: Remove deprecated routemap_optimization_cmd
X-Git-Tag: pim6-testing-20220430~84^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F11006%2Fhead;p=mirror%2Ffrr.git

lib: Remove deprecated routemap_optimization_cmd

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/lib/routemap_cli.c b/lib/routemap_cli.c
index 5597064d20..315007be1c 100644
--- a/lib/routemap_cli.c
+++ b/lib/routemap_cli.c
@@ -1434,41 +1434,6 @@ void route_map_optimization_disabled_show(struct vty *vty,
 		name);
 }
 
-#if CONFDATE > 20220409
-CPP_NOTICE("Time to remove old route-map optimization command")
-#endif
-
-DEFPY_HIDDEN(
-	routemap_optimization, routemap_optimization_cmd,
-	"[no] route-map optimization",
-	NO_STR
-	"route-map\n"
-	"optimization\n")
-{
-	const struct lyd_node *rmi_dnode;
-	const char *rm_name;
-	char xpath[XPATH_MAXLEN];
-
-	vty_out(vty,
-		"%% This command is deprecated. Please, use `route-map NAME optimization` from the config node.\n");
-
-	rmi_dnode =
-		yang_dnode_get(vty->candidate_config->dnode, VTY_CURR_XPATH);
-	if (!rmi_dnode) {
-		vty_out(vty, "%% Failed to get RMI dnode in candidate DB\n");
-		return CMD_WARNING_CONFIG_FAILED;
-	}
-
-	rm_name = yang_dnode_get_string(rmi_dnode, "../name");
-
-	snprintf(
-		xpath, sizeof(xpath),
-		"/frr-route-map:lib/route-map[name='%s']/optimization-disabled",
-		rm_name);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, no ? "true" : "false");
-	return nb_cli_apply_changes(vty, NULL);
-}
-
 static int route_map_config_write(struct vty *vty)
 {
 	const struct lyd_node *dnode;
@@ -1587,6 +1552,4 @@ void route_map_cli_init(void)
 
 	install_element(RMAP_NODE, &set_srte_color_cmd);
 	install_element(RMAP_NODE, &no_set_srte_color_cmd);
-
-	install_element(RMAP_NODE, &routemap_optimization_cmd);
 }