diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-09-23 15:47:20 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-09-23 15:47:20 +0200 |
| commit | 6147e2c694b53647895f048645182065bc25fd05 (patch) | |
| tree | 312a6d95b8efca2df2743a183488ed8baea0de16 | |
| parent | tools: argv_translator convert <1-255> to (1-255), ()s to <>s, etc (diff) | |
| download | frr-6147e2c694b53647895f048645182065bc25fd05.tar.xz frr-6147e2c694b53647895f048645182065bc25fd05.zip | |
convert <1-255> to (1-255), ()s to <>s, etc
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
56 files changed, 891 insertions, 885 deletions
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index e64730624..89b970d97 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -622,7 +622,7 @@ DEFUN (debug_bgp_neighbor_events, DEFUN (debug_bgp_neighbor_events_peer, debug_bgp_neighbor_events_peer_cmd, - "debug bgp neighbor-events (A.B.C.D|X:X::X:X|WORD)", + "debug bgp neighbor-events <A.B.C.D|X:X::X:X|WORD>", DEBUG_STR BGP_STR "BGP Neighbor Events\n" @@ -675,7 +675,7 @@ DEFUN (no_debug_bgp_neighbor_events, DEFUN (no_debug_bgp_neighbor_events_peer, no_debug_bgp_neighbor_events_peer_cmd, - "no debug bgp neighbor-events (A.B.C.D|X:X::X:X|WORD)", + "no debug bgp neighbor-events <A.B.C.D|X:X::X:X|WORD>", NO_STR DEBUG_STR BGP_STR @@ -766,7 +766,7 @@ DEFUN (debug_bgp_keepalive, DEFUN (debug_bgp_keepalive_peer, debug_bgp_keepalive_peer_cmd, - "debug bgp keepalives (A.B.C.D|X:X::X:X|WORD)", + "debug bgp keepalives <A.B.C.D|X:X::X:X|WORD>", DEBUG_STR BGP_STR "BGP Neighbor Events\n" @@ -819,7 +819,7 @@ DEFUN (no_debug_bgp_keepalive, DEFUN (no_debug_bgp_keepalive_peer, no_debug_bgp_keepalive_peer_cmd, - "no debug bgp keepalives (A.B.C.D|X:X::X:X|WORD)", + "no debug bgp keepalives <A.B.C.D|X:X::X:X|WORD>", NO_STR DEBUG_STR BGP_STR @@ -855,7 +855,7 @@ DEFUN (no_debug_bgp_keepalive_peer, /* debug bgp bestpath */ DEFUN (debug_bgp_bestpath_prefix, debug_bgp_bestpath_prefix_cmd, - "debug bgp bestpath (A.B.C.D/M|X:X::X:X/M)", + "debug bgp bestpath <A.B.C.D/M|X:X::X:X/M>", DEBUG_STR BGP_STR "BGP bestpath\n" @@ -902,7 +902,7 @@ DEFUN (debug_bgp_bestpath_prefix, DEFUN (no_debug_bgp_bestpath_prefix, no_debug_bgp_bestpath_prefix_cmd, - "no debug bgp bestpath (A.B.C.D/M|X:X::X:X/M)", + "no debug bgp bestpath <A.B.C.D/M|X:X::X:X/M>", NO_STR DEBUG_STR BGP_STR @@ -998,7 +998,7 @@ DEFUN (debug_bgp_update, DEFUN (debug_bgp_update_direct, debug_bgp_update_direct_cmd, - "debug bgp updates (in|out)", + "debug bgp updates <in|out>", DEBUG_STR BGP_STR "BGP updates\n" @@ -1036,7 +1036,7 @@ DEFUN (debug_bgp_update_direct, DEFUN (debug_bgp_update_direct_peer, debug_bgp_update_direct_peer_cmd, - "debug bgp updates (in|out) (A.B.C.D|X:X::X:X|WORD)", + "debug bgp updates <in|out> <A.B.C.D|X:X::X:X|WORD>", DEBUG_STR BGP_STR "BGP updates\n" @@ -1130,7 +1130,7 @@ DEFUN (debug_bgp_update_direct_peer, DEFUN (no_debug_bgp_update_direct, no_debug_bgp_update_direct_cmd, - "no debug bgp updates (in|out)", + "no debug bgp updates <in|out>", NO_STR DEBUG_STR BGP_STR @@ -1172,7 +1172,7 @@ DEFUN (no_debug_bgp_update_direct, DEFUN (no_debug_bgp_update_direct_peer, no_debug_bgp_update_direct_peer_cmd, - "no debug bgp updates (in|out) (A.B.C.D|X:X::X:X|WORD)", + "no debug bgp updates <in|out> <A.B.C.D|X:X::X:X|WORD>", NO_STR DEBUG_STR BGP_STR @@ -1262,7 +1262,7 @@ DEFUN (no_debug_bgp_update_direct_peer, DEFUN (debug_bgp_update_prefix, debug_bgp_update_prefix_cmd, - "debug bgp updates prefix (A.B.C.D/M|X:X::X:X/M)", + "debug bgp updates prefix <A.B.C.D/M|X:X::X:X/M>", DEBUG_STR BGP_STR "BGP updates\n" @@ -1310,7 +1310,7 @@ DEFUN (debug_bgp_update_prefix, DEFUN (no_debug_bgp_update_prefix, no_debug_bgp_update_prefix_cmd, - "no debug bgp updates prefix (A.B.C.D/M|X:X::X:X/M)", + "no debug bgp updates prefix <A.B.C.D/M|X:X::X:X/M>", NO_STR DEBUG_STR BGP_STR @@ -1409,7 +1409,7 @@ DEFUN (debug_bgp_zebra, DEFUN (debug_bgp_zebra_prefix, debug_bgp_zebra_prefix_cmd, - "debug bgp zebra prefix (A.B.C.D/M|X:X::X:X/M)", + "debug bgp zebra prefix <A.B.C.D/M|X:X::X:X/M>", DEBUG_STR BGP_STR "BGP Zebra messages\n" @@ -1474,7 +1474,7 @@ DEFUN (no_debug_bgp_zebra, DEFUN (no_debug_bgp_zebra_prefix, no_debug_bgp_zebra_prefix_cmd, - "no debug bgp zebra prefix (A.B.C.D/M|X:X::X:X/M)", + "no debug bgp zebra prefix <A.B.C.D/M|X:X::X:X/M>", NO_STR DEBUG_STR BGP_STR diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index 52989385d..c5fc05200 100644 --- a/bgpd/bgp_dump.c +++ b/bgpd/bgp_dump.c @@ -727,7 +727,7 @@ bgp_dump_unset (struct vty *vty, struct bgp_dump *bgp_dump) DEFUN (dump_bgp_all, dump_bgp_all_cmd, - "dump bgp (all|all-et|updates|updates-et|routes-mrt) PATH [INTERVAL]", + "dump bgp <all|all-et|updates|updates-et|routes-mrt> PATH [INTERVAL]", "Dump packet\n" "BGP packet dump\n" "Dump all BGP packets\nDump all BGP packets (Extended Timestamp Header)\n" @@ -771,7 +771,7 @@ DEFUN (dump_bgp_all, DEFUN (no_dump_bgp_all, no_dump_bgp_all_cmd, - "no dump bgp (all|all-et|updates|updates-et|routes-mrt) [PATH] [INTERVAL]", + "no dump bgp <all|all-et|updates|updates-et|routes-mrt> [PATH] [INTERVAL]", NO_STR "Stop dump packet\n" "Stop BGP packet dump\n" diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c index 4b1b6757a..0c7657f8b 100644 --- a/bgpd/bgp_encap.c +++ b/bgpd/bgp_encap.c @@ -707,7 +707,7 @@ DEFUN (show_bgp_ipv6_encap_neighbor_routes, DEFUN (show_bgp_ipv4_encap_rd_neighbor_routes, show_bgp_ipv4_encap_rd_neighbor_routes_cmd, - "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) routes", + "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> routes", SHOW_STR BGP_STR "Address Family\n" @@ -750,7 +750,7 @@ DEFUN (show_bgp_ipv4_encap_rd_neighbor_routes, #ifdef HAVE_IPV6 DEFUN (show_bgp_ipv6_encap_rd_neighbor_routes, show_bgp_ipv6_encap_rd_neighbor_routes_cmd, - "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) routes", + "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> routes", SHOW_STR BGP_STR "Address Family\n" @@ -857,7 +857,7 @@ DEFUN (show_bgp_ipv6_encap_neighbor_advertised_routes, DEFUN (show_bgp_ipv4_encap_rd_neighbor_advertised_routes, show_bgp_ipv4_encap_rd_neighbor_advertised_routes_cmd, - "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) advertised-routes", + "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> advertised-routes", SHOW_STR BGP_STR "Address Family\n" @@ -899,7 +899,7 @@ DEFUN (show_bgp_ipv4_encap_rd_neighbor_advertised_routes, #ifdef HAVE_IPV6 DEFUN (show_bgp_ipv6_encap_rd_neighbor_advertised_routes, show_bgp_ipv6_encap_rd_neighbor_advertised_routes_cmd, - "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) advertised-routes", + "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> advertised-routes", SHOW_STR BGP_STR "Address Family\n" diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c index 1235e50d2..6a39d0217 100644 --- a/bgpd/bgp_filter.c +++ b/bgpd/bgp_filter.c @@ -428,7 +428,7 @@ as_list_dup_check (struct as_list *aslist, struct as_filter *new) DEFUN (ip_as_path, ip_as_path_cmd, - "ip as-path access-list WORD (deny|permit) .LINE", + "ip as-path access-list WORD <deny|permit> .LINE", IP_STR "BGP autonomous system path filter\n" "Specify an access list name\n" @@ -484,7 +484,7 @@ DEFUN (ip_as_path, DEFUN (no_ip_as_path, no_ip_as_path_cmd, - "no ip as-path access-list WORD (deny|permit) .LINE", + "no ip as-path access-list WORD <deny|permit> .LINE", NO_STR IP_STR "BGP autonomous system path filter\n" diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index e408154f2..d0eff6e20 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -7963,7 +7963,7 @@ DEFUN (show_ip_bgp, */ DEFUN (show_ip_bgp_ipv4, show_ip_bgp_ipv4_cmd, - "show ip bgp ipv4 (unicast|multicast) [json]", + "show ip bgp ipv4 <unicast|multicast> [json]", SHOW_STR IP_STR BGP_STR @@ -7996,7 +7996,7 @@ DEFUN (show_ip_bgp_route, DEFUN (show_ip_bgp_route_pathtype, show_ip_bgp_route_pathtype_cmd, - "show ip bgp A.B.C.D (bestpath|multipath) [json]", + "show ip bgp A.B.C.D <bestpath|multipath> [json]", SHOW_STR IP_STR BGP_STR @@ -8015,7 +8015,7 @@ DEFUN (show_ip_bgp_route_pathtype, DEFUN (show_bgp_ipv4_safi_route_pathtype, show_bgp_ipv4_safi_route_pathtype_cmd, - "show bgp ipv4 (unicast|multicast) A.B.C.D (bestpath|multipath) [json]", + "show bgp ipv4 <unicast|multicast> A.B.C.D <bestpath|multipath> [json]", SHOW_STR BGP_STR "Address family\n" @@ -8090,7 +8090,7 @@ DEFUN (show_bgp_ipv6_prefix, */ DEFUN (show_ip_bgp_ipv4_route, show_ip_bgp_ipv4_route_cmd, - "show ip bgp ipv4 (unicast|multicast) A.B.C.D [json]", + "show ip bgp ipv4 <unicast|multicast> A.B.C.D [json]", SHOW_STR IP_STR BGP_STR @@ -8236,7 +8236,7 @@ DEFUN (show_ip_bgp_prefix, DEFUN (show_ip_bgp_prefix_pathtype, show_ip_bgp_prefix_pathtype_cmd, - "show ip bgp A.B.C.D/M (bestpath|multipath) [json]", + "show ip bgp A.B.C.D/M <bestpath|multipath> [json]", SHOW_STR IP_STR BGP_STR @@ -8266,7 +8266,7 @@ DEFUN (show_ip_bgp_prefix_pathtype, */ DEFUN (show_ip_bgp_ipv4_prefix, show_ip_bgp_ipv4_prefix_cmd, - "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M [json]", + "show ip bgp ipv4 <unicast|multicast> A.B.C.D/M [json]", SHOW_STR IP_STR BGP_STR @@ -8301,7 +8301,7 @@ DEFUN (show_ip_bgp_ipv4_prefix, */ DEFUN (show_ip_bgp_ipv4_prefix_pathtype, show_ip_bgp_ipv4_prefix_pathtype_cmd, - "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) [json]", + "show ip bgp ipv4 <unicast|multicast> A.B.C.D/M <bestpath|multipath> [json]", SHOW_STR IP_STR BGP_STR @@ -8418,7 +8418,7 @@ DEFUN (show_ip_bgp_instance_route, DEFUN (show_ip_bgp_instance_route_pathtype, show_ip_bgp_instance_route_pathtype_cmd, - "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D (bestpath|multipath) [json]", + "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D <bestpath|multipath> [json]", SHOW_STR IP_STR BGP_STR @@ -8451,7 +8451,7 @@ DEFUN (show_ip_bgp_instance_prefix, DEFUN (show_ip_bgp_instance_prefix_pathtype, show_ip_bgp_instance_prefix_pathtype_cmd, - "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D/M (bestpath|multipath) [json]", + "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D/M <bestpath|multipath> [json]", SHOW_STR IP_STR BGP_STR @@ -8492,7 +8492,7 @@ DEFUN (show_bgp, DEFUN (show_bgp_ipv6_safi, show_bgp_ipv6_safi_cmd, - "show bgp ipv6 (unicast|multicast) [json]", + "show bgp ipv6 <unicast|multicast> [json]", SHOW_STR BGP_STR "Address family\n" @@ -8543,7 +8543,7 @@ DEFUN (show_bgp_route, DEFUN (show_bgp_ipv6_safi_route, show_bgp_ipv6_safi_route_cmd, - "show bgp ipv6 (unicast|multicast) X:X::X:X [json]", + "show bgp ipv6 <unicast|multicast> X:X::X:X [json]", SHOW_STR BGP_STR "Address family\n" @@ -8573,7 +8573,7 @@ DEFUN (show_bgp_ipv6_safi_route, */ DEFUN (show_bgp_route_pathtype, show_bgp_route_pathtype_cmd, - "show bgp X:X::X:X (bestpath|multipath) [json]", + "show bgp X:X::X:X <bestpath|multipath> [json]", SHOW_STR BGP_STR "Network in the BGP routing table to display\n" @@ -8591,7 +8591,7 @@ DEFUN (show_bgp_route_pathtype, DEFUN (show_bgp_ipv6_safi_route_pathtype, show_bgp_ipv6_safi_route_pathtype_cmd, - "show bgp ipv6 (unicast|multicast) X:X::X:X (bestpath|multipath) [json]", + "show bgp ipv6 <unicast|multicast> X:X::X:X <bestpath|multipath> [json]", SHOW_STR BGP_STR "Address family\n" @@ -8642,7 +8642,7 @@ DEFUN (show_bgp_prefix, DEFUN (show_bgp_ipv6_safi_prefix, show_bgp_ipv6_safi_prefix_cmd, - "show bgp ipv6 (unicast|multicast) X:X::X:X/M [json]", + "show bgp ipv6 <unicast|multicast> X:X::X:X/M [json]", SHOW_STR BGP_STR "Address family\n" @@ -8672,7 +8672,7 @@ DEFUN (show_bgp_ipv6_safi_prefix, */ DEFUN (show_bgp_prefix_pathtype, show_bgp_prefix_pathtype_cmd, - "show bgp X:X::X:X/M (bestpath|multipath) [json]", + "show bgp X:X::X:X/M <bestpath|multipath> [json]", SHOW_STR BGP_STR "IPv6 prefix <network>/<length>\n" @@ -8690,7 +8690,7 @@ DEFUN (show_bgp_prefix_pathtype, DEFUN (show_bgp_ipv6_safi_prefix_pathtype, show_bgp_ipv6_safi_prefix_pathtype_cmd, - "show bgp ipv6 (unicast|multicast) X:X::X:X/M (bestpath|multipath) [json]", + "show bgp ipv6 <unicast|multicast> X:X::X:X/M <bestpath|multipath> [json]", SHOW_STR BGP_STR "Address family\n" @@ -8813,7 +8813,7 @@ DEFUN (show_bgp_instance_route, */ DEFUN (show_bgp_instance_route_pathtype, show_bgp_instance_route_pathtype_cmd, - "show bgp " BGP_INSTANCE_CMD " X:X::X:X (bestpath|multipath) [json]", + "show bgp " BGP_INSTANCE_CMD " X:X::X:X <bestpath|multipath> [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -8869,7 +8869,7 @@ DEFUN (show_bgp_instance_prefix, */ DEFUN (show_bgp_instance_prefix_pathtype, show_bgp_instance_prefix_pathtype_cmd, - "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M (bestpath|multipath) [json]", + "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M <bestpath|multipath> [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -8975,7 +8975,7 @@ DEFUN (show_bgp_instance_route_map, */ DEFUN (show_bgp_instance_community_list, show_bgp_instance_community_list_cmd, - "show bgp " BGP_INSTANCE_CMD " community-list (<1-500>|WORD)", + "show bgp " BGP_INSTANCE_CMD " community-list <(1-500)|WORD>", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -9143,7 +9143,7 @@ DEFUN (show_ip_bgp_flap_regexp, DEFUN (show_ip_bgp_ipv4_regexp, show_ip_bgp_ipv4_regexp_cmd, - "show ip bgp ipv4 (unicast|multicast) regexp .LINE", + "show ip bgp ipv4 <unicast|multicast> regexp .LINE", SHOW_STR IP_STR BGP_STR @@ -9297,7 +9297,7 @@ DEFUN (show_ip_bgp_flap_prefix_list, DEFUN (show_ip_bgp_ipv4_prefix_list, show_ip_bgp_ipv4_prefix_list_cmd, - "show ip bgp ipv4 (unicast|multicast) prefix-list WORD", + "show ip bgp ipv4 <unicast|multicast> prefix-list WORD", SHOW_STR IP_STR BGP_STR @@ -9450,7 +9450,7 @@ DEFUN (show_ip_bgp_flap_filter_list, DEFUN (show_ip_bgp_ipv4_filter_list, show_ip_bgp_ipv4_filter_list_cmd, - "show ip bgp ipv4 (unicast|multicast) filter-list WORD", + "show ip bgp ipv4 <unicast|multicast> filter-list WORD", SHOW_STR IP_STR BGP_STR @@ -9538,7 +9538,7 @@ DEFUN (show_ip_bgp_dampening_info, DEFUN (show_ip_bgp_ipv4_dampening_parameters, show_ip_bgp_ipv4_dampening_parameters_cmd, - "show ip bgp ipv4 (unicast|multicast) dampening parameters", + "show ip bgp ipv4 <unicast|multicast> dampening parameters", SHOW_STR IP_STR BGP_STR @@ -9557,7 +9557,7 @@ DEFUN (show_ip_bgp_ipv4_dampening_parameters, DEFUN (show_ip_bgp_ipv4_dampening_flap_stats, show_ip_bgp_ipv4_dampening_flap_stats_cmd, - "show ip bgp ipv4 (unicast|multicast) dampening flap-statistics", + "show ip bgp ipv4 <unicast|multicast> dampening flap-statistics", SHOW_STR IP_STR BGP_STR @@ -9577,7 +9577,7 @@ DEFUN (show_ip_bgp_ipv4_dampening_flap_stats, DEFUN (show_ip_bgp_ipv4_dampening_dampd_paths, show_ip_bgp_ipv4_dampening_dampd_paths_cmd, - "show ip bgp ipv4 (unicast|multicast) dampening dampened-paths", + "show ip bgp ipv4 <unicast|multicast> dampening dampened-paths", SHOW_STR IP_STR BGP_STR @@ -9676,7 +9676,7 @@ DEFUN (show_ip_bgp_flap_route_map, DEFUN (show_ip_bgp_ipv4_route_map, show_ip_bgp_ipv4_route_map_cmd, - "show ip bgp ipv4 (unicast|multicast) route-map WORD", + "show ip bgp ipv4 <unicast|multicast> route-map WORD", SHOW_STR IP_STR BGP_STR @@ -9756,7 +9756,7 @@ DEFUN (show_ip_bgp_flap_cidr_only, DEFUN (show_ip_bgp_ipv4_cidr_only, show_ip_bgp_ipv4_cidr_only_cmd, - "show ip bgp ipv4 (unicast|multicast) cidr-only", + "show ip bgp ipv4 <unicast|multicast> cidr-only", SHOW_STR IP_STR BGP_STR @@ -9787,7 +9787,7 @@ DEFUN (show_ip_bgp_community_all, DEFUN (show_ip_bgp_ipv4_community_all, show_ip_bgp_ipv4_community_all_cmd, - "show ip bgp ipv4 (unicast|multicast) community", + "show ip bgp ipv4 <unicast|multicast> community", SHOW_STR IP_STR BGP_STR @@ -9977,7 +9977,7 @@ bgp_show_community (struct vty *vty, const char *view_name, int argc, */ DEFUN (show_ip_bgp_community, show_ip_bgp_community_cmd, - "show ip bgp community (AA:NN|local-AS|no-advertise|no-export)", + "show ip bgp community <AA:NN|local-AS|no-advertise|no-export>", SHOW_STR IP_STR BGP_STR @@ -10061,7 +10061,7 @@ DEFUN (show_ip_bgp_community, */ DEFUN (show_ip_bgp_ipv4_community, show_ip_bgp_ipv4_community_cmd, - "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)", + "show ip bgp ipv4 <unicast|multicast> community <AA:NN|local-AS|no-advertise|no-export>", SHOW_STR IP_STR BGP_STR @@ -10085,7 +10085,7 @@ DEFUN (show_ip_bgp_ipv4_community, DEFUN (show_bgp_instance_afi_safi_community_all, show_bgp_instance_afi_safi_community_all_cmd, - "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community", + "show bgp " BGP_INSTANCE_CMD " <ipv4|ipv6> <unicast|multicast> community", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -10183,7 +10183,7 @@ DEFUN (show_bgp_instance_afi_safi_community_all, */ DEFUN (show_bgp_instance_afi_safi_community, show_bgp_instance_afi_safi_community_cmd, - "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)", + "show bgp " BGP_INSTANCE_CMD " <ipv4|ipv6> <unicast|multicast> community <AA:NN|local-AS|no-advertise|no-export>", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -10270,7 +10270,7 @@ DEFUN (show_bgp_instance_afi_safi_community, */ DEFUN (show_ip_bgp_community_exact, show_ip_bgp_community_exact_cmd, - "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", + "show ip bgp community <AA:NN|local-AS|no-advertise|no-export> exact-match", SHOW_STR IP_STR BGP_STR @@ -10358,7 +10358,7 @@ DEFUN (show_ip_bgp_community_exact, */ DEFUN (show_ip_bgp_ipv4_community_exact, show_ip_bgp_ipv4_community_exact_cmd, - "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) exact-match", + "show ip bgp ipv4 <unicast|multicast> community <AA:NN|local-AS|no-advertise|no-export> exact-match", SHOW_STR IP_STR BGP_STR @@ -10502,7 +10502,7 @@ DEFUN (show_ip_bgp_ipv4_community_exact, */ DEFUN (show_bgp_community, show_bgp_community_cmd, - "show bgp community (AA:NN|local-AS|no-advertise|no-export)", + "show bgp community <AA:NN|local-AS|no-advertise|no-export>", SHOW_STR BGP_STR "Display routes matching the communities\n" @@ -10581,7 +10581,7 @@ DEFUN (show_bgp_community, */ DEFUN (show_ipv6_bgp_community, show_ipv6_bgp_community_cmd, - "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export)", + "show ipv6 bgp community <AA:NN|local-AS|no-advertise|no-export>", SHOW_STR IPV6_STR BGP_STR @@ -10728,7 +10728,7 @@ DEFUN (show_ipv6_bgp_community, */ DEFUN (show_bgp_community_exact, show_bgp_community_exact_cmd, - "show bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", + "show bgp community <AA:NN|local-AS|no-advertise|no-export> exact-match", SHOW_STR BGP_STR "Display routes matching the communities\n" @@ -10811,7 +10811,7 @@ DEFUN (show_bgp_community_exact, */ DEFUN (show_ipv6_bgp_community_exact, show_ipv6_bgp_community_exact_cmd, - "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", + "show ipv6 bgp community <AA:NN|local-AS|no-advertise|no-export> exact-match", SHOW_STR IPV6_STR BGP_STR @@ -10892,7 +10892,7 @@ DEFUN (show_ipv6_bgp_community_exact, */ DEFUN (show_ipv6_mbgp_community, show_ipv6_mbgp_community_cmd, - "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export)", + "show ipv6 mbgp community <AA:NN|local-AS|no-advertise|no-export>", SHOW_STR IPV6_STR MBGP_STR @@ -10975,7 +10975,7 @@ DEFUN (show_ipv6_mbgp_community, */ DEFUN (show_ipv6_mbgp_community_exact, show_ipv6_mbgp_community_exact_cmd, - "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", + "show ipv6 mbgp community <AA:NN|local-AS|no-advertise|no-export> exact-match", SHOW_STR IPV6_STR MBGP_STR @@ -11026,7 +11026,7 @@ bgp_show_community_list (struct vty *vty, const char *name, DEFUN (show_ip_bgp_community_list, show_ip_bgp_community_list_cmd, - "show ip bgp community-list (<1-500>|WORD)", + "show ip bgp community-list <(1-500)|WORD>", SHOW_STR IP_STR BGP_STR @@ -11039,7 +11039,7 @@ DEFUN (show_ip_bgp_community_list, DEFUN (show_ip_bgp_instance_community_list, show_ip_bgp_instance_community_list_cmd, - "show ip bgp " BGP_INSTANCE_CMD " community-list (<1-500>|WORD)", + "show ip bgp " BGP_INSTANCE_CMD " community-list <(1-500)|WORD>", SHOW_STR IP_STR BGP_STR @@ -11053,7 +11053,7 @@ DEFUN (show_ip_bgp_instance_community_list, DEFUN (show_ip_bgp_ipv4_community_list, show_ip_bgp_ipv4_community_list_cmd, - "show ip bgp ipv4 (unicast|multicast) community-list (<1-500>|WORD)", + "show ip bgp ipv4 <unicast|multicast> community-list <(1-500)|WORD>", SHOW_STR IP_STR BGP_STR @@ -11072,7 +11072,7 @@ DEFUN (show_ip_bgp_ipv4_community_list, DEFUN (show_ip_bgp_community_list_exact, show_ip_bgp_community_list_exact_cmd, - "show ip bgp community-list (<1-500>|WORD) exact-match", + "show ip bgp community-list <(1-500)|WORD> exact-match", SHOW_STR IP_STR BGP_STR @@ -11086,7 +11086,7 @@ DEFUN (show_ip_bgp_community_list_exact, DEFUN (show_ip_bgp_ipv4_community_list_exact, show_ip_bgp_ipv4_community_list_exact_cmd, - "show ip bgp ipv4 (unicast|multicast) community-list (<1-500>|WORD) exact-match", + "show ip bgp ipv4 <unicast|multicast> community-list <(1-500)|WORD> exact-match", SHOW_STR IP_STR BGP_STR @@ -11118,7 +11118,7 @@ DEFUN (show_ip_bgp_ipv4_community_list_exact, */ DEFUN (show_bgp_community_list, show_bgp_community_list_cmd, - "show bgp community-list (<1-500>|WORD)", + "show bgp community-list <(1-500)|WORD>", SHOW_STR BGP_STR "Display routes matching the community-list\n" @@ -11171,7 +11171,7 @@ DEFUN (show_ipv6_mbgp_community_list, */ DEFUN (show_bgp_community_list_exact, show_bgp_community_list_exact_cmd, - "show bgp community-list (<1-500>|WORD) exact-match", + "show bgp community-list <(1-500)|WORD> exact-match", SHOW_STR BGP_STR "Display routes matching the community-list\n" @@ -11299,7 +11299,7 @@ DEFUN (show_ip_bgp_flap_prefix_longer, DEFUN (show_ip_bgp_ipv4_prefix_longer, show_ip_bgp_ipv4_prefix_longer_cmd, - "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M longer-prefixes", + "show ip bgp ipv4 <unicast|multicast> A.B.C.D/M longer-prefixes", SHOW_STR IP_STR BGP_STR @@ -11821,7 +11821,7 @@ bgp_table_stats_vty (struct vty *vty, const char *name, DEFUN (show_bgp_statistics, show_bgp_statistics_cmd, - "show bgp (ipv4|ipv6) (encap|multicast|unicast|vpn) statistics", + "show bgp <ipv4|ipv6> <encap|multicast|unicast|vpn> statistics", SHOW_STR BGP_STR "Address family\n" @@ -11837,7 +11837,7 @@ DEFUN (show_bgp_statistics, DEFUN (show_bgp_statistics_view, show_bgp_statistics_view_cmd, - "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast|vpn|encap) statistics", + "show bgp " BGP_INSTANCE_CMD " <ipv4|ipv6> <unicast|multicast|vpn|encap> statistics", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -12045,7 +12045,7 @@ bgp_peer_counts (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, u_c DEFUN (show_ip_bgp_neighbor_prefix_counts, show_ip_bgp_neighbor_prefix_counts_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]", SHOW_STR IP_STR BGP_STR @@ -12068,7 +12068,7 @@ DEFUN (show_ip_bgp_neighbor_prefix_counts, DEFUN (show_ip_bgp_instance_neighbor_prefix_counts, show_ip_bgp_instance_neighbor_prefix_counts_cmd, - "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]", + "show ip bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]", SHOW_STR IP_STR BGP_STR @@ -12092,7 +12092,7 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts, DEFUN (show_bgp_ipv6_neighbor_prefix_counts, show_bgp_ipv6_neighbor_prefix_counts_cmd, - "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]", + "show bgp ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]", SHOW_STR BGP_STR "Address family\n" @@ -12115,7 +12115,7 @@ DEFUN (show_bgp_ipv6_neighbor_prefix_counts, DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts, show_bgp_instance_ipv6_neighbor_prefix_counts_cmd, - "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]", + "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -12139,7 +12139,7 @@ DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts, DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts, show_ip_bgp_ipv4_neighbor_prefix_counts_cmd, - "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]", + "show ip bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]", SHOW_STR IP_STR BGP_STR @@ -12168,7 +12168,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts, DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts, show_ip_bgp_vpnv4_neighbor_prefix_counts_cmd, - "show ip bgp vpnv4 all neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]", + "show ip bgp vpnv4 all neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]", SHOW_STR IP_STR BGP_STR @@ -12449,7 +12449,7 @@ peer_adj_routes (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, */ DEFUN (show_ip_bgp_instance_neighbor_advertised_route, show_ip_bgp_instance_neighbor_advertised_route_cmd, - "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]", + "show ip bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]", SHOW_STR IP_STR BGP_STR @@ -12490,7 +12490,7 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route, */ DEFUN (show_ip_bgp_neighbor_advertised_route, show_ip_bgp_neighbor_advertised_route_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]", SHOW_STR IP_STR BGP_STR @@ -12539,7 +12539,7 @@ DEFUN (show_ip_bgp_neighbor_advertised_route, */ DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route, show_ip_bgp_ipv4_neighbor_advertised_route_cmd, - "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]", + "show ip bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]", SHOW_STR IP_STR BGP_STR @@ -12589,7 +12589,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route, */ DEFUN (show_bgp_instance_neighbor_advertised_route, show_bgp_instance_neighbor_advertised_route_cmd, - "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]", + "show bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -12642,7 +12642,7 @@ DEFUN (show_bgp_instance_neighbor_advertised_route, */ DEFUN (show_bgp_neighbor_advertised_route, show_bgp_neighbor_advertised_route_cmd, - "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]", + "show bgp neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]", SHOW_STR BGP_STR "Detailed information on TCP and BGP neighbor connections\n" @@ -12674,7 +12674,7 @@ DEFUN (show_bgp_neighbor_advertised_route, /* old command */ DEFUN (ipv6_mbgp_neighbor_advertised_route, ipv6_mbgp_neighbor_advertised_route_cmd, - "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]", + "show ipv6 mbgp neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]", SHOW_STR IPV6_STR MBGP_STR @@ -12715,7 +12715,7 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route, */ DEFUN (show_bgp_instance_neighbor_received_routes, show_bgp_instance_neighbor_received_routes_cmd, - "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]", + "show bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -12753,7 +12753,7 @@ DEFUN (show_bgp_instance_neighbor_received_routes, */ DEFUN (show_ip_bgp_instance_neighbor_received_routes, show_ip_bgp_instance_neighbor_received_routes_cmd, - "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]", + "show ip bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]", SHOW_STR IP_STR BGP_STR @@ -12792,7 +12792,7 @@ DEFUN (show_ip_bgp_instance_neighbor_received_routes, */ DEFUN (show_ip_bgp_neighbor_received_routes, show_ip_bgp_neighbor_received_routes_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]", SHOW_STR IP_STR BGP_STR @@ -12840,7 +12840,7 @@ DEFUN (show_ip_bgp_neighbor_received_routes, */ DEFUN (show_ip_bgp_ipv4_neighbor_received_routes, show_ip_bgp_ipv4_neighbor_received_routes_cmd, - "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]", + "show ip bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]", SHOW_STR IP_STR BGP_STR @@ -12874,7 +12874,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_routes, DEFUN (show_bgp_instance_afi_safi_neighbor_adv_recd_routes, show_bgp_instance_afi_safi_neighbor_adv_recd_routes_cmd, - "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) (advertised-routes|received-routes) [json]", + "show bgp " BGP_INSTANCE_CMD " <ipv4|ipv6> <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> <advertised-routes|received-routes> [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -12910,7 +12910,7 @@ DEFUN (show_bgp_instance_afi_safi_neighbor_adv_recd_routes, DEFUN (show_ip_bgp_neighbor_received_prefix_filter, show_ip_bgp_neighbor_received_prefix_filter_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> received prefix-filter [json]", SHOW_STR IP_STR BGP_STR @@ -12997,7 +12997,7 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter, DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter, show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd, - "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]", + "show ip bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> received prefix-filter [json]", SHOW_STR IP_STR BGP_STR @@ -13139,7 +13139,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter, */ DEFUN (show_bgp_neighbor_received_routes, show_bgp_neighbor_received_routes_cmd, - "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]", + "show bgp neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]", SHOW_STR BGP_STR "Detailed information on TCP and BGP neighbor connections\n" @@ -13182,7 +13182,7 @@ DEFUN (show_bgp_neighbor_received_routes, */ DEFUN (show_bgp_neighbor_received_prefix_filter, show_bgp_neighbor_received_prefix_filter_cmd, - "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]", + "show bgp neighbors <A.B.C.D|X:X::X:X|WORD> received prefix-filter [json]", SHOW_STR BGP_STR "Detailed information on TCP and BGP neighbor connections\n" @@ -13272,7 +13272,7 @@ DEFUN (show_bgp_neighbor_received_prefix_filter, /* old command */ DEFUN (ipv6_mbgp_neighbor_received_routes, ipv6_mbgp_neighbor_received_routes_cmd, - "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]", + "show ipv6 mbgp neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]", SHOW_STR IPV6_STR MBGP_STR @@ -13312,7 +13312,7 @@ DEFUN (ipv6_mbgp_neighbor_received_routes, */ DEFUN (show_bgp_instance_neighbor_received_prefix_filter, show_bgp_instance_neighbor_received_prefix_filter_cmd, - "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]", + "show bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> received prefix-filter [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13428,7 +13428,7 @@ bgp_show_neighbor_route (struct vty *vty, struct peer *peer, afi_t afi, DEFUN (show_ip_bgp_neighbor_routes, show_ip_bgp_neighbor_routes_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]", SHOW_STR IP_STR BGP_STR @@ -13452,7 +13452,7 @@ DEFUN (show_ip_bgp_neighbor_routes, DEFUN (show_ip_bgp_instance_neighbor_routes, show_ip_bgp_instance_neighbor_routes_cmd, - "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]", + "show ip bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]", SHOW_STR IP_STR BGP_STR @@ -13477,7 +13477,7 @@ DEFUN (show_ip_bgp_instance_neighbor_routes, DEFUN (show_ip_bgp_neighbor_flap, show_ip_bgp_neighbor_flap_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> flap-statistics [json]", SHOW_STR IP_STR BGP_STR @@ -13501,7 +13501,7 @@ DEFUN (show_ip_bgp_neighbor_flap, DEFUN (show_ip_bgp_neighbor_damp, show_ip_bgp_neighbor_damp_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> dampened-routes [json]", SHOW_STR IP_STR BGP_STR @@ -13525,7 +13525,7 @@ DEFUN (show_ip_bgp_neighbor_damp, DEFUN (show_ip_bgp_ipv4_neighbor_routes, show_ip_bgp_ipv4_neighbor_routes_cmd, - "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]", + "show ip bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]", SHOW_STR IP_STR BGP_STR @@ -13572,7 +13572,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes, */ DEFUN (show_bgp_instance_neighbor_routes, show_bgp_instance_neighbor_routes_cmd, - "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]", + "show bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13633,7 +13633,7 @@ DEFUN (show_bgp_instance_neighbor_routes, */ DEFUN (show_bgp_instance_neighbor_damp, show_bgp_instance_neighbor_damp_cmd, - "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]", + "show bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> dampened-routes [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13699,7 +13699,7 @@ DEFUN (show_bgp_instance_neighbor_damp, */ DEFUN (show_bgp_instance_neighbor_flap, show_bgp_instance_neighbor_flap_cmd, - "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]", + "show bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> flap-statistics [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13754,7 +13754,7 @@ DEFUN (show_bgp_instance_neighbor_flap, */ DEFUN (show_bgp_neighbor_routes, show_bgp_neighbor_routes_cmd, - "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]", + "show bgp neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]", SHOW_STR BGP_STR "Detailed information on TCP and BGP neighbor connections\n" @@ -13782,7 +13782,7 @@ DEFUN (show_bgp_neighbor_routes, /* old command */ DEFUN (ipv6_mbgp_neighbor_routes, ipv6_mbgp_neighbor_routes_cmd, - "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]", + "show ipv6 mbgp neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]", SHOW_STR IPV6_STR MBGP_STR @@ -14001,7 +14001,7 @@ bgp_distance_apply (struct prefix *p, struct bgp_info *rinfo, struct bgp *bgp) DEFUN (bgp_distance, bgp_distance_cmd, - "distance bgp <1-255> <1-255> <1-255>", + "distance bgp (1-255) (1-255) (1-255)", "Define an administrative distance\n" "BGP distance\n" "Distance for routes external to the AS\n" @@ -14028,7 +14028,7 @@ DEFUN (bgp_distance, */ DEFUN (no_bgp_distance, no_bgp_distance_cmd, - "no distance bgp <1-255> <1-255> <1-255>", + "no distance bgp (1-255) (1-255) (1-255)", NO_STR "Define an administrative distance\n" "BGP distance\n" @@ -14049,7 +14049,7 @@ DEFUN (no_bgp_distance, DEFUN (bgp_distance_source, bgp_distance_source_cmd, - "distance <1-255> A.B.C.D/M", + "distance (1-255) A.B.C.D/M", "Define an administrative distance\n" "Administrative distance\n" "IP source prefix\n") @@ -14060,7 +14060,7 @@ DEFUN (bgp_distance_source, DEFUN (no_bgp_distance_source, no_bgp_distance_source_cmd, - "no distance <1-255> A.B.C.D/M", + "no distance (1-255) A.B.C.D/M", NO_STR "Define an administrative distance\n" "Administrative distance\n" @@ -14072,7 +14072,7 @@ DEFUN (no_bgp_distance_source, DEFUN (bgp_distance_source_access_list, bgp_distance_source_access_list_cmd, - "distance <1-255> A.B.C.D/M WORD", + "distance (1-255) A.B.C.D/M WORD", "Define an administrative distance\n" "Administrative distance\n" "IP source prefix\n" @@ -14084,7 +14084,7 @@ DEFUN (bgp_distance_source_access_list, DEFUN (no_bgp_distance_source_access_list, no_bgp_distance_source_access_list_cmd, - "no distance <1-255> A.B.C.D/M WORD", + "no distance (1-255) A.B.C.D/M WORD", NO_STR "Define an administrative distance\n" "Administrative distance\n" @@ -14109,7 +14109,7 @@ DEFUN (no_bgp_distance_source_access_list, */ DEFUN (bgp_damp_set, bgp_damp_set_cmd, - "bgp dampening <1-45> <1-20000> <1-20000> <1-255>", + "bgp dampening (1-45) (1-20000) (1-20000) (1-255)", "BGP Specific commands\n" "Enable route-flap dampening\n" "Half-life time for the penalty\n" diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 5b170f88f..dc342b110 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -2994,7 +2994,7 @@ bgp_route_map_event (route_map_event_t event, const char *rmap_name) DEFUN (match_peer, match_peer_cmd, - "match peer (A.B.C.D|X:X::X:X)", + "match peer <A.B.C.D|X:X::X:X>", MATCH_STR "Match peer address\n" "IP address of peer\n" @@ -3046,7 +3046,7 @@ DEFUN (no_match_peer, DEFUN (match_ip_address, match_ip_address_cmd, - "match ip address (<1-199>|<1300-2699>|WORD)", + "match ip address <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match address of route\n" @@ -3085,7 +3085,7 @@ DEFUN (no_match_ip_address, DEFUN (match_ip_next_hop, match_ip_next_hop_cmd, - "match ip next-hop (<1-199>|<1300-2699>|WORD)", + "match ip next-hop <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match next-hop address of route\n" @@ -3126,7 +3126,7 @@ DEFUN (no_match_ip_next_hop, DEFUN (match_probability, match_probability_cmd, - "match probability <0-100>", + "match probability (0-100)", MATCH_STR "Match portion of routes defined by percentage value\n" "Percentage of routes\n") @@ -3160,7 +3160,7 @@ DEFUN (no_match_probability, DEFUN (match_ip_route_source, match_ip_route_source_cmd, - "match ip route-source (<1-199>|<1300-2699>|WORD)", + "match ip route-source <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match advertising source address of route\n" @@ -3313,7 +3313,7 @@ DEFUN (no_match_ip_route_source_prefix_list, DEFUN (match_metric, match_metric_cmd, - "match metric <0-4294967295>", + "match metric (0-4294967295)", MATCH_STR "Match metric of route\n" "Metric value\n") @@ -3346,7 +3346,7 @@ DEFUN (no_match_metric, DEFUN (match_local_pref, match_local_pref_cmd, - "match local-preference <0-4294967295>", + "match local-preference (0-4294967295)", MATCH_STR "Match local-preference of route\n" "Metric value\n") @@ -3379,7 +3379,7 @@ DEFUN (no_match_local_pref, DEFUN (match_community, match_community_cmd, - "match community (<1-99>|<100-500>|WORD)", + "match community <(1-99)|(100-500)|WORD>", MATCH_STR "Match BGP community list\n" "Community-list number (standard)\n" @@ -3392,7 +3392,7 @@ DEFUN (match_community, DEFUN (match_community_exact, match_community_exact_cmd, - "match community (<1-99>|<100-500>|WORD) exact-match", + "match community <(1-99)|(100-500)|WORD> exact-match", MATCH_STR "Match BGP community list\n" "Community-list number (standard)\n" @@ -3451,7 +3451,7 @@ DEFUN (no_match_community, DEFUN (match_ecommunity, match_ecommunity_cmd, - "match extcommunity (<1-99>|<100-500>|WORD)", + "match extcommunity <(1-99)|(100-500)|WORD>", MATCH_STR "Match BGP/VPN extended community list\n" "Extended community-list number (standard)\n" @@ -3519,7 +3519,7 @@ DEFUN (no_match_aspath, DEFUN (match_origin, match_origin_cmd, - "match origin (egp|igp|incomplete)", + "match origin <egp|igp|incomplete>", MATCH_STR "BGP origin code\n" "remote EGP\n" @@ -3596,7 +3596,7 @@ DEFUN (no_match_interface, DEFUN (match_tag, match_tag_cmd, - "match tag <1-65535>", + "match tag (1-65535)", MATCH_STR "Match tag of route\n" "Tag value\n") @@ -3723,7 +3723,7 @@ DEFUN (no_set_ip_nexthop, */ DEFUN (set_metric, set_metric_cmd, - "set metric <0-4294967295>", + "set metric (0-4294967295)", SET_STR "Metric value for destination routing protocol\n" "Metric value\n") @@ -3755,7 +3755,7 @@ DEFUN (no_set_metric, DEFUN (set_local_pref, set_local_pref_cmd, - "set local-preference <0-4294967295>", + "set local-preference (0-4294967295)", SET_STR "BGP local preference path attribute\n" "Preference value\n") @@ -3785,7 +3785,7 @@ DEFUN (no_set_local_pref, DEFUN (set_weight, set_weight_cmd, - "set weight <0-4294967295>", + "set weight (0-4294967295)", SET_STR "BGP weight for routing table\n" "Weight value\n") @@ -4047,7 +4047,7 @@ DEFUN (no_set_community, DEFUN (set_community_delete, set_community_delete_cmd, - "set comm-list (<1-99>|<100-500>|WORD) delete", + "set comm-list <(1-99)|(100-500)|WORD> delete", SET_STR "set BGP community list (for deletion)\n" "Community-list number (standard)\n" @@ -4171,7 +4171,7 @@ DEFUN (no_set_ecommunity_soo, DEFUN (set_origin, set_origin_cmd, - "set origin (egp|igp|incomplete)", + "set origin <egp|igp|incomplete>", SET_STR "BGP origin code\n" "remote EGP\n" @@ -4309,7 +4309,7 @@ DEFUN (no_set_aggregator_as, DEFUN (set_tag, set_tag_cmd, - "set tag <1-65535>", + "set tag (1-65535)", SET_STR "Tag value for routing protocol\n" "Tag value\n") diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 5a06dd8e8..3d2ddacbb 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -608,7 +608,7 @@ DEFUN (no_bgp_multiple_instance, DEFUN (bgp_config_type, bgp_config_type_cmd, - "bgp config-type (cisco|zebra)", + "bgp config-type <cisco|zebra>", BGP_STR "Configuration type\n" "cisco\n" @@ -1145,7 +1145,7 @@ DEFUN (bgp_maxmed_admin, DEFUN (bgp_maxmed_admin_medv, bgp_maxmed_admin_medv_cmd, - "bgp max-med administrative <0-4294967294>", + "bgp max-med administrative (0-4294967294)", BGP_STR "Advertise routes with max-med\n" "Administratively applied, for an indefinite period\n" @@ -1197,7 +1197,7 @@ DEFUN (no_bgp_maxmed_admin, DEFUN (bgp_maxmed_onstartup, bgp_maxmed_onstartup_cmd, - "bgp max-med on-startup <5-86400>", + "bgp max-med on-startup (5-86400)", BGP_STR "Advertise routes with max-med\n" "Effective on a startup\n" @@ -1223,7 +1223,7 @@ DEFUN (bgp_maxmed_onstartup, DEFUN (bgp_maxmed_onstartup_medv, bgp_maxmed_onstartup_medv_cmd, - "bgp max-med on-startup <5-86400> <0-4294967294>", + "bgp max-med on-startup (5-86400) (0-4294967294)", BGP_STR "Advertise routes with max-med\n" "Effective on a startup\n" @@ -1362,7 +1362,7 @@ bgp_config_write_update_delay (struct vty *vty, struct bgp *bgp) /* Update-delay configuration */ DEFUN (bgp_update_delay, bgp_update_delay_cmd, - "update-delay <0-3600>", + "update-delay (0-3600)", "Force initial delay for best-path and updates\n" "Seconds\n") { @@ -1371,7 +1371,7 @@ DEFUN (bgp_update_delay, DEFUN (bgp_update_delay_establish_wait, bgp_update_delay_establish_wait_cmd, - "update-delay <0-3600> <1-3600>", + "update-delay (0-3600) (1-3600)", "Force initial delay for best-path and updates\n" "Seconds\n" "Wait for peers to be established\n" @@ -1392,7 +1392,7 @@ DEFUN (bgp_update_delay_establish_wait, */ DEFUN (no_bgp_update_delay, no_bgp_update_delay_cmd, - "no update-delay <0-3600>", + "no update-delay (0-3600)", "Force initial delay for best-path and updates\n" "Seconds\n") { @@ -1430,7 +1430,7 @@ bgp_config_write_wpkt_quanta (struct vty *vty, struct bgp *bgp) /* Update-delay configuration */ DEFUN (bgp_wpkt_quanta, bgp_wpkt_quanta_cmd, - "write-quanta <1-10000>", + "write-quanta (1-10000)", "How many packets to write to peer socket per run\n" "Number of packets\n") { @@ -1440,7 +1440,7 @@ DEFUN (bgp_wpkt_quanta, /* Update-delay deconfiguration */ DEFUN (no_bgp_wpkt_quanta, no_bgp_wpkt_quanta_cmd, - "no write-quanta <1-10000>", + "no write-quanta (1-10000)", "How many packets to write to peer socket per run\n" "Number of packets\n") { @@ -1476,7 +1476,7 @@ bgp_config_write_coalesce_time (struct vty *vty, struct bgp *bgp) DEFUN (bgp_coalesce_time, bgp_coalesce_time_cmd, - "coalesce-time <0-4294967295>", + "coalesce-time (0-4294967295)", "Subgroup coalesce timer\n" "Subgroup coalesce timer value (in ms)\n") { @@ -1485,7 +1485,7 @@ DEFUN (bgp_coalesce_time, DEFUN (no_bgp_coalesce_time, no_bgp_coalesce_time_cmd, - "no coalesce-time <0-4294967295>", + "no coalesce-time (0-4294967295)", "Subgroup coalesce timer\n" "Subgroup coalesce timer value (in ms)\n") { @@ -1495,7 +1495,7 @@ DEFUN (no_bgp_coalesce_time, /* Maximum-paths configuration */ DEFUN (bgp_maxpaths, bgp_maxpaths_cmd, - "maximum-paths " CMD_RANGE_STR(1, MULTIPATH_NUM), + "maximum-paths " CMD_RANGE_STR<1, MULTIPATH_NUM>, "Forward packets over multiple paths\n" "Number of paths\n") { @@ -1504,7 +1504,7 @@ DEFUN (bgp_maxpaths, DEFUN (bgp_maxpaths_ibgp, bgp_maxpaths_ibgp_cmd, - "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM), + "maximum-paths ibgp " CMD_RANGE_STR<1, MULTIPATH_NUM>, "Forward packets over multiple paths\n" "iBGP-multipath\n" "Number of paths\n") @@ -1514,7 +1514,7 @@ DEFUN (bgp_maxpaths_ibgp, DEFUN (bgp_maxpaths_ibgp_cluster, bgp_maxpaths_ibgp_cluster_cmd, - "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM) " equal-cluster-length", + "maximum-paths ibgp " CMD_RANGE_STR<1, MULTIPATH_NUM> " equal-cluster-length", "Forward packets over multiple paths\n" "iBGP-multipath\n" "Number of paths\n" @@ -1601,7 +1601,7 @@ bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi, DEFUN (bgp_timers, bgp_timers_cmd, - "timers bgp <0-65535> <0-65535>", + "timers bgp (0-65535) (0-65535)", "Adjust routing timers\n" "BGP timers\n" "Keepalive interval\n" @@ -1820,7 +1820,7 @@ DEFUN (no_bgp_graceful_restart, DEFUN (bgp_graceful_restart_stalepath_time, bgp_graceful_restart_stalepath_time_cmd, - "bgp graceful-restart stalepath-time <1-3600>", + "bgp graceful-restart stalepath-time (1-3600)", "BGP specific commands\n" "Graceful restart capability parameters\n" "Set the max time to hold onto restarting peer's stale paths\n" @@ -1840,7 +1840,7 @@ DEFUN (bgp_graceful_restart_stalepath_time, DEFUN (bgp_graceful_restart_restart_time, bgp_graceful_restart_restart_time_cmd, - "bgp graceful-restart restart-time <1-3600>", + "bgp graceful-restart restart-time (1-3600)", "BGP specific commands\n" "Graceful restart capability parameters\n" "Set the time to wait to delete stale routes before a BGP open message is received\n" @@ -2085,7 +2085,7 @@ DEFUN (no_bgp_bestpath_aspath_confed, /* "bgp bestpath as-path multipath-relax" configuration. */ DEFUN (bgp_bestpath_aspath_multipath_relax, bgp_bestpath_aspath_multipath_relax_cmd, - "bgp bestpath as-path multipath-relax {as-set|no-as-set}", + "bgp bestpath as-path multipath-relax [as-set|no-as-set]", "BGP specific commands\n" "Change the default bestpath selection\n" "AS-path attribute\n" @@ -2112,7 +2112,7 @@ DEFUN (bgp_bestpath_aspath_multipath_relax, DEFUN (no_bgp_bestpath_aspath_multipath_relax, no_bgp_bestpath_aspath_multipath_relax_cmd, - "no bgp bestpath as-path multipath-relax {as-set|no-as-set}", + "no bgp bestpath as-path multipath-relax [as-set|no-as-set]", NO_STR "BGP specific commands\n" "Change the default bestpath selection\n" @@ -2162,7 +2162,7 @@ DEFUN (no_bgp_log_neighbor_changes, /* "bgp bestpath med" configuration. */ DEFUN (bgp_bestpath_med, bgp_bestpath_med_cmd, - "bgp bestpath med (confed|missing-as-worst)", + "bgp bestpath med <confed|missing-as-worst>", "BGP specific commands\n" "Change the default bestpath selection\n" "MED attribute\n" @@ -2215,7 +2215,7 @@ DEFUN (bgp_bestpath_med2, DEFUN (no_bgp_bestpath_med, no_bgp_bestpath_med_cmd, - "no bgp bestpath med (confed|missing-as-worst)", + "no bgp bestpath med <confed|missing-as-worst>", NO_STR "BGP specific commands\n" "Change the default bestpath selection\n" @@ -2379,7 +2379,7 @@ DEFUN (no_bgp_network_import_check, DEFUN (bgp_default_local_preference, bgp_default_local_preference_cmd, - "bgp default local-preference <0-4294967295>", + "bgp default local-preference (0-4294967295)", "BGP specific commands\n" "Configure BGP defaults\n" "local preference (higher=more preferred)\n" @@ -2428,7 +2428,7 @@ DEFUN (no_bgp_default_local_preference, DEFUN (bgp_default_subgroup_pkt_queue_max, bgp_default_subgroup_pkt_queue_max_cmd, - "bgp default subgroup-pkt-queue-max <20-100>", + "bgp default subgroup-pkt-queue-max (20-100)", "BGP specific commands\n" "Configure BGP defaults\n" "subgroup-pkt-queue-max\n" @@ -2852,7 +2852,7 @@ peer_remote_as_vty (struct vty *vty, const char *peer_str, DEFUN (neighbor_remote_as, neighbor_remote_as_cmd, - NEIGHBOR_CMD2 "remote-as (" CMD_AS_RANGE "|external|internal)", + NEIGHBOR_CMD2 "remote-as <" CMD_AS_RANGE "|external|internal>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Specify a BGP neighbor\n" @@ -3015,7 +3015,7 @@ DEFUN (neighbor_interface_config_v6only, DEFUN (neighbor_interface_config_remote_as, neighbor_interface_config_remote_as_cmd, - "neighbor WORD interface remote-as (" CMD_AS_RANGE "|external|internal)", + "neighbor WORD interface remote-as <" CMD_AS_RANGE "|external|internal>", NEIGHBOR_STR "Interface name or neighbor tag\n" "Enable BGP on interface\n" @@ -3027,7 +3027,7 @@ DEFUN (neighbor_interface_config_remote_as, DEFUN (neighbor_interface_v6only_config_remote_as, neighbor_interface_v6only_config_remote_as_cmd, - "neighbor WORD interface v6only remote-as (" CMD_AS_RANGE "|external|internal)", + "neighbor WORD interface v6only remote-as <" CMD_AS_RANGE "|external|internal>", NEIGHBOR_STR "Interface name or neighbor tag\n" "Enable BGP on interface\n" @@ -3229,7 +3229,7 @@ DEFUN (no_neighbor_peer_group, DEFUN (no_neighbor_interface_peer_group_remote_as, no_neighbor_interface_peer_group_remote_as_cmd, - "no neighbor WORD remote-as (" CMD_AS_RANGE "|internal|external)", + "no neighbor WORD remote-as <" CMD_AS_RANGE "|internal|external>", NO_STR NEIGHBOR_STR "Interface name or neighbor tag\n" @@ -3786,7 +3786,7 @@ peer_af_flag_unset_vty (struct vty *vty, const char *peer_str, afi_t afi, /* neighbor capability orf prefix-list. */ DEFUN (neighbor_capability_orf_prefix, neighbor_capability_orf_prefix_cmd, - NEIGHBOR_CMD2 "capability orf prefix-list (both|send|receive)", + NEIGHBOR_CMD2 "capability orf prefix-list <both|send|receive>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Advertise capability to the peer\n" @@ -3813,7 +3813,7 @@ DEFUN (neighbor_capability_orf_prefix, DEFUN (no_neighbor_capability_orf_prefix, no_neighbor_capability_orf_prefix_cmd, - NO_NEIGHBOR_CMD2 "capability orf prefix-list (both|send|receive)", + NO_NEIGHBOR_CMD2 "capability orf prefix-list <both|send|receive>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -4057,7 +4057,7 @@ DEFUN (no_neighbor_send_community, /* neighbor send-community extended. */ DEFUN (neighbor_send_community_type, neighbor_send_community_type_cmd, - NEIGHBOR_CMD2 "send-community (both|extended|standard)", + NEIGHBOR_CMD2 "send-community <both|extended|standard>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Send Community attribute to this neighbor\n" @@ -4082,7 +4082,7 @@ DEFUN (neighbor_send_community_type, DEFUN (no_neighbor_send_community_type, no_neighbor_send_community_type_cmd, - NO_NEIGHBOR_CMD2 "send-community (both|extended|standard)", + NO_NEIGHBOR_CMD2 "send-community <both|extended|standard>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -4291,7 +4291,7 @@ DEFUN (neighbor_attr_unchanged, DEFUN (neighbor_attr_unchanged1, neighbor_attr_unchanged1_cmd, - NEIGHBOR_CMD2 "attribute-unchanged (as-path|next-hop|med)", + NEIGHBOR_CMD2 "attribute-unchanged <as-path|next-hop|med>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "BGP attribute is propagated unchanged to this neighbor\n" @@ -4314,7 +4314,7 @@ DEFUN (neighbor_attr_unchanged1, DEFUN (neighbor_attr_unchanged2, neighbor_attr_unchanged2_cmd, - NEIGHBOR_CMD2 "attribute-unchanged as-path (next-hop|med)", + NEIGHBOR_CMD2 "attribute-unchanged as-path <next-hop|med>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "BGP attribute is propagated unchanged to this neighbor\n" @@ -4336,7 +4336,7 @@ DEFUN (neighbor_attr_unchanged2, DEFUN (neighbor_attr_unchanged3, neighbor_attr_unchanged3_cmd, - NEIGHBOR_CMD2 "attribute-unchanged next-hop (as-path|med)", + NEIGHBOR_CMD2 "attribute-unchanged next-hop <as-path|med>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "BGP attribute is propagated unchanged to this neighbor\n" @@ -4357,7 +4357,7 @@ DEFUN (neighbor_attr_unchanged3, DEFUN (neighbor_attr_unchanged4, neighbor_attr_unchanged4_cmd, - NEIGHBOR_CMD2 "attribute-unchanged med (as-path|next-hop)", + NEIGHBOR_CMD2 "attribute-unchanged med <as-path|next-hop>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "BGP attribute is propagated unchanged to this neighbor\n" @@ -4456,7 +4456,7 @@ DEFUN (no_neighbor_attr_unchanged, DEFUN (no_neighbor_attr_unchanged1, no_neighbor_attr_unchanged1_cmd, - NO_NEIGHBOR_CMD2 "attribute-unchanged (as-path|next-hop|med)", + NO_NEIGHBOR_CMD2 "attribute-unchanged <as-path|next-hop|med>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -4480,7 +4480,7 @@ DEFUN (no_neighbor_attr_unchanged1, DEFUN (no_neighbor_attr_unchanged2, no_neighbor_attr_unchanged2_cmd, - NO_NEIGHBOR_CMD2 "attribute-unchanged as-path (next-hop|med)", + NO_NEIGHBOR_CMD2 "attribute-unchanged as-path <next-hop|med>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -4502,7 +4502,7 @@ DEFUN (no_neighbor_attr_unchanged2, DEFUN (no_neighbor_attr_unchanged3, no_neighbor_attr_unchanged3_cmd, - NO_NEIGHBOR_CMD2 "attribute-unchanged next-hop (as-path|med)", + NO_NEIGHBOR_CMD2 "attribute-unchanged next-hop <as-path|med>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -4524,7 +4524,7 @@ DEFUN (no_neighbor_attr_unchanged3, DEFUN (no_neighbor_attr_unchanged4, no_neighbor_attr_unchanged4_cmd, - NO_NEIGHBOR_CMD2 "attribute-unchanged med (as-path|next-hop)", + NO_NEIGHBOR_CMD2 "attribute-unchanged med <as-path|next-hop>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -4598,7 +4598,7 @@ DEFUN (neighbor_ebgp_multihop, DEFUN (neighbor_ebgp_multihop_ttl, neighbor_ebgp_multihop_ttl_cmd, - NEIGHBOR_CMD2 "ebgp-multihop " CMD_RANGE_STR(1, MAXTTL), + NEIGHBOR_CMD2 "ebgp-multihop " CMD_RANGE_STR<1, MAXTTL>, NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Allow EBGP neighbors not on directly connected networks\n" @@ -4890,7 +4890,7 @@ peer_port_vty (struct vty *vty, const char *ip_str, int afi, /* Set specified peer's BGP port. */ DEFUN (neighbor_port, neighbor_port_cmd, - NEIGHBOR_CMD "port <0-65535>", + NEIGHBOR_CMD "port (0-65535)", NEIGHBOR_STR NEIGHBOR_ADDR_STR "Neighbor's BGP port\n" @@ -4956,7 +4956,7 @@ peer_weight_unset_vty (struct vty *vty, const char *ip_str) DEFUN (neighbor_weight, neighbor_weight_cmd, - NEIGHBOR_CMD2 "weight <0-65535>", + NEIGHBOR_CMD2 "weight (0-65535)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Set default weight for routes from this neighbor\n" @@ -5068,7 +5068,7 @@ peer_timers_unset_vty (struct vty *vty, const char *ip_str) DEFUN (neighbor_timers, neighbor_timers_cmd, - NEIGHBOR_CMD2 "timers <0-65535> <0-65535>", + NEIGHBOR_CMD2 "timers (0-65535) (0-65535)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "BGP per neighbor timers\n" @@ -5137,7 +5137,7 @@ peer_timers_connect_unset_vty (struct vty *vty, const char *ip_str) DEFUN (neighbor_timers_connect, neighbor_timers_connect_cmd, - NEIGHBOR_CMD2 "timers connect <1-65535>", + NEIGHBOR_CMD2 "timers connect (1-65535)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "BGP per neighbor timers\n" @@ -5196,7 +5196,7 @@ peer_advertise_interval_vty (struct vty *vty, const char *ip_str, DEFUN (neighbor_advertise_interval, neighbor_advertise_interval_cmd, - NEIGHBOR_CMD2 "advertisement-interval <0-600>", + NEIGHBOR_CMD2 "advertisement-interval (0-600)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Minimum interval between sending BGP routing updates\n" @@ -5230,7 +5230,7 @@ DEFUN (no_neighbor_advertise_interval, /* Time to wait before processing route-map updates */ DEFUN (bgp_set_route_map_delay_timer, bgp_set_route_map_delay_timer_cmd, - "bgp route-map delay-timer <0-600>", + "bgp route-map delay-timer (0-600)", SET_STR "BGP route-map delay timer\n" "Time in secs to wait before processing route-map changes\n" @@ -5374,7 +5374,7 @@ peer_distribute_unset_vty (struct vty *vty, const char *ip_str, afi_t afi, DEFUN (neighbor_distribute_list, neighbor_distribute_list_cmd, - NEIGHBOR_CMD2 "distribute-list (<1-199>|<1300-2699>|WORD) (in|out)", + NEIGHBOR_CMD2 "distribute-list <(1-199)|(1300-2699)|WORD> <in|out>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Filter updates to/from this neighbor\n" @@ -5390,7 +5390,7 @@ DEFUN (neighbor_distribute_list, DEFUN (no_neighbor_distribute_list, no_neighbor_distribute_list_cmd, - NO_NEIGHBOR_CMD2 "distribute-list (<1-199>|<1300-2699>|WORD) (in|out)", + NO_NEIGHBOR_CMD2 "distribute-list <(1-199)|(1300-2699)|WORD> <in|out>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -5455,7 +5455,7 @@ peer_prefix_list_unset_vty (struct vty *vty, const char *ip_str, afi_t afi, DEFUN (neighbor_prefix_list, neighbor_prefix_list_cmd, - NEIGHBOR_CMD2 "prefix-list WORD (in|out)", + NEIGHBOR_CMD2 "prefix-list WORD <in|out>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Filter updates to/from this neighbor\n" @@ -5469,7 +5469,7 @@ DEFUN (neighbor_prefix_list, DEFUN (no_neighbor_prefix_list, no_neighbor_prefix_list_cmd, - NO_NEIGHBOR_CMD2 "prefix-list WORD (in|out)", + NO_NEIGHBOR_CMD2 "prefix-list WORD <in|out>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -5532,7 +5532,7 @@ peer_aslist_unset_vty (struct vty *vty, const char *ip_str, DEFUN (neighbor_filter_list, neighbor_filter_list_cmd, - NEIGHBOR_CMD2 "filter-list WORD (in|out)", + NEIGHBOR_CMD2 "filter-list WORD <in|out>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Establish BGP filters\n" @@ -5546,7 +5546,7 @@ DEFUN (neighbor_filter_list, DEFUN (no_neighbor_filter_list, no_neighbor_filter_list_cmd, - NO_NEIGHBOR_CMD2 "filter-list WORD (in|out)", + NO_NEIGHBOR_CMD2 "filter-list WORD <in|out>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -5609,7 +5609,7 @@ peer_route_map_unset_vty (struct vty *vty, const char *ip_str, afi_t afi, DEFUN (neighbor_route_map, neighbor_route_map_cmd, - NEIGHBOR_CMD2 "route-map WORD (in|out)", + NEIGHBOR_CMD2 "route-map WORD <in|out>", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Apply route map to neighbor\n" @@ -5623,7 +5623,7 @@ DEFUN (neighbor_route_map, DEFUN (no_neighbor_route_map, no_neighbor_route_map_cmd, - NO_NEIGHBOR_CMD2 "route-map WORD (in|out)", + NO_NEIGHBOR_CMD2 "route-map WORD <in|out>", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -5748,7 +5748,7 @@ peer_maximum_prefix_unset_vty (struct vty *vty, const char *ip_str, afi_t afi, each peer configuration. */ DEFUN (neighbor_maximum_prefix, neighbor_maximum_prefix_cmd, - NEIGHBOR_CMD2 "maximum-prefix <1-4294967295>", + NEIGHBOR_CMD2 "maximum-prefix (1-4294967295)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Maximum number of prefix accept from this peer\n" @@ -5761,7 +5761,7 @@ DEFUN (neighbor_maximum_prefix, DEFUN (neighbor_maximum_prefix_threshold, neighbor_maximum_prefix_threshold_cmd, - NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100>", + NEIGHBOR_CMD2 "maximum-prefix (1-4294967295) (1-100)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Maximum number of prefix accept from this peer\n" @@ -5775,7 +5775,7 @@ DEFUN (neighbor_maximum_prefix_threshold, DEFUN (neighbor_maximum_prefix_warning, neighbor_maximum_prefix_warning_cmd, - NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> warning-only", + NEIGHBOR_CMD2 "maximum-prefix (1-4294967295) warning-only", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Maximum number of prefix accept from this peer\n" @@ -5789,7 +5789,7 @@ DEFUN (neighbor_maximum_prefix_warning, DEFUN (neighbor_maximum_prefix_threshold_warning, neighbor_maximum_prefix_threshold_warning_cmd, - NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100> warning-only", + NEIGHBOR_CMD2 "maximum-prefix (1-4294967295) (1-100) warning-only", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Maximum number of prefix accept from this peer\n" @@ -5803,7 +5803,7 @@ DEFUN (neighbor_maximum_prefix_threshold_warning, DEFUN (neighbor_maximum_prefix_restart, neighbor_maximum_prefix_restart_cmd, - NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> restart <1-65535>", + NEIGHBOR_CMD2 "maximum-prefix (1-4294967295) restart (1-65535)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Maximum number of prefix accept from this peer\n" @@ -5817,7 +5817,7 @@ DEFUN (neighbor_maximum_prefix_restart, DEFUN (neighbor_maximum_prefix_threshold_restart, neighbor_maximum_prefix_threshold_restart_cmd, - NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100> restart <1-65535>", + NEIGHBOR_CMD2 "maximum-prefix (1-4294967295) (1-100) restart (1-65535)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Maximum number of prefix accept from this peer\n" @@ -5972,7 +5972,7 @@ DEFUN (no_neighbor_allowas_in, DEFUN (neighbor_ttl_security, neighbor_ttl_security_cmd, - NEIGHBOR_CMD2 "ttl-security hops <1-254>", + NEIGHBOR_CMD2 "ttl-security hops (1-254)", NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Specify the maximum number of hops to the BGP peer\n") @@ -6001,7 +6001,7 @@ DEFUN (neighbor_ttl_security, DEFUN (no_neighbor_ttl_security, no_neighbor_ttl_security_cmd, - NO_NEIGHBOR_CMD2 "ttl-security hops <1-254>", + NO_NEIGHBOR_CMD2 "ttl-security hops (1-254)", NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2 @@ -6092,7 +6092,7 @@ DEFUN (address_family_ipv4, DEFUN (address_family_ipv4_safi, address_family_ipv4_safi_cmd, - "address-family ipv4 (unicast|multicast)", + "address-family ipv4 <unicast|multicast>", "Enter Address Family command mode\n" "Address family\n" "Address Family modifier\n" @@ -6118,7 +6118,7 @@ DEFUN (address_family_ipv6, DEFUN (address_family_ipv6_safi, address_family_ipv6_safi_cmd, - "address-family ipv6 (unicast|multicast)", + "address-family ipv6 <unicast|multicast>", "Enter Address Family command mode\n" "Address family\n" "Address Family modifier\n" @@ -6392,7 +6392,7 @@ DEFUN (clear_ip_bgp_all, */ DEFUN (clear_ip_bgp_peer, clear_ip_bgp_peer_cmd, - "clear ip bgp (A.B.C.D|X:X::X:X|WORD)", + "clear ip bgp <A.B.C.D|X:X::X:X|WORD>", CLEAR_STR IP_STR BGP_STR @@ -6682,7 +6682,7 @@ DEFUN (clear_ip_bgp_all_soft_out, */ DEFUN (clear_ip_bgp_all_ipv4_soft_out, clear_ip_bgp_all_ipv4_soft_out_cmd, - "clear ip bgp * ipv4 (unicast|multicast) soft out", + "clear ip bgp * ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -6717,7 +6717,7 @@ DEFUN (clear_ip_bgp_all_ipv4_soft_out, */ DEFUN (clear_ip_bgp_instance_all_ipv4_soft_out, clear_ip_bgp_instance_all_ipv4_soft_out_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft out", + "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -6878,7 +6878,7 @@ DEFUN (clear_bgp_all_soft_out, DEFUN (clear_bgp_ipv6_safi_prefix, clear_bgp_ipv6_safi_prefix_cmd, - "clear bgp ipv6 (unicast|multicast) prefix X:X::X:X/M", + "clear bgp ipv6 <unicast|multicast> prefix X:X::X:X/M", CLEAR_STR BGP_STR "Address family\n" @@ -6894,7 +6894,7 @@ DEFUN (clear_bgp_ipv6_safi_prefix, DEFUN (clear_bgp_instance_ipv6_safi_prefix, clear_bgp_instance_ipv6_safi_prefix_cmd, - "clear bgp " BGP_INSTANCE_CMD " ipv6 (unicast|multicast) prefix X:X::X:X/M", + "clear bgp " BGP_INSTANCE_CMD " ipv6 <unicast|multicast> prefix X:X::X:X/M", CLEAR_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -6941,7 +6941,7 @@ DEFUN (clear_bgp_instance_ipv6_safi_prefix, */ DEFUN (clear_ip_bgp_peer_soft_out, clear_ip_bgp_peer_soft_out_cmd, - "clear ip bgp (A.B.C.D|WORD) soft out", + "clear ip bgp <A.B.C.D|WORD> soft out", CLEAR_STR IP_STR BGP_STR @@ -6977,7 +6977,7 @@ DEFUN (clear_ip_bgp_peer_soft_out, */ DEFUN (clear_ip_bgp_peer_ipv4_soft_out, clear_ip_bgp_peer_ipv4_soft_out_cmd, - "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) soft out", + "clear ip bgp <A.B.C.D|WORD> ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7014,7 +7014,7 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft_out, */ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_out, clear_ip_bgp_instance_peer_ipv4_soft_out_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) soft out", + "clear ip bgp " BGP_INSTANCE_CMD " <A.B.C.D|WORD> ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7053,7 +7053,7 @@ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_out, */ DEFUN (clear_ip_bgp_peer_vpnv4_soft_out, clear_ip_bgp_peer_vpnv4_soft_out_cmd, - "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft out", + "clear ip bgp <A.B.C.D|WORD> vpnv4 unicast soft out", CLEAR_STR IP_STR BGP_STR @@ -7170,7 +7170,7 @@ DEFUN (clear_ip_bgp_peer_encap_soft_out, */ DEFUN (clear_bgp_peer_soft_out, clear_bgp_peer_soft_out_cmd, - "clear bgp (A.B.C.D|X:X::X:X|WORD) soft out", + "clear bgp <A.B.C.D|X:X::X:X|WORD> soft out", CLEAR_STR BGP_STR "BGP neighbor address to clear\n" @@ -7262,7 +7262,7 @@ DEFUN (clear_ip_bgp_peer_group_soft_out, */ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_out, clear_ip_bgp_peer_group_ipv4_soft_out_cmd, - "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft out", + "clear ip bgp peer-group WORD ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7299,7 +7299,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_out, */ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_out, clear_ip_bgp_instance_peer_group_ipv4_soft_out_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) soft out", + "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7473,7 +7473,7 @@ DEFUN (clear_ip_bgp_external_soft_out, */ DEFUN (clear_ip_bgp_external_ipv4_soft_out, clear_ip_bgp_external_ipv4_soft_out_cmd, - "clear ip bgp external ipv4 (unicast|multicast) soft out", + "clear ip bgp external ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7508,7 +7508,7 @@ DEFUN (clear_ip_bgp_external_ipv4_soft_out, */ DEFUN (clear_ip_bgp_instance_external_ipv4_soft_out, clear_ip_bgp_instance_external_ipv4_soft_out_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) soft out", + "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7673,7 +7673,7 @@ DEFUN (clear_ip_bgp_as_soft_out, */ DEFUN (clear_ip_bgp_as_ipv4_soft_out, clear_ip_bgp_as_ipv4_soft_out_cmd, - "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft out", + "clear ip bgp " CMD_AS_RANGE " ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7708,7 +7708,7 @@ DEFUN (clear_ip_bgp_as_ipv4_soft_out, */ DEFUN (clear_ip_bgp_instance_as_ipv4_soft_out, clear_ip_bgp_instance_as_ipv4_soft_out_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) soft out", + "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 <unicast|multicast> soft out", CLEAR_STR IP_STR BGP_STR @@ -7950,7 +7950,7 @@ DEFUN (clear_ip_bgp_all_in_prefix_filter, */ DEFUN (clear_ip_bgp_all_ipv4_soft_in, clear_ip_bgp_all_ipv4_soft_in_cmd, - "clear ip bgp * ipv4 (unicast|multicast) soft in", + "clear ip bgp * ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -7985,7 +7985,7 @@ DEFUN (clear_ip_bgp_all_ipv4_soft_in, */ DEFUN (clear_ip_bgp_instance_all_ipv4_soft_in, clear_ip_bgp_instance_all_ipv4_soft_in_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft in", + "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8009,7 +8009,7 @@ DEFUN (clear_ip_bgp_instance_all_ipv4_soft_in, DEFUN (clear_ip_bgp_all_ipv4_in_prefix_filter, clear_ip_bgp_all_ipv4_in_prefix_filter_cmd, - "clear ip bgp * ipv4 (unicast|multicast) in prefix-filter", + "clear ip bgp * ipv4 <unicast|multicast> in prefix-filter", CLEAR_STR IP_STR BGP_STR @@ -8223,7 +8223,7 @@ DEFUN (clear_bgp_all_in_prefix_filter, */ DEFUN (clear_ip_bgp_peer_soft_in, clear_ip_bgp_peer_soft_in_cmd, - "clear ip bgp (A.B.C.D|WORD) soft in", + "clear ip bgp <A.B.C.D|WORD> soft in", CLEAR_STR IP_STR BGP_STR @@ -8245,7 +8245,7 @@ DEFUN (clear_ip_bgp_peer_soft_in, DEFUN (clear_ip_bgp_peer_in_prefix_filter, clear_ip_bgp_peer_in_prefix_filter_cmd, - "clear ip bgp (A.B.C.D|WORD) in prefix-filter", + "clear ip bgp <A.B.C.D|WORD> in prefix-filter", CLEAR_STR IP_STR BGP_STR @@ -8274,7 +8274,7 @@ DEFUN (clear_ip_bgp_peer_in_prefix_filter, */ DEFUN (clear_ip_bgp_peer_ipv4_soft_in, clear_ip_bgp_peer_ipv4_soft_in_cmd, - "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) soft in", + "clear ip bgp <A.B.C.D|WORD> ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8311,7 +8311,7 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft_in, */ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_in, clear_ip_bgp_instance_peer_ipv4_soft_in_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) soft in", + "clear ip bgp " BGP_INSTANCE_CMD " <A.B.C.D|WORD> ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8336,7 +8336,7 @@ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_in, DEFUN (clear_ip_bgp_peer_ipv4_in_prefix_filter, clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd, - "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) in prefix-filter", + "clear ip bgp <A.B.C.D|WORD> ipv4 <unicast|multicast> in prefix-filter", CLEAR_STR IP_STR BGP_STR @@ -8371,7 +8371,7 @@ DEFUN (clear_ip_bgp_peer_ipv4_in_prefix_filter, */ DEFUN (clear_ip_bgp_peer_vpnv4_soft_in, clear_ip_bgp_peer_vpnv4_soft_in_cmd, - "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft in", + "clear ip bgp <A.B.C.D|WORD> vpnv4 unicast soft in", CLEAR_STR IP_STR BGP_STR @@ -8488,7 +8488,7 @@ DEFUN (clear_ip_bgp_peer_encap_soft_in, */ DEFUN (clear_bgp_peer_soft_in, clear_bgp_peer_soft_in_cmd, - "clear bgp (A.B.C.D|X:X::X:X|WORD) soft in", + "clear bgp <A.B.C.D|X:X::X:X|WORD> soft in", CLEAR_STR BGP_STR "BGP neighbor address to clear\n" @@ -8527,7 +8527,7 @@ DEFUN (clear_bgp_peer_soft_in, */ DEFUN (clear_bgp_peer_in_prefix_filter, clear_bgp_peer_in_prefix_filter_cmd, - "clear bgp (A.B.C.D|X:X::X:X|WORD) in prefix-filter", + "clear bgp <A.B.C.D|X:X::X:X|WORD> in prefix-filter", CLEAR_STR BGP_STR "BGP neighbor address to clear\n" @@ -8624,7 +8624,7 @@ DEFUN (clear_ip_bgp_peer_group_in_prefix_filter, */ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_in, clear_ip_bgp_peer_group_ipv4_soft_in_cmd, - "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft in", + "clear ip bgp peer-group WORD ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8661,7 +8661,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_in, */ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_in, clear_ip_bgp_instance_peer_group_ipv4_soft_in_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) soft in", + "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8686,7 +8686,7 @@ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_in, DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter, clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd, - "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in prefix-filter", + "clear ip bgp peer-group WORD ipv4 <unicast|multicast> in prefix-filter", CLEAR_STR IP_STR BGP_STR @@ -8898,7 +8898,7 @@ DEFUN (clear_ip_bgp_external_in_prefix_filter, */ DEFUN (clear_ip_bgp_external_ipv4_soft_in, clear_ip_bgp_external_ipv4_soft_in_cmd, - "clear ip bgp external ipv4 (unicast|multicast) soft in", + "clear ip bgp external ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8933,7 +8933,7 @@ DEFUN (clear_ip_bgp_external_ipv4_soft_in, */ DEFUN (clear_ip_bgp_instance_external_ipv4_soft_in, clear_ip_bgp_instance_external_ipv4_soft_in_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) soft in", + "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -8957,7 +8957,7 @@ DEFUN (clear_ip_bgp_instance_external_ipv4_soft_in, DEFUN (clear_ip_bgp_external_ipv4_in_prefix_filter, clear_ip_bgp_external_ipv4_in_prefix_filter_cmd, - "clear ip bgp external ipv4 (unicast|multicast) in prefix-filter", + "clear ip bgp external ipv4 <unicast|multicast> in prefix-filter", CLEAR_STR IP_STR BGP_STR @@ -9158,7 +9158,7 @@ DEFUN (clear_ip_bgp_as_in_prefix_filter, */ DEFUN (clear_ip_bgp_as_ipv4_soft_in, clear_ip_bgp_as_ipv4_soft_in_cmd, - "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft in", + "clear ip bgp " CMD_AS_RANGE " ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -9193,7 +9193,7 @@ DEFUN (clear_ip_bgp_as_ipv4_soft_in, */ DEFUN (clear_ip_bgp_instance_as_ipv4_soft_in, clear_ip_bgp_instance_as_ipv4_soft_in_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) soft in", + "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 <unicast|multicast> soft in", CLEAR_STR IP_STR BGP_STR @@ -9217,7 +9217,7 @@ DEFUN (clear_ip_bgp_instance_as_ipv4_soft_in, DEFUN (clear_ip_bgp_as_ipv4_in_prefix_filter, clear_ip_bgp_as_ipv4_in_prefix_filter_cmd, - "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) in prefix-filter", + "clear ip bgp " CMD_AS_RANGE " ipv4 <unicast|multicast> in prefix-filter", CLEAR_STR IP_STR BGP_STR @@ -9432,7 +9432,7 @@ DEFUN (clear_ip_bgp_all_soft, DEFUN (clear_ip_bgp_all_ipv4_soft, clear_ip_bgp_all_ipv4_soft_cmd, - "clear ip bgp * ipv4 (unicast|multicast) soft", + "clear ip bgp * ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9452,7 +9452,7 @@ DEFUN (clear_ip_bgp_all_ipv4_soft, DEFUN (clear_ip_bgp_instance_all_ipv4_soft, clear_ip_bgp_instance_all_ipv4_soft_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft", + "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9559,7 +9559,7 @@ DEFUN (clear_bgp_all_soft, */ DEFUN (clear_ip_bgp_peer_soft, clear_ip_bgp_peer_soft_cmd, - "clear ip bgp (A.B.C.D|WORD) soft", + "clear ip bgp <A.B.C.D|WORD> soft", CLEAR_STR IP_STR BGP_STR @@ -9578,7 +9578,7 @@ DEFUN (clear_ip_bgp_peer_soft, DEFUN (clear_ip_bgp_peer_ipv4_soft, clear_ip_bgp_peer_ipv4_soft_cmd, - "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) soft", + "clear ip bgp <A.B.C.D|WORD> ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9599,7 +9599,7 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft, DEFUN (clear_ip_bgp_instance_peer_ipv4_soft, clear_ip_bgp_instance_peer_ipv4_soft_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) soft", + "clear ip bgp " BGP_INSTANCE_CMD " <A.B.C.D|WORD> ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9621,7 +9621,7 @@ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft, DEFUN (clear_ip_bgp_peer_vpnv4_soft, clear_ip_bgp_peer_vpnv4_soft_cmd, - "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft", + "clear ip bgp <A.B.C.D|WORD> vpnv4 unicast soft", CLEAR_STR IP_STR BGP_STR @@ -9683,7 +9683,7 @@ DEFUN (clear_ip_bgp_peer_encap_soft, */ DEFUN (clear_bgp_peer_soft, clear_bgp_peer_soft_cmd, - "clear bgp (A.B.C.D|X:X::X:X|WORD) soft", + "clear bgp <A.B.C.D|X:X::X:X|WORD> soft", CLEAR_STR BGP_STR "BGP neighbor address to clear\n" @@ -9735,7 +9735,7 @@ DEFUN (clear_ip_bgp_peer_group_soft, DEFUN (clear_ip_bgp_peer_group_ipv4_soft, clear_ip_bgp_peer_group_ipv4_soft_cmd, - "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft", + "clear ip bgp peer-group WORD ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9756,7 +9756,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft, DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft, clear_ip_bgp_instance_peer_group_ipv4_soft_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) soft", + "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9855,7 +9855,7 @@ DEFUN (clear_ip_bgp_external_soft, DEFUN (clear_ip_bgp_external_ipv4_soft, clear_ip_bgp_external_ipv4_soft_cmd, - "clear ip bgp external ipv4 (unicast|multicast) soft", + "clear ip bgp external ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9875,7 +9875,7 @@ DEFUN (clear_ip_bgp_external_ipv4_soft, DEFUN (clear_ip_bgp_instance_external_ipv4_soft, clear_ip_bgp_instance_external_ipv4_soft_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) soft", + "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9969,7 +9969,7 @@ DEFUN (clear_ip_bgp_as_soft, DEFUN (clear_ip_bgp_as_ipv4_soft, clear_ip_bgp_as_ipv4_soft_cmd, - "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft", + "clear ip bgp " CMD_AS_RANGE " ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -9989,7 +9989,7 @@ DEFUN (clear_ip_bgp_as_ipv4_soft, DEFUN (clear_ip_bgp_instance_as_ipv4_soft, clear_ip_bgp_instance_as_ipv4_soft_cmd, - "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) soft", + "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 <unicast|multicast> soft", CLEAR_STR IP_STR BGP_STR @@ -10815,7 +10815,7 @@ DEFUN (show_ip_bgp_instance_all_summary, */ DEFUN (show_ip_bgp_ipv4_summary, show_ip_bgp_ipv4_summary_cmd, - "show ip bgp ipv4 (unicast|multicast) summary [json]", + "show ip bgp ipv4 <unicast|multicast> summary [json]", SHOW_STR IP_STR BGP_STR @@ -10875,7 +10875,7 @@ DEFUN (show_bgp_ipv6_vpn_summary, */ DEFUN (show_ip_bgp_instance_ipv4_summary, show_ip_bgp_instance_ipv4_summary_cmd, - "show ip bgp view WORD ipv4 (unicast|multicast) summary [json]", + "show ip bgp view WORD ipv4 <unicast|multicast> summary [json]", SHOW_STR IP_STR BGP_STR @@ -10998,7 +10998,7 @@ DEFUN (show_bgp_instance_all_summary, DEFUN (show_bgp_ipv6_safi_summary, show_bgp_ipv6_safi_summary_cmd, - "show bgp ipv6 (unicast|multicast) summary [json]", + "show bgp ipv6 <unicast|multicast> summary [json]", SHOW_STR BGP_STR "Address family\n" @@ -11016,7 +11016,7 @@ DEFUN (show_bgp_ipv6_safi_summary, DEFUN (show_bgp_instance_ipv6_safi_summary, show_bgp_instance_ipv6_safi_summary_cmd, - "show bgp " BGP_INSTANCE_CMD " ipv6 (unicast|multicast) summary [json]", + "show bgp " BGP_INSTANCE_CMD " ipv6 <unicast|multicast> summary [json]", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13013,7 +13013,7 @@ DEFUN (show_ip_bgp_neighbors, */ DEFUN (show_ip_bgp_neighbors_peer, show_ip_bgp_neighbors_peer_cmd, - "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) [json]", + "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> [json]", SHOW_STR IP_STR BGP_STR @@ -13110,7 +13110,7 @@ DEFUN (show_ip_bgp_instance_all_neighbors, */ DEFUN (show_ip_bgp_instance_neighbors_peer, show_ip_bgp_instance_neighbors_peer_cmd, - "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) [json]", + "show ip bgp " BGP_INSTANCE_CMD " neighbors <A.B.C.D|X:X::X:X|WORD> [json]", SHOW_STR IP_STR BGP_STR @@ -13146,7 +13146,7 @@ DEFUN (show_ip_bgp_paths, DEFUN (show_ip_bgp_ipv4_paths, show_ip_bgp_ipv4_paths_cmd, - "show ip bgp ipv4 (unicast|multicast) paths", + "show ip bgp ipv4 <unicast|multicast> paths", SHOW_STR IP_STR BGP_STR @@ -13307,7 +13307,7 @@ DEFUN (show_bgp_instance_all_ipv6_updgrps, DEFUN (show_bgp_updgrps, show_bgp_updgrps_cmd, - "show bgp (ipv4|ipv6) (unicast|multicast) update-groups", + "show bgp <ipv4|ipv6> <unicast|multicast> update-groups", SHOW_STR BGP_STR "Address family\n" @@ -13385,7 +13385,7 @@ DEFUN (show_bgp_instance_ipv6_updgrps_s, DEFUN (show_bgp_updgrps_s, show_bgp_updgrps_s_cmd, - "show bgp (ipv4|ipv6) (unicast|multicast) update-groups SUBGROUP-ID", + "show bgp <ipv4|ipv6> <unicast|multicast> update-groups SUBGROUP-ID", SHOW_STR BGP_STR "Address family\n" @@ -13466,7 +13466,7 @@ show_bgp_updgrps_adj_info_aux (struct vty *vty, const char *name, DEFUN (show_ip_bgp_updgrps_adj, show_ip_bgp_updgrps_adj_cmd, - "show ip bgp update-groups (advertise-queue|advertised-routes|packet-queue)", + "show ip bgp update-groups <advertise-queue|advertised-routes|packet-queue>", SHOW_STR IP_STR BGP_STR @@ -13482,7 +13482,7 @@ DEFUN (show_ip_bgp_updgrps_adj, DEFUN (show_ip_bgp_instance_updgrps_adj, show_ip_bgp_instance_updgrps_adj_cmd, - "show ip bgp " BGP_INSTANCE_CMD " update-groups (advertise-queue|advertised-routes|packet-queue)", + "show ip bgp " BGP_INSTANCE_CMD " update-groups <advertise-queue|advertised-routes|packet-queue>", SHOW_STR IP_STR BGP_STR @@ -13499,7 +13499,7 @@ DEFUN (show_ip_bgp_instance_updgrps_adj, DEFUN (show_bgp_updgrps_afi_adj, show_bgp_updgrps_afi_adj_cmd, - "show bgp (ipv4|ipv6) (unicast|multicast) update-groups (advertise-queue|advertised-routes|packet-queue)", + "show bgp <ipv4|ipv6> <unicast|multicast> update-groups <advertise-queue|advertised-routes|packet-queue>", SHOW_STR BGP_STR "Address family\n" @@ -13523,7 +13523,7 @@ DEFUN (show_bgp_updgrps_afi_adj, DEFUN (show_bgp_updgrps_adj, show_bgp_updgrps_adj_cmd, - "show bgp update-groups (advertise-queue|advertised-routes|packet-queue)", + "show bgp update-groups <advertise-queue|advertised-routes|packet-queue>", SHOW_STR BGP_STR "BGP update groups\n" @@ -13537,7 +13537,7 @@ DEFUN (show_bgp_updgrps_adj, DEFUN (show_bgp_instance_updgrps_adj, show_bgp_instance_updgrps_adj_cmd, - "show bgp " BGP_INSTANCE_CMD " update-groups (advertise-queue|advertised-routes|packet-queue)", + "show bgp " BGP_INSTANCE_CMD " update-groups <advertise-queue|advertised-routes|packet-queue>", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13552,7 +13552,7 @@ DEFUN (show_bgp_instance_updgrps_adj, DEFUN (show_ip_bgp_updgrps_adj_s, show_ip_bgp_updgrps_adj_s_cmd, - "show ip bgp update-groups SUBGROUP-ID (advertise-queue|advertised-routes|packet-queue)", + "show ip bgp update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>", SHOW_STR IP_STR BGP_STR @@ -13573,7 +13573,7 @@ DEFUN (show_ip_bgp_updgrps_adj_s, DEFUN (show_ip_bgp_instance_updgrps_adj_s, show_ip_bgp_instance_updgrps_adj_s_cmd, - "show ip bgp " BGP_INSTANCE_CMD " update-groups SUBGROUP-ID (advertise-queue|advertised-routes|packet-queue)", + "show ip bgp " BGP_INSTANCE_CMD " update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>", SHOW_STR IP_STR BGP_STR @@ -13595,7 +13595,7 @@ DEFUN (show_ip_bgp_instance_updgrps_adj_s, DEFUN (show_bgp_updgrps_afi_adj_s, show_bgp_updgrps_afi_adj_s_cmd, - "show bgp (ipv4|ipv6) (unicast|multicast) update-groups SUBGROUP-ID (advertise-queue|advertised-routes|packet-queue)", + "show bgp <ipv4|ipv6> <unicast|multicast> update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>", SHOW_STR BGP_STR "Address family\n" @@ -13623,7 +13623,7 @@ DEFUN (show_bgp_updgrps_afi_adj_s, DEFUN (show_bgp_updgrps_adj_s, show_bgp_updgrps_adj_s_cmd, - "show bgp update-groups SUBGROUP-ID (advertise-queue|advertised-routes|packet-queue)", + "show bgp update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>", SHOW_STR BGP_STR "BGP update groups\n" @@ -13642,7 +13642,7 @@ DEFUN (show_bgp_updgrps_adj_s, DEFUN (show_bgp_instance_updgrps_adj_s, show_bgp_instance_updgrps_adj_s_cmd, - "show bgp " BGP_INSTANCE_CMD " update-groups SUBGROUP-ID (advertise-queue|advertised-routes|packet-queue)", + "show bgp " BGP_INSTANCE_CMD " update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>", SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR @@ -13914,7 +13914,7 @@ DEFUN (bgp_redistribute_ipv4_rmap, DEFUN (bgp_redistribute_ipv4_metric, bgp_redistribute_ipv4_metric_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>", + "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric (0-4294967295)", "Redistribute information from another routing protocol\n" QUAGGA_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -13939,7 +13939,7 @@ DEFUN (bgp_redistribute_ipv4_metric, DEFUN (bgp_redistribute_ipv4_rmap_metric, bgp_redistribute_ipv4_rmap_metric_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", + "redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" QUAGGA_IP_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -13967,7 +13967,7 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric, DEFUN (bgp_redistribute_ipv4_metric_rmap, bgp_redistribute_ipv4_metric_rmap_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", + "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" QUAGGA_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -13995,7 +13995,7 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap, DEFUN (bgp_redistribute_ipv4_ospf, bgp_redistribute_ipv4_ospf_cmd, - "redistribute (ospf|table) <1-65535>", + "redistribute <ospf|table> (1-65535)", "Redistribute information from another routing protocol\n" "Open Shortest Path First (OSPFv2)\n" "Non-main Kernel Routing Table\n" @@ -14017,7 +14017,7 @@ DEFUN (bgp_redistribute_ipv4_ospf, DEFUN (bgp_redistribute_ipv4_ospf_rmap, bgp_redistribute_ipv4_ospf_rmap_cmd, - "redistribute (ospf|table) <1-65535> route-map WORD", + "redistribute <ospf|table> (1-65535) route-map WORD", "Redistribute information from another routing protocol\n" "Open Shortest Path First (OSPFv2)\n" "Non-main Kernel Routing Table\n" @@ -14042,7 +14042,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap, DEFUN (bgp_redistribute_ipv4_ospf_metric, bgp_redistribute_ipv4_ospf_metric_cmd, - "redistribute (ospf|table) <1-65535> metric <0-4294967295>", + "redistribute <ospf|table> (1-65535) metric (0-4294967295)", "Redistribute information from another routing protocol\n" "Open Shortest Path First (OSPFv2)\n" "Non-main Kernel Routing Table\n" @@ -14070,7 +14070,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric, DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric, bgp_redistribute_ipv4_ospf_rmap_metric_cmd, - "redistribute (ospf|table) <1-65535> route-map WORD metric <0-4294967295>", + "redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" "Open Shortest Path First (OSPFv2)\n" "Non-main Kernel Routing Table\n" @@ -14101,7 +14101,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric, DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap, bgp_redistribute_ipv4_ospf_metric_rmap_cmd, - "redistribute (ospf|table) <1-65535> metric <0-4294967295> route-map WORD", + "redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" "Open Shortest Path First (OSPFv2)\n" "Non-main Kernel Routing Table\n" @@ -14175,7 +14175,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap, */ DEFUN (no_bgp_redistribute_ipv4_ospf, no_bgp_redistribute_ipv4_ospf_cmd, - "no redistribute (ospf|table) <1-65535>", + "no redistribute <ospf|table> (1-65535)", NO_STR "Redistribute information from another routing protocol\n" "Open Shortest Path First (OSPFv2)\n" @@ -14300,7 +14300,7 @@ DEFUN (bgp_redistribute_ipv6_rmap, DEFUN (bgp_redistribute_ipv6_metric, bgp_redistribute_ipv6_metric_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>", + "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric (0-4294967295)", "Redistribute information from another routing protocol\n" QUAGGA_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -14325,7 +14325,7 @@ DEFUN (bgp_redistribute_ipv6_metric, DEFUN (bgp_redistribute_ipv6_rmap_metric, bgp_redistribute_ipv6_rmap_metric_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", + "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" QUAGGA_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -14353,7 +14353,7 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric, DEFUN (bgp_redistribute_ipv6_metric_rmap, bgp_redistribute_ipv6_metric_rmap_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", + "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" QUAGGA_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -15962,7 +15962,7 @@ community_list_unset_vty (struct vty *vty, int argc, const char **argv, */ DEFUN (ip_community_list_standard, ip_community_list_standard_cmd, - "ip community-list <1-99> (deny|permit) .AA:NN", + "ip community-list (1-99) <deny|permit> .AA:NN", IP_STR COMMUNITY_LIST_STR "Community list number (standard)\n" @@ -15976,7 +15976,7 @@ DEFUN (ip_community_list_standard, DEFUN (ip_community_list_expanded, ip_community_list_expanded_cmd, - "ip community-list <100-500> (deny|permit) .LINE", + "ip community-list (100-500) <deny|permit> .LINE", IP_STR COMMUNITY_LIST_STR "Community list number (expanded)\n" @@ -16000,7 +16000,7 @@ DEFUN (ip_community_list_expanded, */ DEFUN (ip_community_list_name_standard, ip_community_list_name_standard_cmd, - "ip community-list standard WORD (deny|permit) .AA:NN", + "ip community-list standard WORD <deny|permit> .AA:NN", IP_STR COMMUNITY_LIST_STR "Add a standard community-list entry\n" @@ -16015,7 +16015,7 @@ DEFUN (ip_community_list_name_standard, DEFUN (ip_community_list_name_expanded, ip_community_list_name_expanded_cmd, - "ip community-list expanded WORD (deny|permit) .LINE", + "ip community-list expanded WORD <deny|permit> .LINE", IP_STR COMMUNITY_LIST_STR "Add an expanded community-list entry\n" @@ -16029,7 +16029,7 @@ DEFUN (ip_community_list_name_expanded, DEFUN (no_ip_community_list_standard_all, no_ip_community_list_standard_all_cmd, - "no ip community-list <1-99>", + "no ip community-list (1-99)", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16040,7 +16040,7 @@ DEFUN (no_ip_community_list_standard_all, DEFUN (no_ip_community_list_standard_direction, no_ip_community_list_standard_direction_cmd, - "no ip community-list <1-99> (deny|permit)", + "no ip community-list (1-99) <deny|permit>", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16054,7 +16054,7 @@ DEFUN (no_ip_community_list_standard_direction, DEFUN (no_ip_community_list_expanded_all, no_ip_community_list_expanded_all_cmd, - "no ip community-list <100-500>", + "no ip community-list (100-500)", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16089,7 +16089,7 @@ DEFUN (no_ip_community_list_name_expanded_all, DEFUN (no_ip_community_list_standard, no_ip_community_list_standard_cmd, - "no ip community-list <1-99> (deny|permit) .AA:NN", + "no ip community-list (1-99) <deny|permit> .AA:NN", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16103,7 +16103,7 @@ DEFUN (no_ip_community_list_standard, DEFUN (no_ip_community_list_expanded, no_ip_community_list_expanded_cmd, - "no ip community-list <100-500> (deny|permit) .LINE", + "no ip community-list (100-500) <deny|permit> .LINE", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16117,7 +16117,7 @@ DEFUN (no_ip_community_list_expanded, DEFUN (no_ip_community_list_name_standard, no_ip_community_list_name_standard_cmd, - "no ip community-list standard WORD (deny|permit) .AA:NN", + "no ip community-list standard WORD <deny|permit> .AA:NN", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16132,7 +16132,7 @@ DEFUN (no_ip_community_list_name_standard, DEFUN (no_ip_community_list_name_standard_brief, no_ip_community_list_name_standard_brief_cmd, - "no ip community-list standard WORD (deny|permit)", + "no ip community-list standard WORD <deny|permit>", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16146,7 +16146,7 @@ DEFUN (no_ip_community_list_name_standard_brief, DEFUN (no_ip_community_list_name_expanded, no_ip_community_list_name_expanded_cmd, - "no ip community-list expanded WORD (deny|permit) .LINE", + "no ip community-list expanded WORD <deny|permit> .LINE", NO_STR IP_STR COMMUNITY_LIST_STR @@ -16216,7 +16216,7 @@ DEFUN (show_ip_community_list, DEFUN (show_ip_community_list_arg, show_ip_community_list_arg_cmd, - "show ip community-list (<1-500>|WORD)", + "show ip community-list <(1-500)|WORD>", SHOW_STR IP_STR "List community-list\n" @@ -16344,7 +16344,7 @@ extcommunity_list_unset_vty (struct vty *vty, int argc, struct cmd_token **argv, */ DEFUN (ip_extcommunity_list_standard, ip_extcommunity_list_standard_cmd, - "ip extcommunity-list <1-99> (deny|permit) .AA:NN", + "ip extcommunity-list (1-99) <deny|permit> .AA:NN", IP_STR EXTCOMMUNITY_LIST_STR "Extended Community list number (standard)\n" @@ -16358,7 +16358,7 @@ DEFUN (ip_extcommunity_list_standard, DEFUN (ip_extcommunity_list_expanded, ip_extcommunity_list_expanded_cmd, - "ip extcommunity-list <100-500> (deny|permit) .LINE", + "ip extcommunity-list (100-500) <deny|permit> .LINE", IP_STR EXTCOMMUNITY_LIST_STR "Extended Community list number (expanded)\n" @@ -16382,7 +16382,7 @@ DEFUN (ip_extcommunity_list_expanded, */ DEFUN (ip_extcommunity_list_name_standard, ip_extcommunity_list_name_standard_cmd, - "ip extcommunity-list standard WORD (deny|permit) .AA:NN", + "ip extcommunity-list standard WORD <deny|permit> .AA:NN", IP_STR EXTCOMMUNITY_LIST_STR "Specify standard extcommunity-list\n" @@ -16397,7 +16397,7 @@ DEFUN (ip_extcommunity_list_name_standard, DEFUN (ip_extcommunity_list_name_expanded, ip_extcommunity_list_name_expanded_cmd, - "ip extcommunity-list expanded WORD (deny|permit) .LINE", + "ip extcommunity-list expanded WORD <deny|permit> .LINE", IP_STR EXTCOMMUNITY_LIST_STR "Specify expanded extcommunity-list\n" @@ -16411,7 +16411,7 @@ DEFUN (ip_extcommunity_list_name_expanded, DEFUN (no_ip_extcommunity_list_standard_all, no_ip_extcommunity_list_standard_all_cmd, - "no ip extcommunity-list <1-99>", + "no ip extcommunity-list (1-99)", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16422,7 +16422,7 @@ DEFUN (no_ip_extcommunity_list_standard_all, DEFUN (no_ip_extcommunity_list_standard_direction, no_ip_extcommunity_list_standard_direction_cmd, - "no ip extcommunity-list <1-99> (deny|permit)", + "no ip extcommunity-list (1-99) <deny|permit>", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16435,7 +16435,7 @@ DEFUN (no_ip_extcommunity_list_standard_direction, DEFUN (no_ip_extcommunity_list_expanded_all, no_ip_extcommunity_list_expanded_all_cmd, - "no ip extcommunity-list <100-500>", + "no ip extcommunity-list (100-500)", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16470,7 +16470,7 @@ DEFUN (no_ip_extcommunity_list_name_expanded_all, DEFUN (no_ip_extcommunity_list_standard, no_ip_extcommunity_list_standard_cmd, - "no ip extcommunity-list <1-99> (deny|permit) .AA:NN", + "no ip extcommunity-list (1-99) <deny|permit> .AA:NN", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16484,7 +16484,7 @@ DEFUN (no_ip_extcommunity_list_standard, DEFUN (no_ip_extcommunity_list_expanded, no_ip_extcommunity_list_expanded_cmd, - "no ip extcommunity-list <100-500> (deny|permit) .LINE", + "no ip extcommunity-list (100-500) <deny|permit> .LINE", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16498,7 +16498,7 @@ DEFUN (no_ip_extcommunity_list_expanded, DEFUN (no_ip_extcommunity_list_name_standard, no_ip_extcommunity_list_name_standard_cmd, - "no ip extcommunity-list standard WORD (deny|permit) .AA:NN", + "no ip extcommunity-list standard WORD <deny|permit> .AA:NN", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16513,7 +16513,7 @@ DEFUN (no_ip_extcommunity_list_name_standard, DEFUN (no_ip_extcommunity_list_name_standard_brief, no_ip_extcommunity_list_name_standard_brief_cmd, - "no ip extcommunity-list standard WORD (deny|permit)", + "no ip extcommunity-list standard WORD <deny|permit>", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16527,7 +16527,7 @@ DEFUN (no_ip_extcommunity_list_name_standard_brief, DEFUN (no_ip_extcommunity_list_name_expanded, no_ip_extcommunity_list_name_expanded_cmd, - "no ip extcommunity-list expanded WORD (deny|permit) .LINE", + "no ip extcommunity-list expanded WORD <deny|permit> .LINE", NO_STR IP_STR EXTCOMMUNITY_LIST_STR @@ -16597,7 +16597,7 @@ DEFUN (show_ip_extcommunity_list, DEFUN (show_ip_extcommunity_list_arg, show_ip_extcommunity_list_arg_cmd, - "show ip extcommunity-list (<1-500>|WORD)", + "show ip extcommunity-list <(1-500)|WORD>", SHOW_STR IP_STR "List extended-community list\n" diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c index cf598cd5d..62b057eab 100644 --- a/isisd/isis_redist.c +++ b/isisd/isis_redist.c @@ -539,7 +539,7 @@ isis_redist_area_finish(struct isis_area *area) DEFUN (isis_redistribute, isis_redistribute_cmd, - "redistribute (ipv4|ipv6) " QUAGGA_REDIST_STR_ISISD " (level-1|level-2) {metric <0-16777215>|route-map WORD}", + "redistribute <ipv4|ipv6> " QUAGGA_REDIST_STR_ISISD " <level-1|level-2> [metric (0-16777215)|route-map WORD]", REDIST_STR "Redistribute IPv4 routes\n" "Redistribute IPv6 routes\n" @@ -607,7 +607,7 @@ DEFUN (isis_redistribute, DEFUN (no_isis_redistribute, no_isis_redistribute_cmd, - "no redistribute (ipv4|ipv6) " QUAGGA_REDIST_STR_ISISD " (level-1|level-2)", + "no redistribute <ipv4|ipv6> " QUAGGA_REDIST_STR_ISISD " <level-1|level-2>", NO_STR REDIST_STR "Redistribute IPv4 routes\n" @@ -650,7 +650,7 @@ DEFUN (no_isis_redistribute, DEFUN (isis_default_originate, isis_default_originate_cmd, - "default-information originate (ipv4|ipv6) (level-1|level-2) {always|metric <0-16777215>|route-map WORD}", + "default-information originate <ipv4|ipv6> <level-1|level-2> [always|metric (0-16777215)|route-map WORD]", "Control distribution of default information\n" "Distribute a default route\n" "Distribute default route for IPv4\n" @@ -721,7 +721,7 @@ DEFUN (isis_default_originate, DEFUN (no_isis_default_originate, no_isis_default_originate_cmd, - "no default-information originate (ipv4|ipv6) (level-1|level-2)", + "no default-information originate <ipv4|ipv6> <level-1|level-2>", NO_STR "Control distribution of default information\n" "Distribute a default route\n" diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 35781ef2c..fd6bff848 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -346,7 +346,7 @@ isis_route_set_delete (struct vty *vty, struct route_map_index *index, DEFUN (match_ip_address, match_ip_address_cmd, - "match ip address (<1-199>|<1300-2699>|WORD)", + "match ip address <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match address of route\n" @@ -368,7 +368,7 @@ DEFUN (match_ip_address, */ DEFUN (no_match_ip_address, no_match_ip_address_val_cmd, - "no match ip address (<1-199>|<1300-2699>|WORD)", + "no match ip address <(1-199)|(1300-2699)|WORD>", NO_STR MATCH_STR IP_STR @@ -507,7 +507,7 @@ DEFUN (no_match_ipv6_address_prefix_list, * verify that the input is a valid isis metric */ DEFUN (set_metric, set_metric_cmd, - "set metric <0-4294967295>", + "set metric (0-4294967295)", SET_STR "Metric vale for destination routing protocol\n" "Metric value\n") @@ -528,7 +528,7 @@ DEFUN (set_metric, */ DEFUN (no_set_metric, no_set_metric_val_cmd, - "no set metric <0-4294967295>", + "no set metric (0-4294967295)", NO_STR SET_STR "Metric value for destination routing protocol\n" diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 0a327c754..b958f0a21 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -1190,7 +1190,7 @@ DEFUN (isis_mpls_te_router_addr, DEFUN (isis_mpls_te_inter_as, isis_mpls_te_inter_as_cmd, - "mpls-te inter-as (level-1|level-1-2|level-2-only)", + "mpls-te inter-as <level-1|level-1-2|level-2-only>", MPLS_TE_STR "Configure MPLS-TE Inter-AS support\n" "AREA native mode self originate INTER-AS LSP with L1 only flooding scope)\n" diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c index b0976177f..a3890a595 100644 --- a/isisd/isis_vty.c +++ b/isisd/isis_vty.c @@ -55,7 +55,7 @@ isis_circuit_lookup (struct vty *vty) DEFUN (ip_router_isis, ip_router_isis_cmd, - "(ip|ipv6) router isis WORD", + "<ip|ipv6> router isis WORD", "Interface Internet Protocol config commands\n" "IP router interface commands\n" "IS-IS Routing for IP\n" @@ -108,7 +108,7 @@ DEFUN (ip_router_isis, DEFUN (no_ip_router_isis, no_ip_router_isis_cmd, - "no (ip|ipv6) router isis WORD", + "no <ip|ipv6> router isis WORD", NO_STR "Interface Internet Protocol config commands\n" "IP router interface commands\n" @@ -192,7 +192,7 @@ DEFUN (no_isis_passive, DEFUN (isis_circuit_type, isis_circuit_type_cmd, - "isis circuit-type (level-1|level-1-2|level-2-only)", + "isis circuit-type <level-1|level-1-2|level-2-only>", "IS-IS commands\n" "Configure circuit type for interface\n" "Level-1 only adjacencies are formed\n" @@ -226,7 +226,7 @@ DEFUN (isis_circuit_type, DEFUN (no_isis_circuit_type, no_isis_circuit_type_cmd, - "no isis circuit-type (level-1|level-1-2|level-2-only)", + "no isis circuit-type <level-1|level-1-2|level-2-only>", NO_STR "IS-IS commands\n" "Configure circuit type for interface\n" @@ -298,7 +298,7 @@ DEFUN (no_isis_network, DEFUN (isis_passwd, isis_passwd_cmd, - "isis password (md5|clear) WORD", + "isis password <md5|clear> WORD", "IS-IS commands\n" "Configure the authentication password for a circuit\n" "HMAC-MD5 authentication\n" @@ -353,7 +353,7 @@ DEFUN (no_isis_passwd, DEFUN (isis_priority, isis_priority_cmd, - "isis priority <0-127>", + "isis priority (0-127)", "IS-IS commands\n" "Set priority for Designated Router election\n" "Priority value\n") @@ -406,7 +406,7 @@ DEFUN (no_isis_priority, DEFUN (isis_priority_l1, isis_priority_l1_cmd, - "isis priority <0-127> level-1", + "isis priority (0-127) level-1", "IS-IS commands\n" "Set priority for Designated Router election\n" "Priority value\n" @@ -460,7 +460,7 @@ DEFUN (no_isis_priority_l1, DEFUN (isis_priority_l2, isis_priority_l2_cmd, - "isis priority <0-127> level-2", + "isis priority (0-127) level-2", "IS-IS commands\n" "Set priority for Designated Router election\n" "Priority value\n" @@ -515,7 +515,7 @@ DEFUN (no_isis_priority_l2, /* Metric command */ DEFUN (isis_metric, isis_metric_cmd, - "isis metric <0-16777215>", + "isis metric (0-16777215)", "IS-IS commands\n" "Set default metric for circuit\n" "Default metric value\n") @@ -580,7 +580,7 @@ DEFUN (no_isis_metric, DEFUN (isis_metric_l1, isis_metric_l1_cmd, - "isis metric <0-16777215> level-1", + "isis metric (0-16777215) level-1", "IS-IS commands\n" "Set default metric for circuit\n" "Default metric value\n" @@ -646,7 +646,7 @@ DEFUN (no_isis_metric_l1, DEFUN (isis_metric_l2, isis_metric_l2_cmd, - "isis metric <0-16777215> level-2", + "isis metric (0-16777215) level-2", "IS-IS commands\n" "Set default metric for circuit\n" "Default metric value\n" @@ -713,7 +713,7 @@ DEFUN (no_isis_metric_l2, DEFUN (isis_hello_interval, isis_hello_interval_cmd, - "isis hello-interval <1-600>", + "isis hello-interval (1-600)", "IS-IS commands\n" "Set Hello interval\n" "Hello interval value\n" @@ -768,7 +768,7 @@ DEFUN (no_isis_hello_interval, DEFUN (isis_hello_interval_l1, isis_hello_interval_l1_cmd, - "isis hello-interval <1-600> level-1", + "isis hello-interval (1-600) level-1", "IS-IS commands\n" "Set Hello interval\n" "Hello interval value\n" @@ -824,7 +824,7 @@ DEFUN (no_isis_hello_interval_l1, DEFUN (isis_hello_interval_l2, isis_hello_interval_l2_cmd, - "isis hello-interval <1-600> level-2", + "isis hello-interval (1-600) level-2", "IS-IS commands\n" "Set Hello interval\n" "Hello interval value\n" @@ -880,7 +880,7 @@ DEFUN (no_isis_hello_interval_l2, DEFUN (isis_hello_multiplier, isis_hello_multiplier_cmd, - "isis hello-multiplier <2-100>", + "isis hello-multiplier (2-100)", "IS-IS commands\n" "Set multiplier for Hello holding time\n" "Hello multiplier value\n") @@ -933,7 +933,7 @@ DEFUN (no_isis_hello_multiplier, DEFUN (isis_hello_multiplier_l1, isis_hello_multiplier_l1_cmd, - "isis hello-multiplier <2-100> level-1", + "isis hello-multiplier (2-100) level-1", "IS-IS commands\n" "Set multiplier for Hello holding time\n" "Hello multiplier value\n" @@ -987,7 +987,7 @@ DEFUN (no_isis_hello_multiplier_l1, DEFUN (isis_hello_multiplier_l2, isis_hello_multiplier_l2_cmd, - "isis hello-multiplier <2-100> level-2", + "isis hello-multiplier (2-100) level-2", "IS-IS commands\n" "Set multiplier for Hello holding time\n" "Hello multiplier value\n" @@ -1076,7 +1076,7 @@ DEFUN (no_isis_hello_padding, DEFUN (csnp_interval, csnp_interval_cmd, - "isis csnp-interval <1-600>", + "isis csnp-interval (1-600)", "IS-IS commands\n" "Set CSNP interval in seconds\n" "CSNP interval value\n") @@ -1129,7 +1129,7 @@ DEFUN (no_csnp_interval, DEFUN (csnp_interval_l1, csnp_interval_l1_cmd, - "isis csnp-interval <1-600> level-1", + "isis csnp-interval (1-600) level-1", "IS-IS commands\n" "Set CSNP interval in seconds\n" "CSNP interval value\n" @@ -1183,7 +1183,7 @@ DEFUN (no_csnp_interval_l1, DEFUN (csnp_interval_l2, csnp_interval_l2_cmd, - "isis csnp-interval <1-600> level-2", + "isis csnp-interval (1-600) level-2", "IS-IS commands\n" "Set CSNP interval in seconds\n" "CSNP interval value\n" @@ -1237,7 +1237,7 @@ DEFUN (no_csnp_interval_l2, DEFUN (psnp_interval, psnp_interval_cmd, - "isis psnp-interval <1-120>", + "isis psnp-interval (1-120)", "IS-IS commands\n" "Set PSNP interval in seconds\n" "PSNP interval value\n") @@ -1290,7 +1290,7 @@ DEFUN (no_psnp_interval, DEFUN (psnp_interval_l1, psnp_interval_l1_cmd, - "isis psnp-interval <1-120> level-1", + "isis psnp-interval (1-120) level-1", "IS-IS commands\n" "Set PSNP interval in seconds\n" "PSNP interval value\n" @@ -1344,7 +1344,7 @@ DEFUN (no_psnp_interval_l1, DEFUN (psnp_interval_l2, psnp_interval_l2_cmd, - "isis psnp-interval <1-120> level-2", + "isis psnp-interval (1-120) level-2", "IS-IS commands\n" "Set PSNP interval in seconds\n" "PSNP interval value\n" @@ -1436,7 +1436,7 @@ validate_metric_style_narrow (struct vty *vty, struct isis_area *area) DEFUN (metric_style, metric_style_cmd, - "metric-style (narrow|transition|wide)", + "metric-style <narrow|transition|wide>", "Use old-style (ISO 10589) or new-style packet formats\n" "Use old style of TLVs with narrow metric\n" "Send and accept both styles of TLVs during transition\n" @@ -1593,7 +1593,7 @@ static int area_lsp_mtu_set(struct vty *vty, unsigned int lsp_mtu) DEFUN (area_lsp_mtu, area_lsp_mtu_cmd, - "lsp-mtu <128-4352>", + "lsp-mtu (128-4352)", "Configure the maximum size of generated LSPs\n" "Maximum size of generated LSPs\n") { @@ -1624,7 +1624,7 @@ DEFUN (no_area_lsp_mtu, DEFUN (is_type, is_type_cmd, - "is-type (level-1|level-1-2|level-2-only)", + "is-type <level-1|level-1-2|level-2-only>", "IS Level for this routing process (OSI only)\n" "Act as a station router only\n" "Act as both a station router and an area router\n" @@ -1655,7 +1655,7 @@ DEFUN (is_type, DEFUN (no_is_type, no_is_type_cmd, - "no is-type (level-1|level-1-2|level-2-only)", + "no is-type <level-1|level-1-2|level-2-only>", NO_STR "IS Level for this routing process (OSI only)\n" "Act as a station router only\n" @@ -1715,7 +1715,7 @@ set_lsp_gen_interval (struct vty *vty, struct isis_area *area, DEFUN (lsp_gen_interval, lsp_gen_interval_cmd, - "lsp-gen-interval <1-120>", + "lsp-gen-interval (1-120)", "Minimum interval between regenerating same LSP\n" "Minimum interval in seconds\n") { @@ -1756,7 +1756,7 @@ DEFUN (no_lsp_gen_interval, DEFUN (lsp_gen_interval_l1, lsp_gen_interval_l1_cmd, - "lsp-gen-interval level-1 <1-120>", + "lsp-gen-interval level-1 (1-120)", "Minimum interval between regenerating same LSP\n" "Set interval for level 1 only\n" "Minimum interval in seconds\n") @@ -1800,7 +1800,7 @@ DEFUN (no_lsp_gen_interval_l1, DEFUN (lsp_gen_interval_l2, lsp_gen_interval_l2_cmd, - "lsp-gen-interval level-2 <1-120>", + "lsp-gen-interval level-2 (1-120)", "Minimum interval between regenerating same LSP\n" "Set interval for level 2 only\n" "Minimum interval in seconds\n") @@ -1844,7 +1844,7 @@ DEFUN (no_lsp_gen_interval_l2, DEFUN (spf_interval, spf_interval_cmd, - "spf-interval <1-120>", + "spf-interval (1-120)", "Minimum interval between SPF calculations\n" "Minimum interval between consecutive SPFs in seconds\n") { @@ -1898,7 +1898,7 @@ DEFUN (no_spf_interval, DEFUN (spf_interval_l1, spf_interval_l1_cmd, - "spf-interval level-1 <1-120>", + "spf-interval level-1 (1-120)", "Minimum interval between SPF calculations\n" "Set interval for level 1 only\n" "Minimum interval between consecutive SPFs in seconds\n") @@ -1932,7 +1932,7 @@ DEFUN (no_spf_interval_l1, DEFUN (spf_interval_l2, spf_interval_l2_cmd, - "spf-interval level-2 <1-120>", + "spf-interval level-2 (1-120)", "Minimum interval between SPF calculations\n" "Set interval for level 2 only\n" "Minimum interval between consecutive SPFs in seconds\n") @@ -2018,7 +2018,7 @@ area_max_lsp_lifetime_set(struct vty *vty, int level, DEFUN (max_lsp_lifetime, max_lsp_lifetime_cmd, - "max-lsp-lifetime <350-65535>", + "max-lsp-lifetime (350-65535)", "Maximum LSP lifetime\n" "LSP lifetime in seconds\n") { @@ -2046,7 +2046,7 @@ DEFUN (no_max_lsp_lifetime, DEFUN (max_lsp_lifetime_l1, max_lsp_lifetime_l1_cmd, - "max-lsp-lifetime level-1 <350-65535>", + "max-lsp-lifetime level-1 (350-65535)", "Maximum LSP lifetime for Level 1 only\n" "LSP lifetime for Level 1 only in seconds\n") { @@ -2073,7 +2073,7 @@ DEFUN (no_max_lsp_lifetime_l1, DEFUN (max_lsp_lifetime_l2, max_lsp_lifetime_l2_cmd, - "max-lsp-lifetime level-2 <350-65535>", + "max-lsp-lifetime level-2 (350-65535)", "Maximum LSP lifetime for Level 2 only\n" "LSP lifetime for Level 2 only in seconds\n") { @@ -2144,7 +2144,7 @@ area_lsp_refresh_interval_set(struct vty *vty, int level, uint16_t interval) DEFUN (lsp_refresh_interval, lsp_refresh_interval_cmd, - "lsp-refresh-interval <1-65235>", + "lsp-refresh-interval (1-65235)", "LSP refresh interval\n" "LSP refresh interval in seconds\n") { @@ -2172,7 +2172,7 @@ DEFUN (no_lsp_refresh_interval, DEFUN (lsp_refresh_interval_l1, lsp_refresh_interval_l1_cmd, - "lsp-refresh-interval level-1 <1-65235>", + "lsp-refresh-interval level-1 (1-65235)", "LSP refresh interval for Level 1 only\n" "LSP refresh interval for Level 1 only in seconds\n") { @@ -2200,7 +2200,7 @@ DEFUN (no_lsp_refresh_interval_l1, DEFUN (lsp_refresh_interval_l2, lsp_refresh_interval_l2_cmd, - "lsp-refresh-interval level-2 <1-65235>", + "lsp-refresh-interval level-2 (1-65235)", "LSP refresh interval for Level 2 only\n" "LSP refresh interval for Level 2 only in seconds\n") { @@ -2265,7 +2265,7 @@ area_passwd_set(struct vty *vty, int level, */ DEFUN (area_passwd_md5, area_passwd_md5_cmd, - "(area-password|domain-password) md5 WORD", + "<area-password|domain-password> md5 WORD", "Configure the authentication password for an area\n" "Set the authentication password for a routing domain\n" "Authentication type\n" @@ -2301,7 +2301,7 @@ DEFUN (area_passwd_md5, */ DEFUN (area_passwd_clear, area_passwd_clear_cmd, - "(area-password|domain-password) clear WORD", + "<area-password|domain-password> clear WORD", "Configure the authentication password for an area\n" "Set the authentication password for a routing domain\n" "Authentication type\n" @@ -2324,7 +2324,7 @@ DEFUN (area_passwd_clear, DEFUN (no_area_passwd, no_area_passwd_cmd, - "no (area-password|domain-password)", + "no <area-password|domain-password>", NO_STR "Configure the authentication password for an area\n" "Set the authentication password for a routing domain\n") diff --git a/isisd/isisd.c b/isisd/isisd.c index bfee7a810..263fa63a3 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -1896,7 +1896,7 @@ DEFUN (no_log_adj_changes, DEFUN (topology_generate_grid, topology_generate_grid_cmd, - "topology generate grid <1-100> <1-100> <1-65000> [param] [param] [param]", + "topology generate grid (1-100) (1-100) (1-65000) [param] [param] [param]", "Topology generation for IS-IS\n" "Topology generation\n" "Grid topology\n" diff --git a/lib/command.c b/lib/command.c index b676b0c9d..7cc2c3b23 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1869,7 +1869,7 @@ DEFUN_DEPRECATED (config_log_syslog_facility, DEFUN (no_config_log_syslog, no_config_log_syslog_cmd, - "no log syslog [" LOG_FACILITIES "] ["LOG_LEVELS"]", + "no log syslog [" LOG_FACILITIES "] [" LOG_LEVELS "]", NO_STR "Logging control\n" "Cancel logging to syslog\n" @@ -1882,7 +1882,7 @@ DEFUN (no_config_log_syslog, DEFUN (config_log_facility, config_log_facility_cmd, - "log facility "LOG_FACILITIES, + "log facility " LOG_FACILITIES, "Logging control\n" "Facility parameter for syslog messages\n" LOG_FACILITY_DESC) @@ -1895,7 +1895,7 @@ DEFUN (config_log_facility, DEFUN (no_config_log_facility, no_config_log_facility_cmd, - "no log facility ["LOG_FACILITIES"]", + "no log facility [" LOG_FACILITIES "]", NO_STR "Logging control\n" "Reset syslog facility to default (daemon)\n" @@ -1907,7 +1907,7 @@ DEFUN (no_config_log_facility, DEFUN_DEPRECATED (config_log_trap, config_log_trap_cmd, - "log trap "LOG_LEVELS, + "log trap " LOG_LEVELS, "Logging control\n" "(Deprecated) Set logging level and default for all destinations\n" LOG_LEVEL_DESC) @@ -1927,7 +1927,7 @@ DEFUN_DEPRECATED (config_log_trap, DEFUN_DEPRECATED (no_config_log_trap, no_config_log_trap_cmd, - "no log trap ["LOG_LEVELS"]", + "no log trap [" LOG_LEVELS "]", NO_STR "Logging control\n" "Permit all logging information\n" @@ -1960,7 +1960,7 @@ DEFUN (no_config_log_record_priority, DEFUN (config_log_timestamp_precision, config_log_timestamp_precision_cmd, - "log timestamp precision <0-6>", + "log timestamp precision (0-6)", "Logging control\n" "Timestamp configuration\n" "Set the timestamp precision\n" diff --git a/lib/filter.c b/lib/filter.c index dee752f22..a25c8cdc9 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -704,7 +704,7 @@ filter_set_cisco (struct vty *vty, const char *name_str, const char *type_str, /* Standard access-list */ DEFUN (access_list_standard, access_list_standard_cmd, - "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D A.B.C.D", + "access-list <(1-99)|(1300-1999)> <deny|permit> A.B.C.D A.B.C.D", "Add an access list entry\n" "IP standard access list\n" "IP standard access list (expanded range)\n" @@ -719,7 +719,7 @@ DEFUN (access_list_standard, DEFUN (access_list_standard_nomask, access_list_standard_nomask_cmd, - "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", + "access-list <(1-99)|(1300-1999)> <deny|permit> A.B.C.D", "Add an access list entry\n" "IP standard access list\n" "IP standard access list (expanded range)\n" @@ -733,7 +733,7 @@ DEFUN (access_list_standard_nomask, DEFUN (access_list_standard_host, access_list_standard_host_cmd, - "access-list (<1-99>|<1300-1999>) (deny|permit) host A.B.C.D", + "access-list <(1-99)|(1300-1999)> <deny|permit> host A.B.C.D", "Add an access list entry\n" "IP standard access list\n" "IP standard access list (expanded range)\n" @@ -748,7 +748,7 @@ DEFUN (access_list_standard_host, DEFUN (access_list_standard_any, access_list_standard_any_cmd, - "access-list (<1-99>|<1300-1999>) (deny|permit) any", + "access-list <(1-99)|(1300-1999)> <deny|permit> any", "Add an access list entry\n" "IP standard access list\n" "IP standard access list (expanded range)\n" @@ -762,7 +762,7 @@ DEFUN (access_list_standard_any, DEFUN (no_access_list_standard, no_access_list_standard_cmd, - "no access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D A.B.C.D", + "no access-list <(1-99)|(1300-1999)> <deny|permit> A.B.C.D A.B.C.D", NO_STR "Add an access list entry\n" "IP standard access list\n" @@ -778,7 +778,7 @@ DEFUN (no_access_list_standard, DEFUN (no_access_list_standard_nomask, no_access_list_standard_nomask_cmd, - "no access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", + "no access-list <(1-99)|(1300-1999)> <deny|permit> A.B.C.D", NO_STR "Add an access list entry\n" "IP standard access list\n" @@ -793,7 +793,7 @@ DEFUN (no_access_list_standard_nomask, DEFUN (no_access_list_standard_host, no_access_list_standard_host_cmd, - "no access-list (<1-99>|<1300-1999>) (deny|permit) host A.B.C.D", + "no access-list <(1-99)|(1300-1999)> <deny|permit> host A.B.C.D", NO_STR "Add an access list entry\n" "IP standard access list\n" @@ -809,7 +809,7 @@ DEFUN (no_access_list_standard_host, DEFUN (no_access_list_standard_any, no_access_list_standard_any_cmd, - "no access-list (<1-99>|<1300-1999>) (deny|permit) any", + "no access-list <(1-99)|(1300-1999)> <deny|permit> any", NO_STR "Add an access list entry\n" "IP standard access list\n" @@ -825,7 +825,7 @@ DEFUN (no_access_list_standard_any, /* Extended access-list */ DEFUN (access_list_extended, access_list_extended_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -843,7 +843,7 @@ DEFUN (access_list_extended, DEFUN (access_list_extended_mask_any, access_list_extended_mask_any_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip A.B.C.D A.B.C.D any", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -861,7 +861,7 @@ DEFUN (access_list_extended_mask_any, DEFUN (access_list_extended_any_mask, access_list_extended_any_mask_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip any A.B.C.D A.B.C.D", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip any A.B.C.D A.B.C.D", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -879,7 +879,7 @@ DEFUN (access_list_extended_any_mask, DEFUN (access_list_extended_any_any, access_list_extended_any_any_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip any any", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip any any", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -896,7 +896,7 @@ DEFUN (access_list_extended_any_any, DEFUN (access_list_extended_mask_host, access_list_extended_mask_host_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D host A.B.C.D", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip A.B.C.D A.B.C.D host A.B.C.D", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -915,7 +915,7 @@ DEFUN (access_list_extended_mask_host, DEFUN (access_list_extended_host_mask, access_list_extended_host_mask_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D A.B.C.D A.B.C.D", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip host A.B.C.D A.B.C.D A.B.C.D", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -934,7 +934,7 @@ DEFUN (access_list_extended_host_mask, DEFUN (access_list_extended_host_host, access_list_extended_host_host_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip host A.B.C.D host A.B.C.D", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -953,7 +953,7 @@ DEFUN (access_list_extended_host_host, DEFUN (access_list_extended_any_host, access_list_extended_any_host_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip any host A.B.C.D", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -971,7 +971,7 @@ DEFUN (access_list_extended_any_host, DEFUN (access_list_extended_host_any, access_list_extended_host_any_cmd, - "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", + "access-list <(100-199)|(2000-2699)> <deny|permit> ip host A.B.C.D any", "Add an access list entry\n" "IP extended access list\n" "IP extended access list (expanded range)\n" @@ -989,7 +989,7 @@ DEFUN (access_list_extended_host_any, DEFUN (no_access_list_extended, no_access_list_extended_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1008,7 +1008,7 @@ DEFUN (no_access_list_extended, DEFUN (no_access_list_extended_mask_any, no_access_list_extended_mask_any_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip A.B.C.D A.B.C.D any", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1027,7 +1027,7 @@ DEFUN (no_access_list_extended_mask_any, DEFUN (no_access_list_extended_any_mask, no_access_list_extended_any_mask_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any A.B.C.D A.B.C.D", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip any A.B.C.D A.B.C.D", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1046,7 +1046,7 @@ DEFUN (no_access_list_extended_any_mask, DEFUN (no_access_list_extended_any_any, no_access_list_extended_any_any_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any any", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip any any", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1064,7 +1064,7 @@ DEFUN (no_access_list_extended_any_any, DEFUN (no_access_list_extended_mask_host, no_access_list_extended_mask_host_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D host A.B.C.D", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip A.B.C.D A.B.C.D host A.B.C.D", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1084,7 +1084,7 @@ DEFUN (no_access_list_extended_mask_host, DEFUN (no_access_list_extended_host_mask, no_access_list_extended_host_mask_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D A.B.C.D A.B.C.D", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip host A.B.C.D A.B.C.D A.B.C.D", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1104,7 +1104,7 @@ DEFUN (no_access_list_extended_host_mask, DEFUN (no_access_list_extended_host_host, no_access_list_extended_host_host_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip host A.B.C.D host A.B.C.D", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1124,7 +1124,7 @@ DEFUN (no_access_list_extended_host_host, DEFUN (no_access_list_extended_any_host, no_access_list_extended_any_host_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip any host A.B.C.D", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1143,7 +1143,7 @@ DEFUN (no_access_list_extended_any_host, DEFUN (no_access_list_extended_host_any, no_access_list_extended_host_any_cmd, - "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", + "no access-list <(100-199)|(2000-2699)> <deny|permit> ip host A.B.C.D any", NO_STR "Add an access list entry\n" "IP extended access list\n" @@ -1244,7 +1244,7 @@ filter_set_zebra (struct vty *vty, const char *name_str, const char *type_str, /* Zebra access-list */ DEFUN (access_list, access_list_cmd, - "access-list WORD (deny|permit) A.B.C.D/M", + "access-list WORD <deny|permit> A.B.C.D/M", "Add an access list entry\n" "IP zebra access-list name\n" "Specify packets to reject\n" @@ -1256,7 +1256,7 @@ DEFUN (access_list, DEFUN (access_list_exact, access_list_exact_cmd, - "access-list WORD (deny|permit) A.B.C.D/M exact-match", + "access-list WORD <deny|permit> A.B.C.D/M exact-match", "Add an access list entry\n" "IP zebra access-list name\n" "Specify packets to reject\n" @@ -1269,7 +1269,7 @@ DEFUN (access_list_exact, DEFUN (access_list_any, access_list_any_cmd, - "access-list WORD (deny|permit) any", + "access-list WORD <deny|permit> any", "Add an access list entry\n" "IP zebra access-list name\n" "Specify packets to reject\n" @@ -1281,7 +1281,7 @@ DEFUN (access_list_any, DEFUN (no_access_list, no_access_list_cmd, - "no access-list WORD (deny|permit) A.B.C.D/M", + "no access-list WORD <deny|permit> A.B.C.D/M", NO_STR "Add an access list entry\n" "IP zebra access-list name\n" @@ -1294,7 +1294,7 @@ DEFUN (no_access_list, DEFUN (no_access_list_exact, no_access_list_exact_cmd, - "no access-list WORD (deny|permit) A.B.C.D/M exact-match", + "no access-list WORD <deny|permit> A.B.C.D/M exact-match", NO_STR "Add an access list entry\n" "IP zebra access-list name\n" @@ -1308,7 +1308,7 @@ DEFUN (no_access_list_exact, DEFUN (no_access_list_any, no_access_list_any_cmd, - "no access-list WORD (deny|permit) any", + "no access-list WORD <deny|permit> any", NO_STR "Add an access list entry\n" "IP zebra access-list name\n" @@ -1321,7 +1321,7 @@ DEFUN (no_access_list_any, DEFUN (no_access_list_all, no_access_list_all_cmd, - "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD)", + "no access-list <(1-99)|(100-199)|(1300-1999)|(2000-2699)|WORD>", NO_STR "Add an access list entry\n" "IP standard access list\n" @@ -1357,7 +1357,7 @@ DEFUN (no_access_list_all, DEFUN (access_list_remark, access_list_remark_cmd, - "access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE", + "access-list <(1-99)|(100-199)|(1300-1999)|(2000-2699)|WORD> remark .LINE", "Add an access list entry\n" "IP standard access list\n" "IP extended access list\n" @@ -1397,7 +1397,7 @@ DEFUN (access_list_remark, */ DEFUN (no_access_list_remark, no_access_list_remark_cmd, - "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark", + "no access-list <(1-99)|(100-199)|(1300-1999)|(2000-2699)|WORD> remark", NO_STR "Add an access list entry\n" "IP standard access list\n" @@ -1414,7 +1414,7 @@ DEFUN (no_access_list_remark, #ifdef HAVE_IPV6 DEFUN (ipv6_access_list, ipv6_access_list_cmd, - "ipv6 access-list WORD (deny|permit) X:X::X:X/M", + "ipv6 access-list WORD <deny|permit> X:X::X:X/M", IPV6_STR "Add an access list entry\n" "IPv6 zebra access-list\n" @@ -1427,7 +1427,7 @@ DEFUN (ipv6_access_list, DEFUN (ipv6_access_list_exact, ipv6_access_list_exact_cmd, - "ipv6 access-list WORD (deny|permit) X:X::X:X/M exact-match", + "ipv6 access-list WORD <deny|permit> X:X::X:X/M exact-match", IPV6_STR "Add an access list entry\n" "IPv6 zebra access-list\n" @@ -1441,7 +1441,7 @@ DEFUN (ipv6_access_list_exact, DEFUN (ipv6_access_list_any, ipv6_access_list_any_cmd, - "ipv6 access-list WORD (deny|permit) any", + "ipv6 access-list WORD <deny|permit> any", IPV6_STR "Add an access list entry\n" "IPv6 zebra access-list\n" @@ -1454,7 +1454,7 @@ DEFUN (ipv6_access_list_any, DEFUN (no_ipv6_access_list, no_ipv6_access_list_cmd, - "no ipv6 access-list WORD (deny|permit) X:X::X:X/M", + "no ipv6 access-list WORD <deny|permit> X:X::X:X/M", NO_STR IPV6_STR "Add an access list entry\n" @@ -1468,7 +1468,7 @@ DEFUN (no_ipv6_access_list, DEFUN (no_ipv6_access_list_exact, no_ipv6_access_list_exact_cmd, - "no ipv6 access-list WORD (deny|permit) X:X::X:X/M exact-match", + "no ipv6 access-list WORD <deny|permit> X:X::X:X/M exact-match", NO_STR IPV6_STR "Add an access list entry\n" @@ -1483,7 +1483,7 @@ DEFUN (no_ipv6_access_list_exact, DEFUN (no_ipv6_access_list_any, no_ipv6_access_list_any_cmd, - "no ipv6 access-list WORD (deny|permit) any", + "no ipv6 access-list WORD <deny|permit> any", NO_STR IPV6_STR "Add an access list entry\n" @@ -1699,7 +1699,7 @@ DEFUN (show_ip_access_list, DEFUN (show_ip_access_list_name, show_ip_access_list_name_cmd, - "show ip access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD)", + "show ip access-list <(1-99)|(100-199)|(1300-1999)|(2000-2699)|WORD>", SHOW_STR IP_STR "List IP access lists\n" @@ -671,7 +671,7 @@ if_dump_all (void) if_dump (p); } -DEFUN (interface_desc, +DEFUN (interface_desc, interface_desc_cmd, "description LINE...", "Interface specific description\n" @@ -690,7 +690,7 @@ DEFUN (interface_desc, return CMD_SUCCESS; } -DEFUN (no_interface_desc, +DEFUN (no_interface_desc, no_interface_desc_cmd, "no description", NO_STR diff --git a/lib/if_rmap.c b/lib/if_rmap.c index 240a03cab..abed32c9e 100644 --- a/lib/if_rmap.c +++ b/lib/if_rmap.c @@ -221,7 +221,7 @@ if_rmap_unset (const char *ifname, enum if_rmap_type type, */ DEFUN (if_rmap, if_rmap_cmd, - "route-map RMAP_NAME (in|out) IFNAME", + "route-map RMAP_NAME <in|out> IFNAME", "Route map set\n" "Route map name\n" "Route map set for input filtering\n" @@ -259,7 +259,7 @@ DEFUN (if_rmap, */ DEFUN (no_if_rmap, no_if_rmap_cmd, - "no route-map ROUTEMAP_NAME (in|out) IFNAME", + "no route-map ROUTEMAP_NAME <in|out> IFNAME", NO_STR "Route map unset\n" "Route map name\n" diff --git a/lib/keychain.c b/lib/keychain.c index 1997496d3..0796d81f1 100644 --- a/lib/keychain.c +++ b/lib/keychain.c @@ -271,7 +271,7 @@ DEFUN (no_key_chain, DEFUN (key, key_cmd, - "key <0-2147483647>", + "key (0-2147483647)", "Configure a key\n" "Key identifier number\n") { @@ -291,7 +291,7 @@ DEFUN (key, DEFUN (no_key, no_key_cmd, - "no key <0-2147483647>", + "no key (0-2147483647)", NO_STR "Delete a key\n" "Key identifier number\n") @@ -541,7 +541,7 @@ key_lifetime_infinite_set (struct vty *vty, struct key_range *krange, DEFUN (accept_lifetime_day_month_day_month, accept_lifetime_day_month_day_month_cmd, - "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", + "accept-lifetime HH:MM:SS (1-31) MONTH (1993-2035) HH:MM:SS (1-31) MONTH (1993-2035)", "Set accept lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -562,7 +562,7 @@ DEFUN (accept_lifetime_day_month_day_month, DEFUN (accept_lifetime_day_month_month_day, accept_lifetime_day_month_month_day_cmd, - "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", + "accept-lifetime HH:MM:SS (1-31) MONTH (1993-2035) HH:MM:SS MONTH (1-31) (1993-2035)", "Set accept lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -583,7 +583,7 @@ DEFUN (accept_lifetime_day_month_month_day, DEFUN (accept_lifetime_month_day_day_month, accept_lifetime_month_day_day_month_cmd, - "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", + "accept-lifetime HH:MM:SS MONTH (1-31) (1993-2035) HH:MM:SS (1-31) MONTH (1993-2035)", "Set accept lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -604,7 +604,7 @@ DEFUN (accept_lifetime_month_day_day_month, DEFUN (accept_lifetime_month_day_month_day, accept_lifetime_month_day_month_day_cmd, - "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", + "accept-lifetime HH:MM:SS MONTH (1-31) (1993-2035) HH:MM:SS MONTH (1-31) (1993-2035)", "Set accept lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -625,7 +625,7 @@ DEFUN (accept_lifetime_month_day_month_day, DEFUN (accept_lifetime_infinite_day_month, accept_lifetime_infinite_day_month_cmd, - "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", + "accept-lifetime HH:MM:SS (1-31) MONTH (1993-2035) infinite", "Set accept lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -643,7 +643,7 @@ DEFUN (accept_lifetime_infinite_day_month, DEFUN (accept_lifetime_infinite_month_day, accept_lifetime_infinite_month_day_cmd, - "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", + "accept-lifetime HH:MM:SS MONTH (1-31) (1993-2035) infinite", "Set accept lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -661,7 +661,7 @@ DEFUN (accept_lifetime_infinite_month_day, DEFUN (accept_lifetime_duration_day_month, accept_lifetime_duration_day_month_cmd, - "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> duration <1-2147483646>", + "accept-lifetime HH:MM:SS (1-31) MONTH (1993-2035) duration (1-2147483646)", "Set accept lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -680,7 +680,7 @@ DEFUN (accept_lifetime_duration_day_month, DEFUN (accept_lifetime_duration_month_day, accept_lifetime_duration_month_day_cmd, - "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", + "accept-lifetime HH:MM:SS MONTH (1-31) (1993-2035) duration (1-2147483646)", "Set accept lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -699,7 +699,7 @@ DEFUN (accept_lifetime_duration_month_day, DEFUN (send_lifetime_day_month_day_month, send_lifetime_day_month_day_month_cmd, - "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", + "send-lifetime HH:MM:SS (1-31) MONTH (1993-2035) HH:MM:SS (1-31) MONTH (1993-2035)", "Set send lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -720,7 +720,7 @@ DEFUN (send_lifetime_day_month_day_month, DEFUN (send_lifetime_day_month_month_day, send_lifetime_day_month_month_day_cmd, - "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", + "send-lifetime HH:MM:SS (1-31) MONTH (1993-2035) HH:MM:SS MONTH (1-31) (1993-2035)", "Set send lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -741,7 +741,7 @@ DEFUN (send_lifetime_day_month_month_day, DEFUN (send_lifetime_month_day_day_month, send_lifetime_month_day_day_month_cmd, - "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", + "send-lifetime HH:MM:SS MONTH (1-31) (1993-2035) HH:MM:SS (1-31) MONTH (1993-2035)", "Set send lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -762,7 +762,7 @@ DEFUN (send_lifetime_month_day_day_month, DEFUN (send_lifetime_month_day_month_day, send_lifetime_month_day_month_day_cmd, - "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", + "send-lifetime HH:MM:SS MONTH (1-31) (1993-2035) HH:MM:SS MONTH (1-31) (1993-2035)", "Set send lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -783,7 +783,7 @@ DEFUN (send_lifetime_month_day_month_day, DEFUN (send_lifetime_infinite_day_month, send_lifetime_infinite_day_month_cmd, - "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", + "send-lifetime HH:MM:SS (1-31) MONTH (1993-2035) infinite", "Set send lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -801,7 +801,7 @@ DEFUN (send_lifetime_infinite_day_month, DEFUN (send_lifetime_infinite_month_day, send_lifetime_infinite_month_day_cmd, - "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", + "send-lifetime HH:MM:SS MONTH (1-31) (1993-2035) infinite", "Set send lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -819,7 +819,7 @@ DEFUN (send_lifetime_infinite_month_day, DEFUN (send_lifetime_duration_day_month, send_lifetime_duration_day_month_cmd, - "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> duration <1-2147483646>", + "send-lifetime HH:MM:SS (1-31) MONTH (1993-2035) duration (1-2147483646)", "Set send lifetime of the key\n" "Time to start\n" "Day of th month to start\n" @@ -838,7 +838,7 @@ DEFUN (send_lifetime_duration_day_month, DEFUN (send_lifetime_duration_month_day, send_lifetime_duration_month_day_cmd, - "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", + "send-lifetime HH:MM:SS MONTH (1-31) (1993-2035) duration (1-2147483646)", "Set send lifetime of the key\n" "Time to start\n" "Month of the year to start\n" @@ -551,7 +551,7 @@ ns_netns_pathname (struct vty *vty, const char *name) DEFUN (ns_netns, ns_netns_cmd, - "logical-router <1-65535> ns NAME", + "logical-router (1-65535) ns NAME", "Enable a logical-router\n" "Specify the logical-router indentifier\n" "The Name Space\n" @@ -589,7 +589,7 @@ DEFUN (ns_netns, DEFUN (no_ns_netns, no_ns_netns_cmd, - "no logical-router <1-65535> ns NAME", + "no logical-router (1-65535) ns NAME", NO_STR "Enable a Logical-Router\n" "Specify the Logical-Router identifier\n" diff --git a/lib/plist.c b/lib/plist.c index d874e1d02..164bc1d7e 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1406,7 +1406,7 @@ vty_clear_prefix_list (struct vty *vty, afi_t afi, const char *name, DEFUN (ip_prefix_list, ip_prefix_list_cmd, - "ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", + "ip prefix-list WORD <deny|permit> <A.B.C.D/M|any>", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1421,7 +1421,7 @@ DEFUN (ip_prefix_list, DEFUN (ip_prefix_list_ge, ip_prefix_list_ge_cmd, - "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", + "ip prefix-list WORD <deny|permit> A.B.C.D/M ge (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1437,7 +1437,7 @@ DEFUN (ip_prefix_list_ge, DEFUN (ip_prefix_list_ge_le, ip_prefix_list_ge_le_cmd, - "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", + "ip prefix-list WORD <deny|permit> A.B.C.D/M ge (0-32) le (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1455,7 +1455,7 @@ DEFUN (ip_prefix_list_ge_le, DEFUN (ip_prefix_list_le, ip_prefix_list_le_cmd, - "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", + "ip prefix-list WORD <deny|permit> A.B.C.D/M le (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1471,7 +1471,7 @@ DEFUN (ip_prefix_list_le, DEFUN (ip_prefix_list_le_ge, ip_prefix_list_le_ge_cmd, - "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", + "ip prefix-list WORD <deny|permit> A.B.C.D/M le (0-32) ge (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1489,7 +1489,7 @@ DEFUN (ip_prefix_list_le_ge, DEFUN (ip_prefix_list_seq, ip_prefix_list_seq_cmd, - "ip prefix-list WORD seq <1-4294967295> (deny|permit) (A.B.C.D/M|any)", + "ip prefix-list WORD seq (1-4294967295) <deny|permit> <A.B.C.D/M|any>", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1506,7 +1506,7 @@ DEFUN (ip_prefix_list_seq, DEFUN (ip_prefix_list_seq_ge, ip_prefix_list_seq_ge_cmd, - "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32>", + "ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M ge (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1524,7 +1524,7 @@ DEFUN (ip_prefix_list_seq_ge, DEFUN (ip_prefix_list_seq_ge_le, ip_prefix_list_seq_ge_le_cmd, - "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", + "ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M ge (0-32) le (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1544,7 +1544,7 @@ DEFUN (ip_prefix_list_seq_ge_le, DEFUN (ip_prefix_list_seq_le, ip_prefix_list_seq_le_cmd, - "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32>", + "ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M le (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1562,7 +1562,7 @@ DEFUN (ip_prefix_list_seq_le, DEFUN (ip_prefix_list_seq_le_ge, ip_prefix_list_seq_le_ge_cmd, - "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", + "ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M le (0-32) ge (0-32)", IP_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -1594,7 +1594,7 @@ DEFUN (no_ip_prefix_list, DEFUN (no_ip_prefix_list_prefix, no_ip_prefix_list_prefix_cmd, - "no ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", + "no ip prefix-list WORD <deny|permit> <A.B.C.D/M|any>", NO_STR IP_STR PREFIX_LIST_STR @@ -1610,7 +1610,7 @@ DEFUN (no_ip_prefix_list_prefix, DEFUN (no_ip_prefix_list_ge, no_ip_prefix_list_ge_cmd, - "no ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", + "no ip prefix-list WORD <deny|permit> A.B.C.D/M ge (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1627,7 +1627,7 @@ DEFUN (no_ip_prefix_list_ge, DEFUN (no_ip_prefix_list_ge_le, no_ip_prefix_list_ge_le_cmd, - "no ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", + "no ip prefix-list WORD <deny|permit> A.B.C.D/M ge (0-32) le (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1646,7 +1646,7 @@ DEFUN (no_ip_prefix_list_ge_le, DEFUN (no_ip_prefix_list_le, no_ip_prefix_list_le_cmd, - "no ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", + "no ip prefix-list WORD <deny|permit> A.B.C.D/M le (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1663,7 +1663,7 @@ DEFUN (no_ip_prefix_list_le, DEFUN (no_ip_prefix_list_le_ge, no_ip_prefix_list_le_ge_cmd, - "no ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", + "no ip prefix-list WORD <deny|permit> A.B.C.D/M le (0-32) ge (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1682,7 +1682,7 @@ DEFUN (no_ip_prefix_list_le_ge, DEFUN (no_ip_prefix_list_seq, no_ip_prefix_list_seq_cmd, - "no ip prefix-list WORD seq <1-4294967295> (deny|permit) (A.B.C.D/M|any)", + "no ip prefix-list WORD seq (1-4294967295) <deny|permit> <A.B.C.D/M|any>", NO_STR IP_STR PREFIX_LIST_STR @@ -1700,7 +1700,7 @@ DEFUN (no_ip_prefix_list_seq, DEFUN (no_ip_prefix_list_seq_ge, no_ip_prefix_list_seq_ge_cmd, - "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32>", + "no ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M ge (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1719,7 +1719,7 @@ DEFUN (no_ip_prefix_list_seq_ge, DEFUN (no_ip_prefix_list_seq_ge_le, no_ip_prefix_list_seq_ge_le_cmd, - "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", + "no ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M ge (0-32) le (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1740,7 +1740,7 @@ DEFUN (no_ip_prefix_list_seq_ge_le, DEFUN (no_ip_prefix_list_seq_le, no_ip_prefix_list_seq_le_cmd, - "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32>", + "no ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M le (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1759,7 +1759,7 @@ DEFUN (no_ip_prefix_list_seq_le, DEFUN (no_ip_prefix_list_seq_le_ge, no_ip_prefix_list_seq_le_ge_cmd, - "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", + "no ip prefix-list WORD seq (1-4294967295) <deny|permit> A.B.C.D/M le (0-32) ge (0-32)", NO_STR IP_STR PREFIX_LIST_STR @@ -1871,7 +1871,7 @@ DEFUN (show_ip_prefix_list_name, DEFUN (show_ip_prefix_list_name_seq, show_ip_prefix_list_name_seq_cmd, - "show ip prefix-list WORD seq <1-4294967295>", + "show ip prefix-list WORD seq (1-4294967295)", SHOW_STR IP_STR PREFIX_LIST_STR @@ -2003,7 +2003,7 @@ DEFUN (clear_ip_prefix_list_name_prefix, #ifdef HAVE_IPV6 DEFUN (ipv6_prefix_list, ipv6_prefix_list_cmd, - "ipv6 prefix-list WORD (deny|permit) (X:X::X:X/M|any)", + "ipv6 prefix-list WORD <deny|permit> <X:X::X:X/M|any>", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2018,7 +2018,7 @@ DEFUN (ipv6_prefix_list, DEFUN (ipv6_prefix_list_ge, ipv6_prefix_list_ge_cmd, - "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128>", + "ipv6 prefix-list WORD <deny|permit> X:X::X:X/M ge (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2034,7 +2034,7 @@ DEFUN (ipv6_prefix_list_ge, DEFUN (ipv6_prefix_list_ge_le, ipv6_prefix_list_ge_le_cmd, - "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", + "ipv6 prefix-list WORD <deny|permit> X:X::X:X/M ge (0-128) le (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2053,7 +2053,7 @@ DEFUN (ipv6_prefix_list_ge_le, DEFUN (ipv6_prefix_list_le, ipv6_prefix_list_le_cmd, - "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128>", + "ipv6 prefix-list WORD <deny|permit> X:X::X:X/M le (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2069,7 +2069,7 @@ DEFUN (ipv6_prefix_list_le, DEFUN (ipv6_prefix_list_le_ge, ipv6_prefix_list_le_ge_cmd, - "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", + "ipv6 prefix-list WORD <deny|permit> X:X::X:X/M le (0-128) ge (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2087,7 +2087,7 @@ DEFUN (ipv6_prefix_list_le_ge, DEFUN (ipv6_prefix_list_seq, ipv6_prefix_list_seq_cmd, - "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) (X:X::X:X/M|any)", + "ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> <X:X::X:X/M|any>", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2104,7 +2104,7 @@ DEFUN (ipv6_prefix_list_seq, DEFUN (ipv6_prefix_list_seq_ge, ipv6_prefix_list_seq_ge_cmd, - "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128>", + "ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M ge (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2122,7 +2122,7 @@ DEFUN (ipv6_prefix_list_seq_ge, DEFUN (ipv6_prefix_list_seq_ge_le, ipv6_prefix_list_seq_ge_le_cmd, - "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", + "ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M ge (0-128) le (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2142,7 +2142,7 @@ DEFUN (ipv6_prefix_list_seq_ge_le, DEFUN (ipv6_prefix_list_seq_le, ipv6_prefix_list_seq_le_cmd, - "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128>", + "ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M le (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2160,7 +2160,7 @@ DEFUN (ipv6_prefix_list_seq_le, DEFUN (ipv6_prefix_list_seq_le_ge, ipv6_prefix_list_seq_le_ge_cmd, - "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", + "ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M le (0-128) ge (0-128)", IPV6_STR PREFIX_LIST_STR "Name of a prefix list\n" @@ -2192,7 +2192,7 @@ DEFUN (no_ipv6_prefix_list, DEFUN (no_ipv6_prefix_list_prefix, no_ipv6_prefix_list_prefix_cmd, - "no ipv6 prefix-list WORD (deny|permit) (X:X::X:X/M|any)", + "no ipv6 prefix-list WORD <deny|permit> <X:X::X:X/M|any>", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2208,7 +2208,7 @@ DEFUN (no_ipv6_prefix_list_prefix, DEFUN (no_ipv6_prefix_list_ge, no_ipv6_prefix_list_ge_cmd, - "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128>", + "no ipv6 prefix-list WORD <deny|permit> X:X::X:X/M ge (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2225,7 +2225,7 @@ DEFUN (no_ipv6_prefix_list_ge, DEFUN (no_ipv6_prefix_list_ge_le, no_ipv6_prefix_list_ge_le_cmd, - "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", + "no ipv6 prefix-list WORD <deny|permit> X:X::X:X/M ge (0-128) le (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2244,7 +2244,7 @@ DEFUN (no_ipv6_prefix_list_ge_le, DEFUN (no_ipv6_prefix_list_le, no_ipv6_prefix_list_le_cmd, - "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128>", + "no ipv6 prefix-list WORD <deny|permit> X:X::X:X/M le (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2261,7 +2261,7 @@ DEFUN (no_ipv6_prefix_list_le, DEFUN (no_ipv6_prefix_list_le_ge, no_ipv6_prefix_list_le_ge_cmd, - "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", + "no ipv6 prefix-list WORD <deny|permit> X:X::X:X/M le (0-128) ge (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2280,7 +2280,7 @@ DEFUN (no_ipv6_prefix_list_le_ge, DEFUN (no_ipv6_prefix_list_seq, no_ipv6_prefix_list_seq_cmd, - "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) (X:X::X:X/M|any)", + "no ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> <X:X::X:X/M|any>", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2298,7 +2298,7 @@ DEFUN (no_ipv6_prefix_list_seq, DEFUN (no_ipv6_prefix_list_seq_ge, no_ipv6_prefix_list_seq_ge_cmd, - "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128>", + "no ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M ge (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2317,7 +2317,7 @@ DEFUN (no_ipv6_prefix_list_seq_ge, DEFUN (no_ipv6_prefix_list_seq_ge_le, no_ipv6_prefix_list_seq_ge_le_cmd, - "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", + "no ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M ge (0-128) le (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2338,7 +2338,7 @@ DEFUN (no_ipv6_prefix_list_seq_ge_le, DEFUN (no_ipv6_prefix_list_seq_le, no_ipv6_prefix_list_seq_le_cmd, - "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128>", + "no ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M le (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2357,7 +2357,7 @@ DEFUN (no_ipv6_prefix_list_seq_le, DEFUN (no_ipv6_prefix_list_seq_le_ge, no_ipv6_prefix_list_seq_le_ge_cmd, - "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", + "no ipv6 prefix-list WORD seq (1-4294967295) <deny|permit> X:X::X:X/M le (0-128) ge (0-128)", NO_STR IPV6_STR PREFIX_LIST_STR @@ -2469,7 +2469,7 @@ DEFUN (show_ipv6_prefix_list_name, DEFUN (show_ipv6_prefix_list_name_seq, show_ipv6_prefix_list_name_seq_cmd, - "show ipv6 prefix-list WORD seq <1-4294967295>", + "show ipv6 prefix-list WORD seq (1-4294967295)", SHOW_STR IPV6_STR PREFIX_LIST_STR @@ -738,7 +738,7 @@ vrf_socket (int domain, int type, int protocol, vrf_id_t vrf_id) * Debug CLI for vrf's */ DEFUN (vrf_debug, - vrf_debug_cmd, + vrf_debug_cmd, "debug vrf", DEBUG_STR "VRF Debugging\n") @@ -749,7 +749,7 @@ DEFUN (vrf_debug, } DEFUN (no_vrf_debug, - no_vrf_debug_cmd, + no_vrf_debug_cmd, "no debug vrf", NO_STR DEBUG_STR diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 4863342ef..1c1a524e4 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -668,7 +668,7 @@ ospf6_area_config_write (struct vty *vty) DEFUN (area_filter_list, area_filter_list_cmd, - "area A.B.C.D filter-list prefix WORD (in|out)", + "area A.B.C.D filter-list prefix WORD <in|out>", "OSPFv6 area parameters\n" "OSPFv6 area ID in IP address format\n" "Filter networks between OSPFv6 areas\n" @@ -709,7 +709,7 @@ DEFUN (area_filter_list, DEFUN (no_area_filter_list, no_area_filter_list_cmd, - "no area A.B.C.D filter-list prefix WORD (in|out)", + "no area A.B.C.D filter-list prefix WORD <in|out>", NO_STR "OSPFv6 area parameters\n" "OSPFv6 area ID in IP address format\n" @@ -996,7 +996,7 @@ DEFUN (show_ipv6_ospf6_simulate_spf_tree_root, DEFUN (ospf6_area_stub, ospf6_area_stub_cmd, - "area (A.B.C.D|<0-4294967295>) stub", + "area <A.B.C.D|(0-4294967295)> stub", "OSPF6 area parameters\n" "OSPF6 area ID in IP address format\n" "OSPF6 area ID as a decimal value\n" @@ -1020,7 +1020,7 @@ DEFUN (ospf6_area_stub, DEFUN (ospf6_area_stub_no_summary, ospf6_area_stub_no_summary_cmd, - "area (A.B.C.D|<0-4294967295>) stub no-summary", + "area <A.B.C.D|(0-4294967295)> stub no-summary", "OSPF6 stub parameters\n" "OSPF6 area ID in IP address format\n" "OSPF6 area ID as a decimal value\n" @@ -1045,7 +1045,7 @@ DEFUN (ospf6_area_stub_no_summary, DEFUN (no_ospf6_area_stub, no_ospf6_area_stub_cmd, - "no area (A.B.C.D|<0-4294967295>) stub", + "no area <A.B.C.D|(0-4294967295)> stub", NO_STR "OSPF6 area parameters\n" "OSPF6 area ID in IP address format\n" @@ -1064,7 +1064,7 @@ DEFUN (no_ospf6_area_stub, DEFUN (no_ospf6_area_stub_no_summary, no_ospf6_area_stub_no_summary_cmd, - "no area (A.B.C.D|<0-4294967295>) stub no-summary", + "no area <A.B.C.D|(0-4294967295)> stub no-summary", NO_STR "OSPF6 area parameters\n" "OSPF6 area ID in IP address format\n" diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 696f18f03..143278b42 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -1078,7 +1078,7 @@ DEFUN (ospf6_routemap_no_match_interface, /* add "set metric-type" */ DEFUN (ospf6_routemap_set_metric_type, ospf6_routemap_set_metric_type_cmd, - "set metric-type (type-1|type-2)", + "set metric-type <type-1|type-2>", "Set value\n" "Type of metric\n" "OSPF6 external type 1 metric\n" @@ -1092,7 +1092,7 @@ DEFUN (ospf6_routemap_set_metric_type, /* delete "set metric-type" */ DEFUN (ospf6_routemap_no_set_metric_type, ospf6_routemap_no_set_metric_type_cmd, - "no set metric-type (type-1|type-2)", + "no set metric-type <type-1|type-2>", NO_STR "Set value\n" "Type of metric\n" @@ -1107,7 +1107,7 @@ DEFUN (ospf6_routemap_no_set_metric_type, /* add "set metric" */ DEFUN (set_metric, set_metric_cmd, - "set metric <0-4294967295>", + "set metric (0-4294967295)", "Set value\n" "Metric value\n" "Metric value\n") diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 66cc59bc3..2b7d180a8 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -1151,7 +1151,7 @@ DEFUN (show_ipv6_ospf6_interface_prefix, /* interface variable set command */ DEFUN (ipv6_ospf6_ifmtu, ipv6_ospf6_ifmtu_cmd, - "ipv6 ospf6 ifmtu <1-65535>", + "ipv6 ospf6 ifmtu (1-65535)", IP6_STR OSPF6_STR "Interface MTU\n" @@ -1259,7 +1259,7 @@ DEFUN (no_ipv6_ospf6_ifmtu, DEFUN (ipv6_ospf6_cost, ipv6_ospf6_cost_cmd, - "ipv6 ospf6 cost <1-65535>", + "ipv6 ospf6 cost (1-65535)", IP6_STR OSPF6_STR "Interface cost\n" @@ -1326,7 +1326,7 @@ DEFUN (no_ipv6_ospf6_cost, DEFUN (auto_cost_reference_bandwidth, auto_cost_reference_bandwidth_cmd, - "auto-cost reference-bandwidth <1-4294967>", + "auto-cost reference-bandwidth (1-4294967)", "Calculate OSPF interface cost according to bandwidth\n" "Use reference bandwidth method to assign OSPF cost\n" "The reference bandwidth in terms of Mbits per second\n") @@ -1391,7 +1391,7 @@ DEFUN (no_auto_cost_reference_bandwidth, DEFUN (ipv6_ospf6_hellointerval, ipv6_ospf6_hellointerval_cmd, - "ipv6 ospf6 hello-interval <1-65535>", + "ipv6 ospf6 hello-interval (1-65535)", IP6_STR OSPF6_STR "Interval time of Hello packets\n" @@ -1416,7 +1416,7 @@ DEFUN (ipv6_ospf6_hellointerval, /* interface variable set command */ DEFUN (ipv6_ospf6_deadinterval, ipv6_ospf6_deadinterval_cmd, - "ipv6 ospf6 dead-interval <1-65535>", + "ipv6 ospf6 dead-interval (1-65535)", IP6_STR OSPF6_STR "Interval time after which a neighbor is declared down\n" @@ -1441,7 +1441,7 @@ DEFUN (ipv6_ospf6_deadinterval, /* interface variable set command */ DEFUN (ipv6_ospf6_transmitdelay, ipv6_ospf6_transmitdelay_cmd, - "ipv6 ospf6 transmit-delay <1-3600>", + "ipv6 ospf6 transmit-delay (1-3600)", IP6_STR OSPF6_STR "Transmit delay of this interface\n" @@ -1466,7 +1466,7 @@ DEFUN (ipv6_ospf6_transmitdelay, /* interface variable set command */ DEFUN (ipv6_ospf6_retransmitinterval, ipv6_ospf6_retransmitinterval_cmd, - "ipv6 ospf6 retransmit-interval <1-65535>", + "ipv6 ospf6 retransmit-interval (1-65535)", IP6_STR OSPF6_STR "Time between retransmitting lost link state advertisements\n" @@ -1491,7 +1491,7 @@ DEFUN (ipv6_ospf6_retransmitinterval, /* interface variable set command */ DEFUN (ipv6_ospf6_priority, ipv6_ospf6_priority_cmd, - "ipv6 ospf6 priority <0-255>", + "ipv6 ospf6 priority (0-255)", IP6_STR OSPF6_STR "Router priority\n" @@ -1522,7 +1522,7 @@ DEFUN (ipv6_ospf6_priority, DEFUN (ipv6_ospf6_instance, ipv6_ospf6_instance_cmd, - "ipv6 ospf6 instance-id <0-255>", + "ipv6 ospf6 instance-id (0-255)", IP6_STR OSPF6_STR "Instance ID for this interface\n" @@ -1740,7 +1740,7 @@ DEFUN (no_ipv6_ospf6_advertise_prefix_list, DEFUN (ipv6_ospf6_network, ipv6_ospf6_network_cmd, - "ipv6 ospf6 network (broadcast|point-to-point)", + "ipv6 ospf6 network <broadcast|point-to-point>", IP6_STR OSPF6_STR "Network Type\n" diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index d58ab567b..db34214e1 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -828,7 +828,7 @@ ospf6_lsa_handler_name (struct ospf6_lsa_handler *h) */ DEFUN (debug_ospf6_lsa_type, debug_ospf6_lsa_hex_cmd, - "debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown)", + "debug ospf6 lsa <router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown>", DEBUG_STR OSPF6_STR "Debug Link State Advertisements (LSAs)\n" @@ -884,7 +884,7 @@ DEFUN (debug_ospf6_lsa_type, */ DEFUN (no_debug_ospf6_lsa_type, no_debug_ospf6_lsa_hex_cmd, - "no debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown)", + "no debug ospf6 lsa <router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown>", NO_STR DEBUG_STR OSPF6_STR diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index e8f4990c9..b2dd6b6ce 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -2358,7 +2358,7 @@ ospf6_lsack_send_interface (struct thread *thread) */ DEFUN (debug_ospf6_message, debug_ospf6_message_cmd, - "debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all)", + "debug ospf6 message <unknown|hello|dbdesc|lsreq|lsupdate|lsack|all>", DEBUG_STR OSPF6_STR "Debug OSPFv3 message\n" @@ -2435,7 +2435,7 @@ DEFUN (debug_ospf6_message, */ DEFUN (no_debug_ospf6_message, no_debug_ospf6_message_cmd, - "no debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all)", + "no debug ospf6 message <unknown|hello|dbdesc|lsreq|lsupdate|lsack|all>", NO_STR DEBUG_STR OSPF6_STR diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index d5267354a..8cf819695 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -1563,7 +1563,7 @@ ospf6_brouter_show (struct vty *vty, struct ospf6_route *route) DEFUN (debug_ospf6_route, debug_ospf6_route_cmd, - "debug ospf6 route (table|intra-area|inter-area|memory)", + "debug ospf6 route <table|intra-area|inter-area|memory>", DEBUG_STR OSPF6_STR "Debug route table calculation\n" @@ -1589,7 +1589,7 @@ DEFUN (debug_ospf6_route, DEFUN (no_debug_ospf6_route, no_debug_ospf6_route_cmd, - "no debug ospf6 route (table|intra-area|inter-area|memory)", + "no debug ospf6 route <table|intra-area|inter-area|memory>", NO_STR DEBUG_STR OSPF6_STR diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 6511d0b36..80fb90416 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -877,7 +877,7 @@ ospf6_timers_spf_set (struct vty *vty, unsigned int delay, DEFUN (ospf6_timers_throttle_spf, ospf6_timers_throttle_spf_cmd, - "timers throttle spf <0-600000> <0-600000> <0-600000>", + "timers throttle spf (0-600000) (0-600000) (0-600000)", "Adjust routing timers\n" "Throttling adaptive timer\n" "OSPF6 SPF timers\n" diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 8ddc6cfc8..9c51b4ee7 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -398,7 +398,7 @@ DEFUN (no_ospf6_log_adjacency_changes_detail, DEFUN (ospf6_timers_lsa, ospf6_timers_lsa_cmd, - "timers lsa min-arrival <0-600000>", + "timers lsa min-arrival (0-600000)", "Adjust routing timers\n" "OSPF6 LSA timers\n" "Minimum delay in receiving new version of a LSA\n" @@ -640,7 +640,7 @@ DEFUN (no_ospf6_stub_router_admin, DEFUN (ospf6_stub_router_startup, ospf6_stub_router_startup_cmd, - "stub-router on-startup <5-86400>", + "stub-router on-startup (5-86400)", "Make router a stub router\n" "Advertise inability to be a transit router\n" "Automatically advertise as stub-router on startup of OSPF6\n" @@ -663,7 +663,7 @@ DEFUN (no_ospf6_stub_router_startup, DEFUN (ospf6_stub_router_shutdown, ospf6_stub_router_shutdown_cmd, - "stub-router on-shutdown <5-86400>", + "stub-router on-shutdown (5-86400)", "Make router a stub router\n" "Advertise inability to be a transit router\n" "Automatically advertise as stub-router before shutdown\n" @@ -868,7 +868,7 @@ DEFUN (show_ipv6_ospf6_route_match_detail, DEFUN (show_ipv6_ospf6_route_type_detail, show_ipv6_ospf6_route_type_detail_cmd, - "show ipv6 ospf6 route (intra-area|inter-area|external-1|external-2) detail", + "show ipv6 ospf6 route <intra-area|inter-area|external-1|external-2> detail", SHOW_STR IP6_STR OSPF6_STR diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index f172b50f0..10b6b27a8 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -718,7 +718,7 @@ ospf6_zebra_init (struct thread_master *master) */ DEFUN (debug_ospf6_zebra_sendrecv, debug_ospf6_zebra_sendrecv_cmd, - "debug ospf6 zebra (send|recv)", + "debug ospf6 zebra <send|recv>", DEBUG_STR OSPF6_STR "Debug connection between zebra\n" @@ -756,7 +756,7 @@ DEFUN (debug_ospf6_zebra_sendrecv, */ DEFUN (no_debug_ospf6_zebra_sendrecv, no_debug_ospf6_zebra_sendrecv_cmd, - "no debug ospf6 zebra (send|recv)", + "no debug ospf6 zebra <send|recv>", NO_STR DEBUG_STR OSPF6_STR diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 74ca444d4..907cd118a 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -248,7 +248,7 @@ DEFUN (show_ipv6_ospf6_database, */ DEFUN (show_ipv6_ospf6_database_type, show_ipv6_ospf6_database_type_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix)", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix>", SHOW_STR IPV6_STR OSPF6_STR @@ -579,7 +579,7 @@ DEFUN (show_ipv6_ospf6_database_router, */ DEFUN (show_ipv6_ospf6_database_type_id, show_ipv6_ospf6_database_type_id_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) A.B.C.D", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> A.B.C.D", SHOW_STR IPV6_STR OSPF6_STR @@ -733,7 +733,7 @@ DEFUN (show_ipv6_ospf6_database_type_id, */ DEFUN (show_ipv6_ospf6_database_type_router, show_ipv6_ospf6_database_type_router_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) * A.B.C.D", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> * A.B.C.D", SHOW_STR IPV6_STR OSPF6_STR @@ -1013,7 +1013,7 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id, */ DEFUN (show_ipv6_ospf6_database_type_id_router, show_ipv6_ospf6_database_type_id_router_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) A.B.C.D A.B.C.D", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> A.B.C.D A.B.C.D", SHOW_STR IPV6_STR OSPF6_STR @@ -1135,7 +1135,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router, */ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id, show_ipv6_ospf6_database_type_adv_router_linkstate_id_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) adv-router A.B.C.D linkstate-id A.B.C.D", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> adv-router A.B.C.D linkstate-id A.B.C.D", SHOW_STR IPV6_STR OSPF6_STR @@ -1316,7 +1316,7 @@ DEFUN (show_ipv6_ospf6_database_self_originated, */ DEFUN (show_ipv6_ospf6_database_type_self_originated, show_ipv6_ospf6_database_type_self_originated_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) self-originated", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> self-originated", SHOW_STR IPV6_STR OSPF6_STR @@ -1417,7 +1417,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated, */ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id, show_ipv6_ospf6_database_type_self_originated_linkstate_id_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) self-originated linkstate-id A.B.C.D", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> self-originated linkstate-id A.B.C.D", SHOW_STR IPV6_STR OSPF6_STR @@ -1531,7 +1531,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id, */ DEFUN (show_ipv6_ospf6_database_type_id_self_originated, show_ipv6_ospf6_database_type_id_self_originated_cmd, - "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) A.B.C.D self-originated", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> A.B.C.D self-originated", SHOW_STR IPV6_STR OSPF6_STR diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 60356e774..5c5e5ceb5 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -847,7 +847,7 @@ debug_ospf_packet_common (struct vty *vty, int arg_base, int argc, */ DEFUN (debug_ospf_packet, debug_ospf_packet_all_cmd, - "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", + "debug ospf packet <hello|dd|ls-request|ls-update|ls-ack|all>", DEBUG_STR OSPF_STR "OSPF packets\n" @@ -898,7 +898,7 @@ DEFUN (debug_ospf_packet, */ DEFUN (debug_ospf_instance_packet, debug_ospf_instance_packet_all_cmd, - "debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all)", + "debug ospf (1-65535) packet <hello|dd|ls-request|ls-update|ls-ack|all>", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1019,7 +1019,7 @@ no_debug_ospf_packet_common (struct vty *vty, int arg_base, int argc, */ DEFUN (no_debug_ospf_packet, no_debug_ospf_packet_all_cmd, - "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", + "no debug ospf packet <hello|dd|ls-request|ls-update|ls-ack|all>", NO_STR DEBUG_STR OSPF_STR @@ -1073,7 +1073,7 @@ DEFUN (no_debug_ospf_packet, */ DEFUN (no_debug_ospf_instance_packet, no_debug_ospf_instance_packet_all_cmd, - "no debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all)", + "no debug ospf (1-65535) packet <hello|dd|ls-request|ls-update|ls-ack|all>", NO_STR DEBUG_STR OSPF_STR @@ -1170,7 +1170,7 @@ DEFUN (debug_ospf_ism, */ DEFUN (debug_ospf_instance_ism, debug_ospf_instance_ism_cmd, - "debug ospf <1-65535> ism", + "debug ospf (1-65535) ism", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1261,7 +1261,7 @@ DEFUN (no_debug_ospf_ism, */ DEFUN (no_debug_ospf_instance_ism, no_debug_ospf_instance_ism_cmd, - "no debug ospf <1-65535> ism", + "no debug ospf (1-65535) ism", NO_STR DEBUG_STR OSPF_STR @@ -1350,7 +1350,7 @@ DEFUN (debug_ospf_nsm, */ DEFUN (debug_ospf_instance_nsm, debug_ospf_instance_nsm_cmd, - "debug ospf <1-65535> nsm", + "debug ospf (1-65535) nsm", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1441,7 +1441,7 @@ DEFUN (no_debug_ospf_nsm, */ DEFUN (no_debug_ospf_instance_nsm, no_debug_ospf_instance_nsm_cmd, - "no debug ospf <1-65535> nsm", + "no debug ospf (1-65535) nsm", NO_STR DEBUG_STR OSPF_STR @@ -1537,7 +1537,7 @@ DEFUN (debug_ospf_lsa, */ DEFUN (debug_ospf_instance_lsa, debug_ospf_instance_lsa_cmd, - "debug ospf <1-65535> lsa", + "debug ospf (1-65535) lsa", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1634,7 +1634,7 @@ DEFUN (no_debug_ospf_lsa, */ DEFUN (no_debug_ospf_instance_lsa, no_debug_ospf_instance_lsa_cmd, - "no debug ospf <1-65535> lsa", + "no debug ospf (1-65535) lsa", NO_STR DEBUG_STR OSPF_STR @@ -1718,7 +1718,7 @@ DEFUN (debug_ospf_zebra, */ DEFUN (debug_ospf_instance_zebra, debug_ospf_instance_zebra_cmd, - "debug ospf <1-65535> zebra", + "debug ospf (1-65535) zebra", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1804,7 +1804,7 @@ DEFUN (no_debug_ospf_zebra, */ DEFUN (no_debug_ospf_instance_zebra, no_debug_ospf_instance_zebra_cmd, - "no debug ospf <1-65535> zebra", + "no debug ospf (1-65535) zebra", NO_STR DEBUG_STR OSPF_STR @@ -1851,7 +1851,7 @@ DEFUN (no_debug_ospf_event, DEFUN (debug_ospf_instance_event, debug_ospf_instance_event_cmd, - "debug ospf <1-65535> event", + "debug ospf (1-65535) event", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1871,7 +1871,7 @@ DEFUN (debug_ospf_instance_event, DEFUN (no_debug_ospf_instance_event, no_debug_ospf_instance_event_cmd, - "no debug ospf <1-65535> event", + "no debug ospf (1-65535) event", NO_STR DEBUG_STR OSPF_STR @@ -1919,7 +1919,7 @@ DEFUN (no_debug_ospf_nssa, DEFUN (debug_ospf_instance_nssa, debug_ospf_instance_nssa_cmd, - "debug ospf <1-65535> nssa", + "debug ospf (1-65535) nssa", DEBUG_STR OSPF_STR "Instance ID\n" @@ -1939,7 +1939,7 @@ DEFUN (debug_ospf_instance_nssa, DEFUN (no_debug_ospf_instance_nssa, no_debug_ospf_instance_nssa_cmd, - "no debug ospf <1-65535> nssa", + "no debug ospf (1-65535) nssa", NO_STR DEBUG_STR OSPF_STR @@ -2160,7 +2160,7 @@ DEFUN (show_debugging_ospf, DEFUN (show_debugging_ospf_instance, show_debugging_ospf_instance_cmd, - "show debugging ospf <1-65535>", + "show debugging ospf (1-65535)", SHOW_STR DEBUG_STR OSPF_STR diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 04601b994..b70433b87 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -1363,7 +1363,7 @@ DEFUN (no_pce_path_scope, DEFUN (pce_domain, pce_domain_cmd, - "pce domain as <0-65535>", + "pce domain as (0-65535)", PCE_STR "Configure PCE domain AS number\n" "AS number where the PCE as visibilities for path computation\n" @@ -1401,7 +1401,7 @@ out:return CMD_SUCCESS; DEFUN (no_pce_domain, no_pce_domain_cmd, - "no pce domain as <0-65535>", + "no pce domain as (0-65535)", NO_STR PCE_STR "Disable PCE domain AS number\n" @@ -1431,7 +1431,7 @@ DEFUN (no_pce_domain, DEFUN (pce_neigbhor, pce_neighbor_cmd, - "pce neighbor as <0-65535>", + "pce neighbor as (0-65535)", PCE_STR "Configure PCE neighbor domain AS number\n" "AS number of PCE neighbors\n" @@ -1469,7 +1469,7 @@ out:return CMD_SUCCESS; DEFUN (no_pce_neighbor, no_pce_neighbor_cmd, - "no pce neighbor as <0-65535>", + "no pce neighbor as (0-65535)", NO_STR PCE_STR "Disable PCE neighbor AS number\n" diff --git a/ospfd/ospf_routemap.c b/ospfd/ospf_routemap.c index f38e45e42..f1fc484e3 100644 --- a/ospfd/ospf_routemap.c +++ b/ospfd/ospf_routemap.c @@ -692,7 +692,7 @@ struct route_map_rule_cmd route_set_tag_cmd = DEFUN (match_ip_nexthop, match_ip_nexthop_cmd, - "match ip next-hop (<1-199>|<1300-2699>|WORD)", + "match ip next-hop <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match next-hop address of route\n" @@ -767,7 +767,7 @@ DEFUN (no_match_ip_next_hop_prefix_list, DEFUN (match_ip_address, match_ip_address_cmd, - "match ip address (<1-199>|<1300-2699>|WORD)", + "match ip address <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match address of route\n" @@ -872,7 +872,7 @@ DEFUN (no_match_interface, DEFUN (match_tag, match_tag_cmd, - "match tag <1-65535>", + "match tag (1-65535)", MATCH_STR "Match tag of route\n" "Tag value\n") @@ -902,7 +902,7 @@ DEFUN (no_match_tag, DEFUN (set_metric, set_metric_cmd, - "set metric <0-4294967295>", + "set metric (0-4294967295)", SET_STR "Metric value for destination routing protocol\n" "Metric value\n") @@ -932,7 +932,7 @@ DEFUN (no_set_metric, DEFUN (set_metric_type, set_metric_type_cmd, - "set metric-type (type-1|type-2)", + "set metric-type <type-1|type-2>", SET_STR "Type of metric for destination routing protocol\n" "OSPF[6] external type 1 metric\n" @@ -969,7 +969,7 @@ DEFUN (no_set_metric_type, DEFUN (set_tag, set_tag_cmd, - "set tag <1-65535>", + "set tag (1-65535)", SET_STR "Tag value for routing protocol\n" "Tag value\n") diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 4505fb3c4..c90a5b2c4 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -2475,7 +2475,7 @@ DEFUN (ospf_mpls_te_inter_as_as, DEFUN (ospf_mpls_te_inter_as_area, ospf_mpls_te_inter_as_area_cmd, - "mpls-te inter-as area (A.B.C.D|<0-4294967295>)", + "mpls-te inter-as area <A.B.C.D|(0-4294967295)>", MPLS_TE_STR "Configure MPLS-TE Inter-AS support\n" "AREA native mode self originate INTER_AS LSA with Type 10 (area flooding scope)\n" diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index e34c0bbeb..8d0fb1d5d 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -529,7 +529,7 @@ DEFUN (no_ospf_passive_interface, DEFUN (ospf_network_area, ospf_network_area_cmd, - "network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", + "network A.B.C.D/M area <A.B.C.D|(0-4294967295)>", "Enable routing on an IP network\n" "OSPF network prefix\n" "Set the OSPF area ID\n" @@ -574,7 +574,7 @@ DEFUN (ospf_network_area, DEFUN (no_ospf_network_area, no_ospf_network_area_cmd, - "no network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", + "no network A.B.C.D/M area <A.B.C.D|(0-4294967295)>", NO_STR "Enable routing on an IP network\n" "OSPF network prefix\n" @@ -645,7 +645,7 @@ DEFUN (no_ospf_network_area, */ DEFUN (ospf_area_range, ospf_area_range_cmd, - "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", + "area <A.B.C.D|(0-4294967295)> range A.B.C.D/M", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -679,7 +679,7 @@ DEFUN (ospf_area_range, DEFUN (ospf_area_range_not_advertise, ospf_area_range_not_advertise_cmd, - "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M not-advertise", + "area <A.B.C.D|(0-4294967295)> range A.B.C.D/M not-advertise", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -739,7 +739,7 @@ DEFUN (ospf_area_range_not_advertise, */ DEFUN (no_ospf_area_range, no_ospf_area_range_cmd, - "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", + "no area <A.B.C.D|(0-4294967295)> range A.B.C.D/M", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -768,7 +768,7 @@ DEFUN (no_ospf_area_range, DEFUN (ospf_area_range_substitute, ospf_area_range_substitute_cmd, - "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", + "area <A.B.C.D|(0-4294967295)> range A.B.C.D/M substitute A.B.C.D/M", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -796,7 +796,7 @@ DEFUN (ospf_area_range_substitute, DEFUN (no_ospf_area_range_substitute, no_ospf_area_range_substitute_cmd, - "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", + "no area <A.B.C.D|(0-4294967295)> range A.B.C.D/M substitute A.B.C.D/M", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -1162,7 +1162,7 @@ ospf_vl_set (struct ospf *ospf, struct ospf_vl_config_data *vl_config) */ DEFUN (ospf_area_vlink, ospf_area_vlink_cmd, - "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D", + "area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D", VLINK_HELPSTR_IPADDR) { struct ospf *ospf = vty->index; @@ -1394,7 +1394,7 @@ DEFUN (ospf_area_vlink, */ DEFUN (no_ospf_area_vlink, no_ospf_area_vlink_cmd, - "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D", + "no area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D", NO_STR VLINK_HELPSTR_IPADDR) { @@ -1538,7 +1538,7 @@ DEFUN (no_ospf_area_vlink, DEFUN (ospf_area_shortcut, ospf_area_shortcut_cmd, - "area (A.B.C.D|<0-4294967295>) shortcut (default|enable|disable)", + "area <A.B.C.D|(0-4294967295)> shortcut <default|enable|disable>", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1581,7 +1581,7 @@ DEFUN (ospf_area_shortcut, DEFUN (no_ospf_area_shortcut, no_ospf_area_shortcut_cmd, - "no area (A.B.C.D|<0-4294967295>) shortcut (enable|disable)", + "no area <A.B.C.D|(0-4294967295)> shortcut <enable|disable>", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -1612,7 +1612,7 @@ DEFUN (no_ospf_area_shortcut, DEFUN (ospf_area_stub, ospf_area_stub_cmd, - "area (A.B.C.D|<0-4294967295>) stub", + "area <A.B.C.D|(0-4294967295)> stub", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1642,7 +1642,7 @@ DEFUN (ospf_area_stub, DEFUN (ospf_area_stub_no_summary, ospf_area_stub_no_summary_cmd, - "area (A.B.C.D|<0-4294967295>) stub no-summary", + "area <A.B.C.D|(0-4294967295)> stub no-summary", "OSPF stub parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1673,7 +1673,7 @@ DEFUN (ospf_area_stub_no_summary, DEFUN (no_ospf_area_stub, no_ospf_area_stub_cmd, - "no area (A.B.C.D|<0-4294967295>) stub", + "no area <A.B.C.D|(0-4294967295)> stub", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -1697,7 +1697,7 @@ DEFUN (no_ospf_area_stub, DEFUN (no_ospf_area_stub_no_summary, no_ospf_area_stub_no_summary_cmd, - "no area (A.B.C.D|<0-4294967295>) stub no-summary", + "no area <A.B.C.D|(0-4294967295)> stub no-summary", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -1769,7 +1769,7 @@ ospf_area_nssa_cmd_handler (struct vty *vty, int argc, const char *argv[], DEFUN (ospf_area_nssa_translate_no_summary, ospf_area_nssa_translate_no_summary_cmd, - "area (A.B.C.D|<0-4294967295>) nssa (translate-candidate|translate-never|translate-always) no-summary", + "area <A.B.C.D|(0-4294967295)> nssa <translate-candidate|translate-never|translate-always> no-summary", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1784,7 +1784,7 @@ DEFUN (ospf_area_nssa_translate_no_summary, DEFUN (ospf_area_nssa_translate, ospf_area_nssa_translate_cmd, - "area (A.B.C.D|<0-4294967295>) nssa (translate-candidate|translate-never|translate-always)", + "area <A.B.C.D|(0-4294967295)> nssa <translate-candidate|translate-never|translate-always>", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1798,7 +1798,7 @@ DEFUN (ospf_area_nssa_translate, DEFUN (ospf_area_nssa, ospf_area_nssa_cmd, - "area (A.B.C.D|<0-4294967295>) nssa", + "area <A.B.C.D|(0-4294967295)> nssa", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1809,7 +1809,7 @@ DEFUN (ospf_area_nssa, DEFUN (ospf_area_nssa_no_summary, ospf_area_nssa_no_summary_cmd, - "area (A.B.C.D|<0-4294967295>) nssa no-summary", + "area <A.B.C.D|(0-4294967295)> nssa no-summary", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1835,7 +1835,7 @@ DEFUN (ospf_area_nssa_no_summary, */ DEFUN (no_ospf_area_nssa, no_ospf_area_nssa_cmd, - "no area (A.B.C.D|<0-4294967295>) nssa", + "no area <A.B.C.D|(0-4294967295)> nssa", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -1862,7 +1862,7 @@ DEFUN (no_ospf_area_nssa, DEFUN (ospf_area_default_cost, ospf_area_default_cost_cmd, - "area (A.B.C.D|<0-4294967295>) default-cost <0-16777215>", + "area <A.B.C.D|(0-4294967295)> default-cost (0-16777215)", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1906,7 +1906,7 @@ DEFUN (ospf_area_default_cost, DEFUN (no_ospf_area_default_cost, no_ospf_area_default_cost_cmd, - "no area (A.B.C.D|<0-4294967295>) default-cost <0-16777215>", + "no area <A.B.C.D|(0-4294967295)> default-cost (0-16777215)", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -1955,7 +1955,7 @@ DEFUN (no_ospf_area_default_cost, DEFUN (ospf_area_export_list, ospf_area_export_list_cmd, - "area (A.B.C.D|<0-4294967295>) export-list NAME", + "area <A.B.C.D|(0-4294967295)> export-list NAME", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -1980,7 +1980,7 @@ DEFUN (ospf_area_export_list, DEFUN (no_ospf_area_export_list, no_ospf_area_export_list_cmd, - "no area (A.B.C.D|<0-4294967295>) export-list NAME", + "no area <A.B.C.D|(0-4294967295)> export-list NAME", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -2010,7 +2010,7 @@ DEFUN (no_ospf_area_export_list, DEFUN (ospf_area_import_list, ospf_area_import_list_cmd, - "area (A.B.C.D|<0-4294967295>) import-list NAME", + "area <A.B.C.D|(0-4294967295)> import-list NAME", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -2035,7 +2035,7 @@ DEFUN (ospf_area_import_list, DEFUN (no_ospf_area_import_list, no_ospf_area_import_list_cmd, - "no area (A.B.C.D|<0-4294967295>) import-list NAME", + "no area <A.B.C.D|(0-4294967295)> import-list NAME", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -2064,7 +2064,7 @@ DEFUN (no_ospf_area_import_list, DEFUN (ospf_area_filter_list, ospf_area_filter_list_cmd, - "area (A.B.C.D|<0-4294967295>) filter-list prefix WORD (in|out)", + "area <A.B.C.D|(0-4294967295)> filter-list prefix WORD <in|out>", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -2111,7 +2111,7 @@ DEFUN (ospf_area_filter_list, DEFUN (no_ospf_area_filter_list, no_ospf_area_filter_list_cmd, - "no area (A.B.C.D|<0-4294967295>) filter-list prefix WORD (in|out)", + "no area <A.B.C.D|(0-4294967295)> filter-list prefix WORD <in|out>", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -2170,7 +2170,7 @@ DEFUN (no_ospf_area_filter_list, DEFUN (ospf_area_authentication_message_digest, ospf_area_authentication_message_digest_cmd, - "area (A.B.C.D|<0-4294967295>) authentication message-digest", + "area <A.B.C.D|(0-4294967295)> authentication message-digest", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -2195,7 +2195,7 @@ DEFUN (ospf_area_authentication_message_digest, DEFUN (ospf_area_authentication, ospf_area_authentication_cmd, - "area (A.B.C.D|<0-4294967295>) authentication", + "area <A.B.C.D|(0-4294967295)> authentication", "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" @@ -2219,7 +2219,7 @@ DEFUN (ospf_area_authentication, DEFUN (no_ospf_area_authentication, no_ospf_area_authentication_cmd, - "no area (A.B.C.D|<0-4294967295>) authentication", + "no area <A.B.C.D|(0-4294967295)> authentication", NO_STR "OSPF area parameters\n" "OSPF area ID in IP address format\n" @@ -2250,7 +2250,7 @@ DEFUN (no_ospf_area_authentication, DEFUN (ospf_abr_type, ospf_abr_type_cmd, - "ospf abr-type (cisco|ibm|shortcut|standard)", + "ospf abr-type <cisco|ibm|shortcut|standard>", "OSPF specific commands\n" "Set OSPF ABR type\n" "Alternative ABR, cisco implementation\n" @@ -2287,7 +2287,7 @@ DEFUN (ospf_abr_type, DEFUN (no_ospf_abr_type, no_ospf_abr_type_cmd, - "no ospf abr-type (cisco|ibm|shortcut|standard)", + "no ospf abr-type <cisco|ibm|shortcut|standard>", NO_STR "OSPF specific commands\n" "Set OSPF ABR type\n" @@ -2461,7 +2461,7 @@ ospf_timers_spf_set (struct vty *vty, unsigned int delay, DEFUN (ospf_timers_min_ls_interval, ospf_timers_min_ls_interval_cmd, - "timers throttle lsa all <0-5000>", + "timers throttle lsa all (0-5000)", "Adjust routing timers\n" "Throttling adaptive timer\n" "LSA delay between transmissions\n" @@ -2516,7 +2516,7 @@ DEFUN (no_ospf_timers_min_ls_interval, DEFUN (ospf_timers_min_ls_arrival, ospf_timers_min_ls_arrival_cmd, - "timers lsa arrival <0-1000>", + "timers lsa arrival (0-1000)", "Adjust routing timers\n" "Throttling link state advertisement delays\n" "OSPF minimum arrival interval delay\n" @@ -2572,7 +2572,7 @@ DEFUN (no_ospf_timers_min_ls_arrival, DEFUN (ospf_timers_throttle_spf, ospf_timers_throttle_spf_cmd, - "timers throttle spf <0-600000> <0-600000> <0-600000>", + "timers throttle spf (0-600000) (0-600000) (0-600000)", "Adjust routing timers\n" "Throttling adaptive timer\n" "OSPF SPF timers\n" @@ -2624,7 +2624,7 @@ DEFUN (no_ospf_timers_throttle_spf, DEFUN (ospf_timers_lsa, ospf_timers_lsa_cmd, - "timers lsa min-arrival <0-600000>", + "timers lsa min-arrival (0-600000)", "Adjust routing timers\n" "OSPF LSA timers\n" "Minimum delay in receiving new version of a LSA\n" @@ -2752,7 +2752,7 @@ DEFUN (ospf_neighbor, */ DEFUN (ospf_neighbor_poll_interval, ospf_neighbor_poll_interval_cmd, - "neighbor A.B.C.D poll-interval <1-65535>", + "neighbor A.B.C.D poll-interval (1-65535)", NEIGHBOR_STR "Neighbor IP address\n" "Dead Neighbor Polling interval\n" @@ -2845,7 +2845,7 @@ DEFUN (no_ospf_neighbor, DEFUN (ospf_refresh_timer, ospf_refresh_timer_cmd, - "refresh timer <10-1800>", + "refresh timer (10-1800)", "Adjust refresh parameters\n" "Set refresh timer\n" "Timer value in seconds\n") @@ -2873,7 +2873,7 @@ DEFUN (ospf_refresh_timer, */ DEFUN (no_ospf_refresh_timer, no_ospf_refresh_timer_val_cmd, - "no refresh timer <10-1800>", + "no refresh timer (10-1800)", "Adjust refresh parameters\n" "Unset refresh timer\n" "Timer value in seconds\n") @@ -2901,7 +2901,7 @@ DEFUN (no_ospf_refresh_timer, DEFUN (ospf_auto_cost_reference_bandwidth, ospf_auto_cost_reference_bandwidth_cmd, - "auto-cost reference-bandwidth <1-4294967>", + "auto-cost reference-bandwidth (1-4294967)", "Calculate OSPF interface cost according to bandwidth\n" "Use reference bandwidth method to assign OSPF cost\n" "The reference bandwidth in terms of Mbits per second\n") @@ -2978,7 +2978,7 @@ DEFUN (no_ospf_auto_cost_reference_bandwidth, */ DEFUN (ospf_write_multiplier, ospf_write_multiplier_cmd, - "ospf write-multiplier <1-100>", + "ospf write-multiplier (1-100)", "OSPF specific commands\n" "Write multiplier\n" "Maximum number of interface serviced per write\n") @@ -3015,7 +3015,7 @@ DEFUN (ospf_write_multiplier, */ DEFUN (no_ospf_write_multiplier, no_ospf_write_multiplier_cmd, - "no ospf write-multiplier <1-100>", + "no ospf write-multiplier (1-100)", NO_STR "OSPF specific commands\n" "Write multiplier\n" @@ -3618,7 +3618,7 @@ DEFUN (show_ip_ospf, DEFUN (show_ip_ospf_instance, show_ip_ospf_instance_cmd, - "show ip ospf <1-65535> [json]", + "show ip ospf (1-65535) [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4028,7 +4028,7 @@ DEFUN (show_ip_ospf_interface, DEFUN (show_ip_ospf_instance_interface, show_ip_ospf_instance_interface_cmd, - "show ip ospf <1-65535> interface [INTERFACE] [json]", + "show ip ospf (1-65535) interface [INTERFACE] [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4185,7 +4185,7 @@ DEFUN (show_ip_ospf_neighbor, DEFUN (show_ip_ospf_instance_neighbor, show_ip_ospf_instance_neighbor_cmd, - "show ip ospf <1-65535> neighbor [json]", + "show ip ospf (1-65535) neighbor [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4296,7 +4296,7 @@ DEFUN (show_ip_ospf_neighbor_all, DEFUN (show_ip_ospf_instance_neighbor_all, show_ip_ospf_instance_neighbor_all_cmd, - "show ip ospf <1-65535> neighbor all [json]", + "show ip ospf (1-65535) neighbor all [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4390,7 +4390,7 @@ DEFUN (show_ip_ospf_neighbor_int, DEFUN (show_ip_ospf_instance_neighbor_int, show_ip_ospf_instance_neighbor_int_cmd, - "show ip ospf <1-65535> neighbor IFNAME [json]", + "show ip ospf (1-65535) neighbor IFNAME [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4756,7 +4756,7 @@ DEFUN (show_ip_ospf_neighbor_id, DEFUN (show_ip_ospf_instance_neighbor_id, show_ip_ospf_instance_neighbor_id_cmd, - "show ip ospf <1-65535> neighbor A.B.C.D [json]", + "show ip ospf (1-65535) neighbor A.B.C.D [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4847,7 +4847,7 @@ DEFUN (show_ip_ospf_neighbor_detail, DEFUN (show_ip_ospf_instance_neighbor_detail, show_ip_ospf_instance_neighbor_detail_cmd, - "show ip ospf <1-65535> neighbor detail [json]", + "show ip ospf (1-65535) neighbor detail [json]", SHOW_STR IP_STR "OSPF information\n" @@ -4945,7 +4945,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all, DEFUN (show_ip_ospf_instance_neighbor_detail_all, show_ip_ospf_instance_neighbor_detail_all_cmd, - "show ip ospf <1-65535> neighbor detail all [json]", + "show ip ospf (1-65535) neighbor detail all [json]", SHOW_STR IP_STR "OSPF information\n" @@ -5047,7 +5047,7 @@ DEFUN (show_ip_ospf_neighbor_int_detail, DEFUN (show_ip_ospf_instance_neighbor_int_detail, show_ip_ospf_instance_neighbor_int_detail_cmd, - "show ip ospf <1-65535> neighbor IFNAME detail [json]", + "show ip ospf (1-65535) neighbor IFNAME detail [json]", SHOW_STR IP_STR "OSPF information\n" @@ -5889,7 +5889,7 @@ DEFUN (show_ip_ospf_database, */ DEFUN (show_ip_ospf_instance_database, show_ip_ospf_instance_database_cmd, - "show ip ospf <1-65535> database", + "show ip ospf (1-65535) database", SHOW_STR IP_STR "OSPF information\n" @@ -5979,7 +5979,7 @@ show_ip_ospf_database_type_adv_router_common (struct vty *vty, struct ospf *ospf */ DEFUN (show_ip_ospf_database_type_adv_router, show_ip_ospf_database_type_adv_router_cmd, - "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") adv-router A.B.C.D", + "show ip ospf database <" OSPF_LSA_TYPES_CMD_STR "> adv-router A.B.C.D", SHOW_STR IP_STR "OSPF information\n" @@ -6011,7 +6011,7 @@ DEFUN (show_ip_ospf_database_type_adv_router, */ DEFUN (show_ip_ospf_instance_database_type_adv_router, show_ip_ospf_instance_database_type_adv_router_cmd, - "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") adv-router A.B.C.D", + "show ip ospf (1-65535) database <" OSPF_LSA_TYPES_CMD_STR "> adv-router A.B.C.D", SHOW_STR IP_STR "OSPF information\n" @@ -6045,7 +6045,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router, */ DEFUN (ip_ospf_authentication_args, ip_ospf_authentication_args_addr_cmd, - "ip ospf authentication (null|message-digest) A.B.C.D", + "ip ospf authentication <null|message-digest> A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Enable authentication on this interface\n" @@ -6154,7 +6154,7 @@ DEFUN (ip_ospf_authentication, */ DEFUN (no_ip_ospf_authentication_args, no_ip_ospf_authentication_args_addr_cmd, - "no ip ospf authentication (null|message-digest) A.B.C.D", + "no ip ospf authentication <null|message-digest> A.B.C.D", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -6488,7 +6488,7 @@ DEFUN (no_ip_ospf_authentication_key, */ DEFUN (ip_ospf_message_digest_key, ip_ospf_message_digest_key_addr_cmd, - "ip ospf message-digest-key <1-255> md5 KEY A.B.C.D", + "ip ospf message-digest-key (1-255) md5 KEY A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Message digest authentication password (key)\n" @@ -6563,7 +6563,7 @@ ALIAS_HIDDEN (ip_ospf_message_digest_key, */ DEFUN (no_ip_ospf_message_digest_key_md5, no_ip_ospf_message_digest_key_md5_addr_cmd, - "no ip ospf message-digest-key <1-255> md5 KEY A.B.C.D", + "no ip ospf message-digest-key (1-255) md5 KEY A.B.C.D", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -6636,7 +6636,7 @@ DEFUN (no_ip_ospf_message_digest_key_md5, */ DEFUN (no_ip_ospf_message_digest_key, no_ip_ospf_message_digest_key_addr_cmd, - "no ip ospf message-digest-key <1-255> A.B.C.D", + "no ip ospf message-digest-key (1-255) A.B.C.D", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -6701,7 +6701,7 @@ DEFUN (no_ip_ospf_message_digest_key, */ DEFUN (ip_ospf_cost, ip_ospf_cost_u32_inet4_cmd, - "ip ospf cost <1-65535> A.B.C.D", + "ip ospf cost (1-65535) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Interface cost\n" @@ -6857,7 +6857,7 @@ DEFUN (no_ip_ospf_cost, */ DEFUN (no_ip_ospf_cost2, no_ip_ospf_cost_u32_cmd, - "no ip ospf cost <1-65535>", + "no ip ospf cost (1-65535)", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -7023,7 +7023,7 @@ ospf_vty_dead_interval_set (struct vty *vty, const char *interval_str, */ DEFUN (ip_ospf_dead_interval, ip_ospf_dead_interval_addr_cmd, - "ip ospf dead-interval <1-65535> A.B.C.D", + "ip ospf dead-interval (1-65535) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Interval after which a neighbor is declared dead\n" @@ -7057,7 +7057,7 @@ ALIAS_HIDDEN (ip_ospf_dead_interval, */ DEFUN (ip_ospf_dead_interval_minimal, ip_ospf_dead_interval_minimal_addr_cmd, - "ip ospf dead-interval minimal hello-multiplier <1-10> A.B.C.D", + "ip ospf dead-interval minimal hello-multiplier (1-10) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Interval after which a neighbor is declared dead\n" @@ -7115,7 +7115,7 @@ DEFUN (ip_ospf_dead_interval_minimal, */ DEFUN (no_ip_ospf_dead_interval, no_ip_ospf_dead_interval_addr_cmd, - "no ip ospf dead-interval <1-65535> A.B.C.D", + "no ip ospf dead-interval (1-65535) A.B.C.D", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -7198,7 +7198,7 @@ DEFUN (no_ip_ospf_dead_interval, */ DEFUN (ip_ospf_hello_interval, ip_ospf_hello_interval_addr_cmd, - "ip ospf hello-interval <1-65535> A.B.C.D", + "ip ospf hello-interval (1-65535) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Time between HELLO packets\n" @@ -7274,7 +7274,7 @@ ALIAS_HIDDEN (ip_ospf_hello_interval, */ DEFUN (no_ip_ospf_hello_interval, no_ip_ospf_hello_interval_addr_cmd, - "no ip ospf hello-interval <1-65535> A.B.C.D", + "no ip ospf hello-interval (1-65535) A.B.C.D", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -7322,7 +7322,7 @@ DEFUN (no_ip_ospf_hello_interval, DEFUN (ip_ospf_network, ip_ospf_network_cmd, - "ip ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)", + "ip ospf network <broadcast|non-broadcast|point-to-multipoint|point-to-point>", "IP Information\n" "OSPF interface commands\n" "Network type\n" @@ -7461,7 +7461,7 @@ DEFUN (no_ip_ospf_network, */ DEFUN (ip_ospf_priority, ip_ospf_priority_addr_cmd, - "ip ospf priority <0-255> A.B.C.D", + "ip ospf priority (0-255) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Router priority\n" @@ -7553,7 +7553,7 @@ ALIAS_HIDDEN (ip_ospf_priority, */ DEFUN (no_ip_ospf_priority, no_ip_ospf_priority_addr_cmd, - "no ip ospf priority <0-255> A.B.C.D", + "no ip ospf priority (0-255) A.B.C.D", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -7627,7 +7627,7 @@ DEFUN (no_ip_ospf_priority, */ DEFUN (ip_ospf_retransmit_interval, ip_ospf_retransmit_interval_addr_cmd, - "ip ospf retransmit-interval <3-65535> A.B.C.D", + "ip ospf retransmit-interval (3-65535) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Time between retransmitting lost link state advertisements\n" @@ -7756,7 +7756,7 @@ DEFUN (no_ip_ospf_retransmit_interval, DEFUN (no_ip_ospf_retransmit_interval_sec, no_ip_ospf_retransmit_interval_sec_cmd, - "no ip ospf retransmit-interval <3-65535>", + "no ip ospf retransmit-interval (3-65535)", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -7787,7 +7787,7 @@ DEFUN (no_ip_ospf_retransmit_interval_sec, */ DEFUN (ip_ospf_transmit_delay, ip_ospf_transmit_delay_addr_cmd, - "ip ospf transmit-delay <1-65535> A.B.C.D", + "ip ospf transmit-delay (1-65535) A.B.C.D", "IP Information\n" "OSPF interface commands\n" "Link state transmit delay\n" @@ -7915,7 +7915,7 @@ DEFUN (no_ip_ospf_transmit_delay, DEFUN (no_ip_ospf_transmit_delay_sec, no_ip_ospf_transmit_delay_sec_cmd, - "no ip ospf transmit-delay <1-65535>", + "no ip ospf transmit-delay (1-65535)", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -7948,7 +7948,7 @@ DEFUN (no_ip_ospf_transmit_delay_sec, */ DEFUN (ip_ospf_area, ip_ospf_area_cmd, - "ip ospf area (A.B.C.D|<0-4294967295>)", + "ip ospf area <A.B.C.D|(0-4294967295)>", "IP Information\n" "OSPF interface commands\n" "Enable OSPF on this interface\n" @@ -8072,7 +8072,7 @@ DEFUN (no_ip_ospf_area, */ DEFUN (no_ip_ospf_instance_area, no_ip_ospf_instance_area_cmd, - "no ip ospf <1-65535> area", + "no ip ospf (1-65535) area", NO_STR "IP Information\n" "OSPF interface commands\n" @@ -8104,7 +8104,7 @@ DEFUN (no_ip_ospf_instance_area, DEFUN (ospf_redistribute_source, ospf_redistribute_source_cmd, - "redistribute " QUAGGA_REDIST_STR_OSPFD " {metric <0-16777214>|metric-type (1|2)|route-map WORD}", + "redistribute " QUAGGA_REDIST_STR_OSPFD " [metric (0-16777214)|metric-type <1|2>|route-map WORD]", REDIST_STR QUAGGA_REDIST_HELP_STR_OSPFD "Metric for redistributed routes\n" @@ -8157,7 +8157,7 @@ DEFUN (ospf_redistribute_source, DEFUN (no_ospf_redistribute_source, no_ospf_redistribute_source_cmd, - "no redistribute " QUAGGA_REDIST_STR_OSPFD " {metric <0-16777214>|metric-type (1|2)|route-map WORD}", + "no redistribute " QUAGGA_REDIST_STR_OSPFD " [metric (0-16777214)|metric-type <1|2>|route-map WORD]", NO_STR REDIST_STR QUAGGA_REDIST_HELP_STR_OSPFD @@ -8189,7 +8189,7 @@ DEFUN (no_ospf_redistribute_source, DEFUN (ospf_redistribute_instance_source, ospf_redistribute_instance_source_cmd, - "redistribute (ospf|table) <1-65535> {metric <0-16777214>|metric-type (1|2)|route-map WORD}", + "redistribute <ospf|table> (1-65535) [metric (0-16777214)|metric-type <1|2>|route-map WORD]", REDIST_STR "Open Shortest Path First\n" "Non-main Kernel Routing Table\n" @@ -8257,7 +8257,7 @@ DEFUN (ospf_redistribute_instance_source, DEFUN (no_ospf_redistribute_instance_source, no_ospf_redistribute_instance_source_cmd, - "no redistribute (ospf|table) <1-65535> {metric <0-16777214>|metric-type (1|2)|route-map WORD}", + "no redistribute <ospf|table> (1-65535) [metric (0-16777214)|metric-type <1|2>|route-map WORD]", NO_STR REDIST_STR "Open Shortest Path First\n" @@ -8355,7 +8355,7 @@ DEFUN (no_ospf_distribute_list_out, /* Default information originate. */ DEFUN (ospf_default_information_originate, ospf_default_information_originate_cmd, - "default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}", + "default-information originate [always|metric (0-16777214)|metric-type <1|2>|route-map WORD]", "Control distribution of default information\n" "Distribute a default route\n" "Always advertise default route\n" @@ -8406,7 +8406,7 @@ DEFUN (ospf_default_information_originate, DEFUN (no_ospf_default_information_originate, no_ospf_default_information_originate_cmd, - "no default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}", + "no default-information originate [always|metric (0-16777214)|metric-type <1|2>|route-map WORD]", NO_STR "Control distribution of default information\n" "Distribute a default route\n" @@ -8449,7 +8449,7 @@ DEFUN (no_ospf_default_information_originate, DEFUN (ospf_default_metric, ospf_default_metric_cmd, - "default-metric <0-16777214>", + "default-metric (0-16777214)", "Set metric of redistributed routes\n" "Default metric\n") { @@ -8494,7 +8494,7 @@ DEFUN (no_ospf_default_metric, DEFUN (ospf_distance, ospf_distance_cmd, - "distance <1-255>", + "distance (1-255)", "Define an administrative distance\n" "OSPF Administrative distance\n") { @@ -8510,7 +8510,7 @@ DEFUN (ospf_distance, DEFUN (no_ospf_distance, no_ospf_distance_cmd, - "no distance <1-255>", + "no distance (1-255)", NO_STR "Define an administrative distance\n" "OSPF Administrative distance\n") @@ -8527,7 +8527,7 @@ DEFUN (no_ospf_distance, DEFUN (no_ospf_distance_ospf, no_ospf_distance_ospf_cmd, - "no distance ospf {intra-area <1-255>|inter-area <1-255>|external <1-255>}", + "no distance ospf [intra-area (1-255)|inter-area (1-255)|external (1-255)]", NO_STR "Define an administrative distance\n" "OSPF Administrative distance\n" @@ -8571,7 +8571,7 @@ DEFUN (no_ospf_distance_ospf, DEFUN (ospf_distance_ospf, ospf_distance_ospf_cmd, - "distance ospf {intra-area <1-255>|inter-area <1-255>|external <1-255>}", + "distance ospf [intra-area (1-255)|inter-area (1-255)|external (1-255)]", "Define an administrative distance\n" "OSPF Administrative distance\n" "Intra-area routes\n" @@ -8610,7 +8610,7 @@ DEFUN (ospf_distance_ospf, DEFUN (ospf_distance_source, ospf_distance_source_cmd, - "distance <1-255> A.B.C.D/M", + "distance (1-255) A.B.C.D/M", "Administrative distance\n" "Distance value\n" "IP source prefix\n") @@ -8627,7 +8627,7 @@ DEFUN (ospf_distance_source, DEFUN (no_ospf_distance_source, no_ospf_distance_source_cmd, - "no distance <1-255> A.B.C.D/M", + "no distance (1-255) A.B.C.D/M", NO_STR "Administrative distance\n" "Distance value\n" @@ -8645,7 +8645,7 @@ DEFUN (no_ospf_distance_source, DEFUN (ospf_distance_source_access_list, ospf_distance_source_access_list_cmd, - "distance <1-255> A.B.C.D/M WORD", + "distance (1-255) A.B.C.D/M WORD", "Administrative distance\n" "Distance value\n" "IP source prefix\n" @@ -8663,7 +8663,7 @@ DEFUN (ospf_distance_source_access_list, DEFUN (no_ospf_distance_source_access_list, no_ospf_distance_source_access_list_cmd, - "no distance <1-255> A.B.C.D/M WORD", + "no distance (1-255) A.B.C.D/M WORD", NO_STR "Administrative distance\n" "Distance value\n" @@ -8844,7 +8844,7 @@ DEFUN (no_ospf_max_metric_router_lsa_admin, DEFUN (ospf_max_metric_router_lsa_startup, ospf_max_metric_router_lsa_startup_cmd, - "max-metric router-lsa on-startup <5-86400>", + "max-metric router-lsa on-startup (5-86400)", "OSPF maximum / infinite-distance metric\n" "Advertise own Router-LSA with infinite distance (stub router)\n" "Automatically advertise stub Router-LSA on startup of OSPF\n" @@ -8880,7 +8880,7 @@ DEFUN (ospf_max_metric_router_lsa_startup, */ DEFUN (no_ospf_max_metric_router_lsa_startup, no_ospf_max_metric_router_lsa_startup_cmd, - "no max-metric router-lsa on-startup <5-86400>", + "no max-metric router-lsa on-startup (5-86400)", NO_STR "OSPF maximum / infinite-distance metric\n" "Advertise own Router-LSA with infinite distance (stub router)\n" @@ -8914,7 +8914,7 @@ DEFUN (no_ospf_max_metric_router_lsa_startup, DEFUN (ospf_max_metric_router_lsa_shutdown, ospf_max_metric_router_lsa_shutdown_cmd, - "max-metric router-lsa on-shutdown <5-100>", + "max-metric router-lsa on-shutdown (5-100)", "OSPF maximum / infinite-distance metric\n" "Advertise own Router-LSA with infinite distance (stub router)\n" "Advertise stub-router prior to full shutdown of OSPF\n" @@ -8953,7 +8953,7 @@ DEFUN (ospf_max_metric_router_lsa_shutdown, */ DEFUN (no_ospf_max_metric_router_lsa_shutdown, no_ospf_max_metric_router_lsa_shutdown_cmd, - "no max-metric router-lsa on-shutdown <5-100>", + "no max-metric router-lsa on-shutdown (5-100)", NO_STR "OSPF maximum / infinite-distance metric\n" "Advertise own Router-LSA with infinite distance (stub router)\n" @@ -9187,7 +9187,7 @@ DEFUN (show_ip_ospf_border_routers, DEFUN (show_ip_ospf_instance_border_routers, show_ip_ospf_instance_border_routers_cmd, - "show ip ospf <1-65535> border-routers", + "show ip ospf (1-65535) border-routers", SHOW_STR IP_STR "OSPF information\n" @@ -9249,7 +9249,7 @@ DEFUN (show_ip_ospf_route, DEFUN (show_ip_ospf_instance_route, show_ip_ospf_instance_route_cmd, - "show ip ospf <1-65535> route", + "show ip ospf (1-65535) route", SHOW_STR IP_STR "OSPF information\n" diff --git a/ripd/rip_debug.c b/ripd/rip_debug.c index 0567f4f20..3566d28ff 100644 --- a/ripd/rip_debug.c +++ b/ripd/rip_debug.c @@ -90,7 +90,7 @@ DEFUN (debug_rip_packet, DEFUN (debug_rip_packet_direct, debug_rip_packet_direct_cmd, - "debug rip packet (recv|send)", + "debug rip packet <recv|send>", DEBUG_STR RIP_STR "RIP packet\n" @@ -142,7 +142,7 @@ DEFUN (no_debug_rip_packet, DEFUN (no_debug_rip_packet_direct, no_debug_rip_packet_direct_cmd, - "no debug rip packet (recv|send)", + "no debug rip packet <recv|send>", NO_STR DEBUG_STR RIP_STR diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 122a53eba..4ad750304 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -1220,7 +1220,7 @@ rip_passive_nondefault_clean (void) /* RIP enable network or interface configuration. */ DEFUN (rip_network, rip_network_cmd, - "network (A.B.C.D/M|WORD)", + "network <A.B.C.D/M|WORD>", "Enable routing on an IP network\n" "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "Interface name\n") @@ -1248,7 +1248,7 @@ DEFUN (rip_network, /* RIP enable network or interface configuration. */ DEFUN (no_rip_network, no_rip_network_cmd, - "no network (A.B.C.D/M|WORD)", + "no network <A.B.C.D/M|WORD>", NO_STR "Enable routing on an IP network\n" "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" @@ -1323,7 +1323,7 @@ DEFUN (no_rip_neighbor, DEFUN (ip_rip_receive_version, ip_rip_receive_version_cmd, - "ip rip receive version (1|2)", + "ip rip receive version <1|2>", IP_STR "Routing Information Protocol\n" "Advertisement reception\n" @@ -1427,7 +1427,7 @@ DEFUN (no_ip_rip_receive_version, DEFUN (ip_rip_send_version, ip_rip_send_version_cmd, - "ip rip send version (1|2)", + "ip rip send version <1|2>", IP_STR "Routing Information Protocol\n" "Advertisement transmission\n" @@ -1545,7 +1545,7 @@ DEFUN (no_ip_rip_send_version, */ DEFUN (ip_rip_authentication_mode, ip_rip_authentication_mode_cmd, - "ip rip authentication mode (md5|text)", + "ip rip authentication mode <md5|text>", IP_STR "Routing Information Protocol\n" "Authentication control\n" @@ -1873,7 +1873,7 @@ DEFUN (no_ip_rip_split_horizon_poisoned_reverse, DEFUN (rip_passive_interface, rip_passive_interface_cmd, - "passive-interface (IFNAME|default)", + "passive-interface <IFNAME|default>", "Suppress routing updates on an interface\n" "Interface name\n" "default for all interfaces\n") @@ -1893,7 +1893,7 @@ DEFUN (rip_passive_interface, DEFUN (no_rip_passive_interface, no_rip_passive_interface_cmd, - "no passive-interface (IFNAME|default)", + "no passive-interface <IFNAME|default>", NO_STR "Suppress routing updates on an interface\n" "Interface name\n" diff --git a/ripd/rip_offset.c b/ripd/rip_offset.c index be734c66d..f57c6684e 100644 --- a/ripd/rip_offset.c +++ b/ripd/rip_offset.c @@ -282,7 +282,7 @@ rip_offset_list_apply_out (struct prefix_ipv4 *p, struct interface *ifp, DEFUN (rip_offset_list, rip_offset_list_cmd, - "offset-list WORD (in|out) <0-16>", + "offset-list WORD <in|out> (0-16)", "Modify RIP metric\n" "Access-list name\n" "For incoming updates\n" @@ -294,7 +294,7 @@ DEFUN (rip_offset_list, DEFUN (rip_offset_list_ifname, rip_offset_list_ifname_cmd, - "offset-list WORD (in|out) <0-16> IFNAME", + "offset-list WORD <in|out> (0-16) IFNAME", "Modify RIP metric\n" "Access-list name\n" "For incoming updates\n" @@ -307,7 +307,7 @@ DEFUN (rip_offset_list_ifname, DEFUN (no_rip_offset_list, no_rip_offset_list_cmd, - "no offset-list WORD (in|out) <0-16>", + "no offset-list WORD <in|out> (0-16)", NO_STR "Modify RIP metric\n" "Access-list name\n" @@ -320,7 +320,7 @@ DEFUN (no_rip_offset_list, DEFUN (no_rip_offset_list_ifname, no_rip_offset_list_ifname_cmd, - "no offset-list WORD (in|out) <0-16> IFNAME", + "no offset-list WORD <in|out> (0-16) IFNAME", NO_STR "Modify RIP metric\n" "Access-list name\n" diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c index 4bb5958e9..35e869172 100644 --- a/ripd/rip_routemap.c +++ b/ripd/rip_routemap.c @@ -737,7 +737,7 @@ static struct route_map_rule_cmd route_set_tag_cmd = DEFUN (match_metric, match_metric_cmd, - "match metric <0-4294967295>", + "match metric (0-4294967295)", MATCH_STR "Match metric of route\n" "Metric value\n") @@ -797,7 +797,7 @@ DEFUN (no_match_interface, DEFUN (match_ip_next_hop, match_ip_next_hop_cmd, - "match ip next-hop (<1-199>|<1300-2699>|WORD)", + "match ip next-hop <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match next-hop address of route\n" @@ -870,7 +870,7 @@ DEFUN (no_match_ip_next_hop_prefix_list, DEFUN (match_ip_address, match_ip_address_cmd, - "match ip address (<1-199>|<1300-2699>|WORD)", + "match ip address <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match address of route\n" @@ -944,7 +944,7 @@ DEFUN (no_match_ip_address_prefix_list, DEFUN (match_tag, match_tag_cmd, - "match tag <1-65535>", + "match tag (1-65535)", MATCH_STR "Match tag of route\n" "Metric value\n") @@ -984,7 +984,7 @@ DEFUN (no_match_tag, */ DEFUN (set_metric, set_metric_cmd, - "set metric <0-4294967295>", + "set metric (0-4294967295)", SET_STR "Metric value for destination routing protocol\n" "Metric value\n") @@ -1072,7 +1072,7 @@ DEFUN (no_set_ip_nexthop, DEFUN (set_tag, set_tag_cmd, - "set tag <1-65535>", + "set tag (1-65535)", SET_STR "Tag value for routing protocol\n" "Tag value\n") diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 4ede048f9..56f4623f3 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -467,7 +467,7 @@ DEFUN (no_rip_redistribute_type_routemap, DEFUN (rip_redistribute_type_metric, rip_redistribute_type_metric_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16>", + "redistribute " QUAGGA_REDIST_STR_RIPD " metric (0-16)", REDIST_STR QUAGGA_REDIST_HELP_STR_RIPD "Metric\n" @@ -497,7 +497,7 @@ DEFUN (rip_redistribute_type_metric, DEFUN (no_rip_redistribute_type_metric, no_rip_redistribute_type_metric_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16>", + "no redistribute " QUAGGA_REDIST_STR_RIPD " metric (0-16)", NO_STR REDIST_STR QUAGGA_REDIST_HELP_STR_RIPD @@ -526,7 +526,7 @@ DEFUN (no_rip_redistribute_type_metric, DEFUN (rip_redistribute_type_metric_routemap, rip_redistribute_type_metric_routemap_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16> route-map WORD", + "redistribute " QUAGGA_REDIST_STR_RIPD " metric (0-16) route-map WORD", REDIST_STR QUAGGA_REDIST_HELP_STR_RIPD "Metric\n" @@ -560,7 +560,7 @@ DEFUN (rip_redistribute_type_metric_routemap, DEFUN (no_rip_redistribute_type_metric_routemap, no_rip_redistribute_type_metric_routemap_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16> route-map WORD", + "no redistribute " QUAGGA_REDIST_STR_RIPD " metric (0-16) route-map WORD", NO_STR REDIST_STR QUAGGA_REDIST_HELP_STR_RIPD diff --git a/ripd/ripd.c b/ripd/ripd.c index d483d1ef3..9fa11ef9a 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -2943,7 +2943,7 @@ DEFUN (no_router_rip, DEFUN (rip_version, rip_version_cmd, - "version <1-2>", + "version (1-2)", "Set routing protocol version\n" "version\n") { @@ -3075,7 +3075,7 @@ rip_update_default_metric (void) DEFUN (rip_default_metric, rip_default_metric_cmd, - "default-metric <1-16>", + "default-metric (1-16)", "Set a metric of redistribute routes\n" "Default metric\n") { @@ -3113,7 +3113,7 @@ DEFUN (no_rip_default_metric, DEFUN (rip_timers, rip_timers_cmd, - "timers basic <5-2147483647> <5-2147483647> <5-2147483647>", + "timers basic (5-2147483647) (5-2147483647) (5-2147483647)", "Adjust routing timers\n" "Basic routing protocol update timers\n" "Routing table update timer value in second. Default is 30.\n" @@ -3388,7 +3388,7 @@ rip_distance_show (struct vty *vty) DEFUN (rip_distance, rip_distance_cmd, - "distance <1-255>", + "distance (1-255)", "Administrative distance\n" "Distance value\n") { @@ -3398,7 +3398,7 @@ DEFUN (rip_distance, DEFUN (no_rip_distance, no_rip_distance_cmd, - "no distance <1-255>", + "no distance (1-255)", NO_STR "Administrative distance\n" "Distance value\n") @@ -3409,7 +3409,7 @@ DEFUN (no_rip_distance, DEFUN (rip_distance_source, rip_distance_source_cmd, - "distance <1-255> A.B.C.D/M", + "distance (1-255) A.B.C.D/M", "Administrative distance\n" "Distance value\n" "IP source prefix\n") @@ -3420,7 +3420,7 @@ DEFUN (rip_distance_source, DEFUN (no_rip_distance_source, no_rip_distance_source_cmd, - "no distance <1-255> A.B.C.D/M", + "no distance (1-255) A.B.C.D/M", NO_STR "Administrative distance\n" "Distance value\n" @@ -3432,7 +3432,7 @@ DEFUN (no_rip_distance_source, DEFUN (rip_distance_source_access_list, rip_distance_source_access_list_cmd, - "distance <1-255> A.B.C.D/M WORD", + "distance (1-255) A.B.C.D/M WORD", "Administrative distance\n" "Distance value\n" "IP source prefix\n" @@ -3444,7 +3444,7 @@ DEFUN (rip_distance_source_access_list, DEFUN (no_rip_distance_source_access_list, no_rip_distance_source_access_list_cmd, - "no distance <1-255> A.B.C.D/M WORD", + "no distance (1-255) A.B.C.D/M WORD", NO_STR "Administrative distance\n" "Distance value\n" diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c index 73bfcb4d6..ecbba5b30 100644 --- a/ripngd/ripng_debug.c +++ b/ripngd/ripng_debug.c @@ -91,7 +91,7 @@ DEFUN (debug_ripng_packet, DEFUN (debug_ripng_packet_direct, debug_ripng_packet_direct_cmd, - "debug ripng packet (recv|send)", + "debug ripng packet <recv|send>", DEBUG_STR "RIPng configuration\n" "Debug option set for ripng packet\n" @@ -144,7 +144,7 @@ DEFUN (no_debug_ripng_packet, DEFUN (no_debug_ripng_packet_direct, no_debug_ripng_packet_direct_cmd, - "no debug ripng packet (recv|send)", + "no debug ripng packet <recv|send>", NO_STR DEBUG_STR "RIPng configuration\n" diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c index 2fbfb33e3..46ca818c4 100644 --- a/ripngd/ripng_offset.c +++ b/ripngd/ripng_offset.c @@ -290,7 +290,7 @@ ripng_offset_list_apply_out (struct prefix_ipv6 *p, struct interface *ifp, DEFUN (ripng_offset_list, ripng_offset_list_cmd, - "offset-list WORD (in|out) <0-16>", + "offset-list WORD <in|out> (0-16)", "Modify RIPng metric\n" "Access-list name\n" "For incoming updates\n" @@ -302,7 +302,7 @@ DEFUN (ripng_offset_list, DEFUN (ripng_offset_list_ifname, ripng_offset_list_ifname_cmd, - "offset-list WORD (in|out) <0-16> IFNAME", + "offset-list WORD <in|out> (0-16) IFNAME", "Modify RIPng metric\n" "Access-list name\n" "For incoming updates\n" @@ -315,7 +315,7 @@ DEFUN (ripng_offset_list_ifname, DEFUN (no_ripng_offset_list, no_ripng_offset_list_cmd, - "no offset-list WORD (in|out) <0-16>", + "no offset-list WORD <in|out> (0-16)", NO_STR "Modify RIPng metric\n" "Access-list name\n" @@ -328,7 +328,7 @@ DEFUN (no_ripng_offset_list, DEFUN (no_ripng_offset_list_ifname, no_ripng_offset_list_ifname_cmd, - "no offset-list WORD (in|out) <0-16> IFNAME", + "no offset-list WORD <in|out> (0-16) IFNAME", NO_STR "Modify RIPng metric\n" "Access-list name\n" diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c index 9c25d6003..0910f94a7 100644 --- a/ripngd/ripng_routemap.c +++ b/ripngd/ripng_routemap.c @@ -502,7 +502,7 @@ static struct route_map_rule_cmd route_set_tag_cmd = DEFUN (match_metric, match_metric_cmd, - "match metric <0-4294967295>", + "match metric (0-4294967295)", MATCH_STR "Match metric of route\n" "Metric value\n") @@ -562,7 +562,7 @@ DEFUN (no_match_interface, DEFUN (match_tag, match_tag_cmd, - "match tag <1-65535>", + "match tag (1-65535)", MATCH_STR "Match tag of route\n" "Metric value\n") @@ -594,7 +594,7 @@ DEFUN (no_match_tag, DEFUN (set_metric, set_metric_cmd, - "set metric <0-4294967295>", + "set metric (0-4294967295)", "Set value\n" "Metric value for destination routing protocol\n" "Metric value\n") @@ -676,7 +676,7 @@ DEFUN (no_set_ipv6_nexthop_local, DEFUN (set_tag, set_tag_cmd, - "set tag <1-65535>", + "set tag (1-65535)", SET_STR "Tag value for routing protocol\n" "Tag value\n") diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index 055a074cc..e45521195 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -394,7 +394,7 @@ DEFUN (no_ripng_redistribute_type, DEFUN (ripng_redistribute_type_metric, ripng_redistribute_type_metric_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>", + "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric (0-16)", "Redistribute\n" QUAGGA_REDIST_HELP_STR_RIPNGD "Metric\n" @@ -446,7 +446,7 @@ DEFUN (ripng_redistribute_type_routemap, DEFUN (ripng_redistribute_type_metric_routemap, ripng_redistribute_type_metric_routemap_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD", + "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric (0-16) route-map WORD", "Redistribute\n" QUAGGA_REDIST_HELP_STR_RIPNGD "Metric\n" diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index dd8f1fc39..5e53d44b6 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -2389,7 +2389,7 @@ DEFUN (no_ripng_aggregate_address, DEFUN (ripng_default_metric, ripng_default_metric_cmd, - "default-metric <1-16>", + "default-metric (1-16)", "Set a metric of redistribute routes\n" "Default metric\n") { @@ -2528,7 +2528,7 @@ DEFUN (no_ripng_garbage_timer, DEFUN (ripng_timers, ripng_timers_cmd, - "timers basic <0-65535> <0-65535> <0-65535>", + "timers basic (0-65535) (0-65535) (0-65535)", "RIPng timers setup\n" "Basic timer\n" "Routing table update timer value in second. Default is 30.\n" diff --git a/tools/argv_translator.py b/tools/argv_translator.py index 08a680066..1c8f0c7e5 100755 --- a/tools/argv_translator.py +++ b/tools/argv_translator.py @@ -21,6 +21,10 @@ def token_is_variable(line_number, token): assert token.endswith(']'), "%d: token %s should end with ]" % (line_number, token) return True + if token.startswith('<'): + assert token.endswith('>'), "%d: token %s should end with >" % (line_number, token) + return True + if token.startswith('{'): # I don't really care about checking for this I just put # these asserts in here to bug sharpd @@ -246,7 +250,7 @@ DEFUN (no_bgp_maxmed_onstartup, while re_argv: index = int(re_argv.group(1)) if index not in variable_indexes and index <= max_index: - raise Exception("%d: index %s is not a variable in the command string" % (self.line_number, index)) + print "%d: index %s is not a variable in the command string" % (self.line_number, index) tmp_line = re_argv.group(2) re_argv = re.search('^.*?argv\[(\d+)\]->arg(.*)$', tmp_line) @@ -341,6 +345,7 @@ def update_argvs(filename): line = line.replace('" QUAGGA_REDIST_STR_RIPD "', '(kernel|connected|static|ospf|isis|bgp|pim|table)') line = line.replace('" QUAGGA_REDIST_STR_OSPF6D "', '(kernel|connected|static|ripng|isis|bgp|table)') line = line.replace('" QUAGGA_REDIST_STR_ISISD "', '(kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|table)') + line = line.replace('" LOG_FACILITIES "', '(kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7)') # endswith line = line.replace('" CMD_AS_RANGE,', ' <1-4294967295>",') @@ -371,6 +376,7 @@ def update_argvs(filename): line = line.replace('" PIM_CMD_IP_IGMP_QUERY_MAX_RESPONSE_TIME,', ' ip igmp query-max-response-time",') line = line.replace('" QUAGGA_REDIST_STR_OSPF6D,', ' (kernel|connected|static|ripng|isis|bgp|table)",') line = line.replace('" QUAGGA_REDIST_STR_ISISD,', ' (kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|table)",') + line = line.replace('" LOG_FACILITIES,', ' (kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7)",') # startswith line = line.replace('LISTEN_RANGE_CMD "', '"bgp listen range (A.B.C.D/M|X:X::X:X/M) ') diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index f767c64d3..dd4131b70 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1772,7 +1772,7 @@ DEFUN (vtysh_show_work_queues, DEFUN (vtysh_show_work_queues_daemon, vtysh_show_work_queues_daemon_cmd, - "show work-queues (zebra|ripd|ripngd|ospfd|ospf6d|bgpd|isisd)", + "show work-queues <zebra|ripd|ripngd|ospfd|ospf6d|bgpd|isisd>", SHOW_STR "Work Queue information\n" "For the zebra daemon\n" @@ -2224,7 +2224,7 @@ DEFUN (vtysh_write_terminal, DEFUN (vtysh_write_terminal_daemon, vtysh_write_terminal_daemon_cmd, - "write terminal (zebra|ripd|ripngd|ospfd|ospf6d|bgpd|isisd|pimd)", + "write terminal <zebra|ripd|ripngd|ospfd|ospf6d|bgpd|isisd|pimd>", "Write running configuration to memory, network, or terminal\n" "Write to terminal\n" "For the zebra daemon\n" @@ -2435,7 +2435,7 @@ ALIAS (vtysh_write_terminal, DEFUN (vtysh_terminal_length, vtysh_terminal_length_cmd, - "terminal length <0-512>", + "terminal length (0-512)", "Set terminal line parameters\n" "Set number of lines on a screen\n" "Number of lines on screen (0 for no pausing)\n") diff --git a/zebra/debug.c b/zebra/debug.c index fb3887c67..cbdcdf27f 100644 --- a/zebra/debug.c +++ b/zebra/debug.c @@ -123,7 +123,7 @@ DEFUN (debug_zebra_packet, DEFUN (debug_zebra_packet_direct, debug_zebra_packet_direct_cmd, - "debug zebra packet (recv|send|detail)", + "debug zebra packet <recv|send|detail>", DEBUG_STR "Zebra configuration\n" "Debug option set for zebra packet\n" @@ -142,7 +142,7 @@ DEFUN (debug_zebra_packet_direct, DEFUN (debug_zebra_packet_detail, debug_zebra_packet_detail_cmd, - "debug zebra packet (recv|send) detail", + "debug zebra packet <recv|send> detail", DEBUG_STR "Zebra configuration\n" "Debug option set for zebra packet\n" @@ -172,7 +172,7 @@ DEFUN (debug_zebra_kernel, DEFUN (debug_zebra_kernel_msgdump, debug_zebra_kernel_msgdump_cmd, - "debug zebra kernel msgdump {recv|send}", + "debug zebra kernel msgdump [recv|send]", DEBUG_STR "Zebra configuration\n" "Debug option set for zebra between kernel interface\n" @@ -259,7 +259,7 @@ DEFUN (no_debug_zebra_packet, DEFUN (no_debug_zebra_packet_direct, no_debug_zebra_packet_direct_cmd, - "no debug zebra packet (recv|send)", + "no debug zebra packet <recv|send>", NO_STR DEBUG_STR "Zebra configuration\n" @@ -288,7 +288,7 @@ DEFUN (no_debug_zebra_kernel, DEFUN (no_debug_zebra_kernel_msgdump, no_debug_zebra_kernel_msgdump_cmd, - "no debug zebra kernel msgdump {recv|send}", + "no debug zebra kernel msgdump [recv|send]", DEBUG_STR "Zebra configuration\n" "Debug option set for zebra between kernel interface\n" diff --git a/zebra/interface.c b/zebra/interface.c index 5e2f64b54..1f1146e24 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1367,7 +1367,7 @@ DEFUN (show_interface_name_vrf, interface_update_stats (); if (argc > 1) - VRF_GET_ID (vrf_id, argv[3]->arg); + VRF_GET_ID (vrf_id, argv[4]->arg); /* Specified interface print. */ ifp = if_lookup_by_name_vrf (argv[2]->arg, vrf_id); @@ -1674,7 +1674,7 @@ DEFUN (no_shutdown_if, DEFUN (bandwidth_if, bandwidth_if_cmd, - "bandwidth <1-100000>", + "bandwidth (1-100000)", "Set bandwidth informational parameter\n" "Bandwidth in megabits\n") { @@ -1840,7 +1840,7 @@ DEFUN (no_link_params_enable, /* STANDARD TE metrics */ DEFUN (link_params_metric, link_params_metric_cmd, - "metric <0-4294967295>", + "metric (0-4294967295)", "Link metric for MPLS-TE purpose\n" "Metric value in decimal\n") { @@ -1948,7 +1948,7 @@ DEFUN (link_params_max_rsv_bw, DEFUN (link_params_unrsv_bw, link_params_unrsv_bw_cmd, - "unrsv-bw <0-7> BANDWIDTH", + "unrsv-bw (0-7) BANDWIDTH", "Unreserved bandwidth at each priority level\n" "Priority\n" "Bytes/second (IEEE floating point format)\n") @@ -2028,7 +2028,7 @@ DEFUN (no_link_params_admin_grp, /* RFC5392 & RFC5316: INTER-AS */ DEFUN (link_params_inter_as, link_params_inter_as_cmd, - "neighbor A.B.C.D as <1-4294967295>", + "neighbor A.B.C.D as (1-4294967295)", "Configure remote ASBR information (Neighbor IP address and AS number)\n" "Remote IP address in dot decimal A.B.C.D\n" "Remote AS number\n" @@ -2101,7 +2101,7 @@ DEFUN (no_link_params_inter_as, */ DEFUN (link_params_delay, link_params_delay_cmd, - "delay <0-16777215>", + "delay (0-16777215)", "Unidirectional Average Link Delay\n" "Average delay in micro-second as decimal (0...16777215)\n") { @@ -2208,7 +2208,7 @@ DEFUN (no_link_params_delay, DEFUN (link_params_delay_var, link_params_delay_var_cmd, - "delay-variation <0-16777215>", + "delay-variation (0-16777215)", "Unidirectional Link Delay Variation\n" "delay variation in micro-second as decimal (0...16777215)\n") { diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c index d41373369..424f02788 100644 --- a/zebra/irdp_interface.c +++ b/zebra/irdp_interface.c @@ -463,7 +463,7 @@ DEFUN (no_ip_irdp_shutdown, DEFUN (ip_irdp_holdtime, ip_irdp_holdtime_cmd, - "ip irdp holdtime <0-9000>", + "ip irdp holdtime (0-9000)", IP_STR "ICMP Router discovery on this interface\n" "Set holdtime value\n" @@ -486,7 +486,7 @@ DEFUN (ip_irdp_holdtime, DEFUN (ip_irdp_minadvertinterval, ip_irdp_minadvertinterval_cmd, - "ip irdp minadvertinterval <3-1800>", + "ip irdp minadvertinterval (3-1800)", IP_STR "ICMP Router discovery on this interface\n" "Set minimum time between advertisement\n" @@ -519,7 +519,7 @@ DEFUN (ip_irdp_minadvertinterval, DEFUN (ip_irdp_maxadvertinterval, ip_irdp_maxadvertinterval_cmd, - "ip irdp maxadvertinterval <4-1800>", + "ip irdp maxadvertinterval (4-1800)", IP_STR "ICMP Router discovery on this interface\n" "Set maximum time between advertisement\n" @@ -558,7 +558,7 @@ DEFUN (ip_irdp_maxadvertinterval, DEFUN (ip_irdp_preference, ip_irdp_preference_cmd, - "ip irdp preference <0-2147483647>", + "ip irdp preference (0-2147483647)", IP_STR "ICMP Router discovery on this interface\n" "Set default preference level for this interface\n" @@ -581,7 +581,7 @@ DEFUN (ip_irdp_preference, DEFUN (ip_irdp_address_preference, ip_irdp_address_preference_cmd, - "ip irdp address A.B.C.D preference <0-2147483647>", + "ip irdp address A.B.C.D preference (0-2147483647)", IP_STR "Alter ICMP Router discovery preference this interface\n" "Specify IRDP non-default preference to advertise\n" @@ -625,7 +625,7 @@ DEFUN (ip_irdp_address_preference, DEFUN (no_ip_irdp_address_preference, no_ip_irdp_address_preference_cmd, - "no ip irdp address A.B.C.D preference <0-2147483647>", + "no ip irdp address A.B.C.D preference (0-2147483647)", NO_STR IP_STR "Alter ICMP Router discovery preference this interface\n" diff --git a/zebra/rtadv.c b/zebra/rtadv.c index d372c985f..c13d85a4d 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -917,7 +917,7 @@ DEFUN (no_ipv6_nd_suppress_ra, DEFUN (ipv6_nd_ra_interval_msec, ipv6_nd_ra_interval_msec_cmd, - "ipv6 nd ra-interval msec <70-1800000>", + "ipv6 nd ra-interval msec (70-1800000)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Router Advertisement interval\n" @@ -952,7 +952,7 @@ DEFUN (ipv6_nd_ra_interval_msec, DEFUN (ipv6_nd_ra_interval, ipv6_nd_ra_interval_cmd, - "ipv6 nd ra-interval <1-1800>", + "ipv6 nd ra-interval (1-1800)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Router Advertisement interval\n" @@ -1033,7 +1033,7 @@ DEFUN (no_ipv6_nd_ra_interval, DEFUN (ipv6_nd_ra_lifetime, ipv6_nd_ra_lifetime_cmd, - "ipv6 nd ra-lifetime <0-9000>", + "ipv6 nd ra-lifetime (0-9000)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Router lifetime\n" @@ -1095,7 +1095,7 @@ DEFUN (no_ipv6_nd_ra_lifetime, DEFUN (ipv6_nd_reachable_time, ipv6_nd_reachable_time_cmd, - "ipv6 nd reachable-time <1-3600000>", + "ipv6 nd reachable-time (1-3600000)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Reachable time\n" @@ -1139,7 +1139,7 @@ DEFUN (no_ipv6_nd_reachable_time, DEFUN (ipv6_nd_homeagent_preference, ipv6_nd_homeagent_preference_cmd, - "ipv6 nd home-agent-preference <0-65535>", + "ipv6 nd home-agent-preference (0-65535)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Home Agent preference\n" @@ -1183,7 +1183,7 @@ DEFUN (no_ipv6_nd_homeagent_preference, DEFUN (ipv6_nd_homeagent_lifetime, ipv6_nd_homeagent_lifetime_cmd, - "ipv6 nd home-agent-lifetime <0-65520>", + "ipv6 nd home-agent-lifetime (0-65520)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Home Agent lifetime\n" @@ -1508,7 +1508,7 @@ DEFUN (no_ipv6_nd_other_config_flag, */ DEFUN (ipv6_nd_prefix, ipv6_nd_prefix_cmd, - "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (off-link|) (no-autoconfig|) (router-address|)", + "ipv6 nd prefix X:X::X:X/M <(0-4294967295)|infinite> <(0-4294967295)|infinite> <off-link|> <no-autoconfig|> <router-address|>", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Prefix information\n" @@ -1782,7 +1782,7 @@ DEFUN (no_ipv6_nd_prefix, DEFUN (ipv6_nd_router_preference, ipv6_nd_router_preference_cmd, - "ipv6 nd router-preference (high|medium|low)", + "ipv6 nd router-preference <high|medium|low>", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Default router preference\n" @@ -1844,7 +1844,7 @@ DEFUN (no_ipv6_nd_router_preference, DEFUN (ipv6_nd_mtu, ipv6_nd_mtu_cmd, - "ipv6 nd mtu <1-65535>", + "ipv6 nd mtu (1-65535)", "Interface IPv6 config commands\n" "Neighbor discovery\n" "Advertised MTU\n" diff --git a/zebra/test_main.c b/zebra/test_main.c index 722151288..2908ddd94 100644 --- a/zebra/test_main.c +++ b/zebra/test_main.c @@ -119,7 +119,7 @@ static ifindex_t test_ifindex = 0; /* testrib commands */ DEFUN (test_interface_state, test_interface_state_cmd, - "state (up|down)", + "state <up|down>", "configure interface\n" "up\n" "down\n") diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 88cc7977f..6dcc7624e 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -330,7 +330,7 @@ DEFUN (no_match_interface, DEFUN (match_tag, match_tag_cmd, - "match tag <1-65535>", + "match tag (1-65535)", MATCH_STR "Match tag of route\n" "Tag value\n") @@ -365,7 +365,7 @@ DEFUN (no_match_tag, DEFUN (match_ip_next_hop, match_ip_next_hop_cmd, - "match ip next-hop (<1-199>|<1300-2699>|WORD)", + "match ip next-hop <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match next-hop address of route\n" @@ -451,7 +451,7 @@ DEFUN (no_match_ip_next_hop_prefix_list, DEFUN (match_ip_address, match_ip_address_cmd, - "match ip address (<1-199>|<1300-2699>|WORD)", + "match ip address <(1-199)|(1300-2699)|WORD>", MATCH_STR IP_STR "Match address of route\n" @@ -623,7 +623,7 @@ DEFUN (no_match_ip_nexthop_prefix_len, DEFUN (match_source_protocol, match_source_protocol_cmd, - "match source-protocol (bgp|ospf|rip|ripng|isis|ospf6|connected|system|kernel|static)", + "match source-protocol <bgp|ospf|rip|ripng|isis|ospf6|connected|system|kernel|static>", MATCH_STR "Match protocol via which the route was learnt\n") { @@ -642,7 +642,7 @@ DEFUN (match_source_protocol, DEFUN (no_match_source_protocol, no_match_source_protocol_cmd, - "no match source-protocol (bgp|ospf|rip|ripng|isis|ospf6|connected|system|kernel|static)", + "no match source-protocol <bgp|ospf|rip|ripng|isis|ospf6|connected|system|kernel|static>", NO_STR MATCH_STR "No match protocol via which the route was learnt\n") @@ -668,7 +668,7 @@ DEFUN (no_match_source_protocol, DEFUN (set_src, set_src_cmd, - "set src (A.B.C.D|X:X::X:X)", + "set src <A.B.C.D|X:X::X:X>", SET_STR "src address for route\n" "src address\n") @@ -727,7 +727,7 @@ DEFUN (set_src, DEFUN (no_set_src, no_set_src_cmd, - "no set src {A.B.C.D|X:X::X:X}", + "no set src [A.B.C.D|X:X::X:X]", NO_STR SET_STR "Source address for route\n") @@ -740,7 +740,7 @@ DEFUN (no_set_src, DEFUN (zebra_route_map_timer, zebra_route_map_timer_cmd, - "zebra route-map delay-timer <0-600>", + "zebra route-map delay-timer (0-600)", "Time to wait before route-map updates are processed\n" "0 means event-driven updates are disabled\n") { diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index f4a663ab3..d395c11a1 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -193,7 +193,7 @@ zebra_static_ipv4 (struct vty *vty, safi_t safi, int add_cmd, */ DEFUN (ip_mroute_dist, ip_mroute_dist_cmd, - "ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>", + "ip mroute A.B.C.D/M <A.B.C.D|INTERFACE> (1-255)", IP_STR "Configure static unicast route into MRIB for multicast RPF lookup\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -218,7 +218,7 @@ DEFUN (ip_mroute_dist, */ DEFUN (no_ip_mroute_dist, no_ip_mroute_dist_cmd, - "no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>", + "no ip mroute A.B.C.D/M <A.B.C.D|INTERFACE> (1-255)", IP_STR "Configure static unicast route into MRIB for multicast RPF lookup\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -232,7 +232,7 @@ DEFUN (no_ip_mroute_dist, DEFUN (ip_multicast_mode, ip_multicast_mode_cmd, - "ip multicast rpf-lookup-mode (urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix)", + "ip multicast rpf-lookup-mode <urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix>", IP_STR "Multicast options\n" "RPF lookup behavior\n" @@ -273,7 +273,7 @@ DEFUN (ip_multicast_mode, */ DEFUN (no_ip_multicast_mode, no_ip_multicast_mode_cmd, - "no ip multicast rpf-lookup-mode (urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix)", + "no ip multicast rpf-lookup-mode <urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix>", NO_STR IP_STR "Multicast options\n" @@ -332,7 +332,7 @@ DEFUN (show_ip_rpf_addr, /* Static route configuration. */ DEFUN (ip_route, ip_route_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0)", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0>", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -346,7 +346,7 @@ DEFUN (ip_route, DEFUN (ip_route_tag, ip_route_tag_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535>", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -362,7 +362,7 @@ DEFUN (ip_route_tag, DEFUN (ip_route_flags, ip_route_flags_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole)", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole>", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -377,7 +377,7 @@ DEFUN (ip_route_flags, DEFUN (ip_route_flags_tag, ip_route_flags_tag_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535>", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -395,7 +395,7 @@ DEFUN (ip_route_flags_tag, DEFUN (ip_route_flags2, ip_route_flags2_cmd, - "ip route A.B.C.D/M (reject|blackhole)", + "ip route A.B.C.D/M <reject|blackhole>", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -408,7 +408,7 @@ DEFUN (ip_route_flags2, DEFUN (ip_route_flags2_tag, ip_route_flags2_tag_cmd, - "ip route A.B.C.D/M (reject|blackhole) tag <1-65535>", + "ip route A.B.C.D/M <reject|blackhole> tag (1-65535)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -425,7 +425,7 @@ DEFUN (ip_route_flags2_tag, /* Mask as A.B.C.D format. */ DEFUN (ip_route_mask, ip_route_mask_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0)", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0>", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -440,7 +440,7 @@ DEFUN (ip_route_mask, DEFUN (ip_route_mask_tag, ip_route_mask_tag_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535>", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -458,7 +458,7 @@ DEFUN (ip_route_mask_tag, DEFUN (ip_route_mask_flags, ip_route_mask_flags_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole)", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole>", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -474,7 +474,7 @@ DEFUN (ip_route_mask_flags, DEFUN (ip_route_mask_flags_tag, ip_route_mask_flags_tag_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535>", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -493,7 +493,7 @@ DEFUN (ip_route_mask_flags_tag, DEFUN (ip_route_mask_flags2, ip_route_mask_flags2_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole)", + "ip route A.B.C.D A.B.C.D <reject|blackhole>", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -507,7 +507,7 @@ DEFUN (ip_route_mask_flags2, DEFUN (ip_route_mask_flags2_tag, ip_route_mask_flags2_tag_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535>", + "ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -524,7 +524,7 @@ DEFUN (ip_route_mask_flags2_tag, /* Distance option value. */ DEFUN (ip_route_distance, ip_route_distance_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) <1-255>", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> (1-255)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -539,7 +539,7 @@ DEFUN (ip_route_distance, DEFUN (ip_route_tag_distance, ip_route_tag_distance_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255>", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -557,7 +557,7 @@ DEFUN (ip_route_tag_distance, DEFUN (ip_route_flags_distance, ip_route_flags_distance_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) <1-255>", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> (1-255)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -573,7 +573,7 @@ DEFUN (ip_route_flags_distance, DEFUN (ip_route_flags_tag_distance, ip_route_flags_tag_distance_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255>", + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -591,7 +591,7 @@ DEFUN (ip_route_flags_tag_distance, DEFUN (ip_route_flags_distance2, ip_route_flags_distance2_cmd, - "ip route A.B.C.D/M (reject|blackhole) <1-255>", + "ip route A.B.C.D/M <reject|blackhole> (1-255)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -605,7 +605,7 @@ DEFUN (ip_route_flags_distance2, DEFUN (ip_route_flags_tag_distance2, ip_route_flags_tag_distance2_cmd, - "ip route A.B.C.D/M (reject|blackhole) tag <1-65535> <1-255>", + "ip route A.B.C.D/M <reject|blackhole> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -621,7 +621,7 @@ DEFUN (ip_route_flags_tag_distance2, DEFUN (ip_route_mask_distance, ip_route_mask_distance_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) <1-255>", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -637,7 +637,7 @@ DEFUN (ip_route_mask_distance, DEFUN (ip_route_mask_tag_distance, ip_route_mask_tag_distance_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255>", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -655,7 +655,7 @@ DEFUN (ip_route_mask_tag_distance, DEFUN (ip_route_mask_flags_tag_distance, ip_route_mask_flags_tag_distance_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255>", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -675,7 +675,7 @@ DEFUN (ip_route_mask_flags_tag_distance, DEFUN (ip_route_mask_flags_distance, ip_route_mask_flags_distance_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) <1-255>", + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> (1-255)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -692,7 +692,7 @@ DEFUN (ip_route_mask_flags_distance, DEFUN (ip_route_mask_flags_distance2, ip_route_mask_flags_distance2_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) <1-255>", + "ip route A.B.C.D A.B.C.D <reject|blackhole> (1-255)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -707,7 +707,7 @@ DEFUN (ip_route_mask_flags_distance2, DEFUN (ip_route_mask_flags_tag_distance2, ip_route_mask_flags_tag_distance2_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535> <1-255>", + "ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -737,7 +737,7 @@ DEFUN (ip_route_mask_flags_tag_distance2, */ DEFUN (no_ip_route, no_ip_route_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0)", + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0>", NO_STR IP_STR "Establish static routes\n" @@ -767,7 +767,7 @@ DEFUN (no_ip_route, */ DEFUN (no_ip_route_tag, no_ip_route_tag_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535>", + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -786,7 +786,7 @@ DEFUN (no_ip_route_tag, DEFUN (no_ip_route_flags2, no_ip_route_flags2_cmd, - "no ip route A.B.C.D/M (reject|blackhole)", + "no ip route A.B.C.D/M <reject|blackhole>", NO_STR IP_STR "Establish static routes\n" @@ -800,7 +800,7 @@ DEFUN (no_ip_route_flags2, DEFUN (no_ip_route_flags2_tag, no_ip_route_flags2_tag_cmd, - "no ip route A.B.C.D/M (reject|blackhole) tag <1-65535>", + "no ip route A.B.C.D/M <reject|blackhole> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -830,7 +830,7 @@ DEFUN (no_ip_route_flags2_tag, */ DEFUN (no_ip_route_mask, no_ip_route_mask_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0)", + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0>", NO_STR IP_STR "Establish static routes\n" @@ -862,7 +862,7 @@ DEFUN (no_ip_route_mask, */ DEFUN (no_ip_route_mask_tag, no_ip_route_mask_tag_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535>", + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -882,7 +882,7 @@ DEFUN (no_ip_route_mask_tag, DEFUN (no_ip_route_mask_flags2, no_ip_route_mask_flags2_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole)", + "no ip route A.B.C.D A.B.C.D <reject|blackhole>", NO_STR IP_STR "Establish static routes\n" @@ -897,7 +897,7 @@ DEFUN (no_ip_route_mask_flags2, DEFUN (no_ip_route_mask_flags2_tag, no_ip_route_mask_flags2_tag_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535>", + "no ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -914,7 +914,7 @@ DEFUN (no_ip_route_mask_flags2_tag, DEFUN (no_ip_route_distance, no_ip_route_distance_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) <1-255>", + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -930,7 +930,7 @@ DEFUN (no_ip_route_distance, DEFUN (no_ip_route_tag_distance, no_ip_route_tag_distance_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255>", + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -948,7 +948,7 @@ DEFUN (no_ip_route_tag_distance, DEFUN (no_ip_route_flags_distance, no_ip_route_flags_distance_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) <1-255>", + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -965,7 +965,7 @@ DEFUN (no_ip_route_flags_distance, DEFUN (no_ip_route_flags_tag_distance, no_ip_route_flags_tag_distance_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255>", + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -984,7 +984,7 @@ DEFUN (no_ip_route_flags_tag_distance, DEFUN (no_ip_route_flags_distance2, no_ip_route_flags_distance2_cmd, - "no ip route A.B.C.D/M (reject|blackhole) <1-255>", + "no ip route A.B.C.D/M <reject|blackhole> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -999,7 +999,7 @@ DEFUN (no_ip_route_flags_distance2, DEFUN (no_ip_route_flags_tag_distance2, no_ip_route_flags_tag_distance2_cmd, - "no ip route A.B.C.D/M (reject|blackhole) tag <1-65535> <1-255>", + "no ip route A.B.C.D/M <reject|blackhole> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1016,7 +1016,7 @@ DEFUN (no_ip_route_flags_tag_distance2, DEFUN (no_ip_route_mask_distance, no_ip_route_mask_distance_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) <1-255>", + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1033,7 +1033,7 @@ DEFUN (no_ip_route_mask_distance, DEFUN (no_ip_route_mask_tag_distance, no_ip_route_mask_tag_distance_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255>", + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1052,7 +1052,7 @@ DEFUN (no_ip_route_mask_tag_distance, DEFUN (no_ip_route_mask_flags_distance, no_ip_route_mask_flags_distance_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) <1-255>", + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1070,7 +1070,7 @@ DEFUN (no_ip_route_mask_flags_distance, DEFUN (no_ip_route_mask_flags_tag_distance, no_ip_route_mask_flags_tag_distance_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255>", + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1090,7 +1090,7 @@ DEFUN (no_ip_route_mask_flags_tag_distance, DEFUN (no_ip_route_mask_flags_distance2, no_ip_route_mask_flags_distance2_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) <1-255>", + "no ip route A.B.C.D A.B.C.D <reject|blackhole> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1106,7 +1106,7 @@ DEFUN (no_ip_route_mask_flags_distance2, DEFUN (no_ip_route_mask_flags_tag_distance2, no_ip_route_mask_flags_tag_distance2_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535> <1-255>", + "no ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -1125,7 +1125,7 @@ DEFUN (no_ip_route_mask_flags_tag_distance2, /* Static route configuration. */ DEFUN (ip_route_vrf, ip_route_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1139,7 +1139,7 @@ DEFUN (ip_route_vrf, DEFUN (ip_route_tag_vrf, ip_route_tag_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535> " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1155,7 +1155,7 @@ DEFUN (ip_route_tag_vrf, DEFUN (ip_route_flags_vrf, ip_route_flags_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1170,7 +1170,7 @@ DEFUN (ip_route_flags_vrf, DEFUN (ip_route_flags_tag_vrf, ip_route_flags_tag_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1188,7 +1188,7 @@ DEFUN (ip_route_flags_tag_vrf, DEFUN (ip_route_flags2_vrf, ip_route_flags2_vrf_cmd, - "ip route A.B.C.D/M (reject|blackhole) " VRF_CMD_STR, + "ip route A.B.C.D/M <reject|blackhole> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1201,7 +1201,7 @@ DEFUN (ip_route_flags2_vrf, DEFUN (ip_route_flags2_tag_vrf, ip_route_flags2_tag_vrf_cmd, - "ip route A.B.C.D/M (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "ip route A.B.C.D/M <reject|blackhole> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1218,7 +1218,7 @@ DEFUN (ip_route_flags2_tag_vrf, /* Mask as A.B.C.D format. */ DEFUN (ip_route_mask_vrf, ip_route_mask_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1233,7 +1233,7 @@ DEFUN (ip_route_mask_vrf, DEFUN (ip_route_mask_tag_vrf, ip_route_mask_tag_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1251,7 +1251,7 @@ DEFUN (ip_route_mask_tag_vrf, DEFUN (ip_route_mask_flags_vrf, ip_route_mask_flags_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1267,7 +1267,7 @@ DEFUN (ip_route_mask_flags_vrf, DEFUN (ip_route_mask_flags_tag_vrf, ip_route_mask_flags_tag_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1286,7 +1286,7 @@ DEFUN (ip_route_mask_flags_tag_vrf, DEFUN (ip_route_mask_flags2_vrf, ip_route_mask_flags2_vrf_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <reject|blackhole> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1300,7 +1300,7 @@ DEFUN (ip_route_mask_flags2_vrf, DEFUN (ip_route_mask_flags2_tag_vrf, ip_route_mask_flags2_tag_vrf_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1317,7 +1317,7 @@ DEFUN (ip_route_mask_flags2_tag_vrf, /* Distance option value. */ DEFUN (ip_route_distance_vrf, ip_route_distance_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) <1-255> " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1332,7 +1332,7 @@ DEFUN (ip_route_distance_vrf, DEFUN (ip_route_tag_distance_vrf, ip_route_tag_distance_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255> " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1350,7 +1350,7 @@ DEFUN (ip_route_tag_distance_vrf, DEFUN (ip_route_flags_distance_vrf, ip_route_flags_distance_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) <1-255> " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1366,7 +1366,7 @@ DEFUN (ip_route_flags_distance_vrf, DEFUN (ip_route_flags_tag_distance_vrf, ip_route_flags_tag_distance_vrf_cmd, - "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1384,7 +1384,7 @@ DEFUN (ip_route_flags_tag_distance_vrf, DEFUN (ip_route_flags_distance2_vrf, ip_route_flags_distance2_vrf_cmd, - "ip route A.B.C.D/M (reject|blackhole) <1-255> " VRF_CMD_STR, + "ip route A.B.C.D/M <reject|blackhole> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1398,7 +1398,7 @@ DEFUN (ip_route_flags_distance2_vrf, DEFUN (ip_route_flags_tag_distance2_vrf, ip_route_flags_tag_distance2_vrf_cmd, - "ip route A.B.C.D/M (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "ip route A.B.C.D/M <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix (e.g. 10.0.0.0/8)\n" @@ -1414,7 +1414,7 @@ DEFUN (ip_route_flags_tag_distance2_vrf, DEFUN (ip_route_mask_distance_vrf, ip_route_mask_distance_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) <1-255> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1430,7 +1430,7 @@ DEFUN (ip_route_mask_distance_vrf, DEFUN (ip_route_mask_tag_distance_vrf, ip_route_mask_tag_distance_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1448,7 +1448,7 @@ DEFUN (ip_route_mask_tag_distance_vrf, DEFUN (ip_route_mask_flags_tag_distance_vrf, ip_route_mask_flags_tag_distance_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1462,13 +1462,13 @@ DEFUN (ip_route_mask_flags_tag_distance_vrf, "Silently discard pkts when matched\n" VRF_CMD_HELP_STR) { - return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, argv[5]->arg, argv[8]->arg, argv[9]->arg, argv[12]->arg); + return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, argv[5]->arg, argv[7]->arg, argv[8]->arg, argv[10]->arg); } DEFUN (ip_route_mask_flags_distance_vrf, ip_route_mask_flags_distance_vrf_cmd, - "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) <1-255> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1485,7 +1485,7 @@ DEFUN (ip_route_mask_flags_distance_vrf, DEFUN (ip_route_mask_flags_distance2_vrf, ip_route_mask_flags_distance2_vrf_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) <1-255> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <reject|blackhole> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1500,7 +1500,7 @@ DEFUN (ip_route_mask_flags_distance2_vrf, DEFUN (ip_route_mask_flags_tag_distance2_vrf, ip_route_mask_flags_tag_distance2_vrf_cmd, - "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IP destination prefix\n" @@ -1517,7 +1517,7 @@ DEFUN (ip_route_mask_flags_tag_distance2_vrf, DEFUN (no_ip_route_vrf, no_ip_route_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1532,7 +1532,7 @@ DEFUN (no_ip_route_vrf, DEFUN (no_ip_route_flags_vrf, no_ip_route_flags_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1548,7 +1548,7 @@ DEFUN (no_ip_route_flags_vrf, DEFUN (no_ip_route_tag_vrf, no_ip_route_tag_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535> " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1565,7 +1565,7 @@ DEFUN (no_ip_route_tag_vrf, DEFUN (no_ip_route_flags_tag_vrf, no_ip_route_flags_tag_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1583,7 +1583,7 @@ DEFUN (no_ip_route_flags_tag_vrf, DEFUN (no_ip_route_flags2_vrf, no_ip_route_flags2_vrf_cmd, - "no ip route A.B.C.D/M (reject|blackhole) " VRF_CMD_STR, + "no ip route A.B.C.D/M <reject|blackhole> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1597,7 +1597,7 @@ DEFUN (no_ip_route_flags2_vrf, DEFUN (no_ip_route_flags2_tag_vrf, no_ip_route_flags2_tag_vrf_cmd, - "no ip route A.B.C.D/M (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "no ip route A.B.C.D/M <reject|blackhole> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1613,7 +1613,7 @@ DEFUN (no_ip_route_flags2_tag_vrf, DEFUN (no_ip_route_mask_vrf, no_ip_route_mask_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1629,7 +1629,7 @@ DEFUN (no_ip_route_mask_vrf, DEFUN (no_ip_route_mask_flags_vrf, no_ip_route_mask_flags_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1646,7 +1646,7 @@ DEFUN (no_ip_route_mask_flags_vrf, DEFUN (no_ip_route_mask_tag_vrf, no_ip_route_mask_tag_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1664,7 +1664,7 @@ DEFUN (no_ip_route_mask_tag_vrf, DEFUN (no_ip_route_mask_flags_tag_vrf, no_ip_route_mask_flags_tag_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1683,7 +1683,7 @@ DEFUN (no_ip_route_mask_flags_tag_vrf, DEFUN (no_ip_route_mask_flags2_vrf, no_ip_route_mask_flags2_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <reject|blackhole> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1698,7 +1698,7 @@ DEFUN (no_ip_route_mask_flags2_vrf, DEFUN (no_ip_route_mask_flags2_tag_vrf, no_ip_route_mask_flags2_tag_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1716,7 +1716,7 @@ DEFUN (no_ip_route_mask_flags2_tag_vrf, DEFUN (no_ip_route_distance_vrf, no_ip_route_distance_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1732,7 +1732,7 @@ DEFUN (no_ip_route_distance_vrf, DEFUN (no_ip_route_tag_distance_vrf, no_ip_route_tag_distance_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1750,7 +1750,7 @@ DEFUN (no_ip_route_tag_distance_vrf, DEFUN (no_ip_route_flags_distance_vrf, no_ip_route_flags_distance_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1767,7 +1767,7 @@ DEFUN (no_ip_route_flags_distance_vrf, DEFUN (no_ip_route_flags_tag_distance_vrf, no_ip_route_flags_tag_distance_vrf_cmd, - "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D/M <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1786,7 +1786,7 @@ DEFUN (no_ip_route_flags_tag_distance_vrf, DEFUN (no_ip_route_flags_distance2_vrf, no_ip_route_flags_distance2_vrf_cmd, - "no ip route A.B.C.D/M (reject|blackhole) <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D/M <reject|blackhole> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1801,7 +1801,7 @@ DEFUN (no_ip_route_flags_distance2_vrf, DEFUN (no_ip_route_flags_tag_distance2_vrf, no_ip_route_flags_tag_distance2_vrf_cmd, - "no ip route A.B.C.D/M (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D/M <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1818,7 +1818,7 @@ DEFUN (no_ip_route_flags_tag_distance2_vrf, DEFUN (no_ip_route_mask_distance_vrf, no_ip_route_mask_distance_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1835,7 +1835,7 @@ DEFUN (no_ip_route_mask_distance_vrf, DEFUN (no_ip_route_mask_tag_distance_vrf, no_ip_route_mask_tag_distance_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1854,7 +1854,7 @@ DEFUN (no_ip_route_mask_tag_distance_vrf, DEFUN (no_ip_route_mask_flags_distance_vrf, no_ip_route_mask_flags_distance_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1872,7 +1872,7 @@ DEFUN (no_ip_route_mask_flags_distance_vrf, DEFUN (no_ip_route_mask_flags_tag_distance_vrf, no_ip_route_mask_flags_tag_distance_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE> <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1892,7 +1892,7 @@ DEFUN (no_ip_route_mask_flags_tag_distance_vrf, DEFUN (no_ip_route_mask_flags_distance2_vrf, no_ip_route_mask_flags_distance2_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <reject|blackhole> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -1908,7 +1908,7 @@ DEFUN (no_ip_route_mask_flags_distance2_vrf, DEFUN (no_ip_route_mask_flags_tag_distance2_vrf, no_ip_route_mask_flags_tag_distance2_vrf_cmd, - "no ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ip route A.B.C.D A.B.C.D <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -2619,7 +2619,7 @@ DEFUN (no_ipv6_nht_default_route, */ DEFUN (show_ip_route_tag, show_ip_route_tag_cmd, - "show ip route tag <1-65535>", + "show ip route tag (1-65535)", SHOW_STR IP_STR "IP routing table\n" @@ -2840,7 +2840,7 @@ DEFUN (show_ip_route_protocol, DEFUN (show_ip_route_ospf_instance, show_ip_route_ospf_instance_cmd, - "show ip route ospf <1-65535>", + "show ip route ospf (1-65535)", SHOW_STR IP_STR "IP routing table\n" @@ -3256,7 +3256,7 @@ DEFUN (show_ip_route_vrf_all, DEFUN (show_ip_route_vrf_all_tag, show_ip_route_vrf_all_tag_cmd, - "show ip route " VRF_ALL_CMD_STR " tag <1-65535>", + "show ip route " VRF_ALL_CMD_STR " tag (1-65535)", SHOW_STR IP_STR "IP routing table\n" @@ -3782,7 +3782,7 @@ static_ipv6_func (struct vty *vty, int add_cmd, const char *dest_str, DEFUN (ipv6_route, ipv6_route_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE)", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE>", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3794,7 +3794,7 @@ DEFUN (ipv6_route, DEFUN (ipv6_route_tag, ipv6_route_tag_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535>", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3808,7 +3808,7 @@ DEFUN (ipv6_route_tag, DEFUN (ipv6_route_flags, ipv6_route_flags_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole)", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole>", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3822,7 +3822,7 @@ DEFUN (ipv6_route_flags, DEFUN (ipv6_route_flags_tag, ipv6_route_flags_tag_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535>", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3849,7 +3849,7 @@ DEFUN (ipv6_route_ifname, } DEFUN (ipv6_route_ifname_tag, ipv6_route_ifname_tag_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535>", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3863,7 +3863,7 @@ DEFUN (ipv6_route_ifname_tag, DEFUN (ipv6_route_ifname_flags, ipv6_route_ifname_flags_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole)", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole>", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3877,7 +3877,7 @@ DEFUN (ipv6_route_ifname_flags, DEFUN (ipv6_route_ifname_flags_tag, ipv6_route_ifname_flags_tag_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535>", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3893,7 +3893,7 @@ DEFUN (ipv6_route_ifname_flags_tag, DEFUN (ipv6_route_pref, ipv6_route_pref_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255>", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3906,7 +3906,7 @@ DEFUN (ipv6_route_pref, DEFUN (ipv6_route_pref_tag, ipv6_route_pref_tag_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535> <1-255>", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3921,7 +3921,7 @@ DEFUN (ipv6_route_pref_tag, DEFUN (ipv6_route_flags_pref, ipv6_route_flags_pref_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) <1-255>", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3936,7 +3936,7 @@ DEFUN (ipv6_route_flags_pref, DEFUN (ipv6_route_flags_pref_tag, ipv6_route_flags_pref_tag_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535> <1-255>", + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3953,7 +3953,7 @@ DEFUN (ipv6_route_flags_pref_tag, DEFUN (ipv6_route_ifname_pref, ipv6_route_ifname_pref_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255>", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3966,7 +3966,7 @@ DEFUN (ipv6_route_ifname_pref, DEFUN (ipv6_route_ifname_pref_tag, ipv6_route_ifname_pref_tag_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535> <1-255>", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3981,7 +3981,7 @@ DEFUN (ipv6_route_ifname_pref_tag, DEFUN (ipv6_route_ifname_flags_pref, ipv6_route_ifname_flags_pref_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) <1-255>", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -3996,7 +3996,7 @@ DEFUN (ipv6_route_ifname_flags_pref, DEFUN (ipv6_route_ifname_flags_pref_tag, ipv6_route_ifname_flags_pref_tag_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535> <1-255>", + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535) (1-255)", IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4013,7 +4013,7 @@ DEFUN (ipv6_route_ifname_flags_pref_tag, DEFUN (no_ipv6_route, no_ipv6_route_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE)", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE>", NO_STR IP_STR "Establish static routes\n" @@ -4026,7 +4026,7 @@ DEFUN (no_ipv6_route, DEFUN (no_ipv6_route_tag, no_ipv6_route_tag_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535>", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -4041,7 +4041,7 @@ DEFUN (no_ipv6_route_tag, DEFUN (no_ipv6_route_flags, no_ipv6_route_flags_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole)", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole>", NO_STR IP_STR "Establish static routes\n" @@ -4056,7 +4056,7 @@ DEFUN (no_ipv6_route_flags, DEFUN (no_ipv6_route_flags_tag, no_ipv6_route_flags_tag_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535>", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -4086,7 +4086,7 @@ DEFUN (no_ipv6_route_ifname, DEFUN (no_ipv6_route_ifname_tag, no_ipv6_route_ifname_tag_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535>", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -4101,7 +4101,7 @@ DEFUN (no_ipv6_route_ifname_tag, DEFUN (no_ipv6_route_ifname_flags, no_ipv6_route_ifname_flags_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole)", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole>", NO_STR IP_STR "Establish static routes\n" @@ -4116,7 +4116,7 @@ DEFUN (no_ipv6_route_ifname_flags, DEFUN (no_ipv6_route_ifname_flags_tag, no_ipv6_route_ifname_flags_tag_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535>", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535)", NO_STR IP_STR "Establish static routes\n" @@ -4133,7 +4133,7 @@ DEFUN (no_ipv6_route_ifname_flags_tag, DEFUN (no_ipv6_route_pref, no_ipv6_route_pref_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255>", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4147,7 +4147,7 @@ DEFUN (no_ipv6_route_pref, DEFUN (no_ipv6_route_pref_tag, no_ipv6_route_pref_tag_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535> <1-255>", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4163,7 +4163,7 @@ DEFUN (no_ipv6_route_pref_tag, DEFUN (no_ipv6_route_flags_pref, no_ipv6_route_flags_pref_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) <1-255>", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4180,7 +4180,7 @@ DEFUN (no_ipv6_route_flags_pref, DEFUN (no_ipv6_route_flags_pref_tag, no_ipv6_route_flags_pref_tag_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535> <1-255>", + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4199,7 +4199,7 @@ DEFUN (no_ipv6_route_flags_pref_tag, DEFUN (no_ipv6_route_ifname_pref, no_ipv6_route_ifname_pref_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255>", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4213,7 +4213,7 @@ DEFUN (no_ipv6_route_ifname_pref, DEFUN (no_ipv6_route_ifname_pref_tag, no_ipv6_route_ifname_pref_tag_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535> <1-255>", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4229,7 +4229,7 @@ DEFUN (no_ipv6_route_ifname_pref_tag, DEFUN (no_ipv6_route_ifname_flags_pref, no_ipv6_route_ifname_flags_pref_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) <1-255>", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4245,7 +4245,7 @@ DEFUN (no_ipv6_route_ifname_flags_pref, DEFUN (no_ipv6_route_ifname_flags_pref_tag, no_ipv6_route_ifname_flags_pref_tag_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535> <1-255>", + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535) (1-255)", NO_STR IP_STR "Establish static routes\n" @@ -4263,7 +4263,7 @@ DEFUN (no_ipv6_route_ifname_flags_pref_tag, DEFUN (ipv6_route_vrf, ipv6_route_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4276,7 +4276,7 @@ DEFUN (ipv6_route_vrf, DEFUN (ipv6_route_tag_vrf, ipv6_route_tag_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4291,7 +4291,7 @@ DEFUN (ipv6_route_tag_vrf, DEFUN (ipv6_route_flags_vrf, ipv6_route_flags_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4306,7 +4306,7 @@ DEFUN (ipv6_route_flags_vrf, DEFUN (ipv6_route_flags_tag_vrf, ipv6_route_flags_tag_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4335,7 +4335,7 @@ DEFUN (ipv6_route_ifname_vrf, } DEFUN (ipv6_route_ifname_tag_vrf, ipv6_route_ifname_tag_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4350,7 +4350,7 @@ DEFUN (ipv6_route_ifname_tag_vrf, DEFUN (ipv6_route_ifname_flags_vrf, ipv6_route_ifname_flags_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4365,7 +4365,7 @@ DEFUN (ipv6_route_ifname_flags_vrf, DEFUN (ipv6_route_ifname_flags_tag_vrf, ipv6_route_ifname_flags_tag_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4382,7 +4382,7 @@ DEFUN (ipv6_route_ifname_flags_tag_vrf, DEFUN (ipv6_route_pref_vrf, ipv6_route_pref_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4396,7 +4396,7 @@ DEFUN (ipv6_route_pref_vrf, DEFUN (ipv6_route_pref_tag_vrf, ipv6_route_pref_tag_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535> <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4412,7 +4412,7 @@ DEFUN (ipv6_route_pref_tag_vrf, DEFUN (ipv6_route_flags_pref_vrf, ipv6_route_flags_pref_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4428,7 +4428,7 @@ DEFUN (ipv6_route_flags_pref_vrf, DEFUN (ipv6_route_flags_pref_tag_vrf, ipv6_route_flags_pref_tag_vrf_cmd, - "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4446,7 +4446,7 @@ DEFUN (ipv6_route_flags_pref_tag_vrf, DEFUN (ipv6_route_ifname_pref_vrf, ipv6_route_ifname_pref_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4460,7 +4460,7 @@ DEFUN (ipv6_route_ifname_pref_vrf, DEFUN (ipv6_route_ifname_pref_tag_vrf, ipv6_route_ifname_pref_tag_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535> <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4476,7 +4476,7 @@ DEFUN (ipv6_route_ifname_pref_tag_vrf, DEFUN (ipv6_route_ifname_flags_pref_vrf, ipv6_route_ifname_flags_pref_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4492,7 +4492,7 @@ DEFUN (ipv6_route_ifname_flags_pref_vrf, DEFUN (ipv6_route_ifname_flags_pref_tag_vrf, ipv6_route_ifname_flags_pref_tag_vrf_cmd, - "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, IP_STR "Establish static routes\n" "IPv6 destination prefix (e.g. 3ffe:506::/32)\n" @@ -4510,7 +4510,7 @@ DEFUN (ipv6_route_ifname_flags_pref_tag_vrf, DEFUN (no_ipv6_route_vrf, no_ipv6_route_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4524,7 +4524,7 @@ DEFUN (no_ipv6_route_vrf, DEFUN (no_ipv6_route_tag_vrf, no_ipv6_route_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4540,7 +4540,7 @@ DEFUN (no_ipv6_route_tag_vrf, DEFUN (no_ipv6_route_flags_vrf, no_ipv6_route_flags_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4556,7 +4556,7 @@ DEFUN (no_ipv6_route_flags_vrf, DEFUN (no_ipv6_route_flags_tag_vrf, no_ipv6_route_flags_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4588,7 +4588,7 @@ DEFUN (no_ipv6_route_ifname_vrf, DEFUN (no_ipv6_route_ifname_tag_vrf, no_ipv6_route_ifname_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4604,7 +4604,7 @@ DEFUN (no_ipv6_route_ifname_tag_vrf, DEFUN (no_ipv6_route_ifname_flags_vrf, no_ipv6_route_ifname_flags_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4620,7 +4620,7 @@ DEFUN (no_ipv6_route_ifname_flags_vrf, DEFUN (no_ipv6_route_ifname_flags_tag_vrf, no_ipv6_route_ifname_flags_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4638,7 +4638,7 @@ DEFUN (no_ipv6_route_ifname_flags_tag_vrf, DEFUN (no_ipv6_route_pref_vrf, no_ipv6_route_pref_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4653,7 +4653,7 @@ DEFUN (no_ipv6_route_pref_vrf, DEFUN (no_ipv6_route_pref_tag_vrf, no_ipv6_route_pref_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4670,7 +4670,7 @@ DEFUN (no_ipv6_route_pref_tag_vrf, DEFUN (no_ipv6_route_flags_pref_vrf, no_ipv6_route_flags_pref_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4688,7 +4688,7 @@ DEFUN (no_ipv6_route_flags_pref_vrf, DEFUN (no_ipv6_route_flags_pref_tag_vrf, no_ipv6_route_flags_pref_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4708,7 +4708,7 @@ DEFUN (no_ipv6_route_flags_pref_tag_vrf, DEFUN (no_ipv6_route_ifname_pref_vrf, no_ipv6_route_ifname_pref_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4723,7 +4723,7 @@ DEFUN (no_ipv6_route_ifname_pref_vrf, DEFUN (no_ipv6_route_ifname_pref_tag_vrf, no_ipv6_route_ifname_pref_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-65535> <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4740,7 +4740,7 @@ DEFUN (no_ipv6_route_ifname_pref_tag_vrf, DEFUN (no_ipv6_route_ifname_flags_pref_vrf, no_ipv6_route_ifname_flags_pref_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4757,7 +4757,7 @@ DEFUN (no_ipv6_route_ifname_flags_pref_vrf, DEFUN (no_ipv6_route_ifname_flags_pref_tag_vrf, no_ipv6_route_ifname_flags_pref_tag_vrf_cmd, - "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-65535> <1-255> " VRF_CMD_STR, + "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <reject|blackhole> tag (1-65535) (1-255) " VRF_CMD_STR, NO_STR IP_STR "Establish static routes\n" @@ -4891,7 +4891,7 @@ DEFUN (show_ipv6_route, */ DEFUN (show_ipv6_route_tag, show_ipv6_route_tag_cmd, - "show ipv6 route tag <1-65535>", + "show ipv6 route tag (1-65535)", SHOW_STR IP_STR "IPv6 routing table\n" @@ -5338,7 +5338,7 @@ DEFUN (show_ipv6_route_vrf_all, DEFUN (show_ipv6_route_vrf_all_tag, show_ipv6_route_vrf_all_tag_cmd, - "show ipv6 route " VRF_ALL_CMD_STR " tag <1-65535>", + "show ipv6 route " VRF_ALL_CMD_STR " tag (1-65535)", SHOW_STR IP_STR "IPv6 routing table\n" @@ -5800,7 +5800,7 @@ zebra_ip_config (struct vty *vty) */ DEFUN (ip_zebra_import_table_distance, ip_zebra_import_table_distance_cmd, - "ip import-table <1-252> distance <1-255>", + "ip import-table (1-252) distance (1-255)", IP_STR "import routes from non-main kernel table\n" "kernel routing table id\n" @@ -5846,7 +5846,7 @@ DEFUN (ip_zebra_import_table_distance, */ DEFUN (ip_zebra_import_table_distance_routemap, ip_zebra_import_table_distance_routemap_cmd, - "ip import-table <1-252> distance <1-255> route-map WORD", + "ip import-table (1-252) distance (1-255) route-map WORD", IP_STR "import routes from non-main kernel table\n" "kernel routing table id\n" @@ -5899,7 +5899,7 @@ DEFUN (ip_zebra_import_table_distance_routemap, */ DEFUN (no_ip_zebra_import_table, no_ip_zebra_import_table_cmd, - "no ip import-table <1-252> {route-map NAME}", + "no ip import-table (1-252) [route-map NAME]", NO_STR IP_STR "import routes from non-main kernel table\n" diff --git a/zebra/zserv.c b/zebra/zserv.c index 3402bf1df..fc7b41954 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -2257,7 +2257,7 @@ DEFUN (show_table, return CMD_SUCCESS; } -DEFUN (config_table, +DEFUN (config_table, config_table_cmd, "table TABLENO", "Configure target kernel routing table\n" |