From 12fde75be5d6c66afb6ed94efd24f5b559845cc6 Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Fri, 19 Feb 2016 13:36:06 +0000 Subject: [PATCH] OSPFv2 has both "router-id x.x.x.x" and "ospf router-id x.x.x.x" Signed-off-by: Daniel Walton Reviewed-by: Don Slice Reviewed-by: Donald Sharp Ticket: CM-9285 --- ospfd/ospf_vty.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index b47679002c..f16b7d4c1e 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -255,12 +255,6 @@ DEFUN (ospf_router_id, return CMD_SUCCESS; } -ALIAS (ospf_router_id, - router_ospf_id_cmd, - "router-id A.B.C.D", - "router-id for the OSPF process\n" - "OSPF router-id in IP address format\n") - DEFUN (no_ospf_router_id, no_ospf_router_id_cmd, "no ospf router-id", @@ -291,10 +285,12 @@ DEFUN (no_ospf_router_id, } ALIAS (no_ospf_router_id, - no_router_ospf_id_cmd, - "no router-id", + no_ospf_router_id_val_cmd, + "no ospf router-id A.B.C.D", NO_STR - "router-id for the OSPF process\n") + "OSPF specific commands\n" + "router-id for the OSPF process\n" + "OSPF router-id in IP address format\n") static void ospf_passive_interface_default (struct ospf *ospf, u_char newval) @@ -10272,8 +10268,7 @@ ospf_vty_init (void) /* "ospf router-id" commands. */ install_element (OSPF_NODE, &ospf_router_id_cmd); install_element (OSPF_NODE, &no_ospf_router_id_cmd); - install_element (OSPF_NODE, &router_ospf_id_cmd); - install_element (OSPF_NODE, &no_router_ospf_id_cmd); + install_element (OSPF_NODE, &no_ospf_router_id_val_cmd); /* "passive-interface" commands. */ install_element (OSPF_NODE, &ospf_passive_interface_addr_cmd); -- 2.39.5