ospfd: Add deprecation cycle for router-info X [A.B.C.D] command

Specifying an area is not relevant anymore. Use it for some time as a hidden command to avoid breaking the scripts. Signed-off-by: Donatas Abraitis <[email protected]>
FRRouting · Feb 9, 2024 · e4a9565 · e4a9565
1 parent b7987ec
commit e4a9565
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c
@@ -1660,11 +1660,10 @@ static void ospf_router_info_schedule(enum lsa_opcode opcode)
 
 DEFUN (router_info,
        router_info_area_cmd,
-       "router-info <as|area [A.B.C.D]>",
+       "router-info <as|area>",
        OSPF_RI_STR
        "Enable the Router Information functionality with AS flooding scope\n"
-       "Enable the Router Information functionality with Area flooding scope\n"
-       "OSPF area ID in IP format (deprecated)\n")
+       "Enable the Router Information functionality with Area flooding scope\n")
 {
 	int idx_mode = 1;
 	uint8_t scope;
@@ -1720,6 +1719,15 @@ DEFUN (router_info,
 	return CMD_SUCCESS;
 }
 
+#if CONFDATE > 20240809
+CPP_NOTICE("Drop deprecated router_info_area_id_cmd")
+#endif
+ALIAS_HIDDEN (router_info,
+              router_info_area_id_cmd,
+              "router-info area A.B.C.D",
+              OSPF_RI_STR
+              "Enable the Router Information functionality with Area flooding scope\n"
+              "OSPF area ID in IP format (deprecated)\n")
 
 DEFUN (no_router_info,
        no_router_info_cmd,
@@ -2110,6 +2118,7 @@ static void ospf_router_info_register_vty(void)
 	install_element(VIEW_NODE, &show_ip_ospf_router_info_pce_cmd);
 
 	install_element(OSPF_NODE, &router_info_area_cmd);
+	install_element(OSPF_NODE, &router_info_area_id_cmd);
 	install_element(OSPF_NODE, &no_router_info_cmd);
 	install_element(OSPF_NODE, &pce_address_cmd);
 	install_element(OSPF_NODE, &no_pce_address_cmd);