bgpd: Make `ip` optional for all `show bgp` and `show ip bgp` commands

This should unify the `show bgp ...` and `show ip bgp...` command
variants under one tree.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index de6caa159657093802d6af85c66a5ca364f01055..fdec5c6b5f62b68ec9b2d19580e444f7e99b5d7f 100644 (file)
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -2182,7 +2182,7 @@ aspath_show_all_iterator (struct hash_backet *backet, struct vty *vty)
 }
 
 /* Print all aspath and hash information.  This function is used from
-   `show ip bgp paths' command. */
+   `show [ip] bgp paths' command. */
 void
 aspath_print_all_vty (struct vty *vty)
 {

diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 6c72aa36d9fa7d603db65aca3f5c9941756fa385..9138c72802a954fd78976443330c99800de4f7f3 100644 (file)
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -584,7 +584,7 @@ ecommunity_str2com (const char *str, int type, int keyword_included)
    extcommunity-list
         "rt 100:1 rt 100:2 soo 100:3"
 
-   "show ip bgp" and extcommunity-list regular expression matching
+   "show [ip] bgp" and extcommunity-list regular expression matching
         "RT:100:1 RT:100:2 SoO:100:3"
 
    For each formath please use below definition for format:

diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c
index dd35bb2c3ce5e52cf36fdefb2ec0485d75f69e44..4ea2f9cde73afe89a2d7138f82bf700546456d0f 100644 (file)
--- a/bgpd/bgp_encap.c
+++ b/bgpd/bgp_encap.c
@@ -475,8 +475,9 @@ bgp_show_encap (
 
 DEFUN (show_bgp_ipv4_encap,
        show_bgp_ipv4_encap_cmd,
-       "show bgp ipv4 encap",
+       "show [ip] bgp ipv4 encap",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n")
@@ -486,8 +487,9 @@ DEFUN (show_bgp_ipv4_encap,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap,
        show_bgp_ipv6_encap_cmd,
-       "show bgp ipv6 encap",
+       "show [ip] bgp ipv6 encap",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n")
@@ -498,8 +500,9 @@ DEFUN (show_bgp_ipv6_encap,
 
 DEFUN (show_bgp_ipv4_encap_rd,
        show_bgp_ipv4_encap_rd_cmd,
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn",
+       "show [ip] bgp ipv4 encap rd ASN:nn_or_IP-address:nn",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -521,8 +524,9 @@ DEFUN (show_bgp_ipv4_encap_rd,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_rd,
        show_bgp_ipv6_encap_rd_cmd,
-       "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn",
+       "show [ip] bgp ipv6 encap rd ASN:nn_or_IP-address:nn",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -546,8 +550,9 @@ DEFUN (show_bgp_ipv6_encap_rd,
 
 DEFUN (show_bgp_ipv4_encap_tags,
        show_bgp_ipv4_encap_tags_cmd,
-       "show bgp ipv4 encap tags",
+       "show [ip] bgp ipv4 encap tags",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -558,8 +563,9 @@ DEFUN (show_bgp_ipv4_encap_tags,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_tags,
        show_bgp_ipv6_encap_tags_cmd,
-       "show bgp ipv6 encap tags",
+       "show [ip] bgp ipv6 encap tags",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -571,8 +577,9 @@ DEFUN (show_bgp_ipv6_encap_tags,
 
 DEFUN (show_bgp_ipv4_encap_rd_tags,
        show_bgp_ipv4_encap_rd_tags_cmd,
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn tags",
+       "show [ip] bgp ipv4 encap rd ASN:nn_or_IP-address:nn tags",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -595,8 +602,9 @@ DEFUN (show_bgp_ipv4_encap_rd_tags,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_rd_tags,
        show_bgp_ipv6_encap_rd_tags_cmd,
-       "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn tags",
+       "show [ip] bgp ipv6 encap rd ASN:nn_or_IP-address:nn tags",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -620,8 +628,9 @@ DEFUN (show_bgp_ipv6_encap_rd_tags,
 
 DEFUN (show_bgp_ipv4_encap_neighbor_routes,
        show_bgp_ipv4_encap_neighbor_routes_cmd,
-       "show bgp ipv4 encap neighbors A.B.C.D routes",
+       "show [ip] bgp ipv4 encap neighbors A.B.C.D routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -651,8 +660,9 @@ DEFUN (show_bgp_ipv4_encap_neighbor_routes,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_neighbor_routes,
        show_bgp_ipv6_encap_neighbor_routes_cmd,
-       "show bgp ipv6 encap neighbors A.B.C.D routes",
+       "show [ip] bgp ipv6 encap neighbors A.B.C.D routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -683,8 +693,9 @@ DEFUN (show_bgp_ipv6_encap_neighbor_routes,
 
 DEFUN (show_bgp_ipv4_encap_rd_neighbor_routes,
        show_bgp_ipv4_encap_rd_neighbor_routes_cmd,
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> routes",
+       "show [ip] bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -727,8 +738,9 @@ DEFUN (show_bgp_ipv4_encap_rd_neighbor_routes,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_rd_neighbor_routes,
        show_bgp_ipv6_encap_rd_neighbor_routes_cmd,
-       "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> routes",
+       "show [ip] bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -772,8 +784,9 @@ DEFUN (show_bgp_ipv6_encap_rd_neighbor_routes,
 
 DEFUN (show_bgp_ipv4_encap_neighbor_advertised_routes,
        show_bgp_ipv4_encap_neighbor_advertised_routes_cmd,
-       "show bgp ipv4 encap neighbors A.B.C.D advertised-routes",
+       "show [ip] bgp ipv4 encap neighbors A.B.C.D advertised-routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -804,8 +817,9 @@ DEFUN (show_bgp_ipv4_encap_neighbor_advertised_routes,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_neighbor_advertised_routes,
        show_bgp_ipv6_encap_neighbor_advertised_routes_cmd,
-       "show bgp ipv6 encap neighbors A.B.C.D advertised-routes",
+       "show [ip] bgp ipv6 encap neighbors A.B.C.D advertised-routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -837,8 +851,9 @@ DEFUN (show_bgp_ipv6_encap_neighbor_advertised_routes,
 
 DEFUN (show_bgp_ipv4_encap_rd_neighbor_advertised_routes,
        show_bgp_ipv4_encap_rd_neighbor_advertised_routes_cmd,
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> advertised-routes",
+       "show [ip] bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> advertised-routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"
@@ -881,8 +896,9 @@ DEFUN (show_bgp_ipv4_encap_rd_neighbor_advertised_routes,
 #ifdef HAVE_IPV6
 DEFUN (show_bgp_ipv6_encap_rd_neighbor_advertised_routes,
        show_bgp_ipv6_encap_rd_neighbor_advertised_routes_cmd,
-       "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> advertised-routes",
+       "show [ip] bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors <A.B.C.D|X:X::X:X> advertised-routes",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display ENCAP NLRI specific information\n"

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index b29fcb0dd486529fcbf6e61487f3b71866c863a3..c64c69dfca1292e5f3aa9da4e2a3480a0ddd4d06 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -897,8 +897,9 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
 
 DEFUN (show_bgp_ivp4_vpn,
        show_bgp_ipv4_vpn_cmd,
-       "show bgp ipv4 vpn [json]",
+       "show [ip] bgp ipv4 vpn [json]",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display VPN NLRI specific information\n"
@@ -909,8 +910,9 @@ DEFUN (show_bgp_ivp4_vpn,
 
 DEFUN (show_bgp_ipv6_vpn,
        show_bgp_ipv6_vpn_cmd,
-       "show bgp ipv6 vpn [json]",
+       "show [ip] bgp ipv6 vpn [json]",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display VPN NLRI specific information\n"
@@ -921,8 +923,9 @@ DEFUN (show_bgp_ipv6_vpn,
 
 DEFUN (show_bgp_ipv4_vpn_rd,
        show_bgp_ipv4_vpn_rd_cmd,
-       "show bgp ipv4 vpn rd ASN:nn_or_IP-address:nn [json]",
+       "show [ip] bgp ipv4 vpn rd ASN:nn_or_IP-address:nn [json]",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display VPN NLRI specific information\n"
@@ -945,8 +948,9 @@ DEFUN (show_bgp_ipv4_vpn_rd,
 
 DEFUN (show_bgp_ipv6_vpn_rd,
        show_bgp_ipv6_vpn_rd_cmd,
-       "show bgp ipv6 vpn rd ASN:nn_or_IP-address:nn [json]",
+       "show [ip] bgp ipv6 vpn rd ASN:nn_or_IP-address:nn [json]",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Display VPN NLRI specific information\n"
@@ -1018,7 +1022,7 @@ DEFUN (show_ip_bgp_vpnv4_all_tags,
 
 DEFUN (show_ip_bgp_vpnv4_rd_tags,
        show_ip_bgp_vpnv4_rd_tags_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn tags",
+       "show [ip] bgp vpnv4 rd ASN:nn_or_IP-address:nn tags",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -1096,7 +1100,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_routes,
 
 DEFUN (show_ip_bgp_vpnv4_rd_neighbor_routes,
        show_ip_bgp_vpnv4_rd_neighbor_routes_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D routes [json]",
+       "show [ip] bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -1222,7 +1226,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_advertised_routes,
 
 DEFUN (show_ip_bgp_vpnv4_rd_neighbor_advertised_routes,
        show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D advertised-routes [json]",
+       "show [ip] bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D advertised-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 6ef31c26933e91a23824da0ac71c92bc1a76f03d..ef807558d571cadd7fbaeab95452112614d28c10 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8247,7 +8247,7 @@ bgp_show_filter_list (struct vty *vty, const char *name,
 
 DEFUN (show_ip_bgp_dampening_info,
        show_ip_bgp_dampening_params_cmd,
-       "show ip bgp dampening parameters",
+       "show [ip] bgp dampening parameters",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8260,7 +8260,7 @@ DEFUN (show_ip_bgp_dampening_info,
 
 DEFUN (show_ip_bgp_ipv4_dampening_parameters,
        show_ip_bgp_ipv4_dampening_parameters_cmd,
-       "show ip bgp ipv4 <unicast|multicast> dampening parameters",
+       "show [ip] bgp ipv4 <unicast|multicast> dampening parameters",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8822,8 +8822,9 @@ bgp_table_stats_vty (struct vty *vty, const char *name,
 
 DEFUN (show_bgp_statistics,
        show_bgp_statistics_cmd,
-       "show bgp <ipv4|ipv6> <encap|multicast|unicast|vpn> statistics",
+       "show [ip] bgp <ipv4|ipv6> <encap|multicast|unicast|vpn> statistics",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Address Family\n"
@@ -8840,8 +8841,9 @@ DEFUN (show_bgp_statistics,
 
 DEFUN (show_bgp_statistics_view,
        show_bgp_statistics_view_cmd,
-       "show bgp <view|vrf> WORD <ipv4|ipv6> <unicast|multicast|vpn|encap> statistics",
+       "show [ip] bgp <view|vrf> WORD <ipv4|ipv6> <unicast|multicast|vpn|encap> statistics",
        SHOW_STR
+       IP_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
        "Address Family\n"
@@ -9050,7 +9052,7 @@ bgp_peer_counts (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, u_c
 
 DEFUN (show_ip_bgp_neighbor_prefix_counts,
        show_ip_bgp_neighbor_prefix_counts_cmd,
-       "show ip bgp neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
+       "show [ip] bgp neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9074,7 +9076,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 <view|vrf> WORD 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
@@ -9100,8 +9102,9 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts,
 
 DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
        show_bgp_ipv6_neighbor_prefix_counts_cmd,
-       "show bgp ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
+       "show [ip] bgp ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Detailed information on TCP and BGP neighbor connections\n"
@@ -9124,8 +9127,9 @@ 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 <view|vrf> WORD ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
+       "show [ip] bgp <view|vrf> WORD ipv6 neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
        SHOW_STR
+       IP_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
        "Address Family\n"
@@ -9150,7 +9154,7 @@ DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts,
 
 DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
        show_ip_bgp_ipv4_neighbor_prefix_counts_cmd,
-       "show ip bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
+       "show [ip] bgp ipv4 <unicast|multicast> neighbors <A.B.C.D|X:X::X:X|WORD> prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9207,7 +9211,7 @@ DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
 
 DEFUN (show_ip_bgp_vpnv4_all_route_prefix,
        show_ip_bgp_vpnv4_all_route_prefix_cmd,
-       "show ip bgp vpnv4 all <A.B.C.D|A.B.C.D/M> [json]",
+       "show [ip] bgp vpnv4 all <A.B.C.D|A.B.C.D/M> [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -9464,7 +9468,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 [<view|vrf>] WORD [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] neighbors <A.B.C.D|X:X::X:X|WORD> [<received-routes|advertised-routes> [route-map WORD]] [json]",
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] neighbors <A.B.C.D|X:X::X:X|WORD> [<received-routes|advertised-routes> [route-map WORD]] [json]",
        SHOW_STR
        IP_STR
        BGP_STR

diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index c485e61e5cf4af211d49b5e10d65ce1b1c837a65..913f3d1500fe07981619680717581a87fffc2013 100644 (file)
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -167,7 +167,7 @@ group_announce_route_walkcb (struct update_group *updgrp, void *arg)
                   subgroup_process_announce_selected (subgrp, ri, ctx->rn, ri->addpath_tx_id);
                 }
 
-              /* Process the bestpath last so the "show ip bgp neighbor x.x.x.x advertised"
+              /* Process the bestpath last so the "show [ip] bgp neighbor x.x.x.x advertised"
                * output shows the attributes from the bestpath */
               if (ctx->ri)
                 subgroup_process_announce_selected (subgrp, ctx->ri, ctx->rn, ctx->ri->addpath_tx_id);

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index fb4e0380725c6052caa72e9ea7267ececcaeeb2e..1f8cb08630bd1d4d92aa55bc5e28c8e1d6478b74 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6647,7 +6647,7 @@ bgp_show_summary_vty (struct vty *vty, const char *name,
   return CMD_SUCCESS;
 }
 
-/* `show ip bgp summary' commands. */
+/* `show [ip] bgp summary' commands. */
 DEFUN (show_ip_bgp_summary,
        show_ip_bgp_summary_cmd,
        "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 <all|rd ASN:nn_or_IP-address:nn>>] summary [json]",
@@ -8540,7 +8540,7 @@ bgp_show_neighbor_vty (struct vty *vty, const char *name,
   return CMD_SUCCESS;
 }
 
-/* "show ip bgp neighbors" commands.  */
+/* "show [ip] bgp neighbors" commands.  */
 DEFUN (show_ip_bgp_neighbors,
        show_ip_bgp_neighbors_cmd,
        "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6|vpnv4 <all|rd ASN:nn_or_IP-address:nn>>] neighbors [<A.B.C.D|X:X::X:X|WORD>] [json]",
@@ -8584,7 +8584,7 @@ DEFUN (show_ip_bgp_neighbors,
   return bgp_show_neighbor_vty (vty, vrf, sh_type, sh_arg, uj);
 }
 
-/* Show BGP's AS paths internal data.  There are both `show ip bgp
+/* Show BGP's AS paths internal data.  There are both `show [ip] bgp
    paths' and `show ip mbgp paths'.  Those functions results are the
    same.*/
 DEFUN (show_ip_bgp_paths,
@@ -8748,8 +8748,9 @@ DEFUN (show_ip_bgp_updgrps,
 
 DEFUN (show_bgp_instance_all_ipv6_updgrps,
        show_bgp_instance_all_ipv6_updgrps_cmd,
-       "show bgp <view|vrf> all update-groups",
+       "show [ip] bgp <view|vrf> all update-groups",
        SHOW_STR
+       IP_STR
        BGP_STR
        BGP_INSTANCE_ALL_HELP_STR
        "Detailed info about dynamic update groups\n")
@@ -8760,8 +8761,9 @@ DEFUN (show_bgp_instance_all_ipv6_updgrps,
 
 DEFUN (show_bgp_updgrps_stats,
        show_bgp_updgrps_stats_cmd,
-       "show bgp update-groups statistics",
+       "show [ip] bgp update-groups statistics",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Detailed info about dynamic update groups\n"
        "Statistics\n")
@@ -8777,8 +8779,9 @@ DEFUN (show_bgp_updgrps_stats,
 
 DEFUN (show_bgp_instance_updgrps_stats,
        show_bgp_instance_updgrps_stats_cmd,
-       "show bgp <view|vrf> WORD update-groups statistics",
+       "show [ip] bgp <view|vrf> WORD update-groups statistics",
        SHOW_STR
+       IP_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
        "Detailed info about dynamic update groups\n"
@@ -8819,7 +8822,7 @@ show_bgp_updgrps_adj_info_aux (struct vty *vty, const char *name,
 
 DEFUN (show_ip_bgp_updgrps_adj,
        show_ip_bgp_updgrps_adj_cmd,
-       "show ip bgp update-groups <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp update-groups <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8836,7 +8839,7 @@ DEFUN (show_ip_bgp_updgrps_adj,
 
 DEFUN (show_ip_bgp_instance_updgrps_adj,
        show_ip_bgp_instance_updgrps_adj_cmd,
-       "show ip bgp <view|vrf> WORD 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
@@ -8855,8 +8858,9 @@ DEFUN (show_ip_bgp_instance_updgrps_adj,
 
 DEFUN (show_bgp_updgrps_afi_adj,
        show_bgp_updgrps_afi_adj_cmd,
-       "show bgp <ipv4|ipv6> <unicast|multicast> update-groups <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp <ipv4|ipv6> <unicast|multicast> update-groups <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Address Family\n"
@@ -8882,8 +8886,9 @@ DEFUN (show_bgp_updgrps_afi_adj,
 
 DEFUN (show_bgp_updgrps_adj,
        show_bgp_updgrps_adj_cmd,
-       "show bgp update-groups <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp update-groups <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Detailed info about dynamic update groups\n"
        "Advertisement queue\n"
@@ -8897,8 +8902,9 @@ DEFUN (show_bgp_updgrps_adj,
 
 DEFUN (show_bgp_instance_updgrps_adj,
        show_bgp_instance_updgrps_adj_cmd,
-       "show bgp <view|vrf> WORD 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
        BGP_INSTANCE_HELP_STR
        "Detailed info about dynamic update groups\n"
@@ -8914,7 +8920,7 @@ DEFUN (show_bgp_instance_updgrps_adj,
 
 DEFUN (show_ip_bgp_updgrps_adj_s,
        show_ip_bgp_updgrps_adj_s_cmd,
-       "show ip bgp update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8937,7 +8943,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 <view|vrf> WORD 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
@@ -8962,8 +8968,9 @@ DEFUN (show_ip_bgp_instance_updgrps_adj_s,
 
 DEFUN (show_bgp_updgrps_afi_adj_s,
        show_bgp_updgrps_afi_adj_s_cmd,
-       "show bgp <ipv4|ipv6> <unicast|multicast> update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp <ipv4|ipv6> <unicast|multicast> update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Address Family\n"
        "Address Family\n"
@@ -8994,8 +9001,9 @@ DEFUN (show_bgp_updgrps_afi_adj_s,
 
 DEFUN (show_bgp_updgrps_adj_s,
        show_bgp_updgrps_adj_s_cmd,
-       "show bgp update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
+       IP_STR
        BGP_STR
        "Detailed info about dynamic update groups\n"
        "Specific subgroup to display info for\n"
@@ -9015,8 +9023,9 @@ DEFUN (show_bgp_updgrps_adj_s,
 
 DEFUN (show_bgp_instance_updgrps_adj_s,
        show_bgp_instance_updgrps_adj_s_cmd,
-       "show bgp <view|vrf> WORD 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
        BGP_INSTANCE_HELP_STR
        "Detailed info about dynamic update groups\n"
@@ -10709,7 +10718,7 @@ bgp_vty_init (void)
   install_element (ENABLE_NODE, &clear_bgp_ipv6_safi_prefix_cmd);
   install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_safi_prefix_cmd);
 
-  /* "show ip bgp summary" commands. */
+  /* "show [ip] bgp summary" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_summary_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_updgrps_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_all_ipv6_updgrps_cmd);
@@ -10738,19 +10747,19 @@ bgp_vty_init (void)
   install_element (VIEW_NODE, &show_bgp_updgrps_stats_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_updgrps_stats_cmd);
 
-  /* "show ip bgp neighbors" commands. */
+  /* "show [ip] bgp neighbors" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_neighbors_cmd);
 
-  /* "show ip bgp peer-group" commands. */
+  /* "show [ip] bgp peer-group" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_peer_groups_cmd);
 
-  /* "show ip bgp paths" commands. */
+  /* "show [ip] bgp paths" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_paths_cmd);
 
-  /* "show ip bgp community" commands. */
+  /* "show [ip] bgp community" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_community_info_cmd);
 
-  /* "show ip bgp attribute-info" commands. */
+  /* "show [ip] bgp attribute-info" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_attr_info_cmd);
 
   /* "redistribute" commands.  */
@@ -10791,13 +10800,13 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &neighbor_ttl_security_cmd);
   install_element (BGP_NODE, &no_neighbor_ttl_security_cmd);
 
-  /* "show bgp memory" commands. */
+  /* "show [ip] bgp memory" commands. */
   install_element (VIEW_NODE, &show_bgp_memory_cmd);
 
-  /* "show bgp views" commands. */
+  /* "show [ip] bgp views" commands. */
   install_element (VIEW_NODE, &show_bgp_views_cmd);
 
-  /* "show bgp vrfs" commands. */
+  /* "show [ip] bgp vrfs" commands. */
   install_element (VIEW_NODE, &show_bgp_vrfs_cmd);
 
   /* Community-list. */