From: Quentin Young Date: Thu, 27 Oct 2016 23:18:26 +0000 (+0000) Subject: bgpd: Clean up cli help strings X-Git-Tag: frr-3.0-branchpoint~129^2~63 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0c7b1b01c862b44ed4181cf8ecb12d95096f6a77;p=mirror%2Ffrr.git bgpd: Clean up cli help strings Signed-off-by: Quentin Young --- diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index 4619a08d55..f6b0500433 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -863,8 +863,8 @@ DEFUN (debug_bgp_bestpath_prefix, DEBUG_STR BGP_STR "BGP bestpath\n" - "IP prefix /, e.g., 35.0.0.0/8\n" - "IPv6 prefix /\n") + "IPv4 prefix\n" + "IPv6 prefix\n") { int idx_ipv4_ipv6_prefixlen = 3; @@ -912,8 +912,8 @@ DEFUN (no_debug_bgp_bestpath_prefix, DEBUG_STR BGP_STR "BGP bestpath\n" - "IP prefix /, e.g., 35.0.0.0/8\n" - "IPv6 prefix /\n") + "IPv4 prefix\n" + "IPv6 prefix\n") { int idx_ipv4_ipv6_prefixlen = 4; @@ -1279,8 +1279,8 @@ DEFUN (debug_bgp_update_prefix, BGP_STR "BGP updates\n" "Specify a prefix to debug\n" - "IP prefix /, e.g., 35.0.0.0/8\n" - "IPv6 prefix /\n") + "IPv4 prefix\n" + "IPv6 prefix\n") { int idx_ipv4_ipv6_prefixlen = 4; @@ -1329,8 +1329,8 @@ DEFUN (no_debug_bgp_update_prefix, BGP_STR "BGP updates\n" "Specify a prefix to debug\n" - "IP prefix /, e.g., 35.0.0.0/8\n" - "IPv6 prefix /\n") + "IPv4 prefix\n" + "IPv6 prefix\n") { int idx_ipv4_ipv6_prefixlen = 5; @@ -1428,8 +1428,8 @@ DEFUN (debug_bgp_zebra_prefix, BGP_STR "BGP Zebra messages\n" "Specify a prefix to debug\n" - "IP prefix /, e.g., 35.0.0.0/8\n" - "IPv6 prefix /\n") + "IPv4 prefix\n" + "IPv6 prefix\n") { int idx_ipv4_ipv6_prefixlen = 4; @@ -1495,8 +1495,8 @@ DEFUN (no_debug_bgp_zebra_prefix, BGP_STR "BGP Zebra messages\n" "Specify a prefix to debug\n" - "IP prefix /, e.g., 35.0.0.0/8\n" - "IPv6 prefix /\n") + "IPv4 prefix\n" + "IPv6 prefix\n") { int idx_ipv4_ipv6_prefixlen = 5; diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c index 499401bd4f..e956f84e2f 100644 --- a/bgpd/bgp_encap.c +++ b/bgpd/bgp_encap.c @@ -218,7 +218,7 @@ DEFUN (encap_network, encap_network_cmd, "network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify Route Distinguisher\n" "ENCAP Route Distinguisher\n" "BGP tag\n" @@ -236,7 +236,7 @@ DEFUN (no_encap_network, "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", NO_STR "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify Route Distinguisher\n" "ENCAP Route Distinguisher\n" "BGP tag\n" diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 5d6dc4c2cf..9c8e0d54c6 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -438,7 +438,7 @@ DEFUN (vpnv4_network, vpnv4_network_cmd, "network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify Route Distinguisher\n" "VPN Route Distinguisher\n" "BGP tag\n" @@ -454,7 +454,7 @@ DEFUN (vpnv4_network_route_map, vpnv4_network_route_map_cmd, "network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD route-map WORD", "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify Route Distinguisher\n" "VPN Route Distinguisher\n" "BGP tag\n" @@ -475,7 +475,7 @@ DEFUN (no_vpnv4_network, "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", NO_STR "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify Route Distinguisher\n" "VPN Route Distinguisher\n" "BGP tag\n" @@ -965,7 +965,7 @@ DEFUN (show_ip_bgp_vpnv4_all, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information about all VPNv4 NLRIs\n") { return bgp_show_mpls_vpn (vty, AFI_IP, NULL, bgp_show_type_normal, NULL, 0, 0); @@ -977,7 +977,7 @@ DEFUN (show_ip_bgp_vpnv4_rd, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information for a route distinguisher\n" "VPN Route Distinguisher\n") { @@ -1000,7 +1000,7 @@ DEFUN (show_ip_bgp_vpnv4_all_tags, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information about all VPNv4 NLRIs\n" "Display BGP tags for prefixes\n") { @@ -1013,7 +1013,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_tags, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information for a route distinguisher\n" "VPN Route Distinguisher\n" "Display BGP tags for prefixes\n") @@ -1037,7 +1037,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_routes, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information about all VPNv4 NLRIs\n" "Detailed information on TCP and BGP neighbor connections\n" "Neighbor to display information about\n" @@ -1091,7 +1091,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_routes, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information for a route distinguisher\n" "VPN Route Distinguisher\n" "Detailed information on TCP and BGP neighbor connections\n" @@ -1164,7 +1164,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_advertised_routes, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information about all VPNv4 NLRIs\n" "Detailed information on TCP and BGP neighbor connections\n" "Neighbor to display information about\n" @@ -1217,7 +1217,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_advertised_routes, SHOW_STR IP_STR BGP_STR - "Display VPNv4 NLRI specific information\n" + "Address Family\n" "Display information for a route distinguisher\n" "VPN Route Distinguisher\n" "Detailed information on TCP and BGP neighbor connections\n" diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 15d58ab064..b4eafd13fe 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -4562,7 +4562,7 @@ DEFUN (bgp_network, bgp_network_cmd, "network A.B.C.D/M", "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n") + "IPv4 prefix\n") { int idx_ipv4_prefixlen = 1; return bgp_static_set (vty, vty->index, argv[idx_ipv4_prefixlen]->arg, @@ -4573,7 +4573,7 @@ DEFUN (bgp_network_route_map, bgp_network_route_map_cmd, "network A.B.C.D/M route-map WORD", "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Route-map to modify the attributes\n" "Name of the route map\n") { @@ -4587,7 +4587,7 @@ DEFUN (bgp_network_backdoor, bgp_network_backdoor_cmd, "network A.B.C.D/M backdoor", "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify a BGP backdoor route\n") { int idx_ipv4_prefixlen = 1; @@ -4743,7 +4743,7 @@ DEFUN (no_bgp_network, "no network A.B.C.D/M []", NO_STR "Specify a network to announce via BGP\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Specify a BGP backdoor route\n" "Route-map to modify the attributes\n" "Name of the route map\n") @@ -4810,7 +4810,7 @@ DEFUN (ipv6_bgp_network, ipv6_bgp_network_cmd, "network X:X::X:X/M", "Specify a network to announce via BGP\n" - "IPv6 prefix /\n") + "IPv6 prefix\n") { int idx_ipv6_prefixlen = 1; return bgp_static_set (vty, vty->index, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, bgp_node_safi(vty), @@ -4821,7 +4821,7 @@ DEFUN (ipv6_bgp_network_route_map, ipv6_bgp_network_route_map_cmd, "network X:X::X:X/M route-map WORD", "Specify a network to announce via BGP\n" - "IPv6 prefix /\n" + "IPv6 prefix\n" "Route-map to modify the attributes\n" "Name of the route map\n") { @@ -4836,7 +4836,7 @@ DEFUN (no_ipv6_bgp_network, "no network X:X::X:X/M [route-map WORD]", NO_STR "Specify a network to announce via BGP\n" - "IPv6 prefix /\n" + "IPv6 prefix\n" "Route-map to modify the attributes\n" "Name of the route map\n") { @@ -8014,12 +8014,11 @@ DEFUN (show_ip_bgp_ipv4, "show [ip] bgp [ WORD] []|ipv6 []|encap [unicast]|vpnv4 [unicast]>]\ [<\ cidr-only\ - |community\ |dampening \ |route-map WORD\ |prefix-list WORD\ |filter-list WORD\ - |community [exact-match]\ + |community [ [exact-match]]\ |community-list <(1-500)|WORD> [exact-match]\ |A.B.C.D/M longer-prefixes\ |X:X::X:X/M longer-prefixes\ @@ -8040,10 +8039,10 @@ DEFUN (show_ip_bgp_ipv4, "Address Family\n" "Address Family modifier\n" "Display only routes with non-natural netmasks\n" - "Display routes matching the communities\n" "Display detailed information about dampening\n" "Display flap statistics of routes\n" "Display paths suppressed due to dampening\n" + "Display dampening parameters\n" "Display routes matching the route-map\n" "A route-map to match on\n" "Display routes conforming to the prefix-list\n" @@ -8060,9 +8059,9 @@ DEFUN (show_ip_bgp_ipv4, "community-list number\n" "community-list name\n" "Exact match of the communities\n" - "IPv4 prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Display route and more specific routes\n" - "IPv6 prefix /\n" + "IPv6 prefix\n" "Display route and more specific routes\n" "JavaScript Object Notation\n") { @@ -8176,9 +8175,9 @@ DEFUN (show_ip_bgp_route, "Address Family\n" "Address Family modifier\n" "Network in the BGP routing table to display\n" - "IP prefix /, e.g., 35.0.0.0/8\n" + "IPv4 prefix\n" "Network in the BGP routing table to display\n" - "IPv6 prefix /\n" + "IPv6 prefix\n" "Display only the bestpath\n" "Display only multipaths\n" "JavaScript Object Notation\n") @@ -10412,7 +10411,7 @@ DEFUN (clear_ip_bgp_dampening_prefix, IP_STR BGP_STR "Clear route flap dampening information\n" - "IP prefix /, e.g., 35.0.0.0/8\n") + "IPv4 prefix\n") { int idx_ipv4_prefixlen = 4; return bgp_clear_damp_route (vty, NULL, argv[idx_ipv4_prefixlen]->arg, AFI_IP, diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 5322f2a034..cd043d07ac 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -6015,7 +6015,7 @@ DEFUN (clear_ip_bgp_prefix, BGP_STR BGP_INSTANCE_HELP_STR "Clear bestpath and re-advertise\n" - "IP prefix /, e.g., 35.0.0.0/8\n") + "IPv4 prefix\n") { char *vrf = NULL; char *prefix = NULL; @@ -6025,7 +6025,7 @@ DEFUN (clear_ip_bgp_prefix, /* [ WORD] */ if (argv_find (argv, argc, "WORD", &idx)) vrf = argv[idx]->arg; - + prefix = argv[argc-1]->arg; return bgp_clear_prefix (vty, vrf, prefix, AFI_IP, SAFI_UNICAST, NULL); @@ -6039,7 +6039,7 @@ DEFUN (clear_bgp_ipv6_safi_prefix, "Address Family\n" "Address Family Modifier\n" "Clear bestpath and re-advertise\n" - "IPv6 prefix /, e.g., 3ffe::/16\n") + "IPv6 prefix\n") { int idx_safi = 3; int idx_ipv6_prefixlen = 5; @@ -6058,7 +6058,7 @@ DEFUN (clear_bgp_instance_ipv6_safi_prefix, "Address Family\n" "Address Family Modifier\n" "Clear bestpath and re-advertise\n" - "IPv6 prefix /, e.g., 3ffe::/16\n") + "IPv6 prefix\n") { int idx_word = 3; int idx_safi = 5; @@ -6787,10 +6787,10 @@ DEFUN (show_ip_bgp_summary, BGP_INSTANCE_HELP_STR "Address Family\n" "Address Family modifier\n" - "Address Family\n" "Address Family modifier\n" "Address Family\n" "Address Family modifier\n" + "Address Family modifier\n" "Address Family\n" "Address Family modifier\n" "Address Family\n" @@ -8834,10 +8834,10 @@ DEFUN (show_ip_bgp_updgrps, BGP_INSTANCE_HELP_STR "Address Family\n" "Address Family modifier\n" - "Address Family\n" "Address Family modifier\n" "Address Family\n" "Address Family modifier\n" + "Address Family modifier\n" "Address Family\n" "Address Family modifier\n" "Address Family\n" @@ -8887,7 +8887,7 @@ DEFUN (show_bgp_instance_all_ipv6_updgrps, SHOW_STR BGP_STR BGP_INSTANCE_ALL_HELP_STR - "Detailed info about v6 dynamic update groups\n") + "Detailed info about dynamic update groups\n") { bgp_show_all_instances_updgrps_vty (vty, AFI_IP6, SAFI_UNICAST); return CMD_SUCCESS; @@ -8898,7 +8898,7 @@ DEFUN (show_bgp_updgrps_stats, "show bgp update-groups statistics", SHOW_STR BGP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Statistics\n") { struct bgp *bgp; @@ -8916,7 +8916,7 @@ DEFUN (show_bgp_instance_updgrps_stats, SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Statistics\n") { int idx_word = 3; @@ -8958,7 +8958,7 @@ DEFUN (show_ip_bgp_updgrps_adj, SHOW_STR IP_STR BGP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Advertisement queue\n" "Announced routes\n" "Packet queue\n") @@ -8976,7 +8976,7 @@ DEFUN (show_ip_bgp_instance_updgrps_adj, IP_STR BGP_STR BGP_INSTANCE_HELP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Advertisement queue\n" "Announced routes\n" "Packet queue\n") @@ -8997,7 +8997,7 @@ DEFUN (show_bgp_updgrps_afi_adj, "Address Family\n" "Address Family modifier\n" "Address Family modifier\n" - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Advertisement queue\n" "Announced routes\n" "Packet queue\n" @@ -9020,7 +9020,7 @@ DEFUN (show_bgp_updgrps_adj, "show bgp update-groups ", SHOW_STR BGP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Advertisement queue\n" "Announced routes\n" "Packet queue\n") @@ -9036,7 +9036,7 @@ DEFUN (show_bgp_instance_updgrps_adj, SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Advertisement queue\n" "Announced routes\n" "Packet queue\n") @@ -9053,7 +9053,7 @@ DEFUN (show_ip_bgp_updgrps_adj_s, SHOW_STR IP_STR BGP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Specific subgroup to display info for\n" "Advertisement queue\n" "Announced routes\n" @@ -9077,7 +9077,7 @@ DEFUN (show_ip_bgp_instance_updgrps_adj_s, IP_STR BGP_STR BGP_INSTANCE_HELP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Specific subgroup to display info for\n" "Advertisement queue\n" "Announced routes\n" @@ -9104,7 +9104,7 @@ DEFUN (show_bgp_updgrps_afi_adj_s, "Address Family\n" "Address Family modifier\n" "Address Family modifier\n" - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Specific subgroup to display info for\n" "Advertisement queue\n" "Announced routes\n" @@ -9132,7 +9132,7 @@ DEFUN (show_bgp_updgrps_adj_s, "show bgp update-groups SUBGROUP-ID ", SHOW_STR BGP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Specific subgroup to display info for\n" "Advertisement queue\n" "Announced routes\n" @@ -9154,7 +9154,7 @@ DEFUN (show_bgp_instance_updgrps_adj_s, SHOW_STR BGP_STR BGP_INSTANCE_HELP_STR - "BGP update groups\n" + "Detailed info about dynamic update groups\n" "Specific subgroup to display info for\n" "Advertisement queue\n" "Announced routes\n"