]> git.proxmox.com Git - mirror_frr.git/commitdiff
Expand #defines in command strings
authorDaniel Walton <dwalton@cumulusnetworks.com>
Sun, 25 Sep 2016 14:10:48 +0000 (14:10 +0000)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Sun, 25 Sep 2016 14:10:48 +0000 (14:10 +0000)
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
19 files changed:
bgpd/bgp_bfd.c
bgpd/bgp_nexthop.c
bgpd/bgp_route.c
bgpd/bgp_routemap.c
bgpd/bgp_vty.c
isisd/isis_redist.c
lib/command.c
lib/if.c
ospf6d/ospf6_asbr.c
ospf6d/ospf6_bfd.c
ospfd/ospf_bfd.c
ospfd/ospf_vty.c
pimd/pim_cmd.c
ripd/rip_zebra.c
ripngd/ripng_zebra.c
tools/argv_translator.py
zebra/interface.c
zebra/zebra_routemap.c
zebra/zebra_vty.c

index 170b207a85185b4d2f04580024e0ba395ffded0c..bb8f4ceeea8944325991bae9e4ec6a8f6b655add 100644 (file)
@@ -555,7 +555,7 @@ bgp_bfd_show_info(struct vty *vty, struct peer *peer, u_char use_json, json_obje
 
 DEFUN (neighbor_bfd,
        neighbor_bfd_cmd,
-       NEIGHBOR_CMD2 "bfd",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> bfd",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Enables BFD support\n")
@@ -578,7 +578,7 @@ DEFUN (neighbor_bfd,
 
 DEFUN (neighbor_bfd_param,
        neighbor_bfd_param_cmd,
-       NEIGHBOR_CMD2 "bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
+       "neighbor <A.B.C.D|X:X::X:X|WORD> bfd (2-255) (50-60000) (50-60000)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Enables BFD support\n"
@@ -652,7 +652,7 @@ DEFUN_HIDDEN (neighbor_bfd_type,
  */
 DEFUN (no_neighbor_bfd,
        no_neighbor_bfd_cmd,
-       NO_NEIGHBOR_CMD2 "bfd",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> bfd",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
index e648af91e7170312bafd5db998b4ad4cdd220283..f59971c1b891c50d2ebc3fb75b55048c2aa11646 100644 (file)
@@ -513,7 +513,7 @@ DEFUN (show_ip_bgp_nexthop_detail,
 
 DEFUN (show_ip_bgp_instance_nexthop,
        show_ip_bgp_instance_nexthop_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " nexthop",
+       "show ip bgp <view|vrf> WORD nexthop",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -526,7 +526,7 @@ DEFUN (show_ip_bgp_instance_nexthop,
 
 DEFUN (show_ip_bgp_instance_all_nexthop,
        show_ip_bgp_instance_all_nexthop_cmd,
-       "show ip bgp " BGP_INSTANCE_ALL_CMD " nexthop",
+       "show ip bgp <view|vrf> all nexthop",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -539,7 +539,7 @@ DEFUN (show_ip_bgp_instance_all_nexthop,
 
 DEFUN (show_ip_bgp_instance_nexthop_detail,
        show_ip_bgp_instance_nexthop_detail_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " nexthop detail",
+       "show ip bgp <view|vrf> WORD nexthop detail",
        SHOW_STR
        IP_STR
        BGP_STR
index 6238f28ddac402ac43e6f33fc55eb4525394e031..14aaf7eebbb06d1afd2657e5724427c038a1bcef 100644 (file)
@@ -8444,7 +8444,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_prefix,
 
 DEFUN (show_ip_bgp_view,
        show_ip_bgp_instance_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " [json]",
+       "show ip bgp <view|vrf> WORD [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8467,7 +8467,7 @@ DEFUN (show_ip_bgp_view,
 
 DEFUN (show_ip_bgp_instance_all,
        show_ip_bgp_instance_all_cmd,
-       "show ip bgp " BGP_INSTANCE_ALL_CMD " [json]",
+       "show ip bgp <view|vrf> all [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8482,7 +8482,7 @@ DEFUN (show_ip_bgp_instance_all,
 
 DEFUN (show_ip_bgp_instance_route,
        show_ip_bgp_instance_route_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D [json]",
+       "show ip bgp <view|vrf> WORD A.B.C.D [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8497,7 +8497,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 <view|vrf> WORD A.B.C.D <bestpath|multipath> [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8520,7 +8520,7 @@ DEFUN (show_ip_bgp_instance_route_pathtype,
 
 DEFUN (show_ip_bgp_instance_prefix,
        show_ip_bgp_instance_prefix_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D/M [json]",
+       "show ip bgp <view|vrf> WORD A.B.C.D/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8535,7 +8535,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 <view|vrf> WORD A.B.C.D/M <bestpath|multipath> [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8836,7 +8836,7 @@ DEFUN (show_ipv6_bgp_prefix,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 [json]",
+ * "show bgp <view|vrf> WORD ipv6 [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8846,7 +8846,7 @@ DEFUN (show_ipv6_bgp_prefix,
  */
 DEFUN (show_bgp_view,
        show_bgp_instance_cmd,
-       "show bgp " BGP_INSTANCE_CMD " [json]",
+       "show bgp <view|vrf> WORD [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8868,7 +8868,7 @@ DEFUN (show_bgp_view,
 
 DEFUN (show_bgp_instance_all,
        show_bgp_instance_all_cmd,
-       "show bgp " BGP_INSTANCE_ALL_CMD " [json]",
+       "show bgp <view|vrf> all [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_ALL_HELP_STR
@@ -8883,7 +8883,7 @@ DEFUN (show_bgp_instance_all,
   
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X [json]",
+ * "show bgp <view|vrf> WORD ipv6 X:X::X:X [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8894,7 +8894,7 @@ DEFUN (show_bgp_instance_all,
  */
 DEFUN (show_bgp_instance_route,
        show_bgp_instance_route_cmd,
-       "show bgp " BGP_INSTANCE_CMD " X:X::X:X [json]",
+       "show bgp <view|vrf> WORD X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8909,7 +8909,7 @@ DEFUN (show_bgp_instance_route,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X (bestpath|multipath) [json]",
+ * "show bgp <view|vrf> WORD ipv6 X:X::X:X (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8922,7 +8922,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 <view|vrf> WORD X:X::X:X <bestpath|multipath> [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8944,7 +8944,7 @@ DEFUN (show_bgp_instance_route_pathtype,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M [json]",
+ * "show bgp <view|vrf> WORD ipv6 X:X::X:X/M [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8955,7 +8955,7 @@ DEFUN (show_bgp_instance_route_pathtype,
  */
 DEFUN (show_bgp_instance_prefix,
        show_bgp_instance_prefix_cmd,
-       "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M [json]",
+       "show bgp <view|vrf> WORD X:X::X:X/M [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8970,7 +8970,7 @@ DEFUN (show_bgp_instance_prefix,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M (bestpath|multipath) [json]",
+ * "show bgp <view|vrf> WORD ipv6 X:X::X:X/M (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8983,7 +8983,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 <view|vrf> WORD X:X::X:X/M <bestpath|multipath> [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9005,7 +9005,7 @@ DEFUN (show_bgp_instance_prefix_pathtype,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 prefix-list WORD",
+ * "show bgp <view|vrf> WORD ipv6 prefix-list WORD",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -9016,7 +9016,7 @@ DEFUN (show_bgp_instance_prefix_pathtype,
  */
 DEFUN (show_bgp_instance_prefix_list,
        show_bgp_instance_prefix_list_cmd,
-       "show bgp " BGP_INSTANCE_CMD " prefix-list WORD",
+       "show bgp <view|vrf> WORD prefix-list WORD",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9032,7 +9032,7 @@ DEFUN (show_bgp_instance_prefix_list,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 filter-list WORD",
+ * "show bgp <view|vrf> WORD ipv6 filter-list WORD",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -9043,7 +9043,7 @@ DEFUN (show_bgp_instance_prefix_list,
  */
 DEFUN (show_bgp_instance_filter_list,
        show_bgp_instance_filter_list_cmd,
-       "show bgp " BGP_INSTANCE_CMD " filter-list WORD",
+       "show bgp <view|vrf> WORD filter-list WORD",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9059,7 +9059,7 @@ DEFUN (show_bgp_instance_filter_list,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 route-map WORD",
+ * "show bgp <view|vrf> WORD ipv6 route-map WORD",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -9070,7 +9070,7 @@ DEFUN (show_bgp_instance_filter_list,
  */
 DEFUN (show_bgp_instance_route_map,
        show_bgp_instance_route_map_cmd,
-       "show bgp " BGP_INSTANCE_CMD " route-map WORD",
+       "show bgp <view|vrf> WORD route-map WORD",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9086,7 +9086,7 @@ DEFUN (show_bgp_instance_route_map,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 community-list (<1-500>|WORD)",
+ * "show bgp <view|vrf> WORD ipv6 community-list (<1-500>|WORD)",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -9098,7 +9098,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 <view|vrf> WORD community-list <(1-500)|WORD>",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9114,7 +9114,7 @@ DEFUN (show_bgp_instance_community_list,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M longer-prefixes",
+ * "show bgp <view|vrf> WORD ipv6 X:X::X:X/M longer-prefixes",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -9125,7 +9125,7 @@ DEFUN (show_bgp_instance_community_list,
  */
 DEFUN (show_bgp_instance_prefix_longer,
        show_bgp_instance_prefix_longer_cmd,
-       "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M longer-prefixes",
+       "show bgp <view|vrf> WORD X:X::X:X/M longer-prefixes",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9387,7 +9387,7 @@ DEFUN (show_ip_bgp_prefix_list,
 
 DEFUN (show_ip_bgp_instance_prefix_list,
        show_ip_bgp_instance_prefix_list_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " prefix-list WORD",
+       "show ip bgp <view|vrf> WORD prefix-list WORD",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9549,7 +9549,7 @@ DEFUN (show_ip_bgp_filter_list,
 
 DEFUN (show_ip_bgp_instance_filter_list,
        show_ip_bgp_instance_filter_list_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " filter-list WORD",
+       "show ip bgp <view|vrf> WORD filter-list WORD",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9787,7 +9787,7 @@ DEFUN (show_ip_bgp_route_map,
 
 DEFUN (show_ip_bgp_instance_route_map,
        show_ip_bgp_instance_route_map_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " route-map WORD",
+       "show ip bgp <view|vrf> WORD route-map WORD",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10246,7 +10246,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 <view|vrf> WORD <ipv4|ipv6> <unicast|multicast> community",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -10278,7 +10278,7 @@ DEFUN (show_bgp_instance_afi_safi_community_all,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ * "show bgp <view|vrf> WORD (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -10300,7 +10300,7 @@ DEFUN (show_bgp_instance_afi_safi_community_all,
  *     "Do not advertise to any peer (well-known community)\n"
  *     "Do not export to next AS (well-known community)\n"
  *
- * "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ * "show bgp <view|vrf> WORD (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -10326,7 +10326,7 @@ DEFUN (show_bgp_instance_afi_safi_community_all,
  *     "Do not advertise to any peer (well-known community)\n"
  *     "Do not export to next AS (well-known community)\n"
  *
- * "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ * "show bgp <view|vrf> WORD (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -10347,7 +10347,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 <view|vrf> WORD <ipv4|ipv6> <unicast|multicast> community <AA:NN|local-AS|no-advertise|no-export>",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -11208,7 +11208,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 <view|vrf> WORD community-list <(1-500)|WORD>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -11441,7 +11441,7 @@ DEFUN (show_ip_bgp_prefix_longer,
 
 DEFUN (show_ip_bgp_instance_prefix_longer,
        show_ip_bgp_instance_prefix_longer_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D/M longer-prefixes",
+       "show ip bgp <view|vrf> WORD A.B.C.D/M longer-prefixes",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12032,7 +12032,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 <view|vrf> WORD <ipv4|ipv6> <unicast|multicast|vpn|encap> statistics",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12266,7 +12266,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12316,7 +12316,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 <view|vrf> WORD ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12640,7 +12640,7 @@ peer_adj_routes (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD [json]",
+ * "show ip bgp <view|vrf> WORD neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12655,7 +12655,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12787,7 +12787,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
 #ifdef HAVE_IPV6
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -12802,7 +12802,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> advertised-routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12918,7 +12918,7 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -12933,7 +12933,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12958,7 +12958,7 @@ DEFUN (show_bgp_instance_neighbor_received_routes,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD [json]",
+ * "show ip bgp <view|vrf> WORD neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12973,7 +12973,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> received-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13101,7 +13101,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 <view|vrf> WORD <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
@@ -13535,7 +13535,7 @@ DEFUN (ipv6_mbgp_neighbor_received_routes,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13551,7 +13551,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> received prefix-filter [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13694,7 +13694,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13805,7 +13805,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes,
 #ifdef HAVE_IPV6
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13820,7 +13820,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13857,7 +13857,7 @@ DEFUN (show_bgp_instance_neighbor_routes,
  *     "Display the dampened routes received from neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13883,7 +13883,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> dampened-routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13926,7 +13926,7 @@ DEFUN (show_bgp_instance_neighbor_damp,
  *     "Display flap statistics of the routes learned from neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13952,7 +13952,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> flap-statistics [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
index 0b43b14e6824b36bcfa0dafcead871a1eaddd9a3..e1d8ca896d2dc5e9abbdf3cfb5335b7263c30d3d 100644 (file)
@@ -3846,7 +3846,7 @@ DEFUN (no_set_weight,
  */
 DEFUN (set_aspath_prepend,
        set_aspath_prepend_cmd,
-       "set as-path prepend ." CMD_AS_RANGE,
+       "set as-path prepend . (1-4294967295)",
        SET_STR
        "Transform BGP AS_PATH attribute\n"
        "Prepend to the as-path\n"
@@ -3865,7 +3865,7 @@ DEFUN (set_aspath_prepend,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no set as-path prepend ." CMD_AS_RANGE,
+ * "no set as-path prepend . (1-4294967295)",
  *     NO_STR
  *     SET_STR
  *     "Transform BGP AS_PATH attribute\n"
@@ -3893,7 +3893,7 @@ DEFUN (no_set_aspath_prepend,
 
 DEFUN (set_aspath_exclude,
        set_aspath_exclude_cmd,
-       "set as-path exclude ." CMD_AS_RANGE,
+       "set as-path exclude . (1-4294967295)",
        SET_STR
        "Transform BGP AS-path attribute\n"
        "Exclude from the as-path\n"
@@ -3910,7 +3910,7 @@ DEFUN (set_aspath_exclude,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no set as-path exclude ." CMD_AS_RANGE,
+ * "no set as-path exclude . (1-4294967295)",
  *     NO_STR
  *     SET_STR
  *     "Transform BGP AS_PATH attribute\n"
@@ -4254,7 +4254,7 @@ DEFUN (no_set_atomic_aggregate,
 
 DEFUN (set_aggregator_as,
        set_aggregator_as_cmd,
-       "set aggregator as " CMD_AS_RANGE " A.B.C.D",
+       "set aggregator as (1-4294967295) A.B.C.D",
        SET_STR
        "BGP aggregator attribute\n"
        "AS number of aggregator\n"
@@ -4288,7 +4288,7 @@ DEFUN (set_aggregator_as,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no set aggregator as " CMD_AS_RANGE " A.B.C.D",
+ * "no set aggregator as (1-4294967295) A.B.C.D",
  *     NO_STR
  *     SET_STR
  *     "BGP aggregator attribute\n"
index c7d0102a45777a7657ac0d24222114ea1e1d5005..f1411ea5eb5d354bbec4d5198b46c724627e486c 100644 (file)
@@ -662,7 +662,7 @@ DEFUN (no_auto_summary,
  *     ROUTER_STR
  *     BGP_STR
  *
- * "router bgp " CMD_AS_RANGE " (view|vrf) WORD",
+ * "router bgp (1-4294967295) (view|vrf) WORD",
  *     ROUTER_STR
  *     BGP_STR
  *     AS_STR
@@ -672,7 +672,7 @@ DEFUN (no_auto_summary,
  */
 DEFUN (router_bgp,
        router_bgp_cmd,
-       "router bgp " CMD_AS_RANGE,
+       "router bgp (1-4294967295)",
        ROUTER_STR
        BGP_STR
        AS_STR)
@@ -752,7 +752,7 @@ DEFUN (router_bgp,
  *     ROUTER_STR
  *     BGP_STR
  *
- * "no router bgp " CMD_AS_RANGE " (view|vrf) WORD",
+ * "no router bgp (1-4294967295) (view|vrf) WORD",
  *     NO_STR
  *     ROUTER_STR
  *     BGP_STR
@@ -763,7 +763,7 @@ DEFUN (router_bgp,
  */
 DEFUN (no_router_bgp,
        no_router_bgp_cmd,
-       "no router bgp " CMD_AS_RANGE,
+       "no router bgp (1-4294967295)",
        NO_STR
        ROUTER_STR
        BGP_STR
@@ -938,7 +938,7 @@ DEFUN (no_bgp_cluster_id,
 
 DEFUN (bgp_confederation_identifier,
        bgp_confederation_identifier_cmd,
-       "bgp confederation identifier " CMD_AS_RANGE,
+       "bgp confederation identifier (1-4294967295)",
        "BGP specific commands\n"
        "AS confederation parameters\n"
        "AS number\n"
@@ -975,7 +975,7 @@ DEFUN (no_bgp_confederation_identifier,
 
 DEFUN (bgp_confederation_peers,
        bgp_confederation_peers_cmd,
-       "bgp confederation peers ." CMD_AS_RANGE,
+       "bgp confederation peers . (1-4294967295)",
        "BGP specific commands\n"
        "AS confederation parameters\n"
        "Peer ASs in BGP confederation\n"
@@ -1005,7 +1005,7 @@ DEFUN (bgp_confederation_peers,
 
 DEFUN (no_bgp_confederation_peers,
        no_bgp_confederation_peers_cmd,
-       "no bgp confederation peers ." CMD_AS_RANGE,
+       "no bgp confederation peers . (1-4294967295)",
        NO_STR
        "BGP specific commands\n"
        "AS confederation parameters\n"
@@ -1415,7 +1415,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 (1-255)",
        "Forward packets over multiple paths\n"
        "Number of paths\n")
 {
@@ -1425,7 +1425,7 @@ DEFUN (bgp_maxpaths,
 
 DEFUN (bgp_maxpaths_ibgp,
        bgp_maxpaths_ibgp_cmd,
-       "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM),
+       "maximum-paths ibgp (1-255)",
        "Forward packets over multiple paths\n"
        "iBGP-multipath\n"
        "Number of paths\n")
@@ -1436,7 +1436,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 (1-255) equal-cluster-length",
        "Forward packets over multiple paths\n"
        "iBGP-multipath\n"
        "Number of paths\n"
@@ -1449,7 +1449,7 @@ DEFUN (bgp_maxpaths_ibgp_cluster,
 
 DEFUN (no_bgp_maxpaths,
        no_bgp_maxpaths_cmd,
-       "no maximum-paths [" CMD_RANGE_STR(1, MULTIPATH_NUM) "]",
+       "no maximum-paths [(1-255)]",
        NO_STR
        "Forward packets over multiple paths\n"
        "Number of paths\n")
@@ -1459,7 +1459,7 @@ DEFUN (no_bgp_maxpaths,
 
 DEFUN (no_bgp_maxpaths_ibgp,
        no_bgp_maxpaths_ibgp_cmd,
-       "no maximum-paths ibgp [" CMD_RANGE_STR(1, MULTIPATH_NUM) " [equal-cluster-length]]",
+       "no maximum-paths ibgp [(1-255) [equal-cluster-length]]",
        NO_STR
        "Forward packets over multiple paths\n"
        "iBGP-multipath\n"
@@ -2357,7 +2357,7 @@ DEFUN (no_bgp_rr_allow_outbound_policy,
 
 DEFUN (bgp_listen_limit,
        bgp_listen_limit_cmd,
-       "bgp listen limit " DYNAMIC_NEIGHBOR_LIMIT_RANGE,
+       "bgp listen limit (1-5000)",
        "BGP specific commands\n"
        "Configure BGP defaults\n"
        "maximum number of BGP Dynamic Neighbors that can be created\n"
@@ -2429,7 +2429,7 @@ listen_range_exists (struct bgp *bgp, struct prefix *range, int exact)
 
 DEFUN (bgp_listen_range,
        bgp_listen_range_cmd,
-       LISTEN_RANGE_CMD "peer-group WORD" ,
+       "bgp listen range <A.B.C.D/M|X:X::X:X/M> peer-group WORD",
        "BGP specific commands\n"
        "Configure BGP Dynamic Neighbors\n"
        "add a listening range for Dynamic Neighbors\n"
@@ -2503,7 +2503,7 @@ DEFUN (bgp_listen_range,
 
 DEFUN (no_bgp_listen_range,
        no_bgp_listen_range_cmd,
-       "no bgp listen range A.B.C.D/M peer-group WORD" ,
+       "no bgp listen range A.B.C.D/M peer-group WORD",
        "BGP specific commands\n"
        "Configure BGP defaults\n"
        "delete a listening range for Dynamic Neighbors\n"
@@ -2688,7 +2688,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 <A.B.C.D|X:X::X:X|WORD> remote-as <(1-4294967295)|external|internal>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Specify a BGP neighbor\n"
@@ -2855,7 +2855,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 <(1-4294967295)|external|internal>",
        NEIGHBOR_STR
        "Interface name or neighbor tag\n"
        "Enable BGP on interface\n"
@@ -2869,7 +2869,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 <(1-4294967295)|external|internal>",
        NEIGHBOR_STR
        "Interface name or neighbor tag\n"
        "Enable BGP on interface\n"
@@ -2920,7 +2920,7 @@ DEFUN (neighbor_peer_group,
  */
 DEFUN (no_neighbor,
        no_neighbor_cmd,
-       NO_NEIGHBOR_CMD2,
+       "no neighbor <A.B.C.D|X:X::X:X|WORD>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2)
@@ -2980,7 +2980,7 @@ DEFUN (no_neighbor,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no neighbor WORD interface remote-as (" CMD_AS_RANGE "|internal|external)",
+ * "no neighbor WORD interface remote-as ((1-4294967295)|internal|external)",
  *     NO_STR
  *     NEIGHBOR_STR
  *     "Interface name\n"
@@ -2996,7 +2996,7 @@ DEFUN (no_neighbor,
  *     "Member of the peer-group\n"
  *     "peer-group name\n"
  *
- * "no neighbor WORD interface v6only remote-as (" CMD_AS_RANGE "|internal|external)",
+ * "no neighbor WORD interface v6only remote-as ((1-4294967295)|internal|external)",
  *     NO_STR
  *     NEIGHBOR_STR
  *     "Interface name\n"
@@ -3072,7 +3072,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 <(1-4294967295)|internal|external>",
        NO_STR
        NEIGHBOR_STR
        "Interface name or neighbor tag\n"
@@ -3104,7 +3104,7 @@ DEFUN (no_neighbor_interface_peer_group_remote_as,
 
 DEFUN (neighbor_local_as,
        neighbor_local_as_cmd,
-       NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE,
+       "neighbor <A.B.C.D|X:X::X:X|WORD> local-as (1-4294967295)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Specify a local-as number\n"
@@ -3125,7 +3125,7 @@ DEFUN (neighbor_local_as,
 
 DEFUN (neighbor_local_as_no_prepend,
        neighbor_local_as_no_prepend_cmd,
-       NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE " no-prepend",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> local-as (1-4294967295) no-prepend",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Specify a local-as number\n"
@@ -3147,7 +3147,7 @@ DEFUN (neighbor_local_as_no_prepend,
 
 DEFUN (neighbor_local_as_no_prepend_replace_as,
        neighbor_local_as_no_prepend_replace_as_cmd,
-       NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE " no-prepend replace-as",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> local-as (1-4294967295) no-prepend replace-as",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Specify a local-as number\n"
@@ -3198,7 +3198,7 @@ DEFUN (neighbor_local_as_no_prepend_replace_as,
  */
 DEFUN (no_neighbor_local_as,
        no_neighbor_local_as_cmd,
-       NO_NEIGHBOR_CMD2 "local-as",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> local-as",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3221,7 +3221,7 @@ DEFUN (no_neighbor_local_as,
 
 DEFUN (neighbor_solo,
        neighbor_solo_cmd,
-       NEIGHBOR_CMD2 "solo",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> solo",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Solo peer - part of its own update group\n")
@@ -3240,7 +3240,7 @@ DEFUN (neighbor_solo,
 
 DEFUN (no_neighbor_solo,
        no_neighbor_solo_cmd,
-       NO_NEIGHBOR_CMD2 "solo",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> solo",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3260,7 +3260,7 @@ DEFUN (no_neighbor_solo,
 
 DEFUN (neighbor_password,
        neighbor_password_cmd,
-       NEIGHBOR_CMD2 "password LINE",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> password LINE",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Set a password\n"
@@ -3291,7 +3291,7 @@ DEFUN (neighbor_password,
  */
 DEFUN (no_neighbor_password,
        no_neighbor_password_cmd,
-       NO_NEIGHBOR_CMD2 "password",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> password",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3312,7 +3312,7 @@ DEFUN (no_neighbor_password,
 
 DEFUN (neighbor_activate,
        neighbor_activate_cmd,
-       NEIGHBOR_CMD2 "activate",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> activate",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Enable the Address Family for this Neighbor\n")
@@ -3334,7 +3334,7 @@ DEFUN (neighbor_activate,
 
 DEFUN (no_neighbor_activate,
        no_neighbor_activate_cmd,
-       NO_NEIGHBOR_CMD2 "activate",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> activate",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3358,7 +3358,7 @@ DEFUN (no_neighbor_activate,
 
 DEFUN (neighbor_set_peer_group,
        neighbor_set_peer_group_cmd,
-       NEIGHBOR_CMD2 "peer-group WORD",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Member of the peer-group\n"
@@ -3425,7 +3425,7 @@ DEFUN (neighbor_set_peer_group,
 
 DEFUN (no_neighbor_set_peer_group,
        no_neighbor_set_peer_group_cmd,
-       NO_NEIGHBOR_CMD2 "peer-group WORD",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3501,7 +3501,7 @@ peer_flag_unset_vty (struct vty *vty, const char *ip_str, u_int16_t flag)
 /* neighbor passive. */
 DEFUN (neighbor_passive,
        neighbor_passive_cmd,
-       NEIGHBOR_CMD2 "passive",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> passive",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Don't send open messages to this neighbor\n")
@@ -3512,7 +3512,7 @@ DEFUN (neighbor_passive,
 
 DEFUN (no_neighbor_passive,
        no_neighbor_passive_cmd,
-       NO_NEIGHBOR_CMD2 "passive",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> passive",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3525,7 +3525,7 @@ DEFUN (no_neighbor_passive,
 /* neighbor shutdown. */
 DEFUN (neighbor_shutdown,
        neighbor_shutdown_cmd,
-       NEIGHBOR_CMD2 "shutdown",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> shutdown",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Administratively shut down this neighbor\n")
@@ -3536,7 +3536,7 @@ DEFUN (neighbor_shutdown,
 
 DEFUN (no_neighbor_shutdown,
        no_neighbor_shutdown_cmd,
-       NO_NEIGHBOR_CMD2 "shutdown",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> shutdown",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3549,7 +3549,7 @@ DEFUN (no_neighbor_shutdown,
 /* neighbor capability dynamic. */
 DEFUN (neighbor_capability_dynamic,
        neighbor_capability_dynamic_cmd,
-       NEIGHBOR_CMD2 "capability dynamic",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> capability dynamic",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Advertise capability to the peer\n"
@@ -3561,7 +3561,7 @@ DEFUN (neighbor_capability_dynamic,
 
 DEFUN (no_neighbor_capability_dynamic,
        no_neighbor_capability_dynamic_cmd,
-       NO_NEIGHBOR_CMD2 "capability dynamic",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> capability dynamic",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3575,7 +3575,7 @@ DEFUN (no_neighbor_capability_dynamic,
 /* neighbor dont-capability-negotiate */
 DEFUN (neighbor_dont_capability_negotiate,
        neighbor_dont_capability_negotiate_cmd,
-       NEIGHBOR_CMD2 "dont-capability-negotiate",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> dont-capability-negotiate",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Do not perform capability negotiation\n")
@@ -3586,7 +3586,7 @@ DEFUN (neighbor_dont_capability_negotiate,
 
 DEFUN (no_neighbor_dont_capability_negotiate,
        no_neighbor_dont_capability_negotiate_cmd,
-       NO_NEIGHBOR_CMD2 "dont-capability-negotiate",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> dont-capability-negotiate",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3599,7 +3599,7 @@ DEFUN (no_neighbor_dont_capability_negotiate,
 /* neighbor capability extended next hop encoding */
 DEFUN (neighbor_capability_enhe,
        neighbor_capability_enhe_cmd,
-       NEIGHBOR_CMD2 "capability extended-nexthop",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> capability extended-nexthop",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Advertise capability to the peer\n"
@@ -3611,7 +3611,7 @@ DEFUN (neighbor_capability_enhe,
 
 DEFUN (no_neighbor_capability_enhe,
        no_neighbor_capability_enhe_cmd,
-       NO_NEIGHBOR_CMD2 "capability extended-nexthop",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> capability extended-nexthop",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3658,7 +3658,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 <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Advertise capability to the peer\n"
@@ -3687,7 +3687,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 <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3718,7 +3718,7 @@ DEFUN (no_neighbor_capability_orf_prefix,
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self,
        neighbor_nexthop_self_cmd,
-       NEIGHBOR_CMD2 "next-hop-self",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Disable the next hop calculation for this neighbor\n")
@@ -3731,7 +3731,7 @@ DEFUN (neighbor_nexthop_self,
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self_force,
        neighbor_nexthop_self_force_cmd,
-       NEIGHBOR_CMD2 "next-hop-self force",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Disable the next hop calculation for this neighbor\n"
@@ -3745,7 +3745,7 @@ DEFUN (neighbor_nexthop_self_force,
 
 DEFUN (no_neighbor_nexthop_self,
        no_neighbor_nexthop_self_cmd,
-       NO_NEIGHBOR_CMD2 "next-hop-self",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3759,7 +3759,7 @@ DEFUN (no_neighbor_nexthop_self,
 
 DEFUN (no_neighbor_nexthop_self_force,
        no_neighbor_nexthop_self_force_cmd,
-       NO_NEIGHBOR_CMD2 "next-hop-self force",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3775,7 +3775,7 @@ DEFUN (no_neighbor_nexthop_self_force,
 /* neighbor as-override */
 DEFUN (neighbor_as_override,
        neighbor_as_override_cmd,
-       NEIGHBOR_CMD2 "as-override",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Override ASNs in outbound updates if aspath equals remote-as\n")
@@ -3788,7 +3788,7 @@ DEFUN (neighbor_as_override,
 
 DEFUN (no_neighbor_as_override,
        no_neighbor_as_override_cmd,
-       NO_NEIGHBOR_CMD2 "as-override",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3803,7 +3803,7 @@ DEFUN (no_neighbor_as_override,
 /* neighbor remove-private-AS. */
 DEFUN (neighbor_remove_private_as,
        neighbor_remove_private_as_cmd,
-       NEIGHBOR_CMD2 "remove-private-AS",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Remove private ASNs in outbound updates\n")
@@ -3816,7 +3816,7 @@ DEFUN (neighbor_remove_private_as,
 
 DEFUN (neighbor_remove_private_as_all,
        neighbor_remove_private_as_all_cmd,
-       NEIGHBOR_CMD2 "remove-private-AS all",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Remove private ASNs in outbound updates\n"
@@ -3830,7 +3830,7 @@ DEFUN (neighbor_remove_private_as_all,
 
 DEFUN (neighbor_remove_private_as_replace_as,
        neighbor_remove_private_as_replace_as_cmd,
-       NEIGHBOR_CMD2 "remove-private-AS replace-AS",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Remove private ASNs in outbound updates\n"
@@ -3844,7 +3844,7 @@ DEFUN (neighbor_remove_private_as_replace_as,
 
 DEFUN (neighbor_remove_private_as_all_replace_as,
        neighbor_remove_private_as_all_replace_as_cmd,
-       NEIGHBOR_CMD2 "remove-private-AS all replace-AS",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Remove private ASNs in outbound updates\n"
@@ -3859,7 +3859,7 @@ DEFUN (neighbor_remove_private_as_all_replace_as,
 
 DEFUN (no_neighbor_remove_private_as,
        no_neighbor_remove_private_as_cmd,
-       NO_NEIGHBOR_CMD2 "remove-private-AS",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3873,7 +3873,7 @@ DEFUN (no_neighbor_remove_private_as,
 
 DEFUN (no_neighbor_remove_private_as_all,
        no_neighbor_remove_private_as_all_cmd,
-       NO_NEIGHBOR_CMD2 "remove-private-AS all",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3888,7 +3888,7 @@ DEFUN (no_neighbor_remove_private_as_all,
 
 DEFUN (no_neighbor_remove_private_as_replace_as,
        no_neighbor_remove_private_as_replace_as_cmd,
-       NO_NEIGHBOR_CMD2 "remove-private-AS replace-AS",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3903,7 +3903,7 @@ DEFUN (no_neighbor_remove_private_as_replace_as,
 
 DEFUN (no_neighbor_remove_private_as_all_replace_as,
        no_neighbor_remove_private_as_all_replace_as_cmd,
-       NO_NEIGHBOR_CMD2 "remove-private-AS all replace-AS",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3921,7 +3921,7 @@ DEFUN (no_neighbor_remove_private_as_all_replace_as,
 /* neighbor send-community. */
 DEFUN (neighbor_send_community,
        neighbor_send_community_cmd,
-       NEIGHBOR_CMD2 "send-community",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Send Community attribute to this neighbor\n")
@@ -3934,7 +3934,7 @@ DEFUN (neighbor_send_community,
 
 DEFUN (no_neighbor_send_community,
        no_neighbor_send_community_cmd,
-       NO_NEIGHBOR_CMD2 "send-community",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3949,7 +3949,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 <A.B.C.D|X:X::X:X|WORD> send-community <both|extended|standard>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Send Community attribute to this neighbor\n"
@@ -3976,7 +3976,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 <A.B.C.D|X:X::X:X|WORD> send-community <both|extended|standard>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4005,7 +4005,7 @@ DEFUN (no_neighbor_send_community_type,
 /* neighbor soft-reconfig. */
 DEFUN (neighbor_soft_reconfiguration,
        neighbor_soft_reconfiguration_cmd,
-       NEIGHBOR_CMD2 "soft-reconfiguration inbound",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Per neighbor soft reconfiguration\n"
@@ -4019,7 +4019,7 @@ DEFUN (neighbor_soft_reconfiguration,
 
 DEFUN (no_neighbor_soft_reconfiguration,
        no_neighbor_soft_reconfiguration_cmd,
-       NO_NEIGHBOR_CMD2 "soft-reconfiguration inbound",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4034,7 +4034,7 @@ DEFUN (no_neighbor_soft_reconfiguration,
 
 DEFUN (neighbor_route_reflector_client,
        neighbor_route_reflector_client_cmd,
-       NEIGHBOR_CMD2 "route-reflector-client",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Configure a neighbor as Route Reflector client\n")
@@ -4054,7 +4054,7 @@ DEFUN (neighbor_route_reflector_client,
 
 DEFUN (no_neighbor_route_reflector_client,
        no_neighbor_route_reflector_client_cmd,
-       NO_NEIGHBOR_CMD2 "route-reflector-client",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4069,7 +4069,7 @@ DEFUN (no_neighbor_route_reflector_client,
 /* neighbor route-server-client. */
 DEFUN (neighbor_route_server_client,
        neighbor_route_server_client_cmd,
-       NEIGHBOR_CMD2 "route-server-client",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Configure a neighbor as Route Server client\n")
@@ -4087,7 +4087,7 @@ DEFUN (neighbor_route_server_client,
 
 DEFUN (no_neighbor_route_server_client,
        no_neighbor_route_server_client_cmd,
-       NO_NEIGHBOR_CMD2 "route-server-client",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4101,7 +4101,7 @@ DEFUN (no_neighbor_route_server_client,
 
 DEFUN (neighbor_nexthop_local_unchanged,
        neighbor_nexthop_local_unchanged_cmd,
-       NEIGHBOR_CMD2 "nexthop-local unchanged",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> nexthop-local unchanged",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Configure treatment of outgoing link-local nexthop attribute\n"
@@ -4115,7 +4115,7 @@ DEFUN (neighbor_nexthop_local_unchanged,
 
 DEFUN (no_neighbor_nexthop_local_unchanged,
        no_neighbor_nexthop_local_unchanged_cmd,
-       NO_NEIGHBOR_CMD2 "nexthop-local unchanged",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> nexthop-local unchanged",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4181,7 +4181,7 @@ DEFUN (no_neighbor_nexthop_local_unchanged,
  */
 DEFUN (neighbor_attr_unchanged,
        neighbor_attr_unchanged_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP attribute is propagated unchanged to this neighbor\n")
@@ -4196,7 +4196,7 @@ DEFUN (neighbor_attr_unchanged,
 
 DEFUN (neighbor_attr_unchanged1,
        neighbor_attr_unchanged1_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged <as-path|next-hop|med>",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged <as-path|next-hop|med>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP attribute is propagated unchanged to this neighbor\n"
@@ -4221,7 +4221,7 @@ DEFUN (neighbor_attr_unchanged1,
 
 DEFUN (neighbor_attr_unchanged2,
        neighbor_attr_unchanged2_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged as-path <next-hop|med>",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged as-path <next-hop|med>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP attribute is propagated unchanged to this neighbor\n"
@@ -4245,7 +4245,7 @@ DEFUN (neighbor_attr_unchanged2,
 
 DEFUN (neighbor_attr_unchanged3,
        neighbor_attr_unchanged3_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged next-hop <as-path|med>",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged next-hop <as-path|med>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP attribute is propagated unchanged to this neighbor\n"
@@ -4268,7 +4268,7 @@ DEFUN (neighbor_attr_unchanged3,
 
 DEFUN (neighbor_attr_unchanged4,
        neighbor_attr_unchanged4_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged med <as-path|next-hop>",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged med <as-path|next-hop>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP attribute is propagated unchanged to this neighbor\n"
@@ -4354,7 +4354,7 @@ DEFUN (neighbor_attr_unchanged4,
  */
 DEFUN (no_neighbor_attr_unchanged,
        no_neighbor_attr_unchanged_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged",
        NO_STR   
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4370,7 +4370,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 <A.B.C.D|X:X::X:X|WORD> attribute-unchanged <as-path|next-hop|med>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4396,7 +4396,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 <A.B.C.D|X:X::X:X|WORD> attribute-unchanged as-path <next-hop|med>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4420,7 +4420,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 <A.B.C.D|X:X::X:X|WORD> attribute-unchanged next-hop <as-path|med>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4444,7 +4444,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 <A.B.C.D|X:X::X:X|WORD> attribute-unchanged med <as-path|next-hop>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4510,7 +4510,7 @@ peer_ebgp_multihop_unset_vty (struct vty *vty, const char *ip_str)
 /* neighbor ebgp-multihop. */
 DEFUN (neighbor_ebgp_multihop,
        neighbor_ebgp_multihop_cmd,
-       NEIGHBOR_CMD2 "ebgp-multihop",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> ebgp-multihop",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Allow EBGP neighbors not on directly connected networks\n")
@@ -4521,7 +4521,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 <A.B.C.D|X:X::X:X|WORD> ebgp-multihop (1-255)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Allow EBGP neighbors not on directly connected networks\n"
@@ -4544,7 +4544,7 @@ DEFUN (neighbor_ebgp_multihop_ttl,
  */
 DEFUN (no_neighbor_ebgp_multihop,
        no_neighbor_ebgp_multihop_cmd,
-       NO_NEIGHBOR_CMD2 "ebgp-multihop",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> ebgp-multihop",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4566,7 +4566,7 @@ DEFUN (no_neighbor_ebgp_multihop,
  */
 DEFUN (neighbor_disable_connected_check,
        neighbor_disable_connected_check_cmd,
-       NEIGHBOR_CMD2 "disable-connected-check",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> disable-connected-check",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "one-hop away EBGP peer using loopback address\n")
@@ -4586,7 +4586,7 @@ DEFUN (neighbor_disable_connected_check,
  */
 DEFUN (no_neighbor_disable_connected_check,
        no_neighbor_disable_connected_check_cmd,
-       NO_NEIGHBOR_CMD2 "disable-connected-check",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> disable-connected-check",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4602,7 +4602,7 @@ DEFUN (no_neighbor_disable_connected_check,
 
 DEFUN (neighbor_description,
        neighbor_description_cmd,
-       NEIGHBOR_CMD2 "description .LINE",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> description .LINE",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Neighbor specific description\n"
@@ -4640,7 +4640,7 @@ DEFUN (neighbor_description,
  */
 DEFUN (no_neighbor_description,
        no_neighbor_description_cmd,
-       NO_NEIGHBOR_CMD2 "description",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> description",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4699,7 +4699,7 @@ peer_update_source_vty (struct vty *vty, const char *peer_str,
 
 DEFUN (neighbor_update_source,
        neighbor_update_source_cmd,
-       NEIGHBOR_CMD2 "update-source " BGP_UPDATE_SOURCE_REQ_STR,
+       "neighbor <A.B.C.D|X:X::X:X|WORD> update-source <A.B.C.D|X:X::X:X|WORD>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Source of routing updates\n"
@@ -4712,7 +4712,7 @@ DEFUN (neighbor_update_source,
 
 DEFUN (no_neighbor_update_source,
        no_neighbor_update_source_cmd,
-       NO_NEIGHBOR_CMD2 "update-source " BGP_UPDATE_SOURCE_OPT_STR,
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> update-source [A.B.C.D|X:X::X:X|WORD]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4746,7 +4746,7 @@ peer_default_originate_set_vty (struct vty *vty, const char *peer_str,
 /* neighbor default-originate. */
 DEFUN (neighbor_default_originate,
        neighbor_default_originate_cmd,
-       NEIGHBOR_CMD2 "default-originate",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Originate default route to this neighbor\n")
@@ -4758,7 +4758,7 @@ DEFUN (neighbor_default_originate,
 
 DEFUN (neighbor_default_originate_rmap,
        neighbor_default_originate_rmap_cmd,
-       NEIGHBOR_CMD2 "default-originate route-map WORD",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Originate default route to this neighbor\n"
@@ -4784,7 +4784,7 @@ DEFUN (neighbor_default_originate_rmap,
  */
 DEFUN (no_neighbor_default_originate,
        no_neighbor_default_originate_cmd,
-       NO_NEIGHBOR_CMD2 "default-originate",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4827,7 +4827,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 <A.B.C.D|X:X::X:X> port (0-65535)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR
        "Neighbor's BGP port\n"
@@ -4840,7 +4840,7 @@ DEFUN (neighbor_port,
 
 DEFUN (no_neighbor_port,
        no_neighbor_port_cmd,
-       NO_NEIGHBOR_CMD "port [(0-65535)]",
+       "no neighbor <A.B.C.D|X:X::X:X> port [(0-65535)]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR
@@ -4887,7 +4887,7 @@ peer_weight_unset_vty (struct vty *vty, const char *ip_str)
 
 DEFUN (neighbor_weight,
        neighbor_weight_cmd,
-       NEIGHBOR_CMD2 "weight (0-65535)",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> weight (0-65535)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Set default weight for routes from this neighbor\n"
@@ -4900,7 +4900,7 @@ DEFUN (neighbor_weight,
 
 DEFUN (no_neighbor_weight,
        no_neighbor_weight_cmd,
-       NO_NEIGHBOR_CMD2 "weight [(0-65535)]",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> weight [(0-65535)]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4915,7 +4915,7 @@ DEFUN (no_neighbor_weight,
 /* Override capability negotiation. */
 DEFUN (neighbor_override_capability,
        neighbor_override_capability_cmd,
-       NEIGHBOR_CMD2 "override-capability",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> override-capability",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Override capability negotiation result\n")
@@ -4926,7 +4926,7 @@ DEFUN (neighbor_override_capability,
 
 DEFUN (no_neighbor_override_capability,
        no_neighbor_override_capability_cmd,
-       NO_NEIGHBOR_CMD2 "override-capability",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> override-capability",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -4938,7 +4938,7 @@ DEFUN (no_neighbor_override_capability,
 
 DEFUN (neighbor_strict_capability,
        neighbor_strict_capability_cmd,
-       NEIGHBOR_CMD "strict-capability-match",
+       "neighbor <A.B.C.D|X:X::X:X> strict-capability-match",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR
        "Strict capability negotiation match\n")
@@ -4949,7 +4949,7 @@ DEFUN (neighbor_strict_capability,
 
 DEFUN (no_neighbor_strict_capability,
        no_neighbor_strict_capability_cmd,
-       NO_NEIGHBOR_CMD "strict-capability-match",
+       "no neighbor <A.B.C.D|X:X::X:X> strict-capability-match",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR
@@ -4997,7 +4997,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 <A.B.C.D|X:X::X:X|WORD> timers (0-65535) (0-65535)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP per neighbor timers\n"
@@ -5012,7 +5012,7 @@ DEFUN (neighbor_timers,
 
 DEFUN (no_neighbor_timers,
        no_neighbor_timers_cmd,
-       NO_NEIGHBOR_CMD2 "timers [(0-65535) (0-65535)]",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> timers [(0-65535) (0-65535)]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5061,7 +5061,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 <A.B.C.D|X:X::X:X|WORD> timers connect (1-65535)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "BGP per neighbor timers\n"
@@ -5075,7 +5075,7 @@ DEFUN (neighbor_timers_connect,
 
 DEFUN (no_neighbor_timers_connect,
        no_neighbor_timers_connect_cmd,
-       NO_NEIGHBOR_CMD2 "timers connect [(1-65535)]",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> timers connect [(1-65535)]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5113,7 +5113,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 <A.B.C.D|X:X::X:X|WORD> advertisement-interval (0-600)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Minimum interval between sending BGP routing updates\n"
@@ -5126,7 +5126,7 @@ DEFUN (neighbor_advertise_interval,
 
 DEFUN (no_neighbor_advertise_interval,
        no_neighbor_advertise_interval_cmd,
-       NO_NEIGHBOR_CMD2 "advertisement-interval [(0-600)]",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> advertisement-interval [(0-600)]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5204,7 +5204,7 @@ peer_interface_vty (struct vty *vty, const char *ip_str, const char *str)
 
 DEFUN (neighbor_interface,
        neighbor_interface_cmd,
-       NEIGHBOR_CMD "interface WORD",
+       "neighbor <A.B.C.D|X:X::X:X> interface WORD",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR
        "Interface\n"
@@ -5220,7 +5220,7 @@ DEFUN (neighbor_interface,
 
 DEFUN (no_neighbor_interface,
        no_neighbor_interface_cmd,
-       NO_NEIGHBOR_CMD2 "interface WORD",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> interface WORD",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR
@@ -5281,7 +5281,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 <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Filter updates to/from this neighbor\n"
@@ -5300,7 +5300,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 <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5367,7 +5367,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 <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Filter updates to/from this neighbor\n"
@@ -5384,7 +5384,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 <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5449,7 +5449,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 <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Establish BGP filters\n"
@@ -5466,7 +5466,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 <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5531,7 +5531,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 <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Apply route map to neighbor\n"
@@ -5548,7 +5548,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 <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5599,7 +5599,7 @@ peer_unsuppress_map_unset_vty (struct vty *vty, const char *ip_str, afi_t afi,
 
 DEFUN (neighbor_unsuppress_map,
        neighbor_unsuppress_map_cmd,
-       NEIGHBOR_CMD2 "unsuppress-map WORD",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Route-map to selectively unsuppress suppressed routes\n"
@@ -5613,7 +5613,7 @@ DEFUN (neighbor_unsuppress_map,
 
 DEFUN (no_neighbor_unsuppress_map,
        no_neighbor_unsuppress_map_cmd,
-       NO_NEIGHBOR_CMD2 "unsuppress-map WORD",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5678,7 +5678,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 <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
@@ -5693,7 +5693,7 @@ DEFUN (neighbor_maximum_prefix,
 
 DEFUN (neighbor_maximum_prefix_threshold,
        neighbor_maximum_prefix_threshold_cmd,
-       NEIGHBOR_CMD2 "maximum-prefix (1-4294967295) (1-100)",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
@@ -5710,7 +5710,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 <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) warning-only",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
@@ -5726,7 +5726,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 <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) warning-only",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
@@ -5743,7 +5743,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 <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) restart (1-65535)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
@@ -5760,7 +5760,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 <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) restart (1-65535)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
@@ -5833,7 +5833,7 @@ DEFUN (neighbor_maximum_prefix_threshold_restart,
  */
 DEFUN (no_neighbor_maximum_prefix,
        no_neighbor_maximum_prefix_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5862,7 +5862,7 @@ DEFUN (no_neighbor_maximum_prefix,
  */
 DEFUN (neighbor_allowas_in,
        neighbor_allowas_in_cmd,
-       NEIGHBOR_CMD2 "allowas-in",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Accept as-path with my AS present in it\n")
@@ -5889,7 +5889,7 @@ DEFUN (neighbor_allowas_in,
 
 DEFUN (no_neighbor_allowas_in,
        no_neighbor_allowas_in_cmd,
-       NO_NEIGHBOR_CMD2 "allowas-in [(1-10)]",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [(1-10)]",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5912,7 +5912,7 @@ DEFUN (no_neighbor_allowas_in,
 
 DEFUN (neighbor_ttl_security,
        neighbor_ttl_security_cmd,
-       NEIGHBOR_CMD2 "ttl-security hops (1-254)",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> ttl-security hops (1-254)",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Specify the maximum number of hops to the BGP peer\n")
@@ -5943,7 +5943,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 <A.B.C.D|X:X::X:X|WORD> ttl-security hops (1-254)",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5961,7 +5961,7 @@ DEFUN (no_neighbor_ttl_security,
 
 DEFUN (neighbor_addpath_tx_all_paths,
        neighbor_addpath_tx_all_paths_cmd,
-       NEIGHBOR_CMD2 "addpath-tx-all-paths",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Use addpath to advertise all paths to a neighbor\n")
@@ -5980,7 +5980,7 @@ DEFUN (neighbor_addpath_tx_all_paths,
 
 DEFUN (no_neighbor_addpath_tx_all_paths,
        no_neighbor_addpath_tx_all_paths_cmd,
-       NO_NEIGHBOR_CMD2 "addpath-tx-all-paths",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -5994,7 +5994,7 @@ DEFUN (no_neighbor_addpath_tx_all_paths,
 
 DEFUN (neighbor_addpath_tx_bestpath_per_as,
        neighbor_addpath_tx_bestpath_per_as_cmd,
-       NEIGHBOR_CMD2 "addpath-tx-bestpath-per-AS",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Use addpath to advertise the bestpath per each neighboring AS\n")
@@ -6013,7 +6013,7 @@ DEFUN (neighbor_addpath_tx_bestpath_per_as,
 
 DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
        no_neighbor_addpath_tx_bestpath_per_as_cmd,
-       NO_NEIGHBOR_CMD2 "addpath-tx-bestpath-per-AS",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -6230,7 +6230,7 @@ bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str,
  *     BGP_STR
  *     "Clear all peers\n"
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 *",
+ * "clear bgp <view|vrf> WORD ipv6 *",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -6313,7 +6313,7 @@ DEFUN (clear_ip_bgp_peer,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 external",
+ * "clear bgp <view|vrf> WORD ipv6 external",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -6387,13 +6387,13 @@ DEFUN (clear_ip_bgp_prefix,
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
  * need ipv6 options
  *
- * "clear bgp ipv6 " CMD_AS_RANGE,
+ * "clear bgp ipv6 (1-4294967295)",
  *     CLEAR_STR
  *     BGP_STR
  *     "Address family\n"
  *     "Clear peers with the AS number\n"
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE,
+ * "clear bgp <view|vrf> WORD ipv6 (1-4294967295)",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -6402,7 +6402,7 @@ DEFUN (clear_ip_bgp_prefix,
  */
 DEFUN (clear_ip_bgp_as,
        clear_ip_bgp_as_cmd,
-       "clear [ip] bgp [<view|vrf> WORD] " CMD_AS_RANGE,
+       "clear [ip] bgp [<view|vrf> WORD] (1-4294967295)",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6476,7 +6476,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 <view|vrf> WORD * ipv4 <unicast|multicast> [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6574,7 +6574,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 <view|vrf> WORD ipv6 <unicast|multicast> prefix X:X::X:X/M",
        CLEAR_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -6644,7 +6644,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 <view|vrf> WORD <A.B.C.D|WORD> ipv4 <unicast|multicast> [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6790,7 +6790,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 <view|vrf> WORD peer-group WORD ipv4 <unicast|multicast> [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6892,7 +6892,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 <view|vrf> WORD external ipv4 <unicast|multicast> [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6937,7 +6937,7 @@ DEFUN (clear_bgp_external_soft_out,
 
 DEFUN (clear_ip_bgp_as_soft_out,
        clear_ip_bgp_as_soft_out_cmd,
-       "clear ip bgp [<view|vrf> WORD] " CMD_AS_RANGE " [soft] out",
+       "clear ip bgp [<view|vrf> WORD] (1-4294967295) [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6962,7 +6962,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 (1-4294967295) ipv4 <unicast|multicast> [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6985,7 +6985,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 <view|vrf> WORD (1-4294967295) ipv4 <unicast|multicast> [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7010,7 +7010,7 @@ DEFUN (clear_ip_bgp_instance_as_ipv4_soft_out,
 
 DEFUN (clear_ip_bgp_as_vpnv4_soft_out,
        clear_ip_bgp_as_vpnv4_soft_out_cmd,
-       "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast [soft] out",
+       "clear ip bgp (1-4294967295) vpnv4 unicast [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7027,7 +7027,7 @@ DEFUN (clear_ip_bgp_as_vpnv4_soft_out,
 
 DEFUN (clear_ip_bgp_as_encap_soft_out,
        clear_ip_bgp_as_encap_soft_out_cmd,
-       "clear ip bgp " CMD_AS_RANGE " encap unicast [soft] out",
+       "clear ip bgp (1-4294967295) encap unicast [soft] out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7044,7 +7044,7 @@ DEFUN (clear_ip_bgp_as_encap_soft_out,
 
 DEFUN (clear_bgp_as_soft_out,
        clear_bgp_as_soft_out_cmd,
-       "clear bgp [<view|vrf> WORD] [ipv6] " CMD_AS_RANGE " [soft] out",
+       "clear bgp [<view|vrf> WORD] [ipv6] (1-4294967295) [soft] out",
        CLEAR_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -7138,7 +7138,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 <view|vrf> WORD * ipv4 <unicast|multicast> [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7321,7 +7321,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 <view|vrf> WORD <A.B.C.D|WORD> ipv4 <unicast|multicast> [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7472,7 +7472,7 @@ DEFUN (clear_bgp_peer_in_prefix_filter,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD soft in",
+ * "clear ip bgp <view|vrf> WORD peer-group WORD soft in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -7490,7 +7490,7 @@ DEFUN (clear_bgp_peer_in_prefix_filter,
  *     "BGP peer-group name\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD in",
+ * "clear ip bgp <view|vrf> WORD peer-group WORD in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -7565,7 +7565,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 <view|vrf> WORD peer-group WORD ipv4 <unicast|multicast> [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7625,7 +7625,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter,
  *     "BGP peer-group name\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD soft in",
+ * "clear bgp <view|vrf> WORD ipv6 peer-group WORD soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7635,7 +7635,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter,
  *     BGP_SOFT_STR
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " peer-group WORD soft in",
+ * "clear bgp <view|vrf> WORD peer-group WORD soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7651,7 +7651,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter,
  *     "BGP peer-group name\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " peer-group WORD in",
+ * "clear bgp <view|vrf> WORD peer-group WORD in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7668,7 +7668,7 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter,
  *     BGP_SOFT_STR
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD in",
+ * "clear bgp <view|vrf> WORD ipv6 peer-group WORD in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7734,7 +7734,7 @@ DEFUN (clear_bgp_peer_group_in_prefix_filter,
  *     "Clear all external peers\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear ip bgp " BGP_INSTANCE_CMD " external in",
+ * "clear ip bgp <view|vrf> WORD external in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -7742,7 +7742,7 @@ DEFUN (clear_bgp_peer_group_in_prefix_filter,
  *     "Clear all external peers\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear ip bgp " BGP_INSTANCE_CMD " external soft in",
+ * "clear ip bgp <view|vrf> WORD external soft in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -7811,7 +7811,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 <view|vrf> WORD external ipv4 <unicast|multicast> [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -7859,14 +7859,14 @@ DEFUN (clear_ip_bgp_external_ipv4_in_prefix_filter,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp " BGP_INSTANCE_CMD " external in",
+ * "clear bgp <view|vrf> WORD external in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
  *     "Clear all external peers\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 external soft in",
+ * "clear bgp <view|vrf> WORD ipv6 external soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7875,7 +7875,7 @@ DEFUN (clear_ip_bgp_external_ipv4_in_prefix_filter,
  *     BGP_SOFT_STR
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " external soft in",
+ * "clear bgp <view|vrf> WORD external soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7883,7 +7883,7 @@ DEFUN (clear_ip_bgp_external_ipv4_in_prefix_filter,
  *     BGP_SOFT_STR
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 external WORD in",
+ * "clear bgp <view|vrf> WORD ipv6 external WORD in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -7957,14 +7957,14 @@ DEFUN (clear_bgp_external_in_prefix_filter,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " CMD_AS_RANGE " in",
+ * "clear ip bgp (1-4294967295) in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " in",
+ * "clear ip bgp <view|vrf> WORD (1-4294967295) in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -7972,7 +7972,7 @@ DEFUN (clear_bgp_external_in_prefix_filter,
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft in",
+ * "clear ip bgp <view|vrf> WORD (1-4294967295) soft in",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -7984,7 +7984,7 @@ DEFUN (clear_bgp_external_in_prefix_filter,
  */
 DEFUN (clear_ip_bgp_as_soft_in,
        clear_ip_bgp_as_soft_in_cmd,
-       "clear ip bgp " CMD_AS_RANGE " soft in",
+       "clear ip bgp (1-4294967295) soft in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8003,7 +8003,7 @@ DEFUN (clear_ip_bgp_as_soft_in,
 
 DEFUN (clear_ip_bgp_as_in_prefix_filter,
        clear_ip_bgp_as_in_prefix_filter_cmd,
-       "clear ip bgp " CMD_AS_RANGE " in prefix-filter",
+       "clear ip bgp (1-4294967295) in prefix-filter",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8018,7 +8018,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 (1-4294967295) ipv4 <unicast|multicast> [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8041,7 +8041,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 <view|vrf> WORD (1-4294967295) ipv4 <unicast|multicast> [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8066,7 +8066,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 (1-4294967295) ipv4 <unicast|multicast> in prefix-filter",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8089,7 +8089,7 @@ DEFUN (clear_ip_bgp_as_ipv4_in_prefix_filter,
 
 DEFUN (clear_ip_bgp_as_vpnv4_soft_in,
        clear_ip_bgp_as_vpnv4_soft_in_cmd,
-       "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast [soft] in",
+       "clear ip bgp (1-4294967295) vpnv4 unicast [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8106,7 +8106,7 @@ DEFUN (clear_ip_bgp_as_vpnv4_soft_in,
 
 DEFUN (clear_ip_bgp_as_encap_soft_in,
        clear_ip_bgp_as_encap_soft_in_cmd,
-       "clear ip bgp " CMD_AS_RANGE " encap unicast [soft] in",
+       "clear ip bgp (1-4294967295) encap unicast [soft] in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8123,21 +8123,21 @@ DEFUN (clear_ip_bgp_as_encap_soft_in,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp ipv6 " CMD_AS_RANGE " in",
+ * "clear bgp ipv6 (1-4294967295) in",
  *     CLEAR_STR
  *     BGP_STR
  *     "Address family\n"
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " in",
+ * "clear bgp <view|vrf> WORD (1-4294967295) in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " in",
+ * "clear bgp <view|vrf> WORD ipv6 (1-4294967295) in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8145,7 +8145,7 @@ DEFUN (clear_ip_bgp_as_encap_soft_in,
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp ipv6 " CMD_AS_RANGE " soft in",
+ * "clear bgp ipv6 (1-4294967295) soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8153,7 +8153,7 @@ DEFUN (clear_ip_bgp_as_encap_soft_in,
  *     BGP_SOFT_STR
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft in",
+ * "clear bgp <view|vrf> WORD (1-4294967295) soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8161,13 +8161,13 @@ DEFUN (clear_ip_bgp_as_encap_soft_in,
  *     BGP_SOFT_STR
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " CMD_AS_RANGE " in",
+ * "clear bgp (1-4294967295) in",
  *     CLEAR_STR
  *     BGP_STR
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_IN_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " soft in",
+ * "clear bgp <view|vrf> WORD ipv6 (1-4294967295) soft in",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8179,7 +8179,7 @@ DEFUN (clear_ip_bgp_as_encap_soft_in,
  */
 DEFUN (clear_bgp_as_soft_in,
        clear_bgp_as_soft_in_cmd,
-       "clear bgp " CMD_AS_RANGE " soft in",
+       "clear bgp (1-4294967295) soft in",
        CLEAR_STR
        BGP_STR
        "Clear peers with the AS number\n"
@@ -8197,7 +8197,7 @@ DEFUN (clear_bgp_as_soft_in,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp ipv6 " CMD_AS_RANGE " in prefix-filter",
+ * "clear bgp ipv6 (1-4294967295) in prefix-filter",
  *     CLEAR_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8208,7 +8208,7 @@ DEFUN (clear_bgp_as_soft_in,
  */
 DEFUN (clear_bgp_as_in_prefix_filter,
        clear_bgp_as_in_prefix_filter_cmd,
-       "clear bgp " CMD_AS_RANGE " in prefix-filter",
+       "clear bgp (1-4294967295) in prefix-filter",
        CLEAR_STR
        BGP_STR
        "Clear peers with the AS number\n"
@@ -8224,7 +8224,7 @@ DEFUN (clear_bgp_as_in_prefix_filter,
 /* Both soft-reconfiguration */
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " BGP_INSTANCE_CMD " * soft",
+ * "clear ip bgp <view|vrf> WORD * soft",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -8273,7 +8273,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 <view|vrf> WORD * ipv4 <unicast|multicast> soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8333,14 +8333,14 @@ DEFUN (clear_ip_bgp_all_encap_soft,
  *     "Clear all peers\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " * soft",
+ * "clear bgp <view|vrf> WORD * soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
  *     "Clear all peers\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 * soft",
+ * "clear bgp <view|vrf> WORD ipv6 * soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8367,7 +8367,7 @@ DEFUN (clear_bgp_all_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) soft",
+ * "clear ip bgp <view|vrf> WORD (A.B.C.D|WORD) soft",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -8422,7 +8422,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 <view|vrf> WORD <A.B.C.D|WORD> ipv4 <unicast|multicast> soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8489,7 +8489,7 @@ DEFUN (clear_ip_bgp_peer_encap_soft,
  *     "BGP neighbor on interface to clear\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD) soft",
+ * "clear bgp <view|vrf> WORD ipv6 (A.B.C.D|X:X::X:X|WORD) soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8499,7 +8499,7 @@ DEFUN (clear_ip_bgp_peer_encap_soft,
  *     "BGP neighbor on interface to clear\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD) soft",
+ * "clear bgp <view|vrf> WORD (A.B.C.D|X:X::X:X|WORD) soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8533,7 +8533,7 @@ DEFUN (clear_bgp_peer_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD soft",
+ * "clear ip bgp <view|vrf> WORD peer-group WORD soft",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -8588,7 +8588,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 <view|vrf> WORD peer-group WORD ipv4 <unicast|multicast> soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8613,7 +8613,7 @@ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD soft",
+ * "clear bgp <view|vrf> WORD ipv6 peer-group WORD soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8622,7 +8622,7 @@ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft,
  *     "BGP peer-group name\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " peer-group WORD soft",
+ * "clear bgp <view|vrf> WORD peer-group WORD soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8659,7 +8659,7 @@ DEFUN (clear_bgp_peer_group_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " BGP_INSTANCE_CMD " external soft",
+ * "clear ip bgp <view|vrf> WORD external soft",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -8709,7 +8709,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 <view|vrf> WORD external ipv4 <unicast|multicast> soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8732,14 +8732,14 @@ DEFUN (clear_ip_bgp_instance_external_ipv4_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp " BGP_INSTANCE_CMD " external soft",
+ * "clear bgp <view|vrf> WORD external soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
  *     "Clear all external peers\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 external soft",
+ * "clear bgp <view|vrf> WORD ipv6 external soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8773,7 +8773,7 @@ DEFUN (clear_bgp_external_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft",
+ * "clear ip bgp <view|vrf> WORD (1-4294967295) soft",
  *     CLEAR_STR
  *     IP_STR
  *     BGP_STR
@@ -8784,7 +8784,7 @@ DEFUN (clear_bgp_external_soft,
  */
 DEFUN (clear_ip_bgp_as_soft,
        clear_ip_bgp_as_soft_cmd,
-       "clear ip bgp " CMD_AS_RANGE " soft",
+       "clear ip bgp (1-4294967295) soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8803,7 +8803,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 (1-4294967295) ipv4 <unicast|multicast> soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8825,7 +8825,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 <view|vrf> WORD (1-4294967295) ipv4 <unicast|multicast> soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8849,7 +8849,7 @@ DEFUN (clear_ip_bgp_instance_as_ipv4_soft,
 
 DEFUN (clear_ip_bgp_as_vpnv4_soft,
        clear_ip_bgp_as_vpnv4_soft_cmd,
-       "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft",
+       "clear ip bgp (1-4294967295) vpnv4 unicast soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8865,7 +8865,7 @@ DEFUN (clear_ip_bgp_as_vpnv4_soft,
 
 DEFUN (clear_ip_bgp_as_encap_soft,
        clear_ip_bgp_as_encap_soft_cmd,
-       "clear ip bgp " CMD_AS_RANGE " encap unicast soft",
+       "clear ip bgp (1-4294967295) encap unicast soft",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -8881,14 +8881,14 @@ DEFUN (clear_ip_bgp_as_encap_soft,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "clear bgp ipv6 " CMD_AS_RANGE " soft",
+ * "clear bgp ipv6 (1-4294967295) soft",
  *     CLEAR_STR
  *     BGP_STR
  *     "Address family\n"
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " soft",
+ * "clear bgp <view|vrf> WORD ipv6 (1-4294967295) soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8896,7 +8896,7 @@ DEFUN (clear_ip_bgp_as_encap_soft,
  *     "Clear peers with the AS number\n"
  *     BGP_SOFT_STR
  *
- * "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft",
+ * "clear bgp <view|vrf> WORD (1-4294967295) soft",
  *     CLEAR_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8906,7 +8906,7 @@ DEFUN (clear_ip_bgp_as_encap_soft,
  */
 DEFUN (clear_bgp_as_soft,
        clear_bgp_as_soft_cmd,
-       "clear bgp " CMD_AS_RANGE " soft",
+       "clear bgp (1-4294967295) soft",
        CLEAR_STR
        BGP_STR
        "Clear peers with the AS number\n"
@@ -9616,7 +9616,7 @@ DEFUN (show_ip_bgp_summary,
 
 DEFUN (show_ip_bgp_instance_summary,
        show_ip_bgp_instance_summary_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " summary [json]",
+       "show ip bgp <view|vrf> WORD summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9631,7 +9631,7 @@ DEFUN (show_ip_bgp_instance_summary,
 
 DEFUN (show_ip_bgp_instance_all_summary,
        show_ip_bgp_instance_all_summary_cmd,
-       "show ip bgp " BGP_INSTANCE_ALL_CMD " summary [json]",
+       "show ip bgp <view|vrf> all summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9806,7 +9806,7 @@ DEFUN (show_bgp_summary,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 summary [json]",
+ * "show bgp <view|vrf> WORD ipv6 summary [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -9816,7 +9816,7 @@ DEFUN (show_bgp_summary,
  */
 DEFUN (show_bgp_instance_summary,
        show_bgp_instance_summary_cmd,
-       "show bgp " BGP_INSTANCE_CMD " summary [json]",
+       "show bgp <view|vrf> WORD summary [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9829,7 +9829,7 @@ DEFUN (show_bgp_instance_summary,
 
 DEFUN (show_bgp_instance_all_summary,
        show_bgp_instance_all_summary_cmd,
-       "show bgp " BGP_INSTANCE_ALL_CMD " summary [json]",
+       "show bgp <view|vrf> all summary [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_ALL_HELP_STR
@@ -9865,7 +9865,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 <view|vrf> WORD ipv6 <unicast|multicast> summary [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -11886,14 +11886,14 @@ DEFUN (show_ip_bgp_neighbors_peer,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " neighbors [json]",
+ * "show bgp <view|vrf> WORD neighbors [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
  *     "Detailed information on TCP and BGP neighbor connections\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -11904,7 +11904,7 @@ DEFUN (show_ip_bgp_neighbors_peer,
  */
 DEFUN (show_ip_bgp_instance_neighbors,
        show_ip_bgp_instance_neighbors_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors [json]",
+       "show ip bgp <view|vrf> WORD neighbors [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -11920,7 +11920,7 @@ DEFUN (show_ip_bgp_instance_neighbors,
 
 DEFUN (show_ip_bgp_instance_all_neighbors,
        show_ip_bgp_instance_all_neighbors_cmd,
-       "show ip bgp " BGP_INSTANCE_ALL_CMD " neighbors [json]",
+       "show ip bgp <view|vrf> all neighbors [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -11938,7 +11938,7 @@ DEFUN (show_ip_bgp_instance_all_neighbors,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
+ * "show bgp <view|vrf> WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -11949,7 +11949,7 @@ DEFUN (show_ip_bgp_instance_all_neighbors,
  *     "Neighbor on bgp configured interface\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
+ * "show bgp <view|vrf> WORD neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -11962,7 +11962,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 <view|vrf> WORD neighbors <A.B.C.D|X:X::X:X|WORD> [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12103,7 +12103,7 @@ DEFUN (show_ip_bgp_updgrps,
 
 DEFUN (show_ip_bgp_instance_updgrps,
        show_ip_bgp_instance_updgrps_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " update-groups",
+       "show ip bgp <view|vrf> WORD update-groups",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12116,7 +12116,7 @@ DEFUN (show_ip_bgp_instance_updgrps,
 
 DEFUN (show_ip_bgp_instance_all_updgrps,
        show_ip_bgp_instance_all_updgrps_cmd,
-       "show ip bgp " BGP_INSTANCE_ALL_CMD " update-groups",
+       "show ip bgp <view|vrf> all update-groups",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12139,7 +12139,7 @@ DEFUN (show_bgp_ipv6_updgrps,
 
 DEFUN (show_bgp_instance_ipv6_updgrps,
        show_bgp_instance_ipv6_updgrps_cmd,
-       "show bgp " BGP_INSTANCE_CMD " update-groups",
+       "show bgp <view|vrf> WORD update-groups",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12151,7 +12151,7 @@ DEFUN (show_bgp_instance_ipv6_updgrps,
 
 DEFUN (show_bgp_instance_all_ipv6_updgrps,
        show_bgp_instance_all_ipv6_updgrps_cmd,
-       "show bgp " BGP_INSTANCE_ALL_CMD " update-groups",
+       "show bgp <view|vrf> all update-groups",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_ALL_HELP_STR
@@ -12199,7 +12199,7 @@ DEFUN (show_ip_bgp_updgrps_s,
 
 DEFUN (show_ip_bgp_instance_updgrps_s,
        show_ip_bgp_instance_updgrps_s_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " update-groups SUBGROUP-ID",
+       "show ip bgp <view|vrf> WORD update-groups SUBGROUP-ID",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12230,7 +12230,7 @@ DEFUN (show_bgp_ipv6_updgrps_s,
 
 DEFUN (show_bgp_instance_ipv6_updgrps_s,
        show_bgp_instance_ipv6_updgrps_s_cmd,
-       "show bgp " BGP_INSTANCE_CMD " update-groups SUBGROUP-ID",
+       "show bgp <view|vrf> WORD update-groups SUBGROUP-ID",
        SHOW_STR
        BGP_STR
        "Detailed info about v6 dynamic update groups\n"
@@ -12287,7 +12287,7 @@ DEFUN (show_bgp_updgrps_stats,
 
 DEFUN (show_bgp_instance_updgrps_stats,
        show_bgp_instance_updgrps_stats_cmd,
-       "show bgp " BGP_INSTANCE_CMD " update-groups statistics",
+       "show bgp <view|vrf> WORD update-groups statistics",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12346,7 +12346,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 <view|vrf> WORD update-groups <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12407,7 +12407,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 <view|vrf> WORD update-groups <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12446,7 +12446,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 <view|vrf> WORD update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12521,7 +12521,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 <view|vrf> WORD update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12715,7 +12715,7 @@ DEFUN (show_ip_bgp_peer_groups,
 
 DEFUN (show_ip_bgp_instance_peer_groups,
        show_ip_bgp_instance_peer_groups_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " peer-group",
+       "show ip bgp <view|vrf> WORD peer-group",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12741,7 +12741,7 @@ DEFUN (show_ip_bgp_peer_group,
 
 DEFUN (show_ip_bgp_instance_peer_group,
        show_ip_bgp_instance_peer_group_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " peer-group WORD",
+       "show ip bgp <view|vrf> WORD peer-group WORD",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12758,7 +12758,7 @@ DEFUN (show_ip_bgp_instance_peer_group,
 
 DEFUN (bgp_redistribute_ipv4,
        bgp_redistribute_ipv4_cmd,
-       "redistribute " QUAGGA_IP_REDIST_STR_BGPD,
+       "redistribute <kernel|connected|static|rip|ospf|isis|pim|table>",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP_REDIST_HELP_STR_BGPD)
 {
@@ -12777,7 +12777,7 @@ DEFUN (bgp_redistribute_ipv4,
 
 DEFUN (bgp_redistribute_ipv4_rmap,
        bgp_redistribute_ipv4_rmap_cmd,
-       "redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD",
+       "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP_REDIST_HELP_STR_BGPD
        "Route map reference\n"
@@ -12802,7 +12802,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 <kernel|connected|static|rip|ospf|isis|pim|table> metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
@@ -12829,7 +12829,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 <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP_REDIST_HELP_STR_BGPD
        "Route map reference\n"
@@ -12860,7 +12860,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 <kernel|connected|static|rip|ospf|isis|pim|table> metric (0-4294967295) route-map WORD",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
@@ -13114,7 +13114,7 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD",
+ * "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table> metric <0-4294967295> route-map WORD",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP_REDIST_HELP_STR_BGPD
@@ -13123,14 +13123,14 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
  *     "Route map reference\n"
  *     "Pointer to route-map entries\n"
  *
- * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD",
+ * "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP_REDIST_HELP_STR_BGPD
  *     "Route map reference\n"
  *     "Pointer to route-map entries\n"
  *
- * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
+ * "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD metric <0-4294967295>",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP_REDIST_HELP_STR_BGPD
@@ -13139,7 +13139,7 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
  *     "Metric for redistributed routes\n"
  *     "Default metric\n"
  *
- * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>",
+ * "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table> metric <0-4294967295>",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP_REDIST_HELP_STR_BGPD
@@ -13149,7 +13149,7 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
  */
 DEFUN (no_bgp_redistribute_ipv4,
        no_bgp_redistribute_ipv4_cmd,
-       "no redistribute " QUAGGA_IP_REDIST_STR_BGPD,
+       "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table>",
        NO_STR
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP_REDIST_HELP_STR_BGPD)
@@ -13173,7 +13173,7 @@ DEFUN (no_bgp_redistribute_ipv4,
 #ifdef HAVE_IPV6
 DEFUN (bgp_redistribute_ipv6,
        bgp_redistribute_ipv6_cmd,
-       "redistribute " QUAGGA_IP6_REDIST_STR_BGPD,
+       "redistribute <kernel|connected|static|ripng|ospf6|isis|table>",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP6_REDIST_HELP_STR_BGPD)
 {
@@ -13193,7 +13193,7 @@ DEFUN (bgp_redistribute_ipv6,
 
 DEFUN (bgp_redistribute_ipv6_rmap,
        bgp_redistribute_ipv6_rmap_cmd,
-       "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD",
+       "redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP6_REDIST_HELP_STR_BGPD
        "Route map reference\n"
@@ -13218,7 +13218,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 <kernel|connected|static|ripng|ospf6|isis|table> metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP6_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
@@ -13245,7 +13245,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 <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP6_REDIST_HELP_STR_BGPD
        "Route map reference\n"
@@ -13276,7 +13276,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 <kernel|connected|static|ripng|ospf6|isis|table> metric (0-4294967295) route-map WORD",
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP6_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
@@ -13307,14 +13307,14 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD",
+ * "no redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
  *     "Route map reference\n"
  *     "Pointer to route-map entries\n"
  *
- * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
+ * "no redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD metric <0-4294967295>",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
@@ -13323,7 +13323,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
  *     "Metric for redistributed routes\n"
  *     "Default metric\n"
  *
- * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD",
+ * "no redistribute <kernel|connected|static|ripng|ospf6|isis|table> metric <0-4294967295> route-map WORD",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
@@ -13332,7 +13332,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
  *     "Route map reference\n"
  *     "Pointer to route-map entries\n"
  *
- * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
+ * "no redistribute <kernel|connected|static|ripng|ospf6|isis|table> metric <0-4294967295>",
  *     NO_STR
  *     "Redistribute information from another routing protocol\n"
  *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
@@ -13342,7 +13342,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
  */
 DEFUN (no_bgp_redistribute_ipv6,
        no_bgp_redistribute_ipv6_cmd,
-       "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD,
+       "no redistribute <kernel|connected|static|ripng|ospf6|isis|table>",
        NO_STR
        "Redistribute information from another routing protocol\n"
        QUAGGA_IP6_REDIST_HELP_STR_BGPD)
index fcdc11bba1b2b92b9d0a9574b5f40858d62e871a..a0ca5ad2c5267074350c42039442c0ebbb92e25f 100644 (file)
@@ -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> <kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|table> <level-1|level-2> [metric (0-16777215)|route-map WORD]",
        REDIST_STR
        "Redistribute IPv4 routes\n"
        "Redistribute IPv6 routes\n"
@@ -611,7 +611,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> <kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|table> <level-1|level-2>",
        NO_STR
        REDIST_STR
        "Redistribute IPv4 routes\n"
index ed2c30ad631b021f0d82dbc86ad95c40909911a0..6fb265f97a7d6c773031732df4710a4abcaf23e2 100644 (file)
@@ -1893,7 +1893,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 [<kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>] [" LOG_LEVELS "]",
        NO_STR
        "Logging control\n"
        "Cancel logging to syslog\n"
@@ -1906,7 +1906,7 @@ DEFUN (no_config_log_syslog,
 
 DEFUN (config_log_facility,
        config_log_facility_cmd,
-       "log facility " LOG_FACILITIES,
+       "log facility <kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>",
        "Logging control\n"
        "Facility parameter for syslog messages\n"
        LOG_FACILITY_DESC)
@@ -1920,7 +1920,7 @@ DEFUN (config_log_facility,
 
 DEFUN (no_config_log_facility,
        no_config_log_facility_cmd,
-       "no log facility [" LOG_FACILITIES "]",
+       "no log facility [<kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>]",
        NO_STR
        "Logging control\n"
        "Reset syslog facility to default (daemon)\n"
index 4c4b66cda5169473ecb31cd319ce809b38410729..a0083933f8b41f6a28b3be6caf8812cb33e5d462 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -926,7 +926,7 @@ DEFUN (show_address,
 
 DEFUN (show_address_vrf_all,
        show_address_vrf_all_cmd,
-       "show address " VRF_ALL_CMD_STR,
+       "show address vrf all",
        SHOW_STR
        "address\n"
        VRF_ALL_CMD_HELP_STR)
index c35b30a65b51f325a9d36e8d91732ba3ce44c88c..379320e869a829c1f59e1892a04cfddc4c39f2e0 100644 (file)
@@ -642,7 +642,7 @@ ospf6_asbr_redistribute_remove (int type, ifindex_t ifindex,
 
 DEFUN (ospf6_redistribute,
        ospf6_redistribute_cmd,
-       "redistribute " QUAGGA_REDIST_STR_OSPF6D,
+       "redistribute <kernel|connected|static|ripng|isis|bgp|table>",
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_OSPF6D
       )
@@ -660,7 +660,7 @@ DEFUN (ospf6_redistribute,
 
 DEFUN (ospf6_redistribute_routemap,
        ospf6_redistribute_routemap_cmd,
-       "redistribute " QUAGGA_REDIST_STR_OSPF6D " route-map WORD",
+       "redistribute <kernel|connected|static|ripng|isis|bgp|table> route-map WORD",
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_OSPF6D
        "Route map reference\n"
@@ -683,7 +683,7 @@ DEFUN (ospf6_redistribute_routemap,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no redistribute " QUAGGA_REDIST_STR_OSPF6D " route-map WORD",
+ * "no redistribute <kernel|connected|static|ripng|isis|bgp|table> route-map WORD",
  *     NO_STR
  *     "Redistribute\n"
  *     QUAGGA_REDIST_HELP_STR_OSPF6D
@@ -693,7 +693,7 @@ DEFUN (ospf6_redistribute_routemap,
  */
 DEFUN (no_ospf6_redistribute,
        no_ospf6_redistribute_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_OSPF6D,
+       "no redistribute <kernel|connected|static|ripng|isis|bgp|table>",
        NO_STR
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_OSPF6D
index 5d1eae3e3878b0afdbea7b14e5c070ca4af755ff..ffbefd139d54f14b9b37a05c8a9b1f29547b742d 100644 (file)
@@ -346,7 +346,7 @@ DEFUN (ipv6_ospf6_bfd,
 
 DEFUN (ipv6_ospf6_bfd_param,
        ipv6_ospf6_bfd_param_cmd,
-       "ipv6 ospf6 bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
+       "ipv6 ospf6 bfd (2-255) (50-60000) (50-60000)",
        IP6_STR
        OSPF6_STR
        "Enables BFD support\n"
index d8fefab9cce8d6055d6ac9cee4b2d45215797a26..ae4691efa990b59ac4ef9b062abbdc8ace0a6fd6 100644 (file)
@@ -379,7 +379,7 @@ DEFUN (ip_ospf_bfd,
 
 DEFUN (ip_ospf_bfd_param,
        ip_ospf_bfd_param_cmd,
-       "ip ospf bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
+       "ip ospf bfd (2-255) (50-60000) (50-60000)",
        "IP Information\n"
        "OSPF interface commands\n"
        "Enables BFD support\n"
@@ -409,7 +409,7 @@ DEFUN (ip_ospf_bfd_param,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no ip ospf bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
+ * "no ip ospf bfd (2-255) (50-60000) (50-60000)",
  *     NO_STR
  *     "IP Information\n"
  *     "OSPF interface commands\n"
index b3019b465353cb45aa23ee541ec240daa406581e..b022261d2d5ca8288865f0e8f02ac4b525e76b5a 100644 (file)
@@ -5858,7 +5858,7 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D",
+ * "show ip ospf database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) A.B.C.D",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5866,7 +5866,7 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf,
  *     OSPF_LSA_TYPES_DESC
  *     "Link State ID (as an IP address)\n"
  *
- * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D (self-originate|)",
+ * "show ip ospf database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) A.B.C.D (self-originate|)",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5876,7 +5876,7 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf,
  *     "Self-originated link states\n"
  *     "\n"
  *
- * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D adv-router A.B.C.D",
+ * "show ip ospf database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) A.B.C.D adv-router A.B.C.D",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5886,7 +5886,7 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf,
  *     "Advertising Router link states\n"
  *     "Advertising Router (as an IP address)\n"
  *
- * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR "|max-age|self-originate)",
+ * "show ip ospf database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as|max-age|self-originate)",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5918,7 +5918,7 @@ DEFUN (show_ip_ospf_database,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D adv-router A.B.C.D",
+ * "show ip ospf <1-65535> database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) A.B.C.D adv-router A.B.C.D",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5929,7 +5929,7 @@ DEFUN (show_ip_ospf_database,
  *     "Advertising Router link states\n"
  *     "Advertising Router (as an IP address)\n"
  *
- * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D",
+ * "show ip ospf <1-65535> database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) A.B.C.D",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5938,7 +5938,7 @@ DEFUN (show_ip_ospf_database,
  *     OSPF_LSA_TYPES_DESC
  *     "Link State ID (as an IP address)\n"
  *
- * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D (self-originate|)",
+ * "show ip ospf <1-65535> database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) A.B.C.D (self-originate|)",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -5949,7 +5949,7 @@ DEFUN (show_ip_ospf_database,
  *     "Self-originated link states\n"
  *     "\n"
  *
- * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR "|max-age|self-originate)",
+ * "show ip ospf <1-65535> database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as|max-age|self-originate)",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -6042,7 +6042,7 @@ show_ip_ospf_database_type_adv_router_common (struct vty *vty, struct ospf *ospf
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") (self-originate|)",
+ * "show ip ospf database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) (self-originate|)",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -6053,7 +6053,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 <asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> adv-router A.B.C.D",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -6073,7 +6073,7 @@ DEFUN (show_ip_ospf_database_type_adv_router,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") (self-originate|)",
+ * "show ip ospf <1-65535> database (asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as) (self-originate|)",
  *     SHOW_STR
  *     IP_STR
  *     "OSPF information\n"
@@ -6085,7 +6085,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 <asbr-summary|external|network|router|summary|nssa-external|opaque-link|opaque-area|opaque-as> adv-router A.B.C.D",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -8213,7 +8213,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 <kernel|connected|static|rip|isis|bgp|pim|table> [metric (0-16777214)|metric-type <1|2>|route-map WORD]",
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_OSPFD
        "Metric for redistributed routes\n"
@@ -8268,7 +8268,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 <kernel|connected|static|rip|isis|bgp|pim|table> [metric (0-16777214)|metric-type <1|2>|route-map WORD]",
        NO_STR
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_OSPFD
@@ -8427,7 +8427,7 @@ DEFUN (no_ospf_redistribute_instance_source,
 
 DEFUN (ospf_distribute_list_out,
        ospf_distribute_list_out_cmd,
-       "distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD,
+       "distribute-list WORD out <kernel|connected|static|rip|isis|bgp|pim|table>",
        "Filter networks in routing updates\n"
        "Access-list name\n"
        OUT_STR
@@ -8450,7 +8450,7 @@ DEFUN (ospf_distribute_list_out,
 
 DEFUN (no_ospf_distribute_list_out,
        no_ospf_distribute_list_out_cmd,
-       "no distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD,
+       "no distribute-list WORD out <kernel|connected|static|rip|isis|bgp|pim|table>",
        NO_STR
        "Filter networks in routing updates\n"
        "Access-list name\n"
index 9232c48e7f9f62bf79a185f8950499105be6ac0d..52302a64601a496c6c36a8f89e9600994403fad6 100644 (file)
@@ -2501,7 +2501,7 @@ DEFUN (no_ip_pim_rp,
 
 DEFUN (ip_multicast_routing,
        ip_multicast_routing_cmd,
-       PIM_CMD_IP_MULTICAST_ROUTING,
+       "ip multicast-routing",
        IP_STR
        "Enable IP multicast forwarding\n")
 {
@@ -2514,7 +2514,7 @@ DEFUN (ip_multicast_routing,
 
 DEFUN (no_ip_multicast_routing,
        no_ip_multicast_routing_cmd,
-       PIM_CMD_NO " " PIM_CMD_IP_MULTICAST_ROUTING,
+       "no ip multicast-routing",
        NO_STR
        IP_STR
        "Global IP configuration subcommands\n"
@@ -2874,7 +2874,7 @@ static void change_query_max_response_time(struct pim_interface *pim_ifp,
 
 DEFUN (interface_ip_igmp_query_interval,
        interface_ip_igmp_query_interval_cmd,
-       PIM_CMD_IP_IGMP_QUERY_INTERVAL " (1-1800)",
+       "ip igmp query-interval (1-1800)",
        IP_STR
        IFACE_IGMP_STR
        IFACE_IGMP_QUERY_INTERVAL_STR
@@ -2933,7 +2933,7 @@ DEFUN (interface_ip_igmp_query_interval,
 
 DEFUN (interface_no_ip_igmp_query_interval,
        interface_no_ip_igmp_query_interval_cmd,
-       PIM_CMD_NO " " PIM_CMD_IP_IGMP_QUERY_INTERVAL,
+       "no ip igmp query-interval",
        NO_STR
        IP_STR
        IFACE_IGMP_STR
@@ -2969,7 +2969,7 @@ DEFUN (interface_no_ip_igmp_query_interval,
 
 DEFUN (interface_ip_igmp_query_max_response_time,
        interface_ip_igmp_query_max_response_time_cmd,
-       PIM_CMD_IP_IGMP_QUERY_MAX_RESPONSE_TIME " (1-25)",
+       "ip igmp query-max-response-time (1-25)",
        IP_STR
        IFACE_IGMP_STR
        IFACE_IGMP_QUERY_MAX_RESPONSE_TIME_STR
@@ -3026,7 +3026,7 @@ DEFUN (interface_ip_igmp_query_max_response_time,
 
 DEFUN (interface_no_ip_igmp_query_max_response_time,
        interface_no_ip_igmp_query_max_response_time_cmd,
-       PIM_CMD_NO " " PIM_CMD_IP_IGMP_QUERY_MAX_RESPONSE_TIME,
+       "no ip igmp query-max-response-time",
        NO_STR
        IP_STR
        IFACE_IGMP_STR
@@ -3062,7 +3062,7 @@ DEFUN (interface_no_ip_igmp_query_max_response_time,
 
 DEFUN (interface_ip_igmp_query_max_response_time_dsec,
        interface_ip_igmp_query_max_response_time_dsec_cmd,
-       PIM_CMD_IP_IGMP_QUERY_MAX_RESPONSE_TIME_DSEC " (10-250)",
+       "ip igmp query-max-response-time-dsec (10-250)",
        IP_STR
        IFACE_IGMP_STR
        IFACE_IGMP_QUERY_MAX_RESPONSE_TIME_DSEC_STR
@@ -3122,7 +3122,7 @@ DEFUN (interface_ip_igmp_query_max_response_time_dsec,
 
 DEFUN (interface_no_ip_igmp_query_max_response_time_dsec,
        interface_no_ip_igmp_query_max_response_time_dsec_cmd,
-       PIM_CMD_NO " " PIM_CMD_IP_IGMP_QUERY_MAX_RESPONSE_TIME_DSEC,
+       "no ip igmp query-max-response-time-dsec",
        NO_STR
        IP_STR
        IFACE_IGMP_STR
index 3596938bbf10a5fc9e42ba4e1ac878ce2972c915..f4cca7e8ab7aac450b8f29eb26e49fb4e7098c59 100644 (file)
@@ -359,7 +359,7 @@ DEFUN (no_rip_redistribute_rip,
 
 DEFUN (rip_redistribute_type,
        rip_redistribute_type_cmd,
-       "redistribute " QUAGGA_REDIST_STR_RIPD,
+       "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>",
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD)
 {
@@ -384,7 +384,7 @@ DEFUN (rip_redistribute_type,
 
 DEFUN (no_rip_redistribute_type,
        no_rip_redistribute_type_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_RIPD,
+       "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>",
        NO_STR
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD)
@@ -411,7 +411,7 @@ DEFUN (no_rip_redistribute_type,
 
 DEFUN (rip_redistribute_type_routemap,
        rip_redistribute_type_routemap_cmd,
-       "redistribute " QUAGGA_REDIST_STR_RIPD " route-map WORD",
+       "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD",
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD
        "Route map reference\n"
@@ -440,7 +440,7 @@ DEFUN (rip_redistribute_type_routemap,
 
 DEFUN (no_rip_redistribute_type_routemap,
        no_rip_redistribute_type_routemap_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_RIPD " route-map WORD",
+       "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD",
        NO_STR
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD
@@ -471,7 +471,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 <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)",
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD
        "Metric\n"
@@ -503,7 +503,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 <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)",
        NO_STR
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD
@@ -534,7 +534,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 <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD",
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD
        "Metric\n"
@@ -571,7 +571,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 <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD",
        NO_STR
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_RIPD
index a6dc20072d4ec38b5073a57390457431bdd5338c..07c51ca6d2ec5b69db1d7a1870a98759a2f0998f 100644 (file)
@@ -327,7 +327,7 @@ DEFUN (no_ripng_redistribute_ripng,
 
 DEFUN (ripng_redistribute_type,
        ripng_redistribute_type_cmd,
-       "redistribute " QUAGGA_REDIST_STR_RIPNGD,
+       "redistribute <kernel|connected|static|ospf6|isis|bgp|table>",
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_RIPNGD)
 {
@@ -347,21 +347,21 @@ DEFUN (ripng_redistribute_type,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
+ * "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric <0-16> route-map WORD",
  *     NO_STR
  *     "Redistribute\n"
  *     QUAGGA_REDIST_HELP_STR_RIPNGD
  *     "Route map reference\n"
  *     "Pointer to route-map entries\n"
  *
- * "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>",
+ * "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric <0-16>",
  *     NO_STR
  *     "Redistribute\n"
  *     QUAGGA_REDIST_HELP_STR_RIPNGD
  *     "Metric\n"
  *     "Metric value\n"
  *
- * "no redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD",
+ * "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> route-map WORD",
  *     NO_STR
  *     "Redistribute\n"
  *     QUAGGA_REDIST_HELP_STR_RIPNGD
@@ -371,7 +371,7 @@ DEFUN (ripng_redistribute_type,
  */
 DEFUN (no_ripng_redistribute_type,
        no_ripng_redistribute_type_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_RIPNGD,
+       "no redistribute <kernel|connected|static|ospf6|isis|bgp|table>",
        NO_STR
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_RIPNGD)
@@ -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 <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16)",
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_RIPNGD
        "Metric\n"
@@ -423,7 +423,7 @@ DEFUN (ripng_redistribute_type_metric,
 
 DEFUN (ripng_redistribute_type_routemap,
        ripng_redistribute_type_routemap_cmd,
-       "redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD",
+       "redistribute <kernel|connected|static|ospf6|isis|bgp|table> route-map WORD",
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_RIPNGD
        "Route map reference\n"
@@ -450,7 +450,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 <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16) route-map WORD",
        "Redistribute\n"
        QUAGGA_REDIST_HELP_STR_RIPNGD
        "Metric\n"
index a35f0e08210476e54824320cd40c2e952d5663e1..8a4a0b8cf26e9c76fd8c66759b43ea0e4a3812c9 100755 (executable)
@@ -4,7 +4,6 @@
 Usage:
 
     argv_translator.py rebuild-defuns [<text>]
-    argv_translator.py idx-logic <wildcard>
 
 Help:
     rebuild-defuns : foo
@@ -500,11 +499,6 @@ def get_command_string_index_variable_table(line_number, line):
     return indexes
 
 
-def get_idx_logic(wildcard):
-    # dwalton
-    return None
-
-
 def expand_command_string(line):
 
     # in the middle
@@ -579,6 +573,10 @@ def expand_command_string(line):
     if line.rstrip().endswith('" ,'):
         line = line.replace('" ,', '",')
 
+    # compress duplicate white spaces
+    re_space = re.search('^(\s*).*(\s*)$', line)
+    line = re_space.group(1) + ' '.join(line.split()) + re_space.group(2)
+
     return line
 
 
@@ -721,9 +719,12 @@ DEFUN (no_bgp_maxmed_onstartup,
         new_command_string = self.get_new_command_string()
         new_command_string_expanded = expand_command_string(new_command_string)
         lines = []
+
+        # dwalton
         lines.append("DEFUN (%s,\n" % self.name)
         lines.append("       %s,\n" % self.name_cmd)
-        lines.append(new_command_string)
+        # lines.append(new_command_string)
+        lines.append(new_command_string_expanded)
         lines.extend(self.help_strings)
         lines.append('{\n')
 
@@ -847,10 +848,14 @@ def update_argvs(filename):
     with open(filename, 'w') as fh:
         state = None
 
-        for line in lines:
+        for (line_number, line) in enumerate(lines):
 
             if state is None:
-                if line.startswith('DEFUN ('):
+                if 'The following ALIASes need to be implemented in this DEFUN' in line:
+                    state = 'CHANGE ME'
+                    fh.write(line)
+
+                elif line.startswith('DEFUN ('):
                     state = 'DEFUN_HEADER'
                     re_name = re.search('DEFUN \((.*),', line.strip())
                     name = re_name.group(1)
@@ -859,6 +864,17 @@ def update_argvs(filename):
                 else:
                     fh.write(line)
 
+            elif state == 'CHANGE ME':
+                if line.strip() == '*/':
+                    state = None
+                    fh.write(line)
+                elif line.strip().startswith('* "'):
+                    # dwalton
+                    new_line = expand_command_string(line[3:]) # chop the leading " * "
+                    fh.write(" * %s" % new_line)
+                else:
+                    fh.write(line)
+
             elif state == 'DEFUN_HEADER':
                 if line.strip() == '{':
                     state = 'DEFUN_BODY'
@@ -867,6 +883,9 @@ def update_argvs(filename):
                 if line.rstrip() == '}':
                     state = None
 
+            # uncomment to debug state machine
+            # print "%5d %12s: %s" % (line_number, state, line.rstrip())
+
 
 if __name__ == '__main__':
     (print_options, ended_with_space, sys.argv) = get_network_docopt_info(sys.argv)
@@ -888,5 +907,3 @@ if __name__ == '__main__':
                     filename = filename.strip()
                     print "crunching %s" % filename
                     update_argvs(filename)
-        elif cli.get('idx-logic'):
-            print get_idx_logic(cli.args.get('<wildcard>'))
index d1f21c17b321ea4cc01d834a9ccfacb49c4dc4d5..c1fbc9cdd3cf82fa247867cb88e1a9e36cb98780 100644 (file)
@@ -1300,7 +1300,7 @@ struct cmd_node vrf_node =
 /* Show all interfaces to vty. */
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show interface " VRF_CMD_STR,
+ * "show interface vrf NAME",
  *     SHOW_STR
  *     "Interface status and configuration\n"
  *     VRF_CMD_HELP_STR
@@ -1332,7 +1332,7 @@ DEFUN (show_interface,
 /* Show all interfaces to vty. */
 DEFUN (show_interface_vrf_all,
        show_interface_vrf_all_cmd,
-       "show interface " VRF_ALL_CMD_STR,
+       "show interface vrf all",
        SHOW_STR
        "Interface status and configuration\n"
        VRF_ALL_CMD_HELP_STR)
@@ -1355,7 +1355,7 @@ DEFUN (show_interface_vrf_all,
 
 DEFUN (show_interface_name_vrf,
        show_interface_name_vrf_cmd,
-       "show interface IFNAME " VRF_CMD_STR,
+       "show interface IFNAME vrf NAME",
        SHOW_STR
        "Interface status and configuration\n"
        "Interface name\n"
@@ -1395,7 +1395,7 @@ DEFUN (show_interface_name_vrf,
  */
 DEFUN (show_interface_name_vrf_all,
        show_interface_name_vrf_all_cmd,
-       "show interface IFNAME " VRF_ALL_CMD_STR,
+       "show interface IFNAME vrf all",
        SHOW_STR
        "Interface status and configuration\n"
        "Interface name\n"
@@ -1472,7 +1472,7 @@ if_show_description (struct vty *vty, vrf_id_t vrf_id)
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show interface description " VRF_CMD_STR,
+ * "show interface description vrf NAME",
  *     SHOW_STR
  *     "Interface status and configuration\n"
  *     "Interface description\n"
@@ -1499,7 +1499,7 @@ DEFUN (show_interface_desc,
 
 DEFUN (show_interface_desc_vrf_all,
        show_interface_desc_vrf_all_cmd,
-       "show interface description " VRF_ALL_CMD_STR,
+       "show interface description vrf all",
        SHOW_STR
        "Interface status and configuration\n"
        "Interface description\n"
index ed90042b8cbd6e093e79308b4612df2706654c38..6b861d78040c24c748bb44d0c719c38c009017d8 100644 (file)
@@ -661,7 +661,7 @@ DEFUN (no_zebra_route_map_timer,
 
 DEFUN (ip_protocol,
        ip_protocol_cmd,
-       "ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+       "ip protocol <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> route-map ROUTE-MAP",
        IP_STR
        "Filter routing info exchanged between zebra and protocol\n"
        QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
@@ -700,7 +700,7 @@ DEFUN (ip_protocol,
 
 DEFUN (no_ip_protocol,
        no_ip_protocol_cmd,
-       "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]",
+       "no ip protocol <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> [route-map ROUTE-MAP]",
        NO_STR
        IP_STR
        "Stop filtering routing info between zebra and protocol\n"
@@ -771,7 +771,7 @@ DEFUN (show_ip_protocol,
 
 DEFUN (ipv6_protocol,
        ipv6_protocol_cmd,
-       "ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+       "ipv6 protocol <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> route-map ROUTE-MAP",
        IP6_STR
        "Filter IPv6 routing info exchanged between zebra and protocol\n"
        QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
@@ -810,7 +810,7 @@ DEFUN (ipv6_protocol,
 
 DEFUN (no_ipv6_protocol,
        no_ipv6_protocol_cmd,
-       "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]",
+       "no ipv6 protocol <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> [route-map ROUTE-MAP]",
        NO_STR
        IP6_STR
        "Stop filtering IPv6 routing info between zebra and protocol\n"
@@ -880,7 +880,7 @@ DEFUN (show_ipv6_protocol,
 
 DEFUN (ip_protocol_nht_rmap,
        ip_protocol_nht_rmap_cmd,
-       "ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+       "ip nht <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> route-map ROUTE-MAP",
        IP_STR
        "Filter Next Hop tracking route resolution\n"
        QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
@@ -916,7 +916,7 @@ DEFUN (ip_protocol_nht_rmap,
 
 DEFUN (no_ip_protocol_nht_rmap,
        no_ip_protocol_nht_rmap_cmd,
-       "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]",
+       "no ip nht <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> [route-map ROUTE-MAP]",
        NO_STR
        IP_STR
        "Filter Next Hop tracking route resolution\n"
@@ -981,7 +981,7 @@ DEFUN (show_ip_protocol_nht,
 
 DEFUN (ipv6_protocol_nht_rmap,
        ipv6_protocol_nht_rmap_cmd,
-       "ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+       "ipv6 nht <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> route-map ROUTE-MAP",
        IP6_STR
        "Filter Next Hop tracking route resolution\n"
        QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
@@ -1011,7 +1011,7 @@ DEFUN (ipv6_protocol_nht_rmap,
 
 DEFUN (no_ipv6_protocol_nht_rmap,
        no_ipv6_protocol_nht_rmap_cmd,
-       "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]",
+       "no ipv6 nht <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> [route-map ROUTE-MAP]",
        NO_STR
        IP6_STR
        "Filter Next Hop tracking route resolution\n"
index ebe0ca4054abda078b991e331c4378e8a828d12c..878af09ee09f312cb23d1705319be0d4a7329b4c 100644 (file)
@@ -1297,7 +1297,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1314,7 +1314,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1334,7 +1334,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1353,7 +1353,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1376,7 +1376,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1392,7 +1392,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1413,7 +1413,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1432,7 +1432,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1455,7 +1455,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1476,7 +1476,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1501,7 +1501,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1519,7 +1519,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1541,7 +1541,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1560,7 +1560,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1583,7 +1583,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1604,7 +1604,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1628,7 +1628,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1646,7 +1646,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix (e.g. 10.0.0.0/8)\n"
@@ -1667,7 +1667,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1688,7 +1688,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1712,7 +1712,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1739,7 +1739,7 @@ DEFUN (ip_route_mask_flags_tag_distance_vrf,
 
 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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1762,7 +1762,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1782,7 +1782,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -1805,7 +1805,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1823,7 +1823,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1843,7 +1843,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1864,7 +1864,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1887,7 +1887,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1904,7 +1904,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1924,7 +1924,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1944,7 +1944,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1966,7 +1966,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -1989,7 +1989,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2014,7 +2014,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2033,7 +2033,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2056,7 +2056,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2076,7 +2076,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2099,7 +2099,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2121,7 +2121,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2146,7 +2146,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2165,7 +2165,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2187,7 +2187,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2209,7 +2209,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2234,7 +2234,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2258,7 +2258,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2285,7 +2285,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2306,7 +2306,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -2840,7 +2840,7 @@ do_show_ip_route (struct vty *vty, const char *vrf_name, safi_t safi,
 
 DEFUN (show_ip_route_vrf,
        show_ip_route_vrf_cmd,
-       "show ip route " VRF_CMD_STR " [json]",
+       "show ip route vrf NAME [json]",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -2876,7 +2876,7 @@ DEFUN (show_ip_nht,
 
 DEFUN (show_ip_nht_vrf_all,
        show_ip_nht_vrf_all_cmd,
-       "show ip nht " VRF_ALL_CMD_STR,
+       "show ip nht vrf all",
        SHOW_STR
        IP_STR
        "IP nexthop tracking table\n"
@@ -2916,7 +2916,7 @@ DEFUN (show_ipv6_nht,
 
 DEFUN (show_ipv6_nht_vrf_all,
        show_ipv6_nht_vrf_all_cmd,
-       "show ipv6 nht " VRF_ALL_CMD_STR,
+       "show ipv6 nht vrf all",
        SHOW_STR
        IP_STR
        "IPv6 nexthop tracking table\n"
@@ -3144,7 +3144,7 @@ DEFUN (show_ip_route_supernets,
 
 DEFUN (show_ip_route_protocol,
        show_ip_route_protocol_cmd,
-       "show ip route [vrf NAME] " QUAGGA_IP_REDIST_STR_ZEBRA,
+       "show ip route [vrf NAME] <kernel|connected|static|rip|ospf|isis|bgp|pim|table>",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3534,7 +3534,7 @@ DEFUN (show_ip_route_summary_prefix,
 
 DEFUN (show_ip_route_vrf_all,
        show_ip_route_vrf_all_cmd,
-       "show ip route " VRF_ALL_CMD_STR,
+       "show ip route vrf all",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3579,7 +3579,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 tag (1-65535)",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3633,7 +3633,7 @@ DEFUN (show_ip_route_vrf_all_tag,
 
 DEFUN (show_ip_route_vrf_all_prefix_longer,
        show_ip_route_vrf_all_prefix_longer_cmd,
-       "show ip route " VRF_ALL_CMD_STR " A.B.C.D/M longer-prefixes",
+       "show ip route vrf all A.B.C.D/M longer-prefixes",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3691,7 +3691,7 @@ DEFUN (show_ip_route_vrf_all_prefix_longer,
 
 DEFUN (show_ip_route_vrf_all_supernets,
        show_ip_route_vrf_all_supernets_cmd,
-       "show ip route " VRF_ALL_CMD_STR " supernets-only",
+       "show ip route vrf all supernets-only",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3745,7 +3745,7 @@ DEFUN (show_ip_route_vrf_all_supernets,
 
 DEFUN (show_ip_route_vrf_all_protocol,
        show_ip_route_vrf_all_protocol_cmd,
-       "show ip route " VRF_ALL_CMD_STR " " QUAGGA_IP_REDIST_STR_ZEBRA,
+       "show ip route vrf all <kernel|connected|static|rip|ospf|isis|bgp|pim|table>",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3800,7 +3800,7 @@ DEFUN (show_ip_route_vrf_all_protocol,
 
 DEFUN (show_ip_route_vrf_all_addr,
        show_ip_route_vrf_all_addr_cmd,
-       "show ip route " VRF_ALL_CMD_STR " A.B.C.D",
+       "show ip route vrf all A.B.C.D",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3842,7 +3842,7 @@ DEFUN (show_ip_route_vrf_all_addr,
 
 DEFUN (show_ip_route_vrf_all_prefix,
        show_ip_route_vrf_all_prefix_cmd,
-       "show ip route " VRF_ALL_CMD_STR " A.B.C.D/M",
+       "show ip route vrf all A.B.C.D/M",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3889,7 +3889,7 @@ DEFUN (show_ip_route_vrf_all_prefix,
 
 DEFUN (show_ip_route_vrf_all_summary,
        show_ip_route_vrf_all_summary_cmd,
-       "show ip route " VRF_ALL_CMD_STR " summary ",
+       "show ip route vrf all summary ",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -3908,7 +3908,7 @@ DEFUN (show_ip_route_vrf_all_summary,
 
 DEFUN (show_ip_route_vrf_all_summary_prefix,
        show_ip_route_vrf_all_summary_prefix_cmd,
-       "show ip route " VRF_ALL_CMD_STR " summary prefix",
+       "show ip route vrf all summary prefix",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -4718,7 +4718,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4734,7 +4734,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4753,7 +4753,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4772,7 +4772,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4794,7 +4794,7 @@ DEFUN (ipv6_route_flags_tag_vrf,
 
 DEFUN (ipv6_route_ifname_vrf,
        ipv6_route_ifname_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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4810,7 +4810,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4830,7 +4830,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4850,7 +4850,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4873,7 +4873,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4891,7 +4891,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4912,7 +4912,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4933,7 +4933,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4957,7 +4957,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4976,7 +4976,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -4998,7 +4998,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -5020,7 +5020,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 NAME",
        IP_STR
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -5045,7 +5045,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5062,7 +5062,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5082,7 +5082,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5102,7 +5102,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5125,7 +5125,7 @@ DEFUN (no_ipv6_route_flags_tag_vrf,
 
 DEFUN (no_ipv6_route_ifname_vrf,
        no_ipv6_route_ifname_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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5143,7 +5143,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5164,7 +5164,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5185,7 +5185,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5209,7 +5209,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5228,7 +5228,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5250,7 +5250,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5273,7 +5273,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5299,7 +5299,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5319,7 +5319,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5342,7 +5342,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5365,7 +5365,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 NAME",
        NO_STR
        IP_STR
        "Establish static routes\n"
@@ -5391,7 +5391,7 @@ DEFUN (no_ipv6_route_ifname_flags_pref_tag_vrf,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ipv6 route  " VRF_CMD_STR " [json]",
+ * "show ipv6 route vrf NAME [json]",
  *     SHOW_STR
  *     IP_STR
  *     "IPv6 routing table\n"
@@ -5597,7 +5597,7 @@ DEFUN (show_ipv6_route_prefix_longer,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ipv6 route "  VRF_CMD_STR "  " QUAGGA_IP6_REDIST_STR_ZEBRA,
+ * "show ipv6 route " VRF_CMD_STR " <kernel|connected|static|ripng|ospf6|isis|bgp|table>",
  *     SHOW_STR
  *     IP_STR
  *     "IP routing table\n"
@@ -5607,7 +5607,7 @@ DEFUN (show_ipv6_route_prefix_longer,
  */
 DEFUN (show_ipv6_route_protocol,
        show_ipv6_route_protocol_cmd,
-       "show ipv6 route " QUAGGA_IP6_REDIST_STR_ZEBRA,
+       "show ipv6 route <kernel|connected|static|ripng|ospf6|isis|bgp|table>",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -5846,7 +5846,7 @@ DEFUN (show_ipv6_mroute,
 
 DEFUN (show_ipv6_route_vrf_all,
        show_ipv6_route_vrf_all_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR,
+       "show ipv6 route vrf all",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"
@@ -5891,7 +5891,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 tag (1-65535)",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"
@@ -5946,7 +5946,7 @@ DEFUN (show_ipv6_route_vrf_all_tag,
 
 DEFUN (show_ipv6_route_vrf_all_prefix_longer,
        show_ipv6_route_vrf_all_prefix_longer_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR " X:X::X:X/M longer-prefixes",
+       "show ipv6 route vrf all X:X::X:X/M longer-prefixes",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"
@@ -6004,7 +6004,7 @@ DEFUN (show_ipv6_route_vrf_all_prefix_longer,
 
 DEFUN (show_ipv6_route_vrf_all_protocol,
        show_ipv6_route_vrf_all_protocol_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR " " QUAGGA_IP6_REDIST_STR_ZEBRA,
+       "show ipv6 route vrf all <kernel|connected|static|ripng|ospf6|isis|bgp|table>",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -6059,7 +6059,7 @@ DEFUN (show_ipv6_route_vrf_all_protocol,
 
 DEFUN (show_ipv6_route_vrf_all_addr,
        show_ipv6_route_vrf_all_addr_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR " X:X::X:X",
+       "show ipv6 route vrf all X:X::X:X",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"
@@ -6101,7 +6101,7 @@ DEFUN (show_ipv6_route_vrf_all_addr,
 
 DEFUN (show_ipv6_route_vrf_all_prefix,
        show_ipv6_route_vrf_all_prefix_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR " X:X::X:X/M",
+       "show ipv6 route vrf all X:X::X:X/M",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"
@@ -6148,7 +6148,7 @@ DEFUN (show_ipv6_route_vrf_all_prefix,
 
 DEFUN (show_ipv6_route_vrf_all_summary,
        show_ipv6_route_vrf_all_summary_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR " summary",
+       "show ipv6 route vrf all summary",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"
@@ -6167,7 +6167,7 @@ DEFUN (show_ipv6_route_vrf_all_summary,
 
 DEFUN (show_ipv6_mroute_vrf_all,
        show_ipv6_mroute_vrf_all_cmd,
-       "show ipv6 mroute " VRF_ALL_CMD_STR,
+       "show ipv6 mroute vrf all",
        SHOW_STR
        IP_STR
        "IPv6 Multicast routing table\n"
@@ -6203,7 +6203,7 @@ DEFUN (show_ipv6_mroute_vrf_all,
 
 DEFUN (show_ipv6_route_vrf_all_summary_prefix,
        show_ipv6_route_vrf_all_summary_prefix_cmd,
-       "show ipv6 route " VRF_ALL_CMD_STR " summary prefix",
+       "show ipv6 route vrf all summary prefix",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n"