Change {json} to [json]

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 4721a2e8e16c15cafaee65a58b478e87eddfeb61..629cfffb306f56d1da775748fb795ee66984c71f 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -760,7 +760,7 @@ 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 bgp ipv4 vpn [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -771,7 +771,7 @@ DEFUN (show_bgp_ivp4_vpn,
 
 DEFUN (show_bgp_ipv6_vpn,
        show_bgp_ipv6_vpn_cmd,
-       "show bgp ipv6 vpn {json}",
+       "show bgp ipv6 vpn [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -782,7 +782,7 @@ 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 bgp ipv4 vpn rd ASN:nn_or_IP-address:nn [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -805,7 +805,7 @@ 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 bgp ipv6 vpn rd ASN:nn_or_IP-address:nn [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -899,7 +899,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_tags,
 
 DEFUN (show_ip_bgp_vpnv4_all_neighbor_routes,
        show_ip_bgp_vpnv4_all_neighbor_routes_cmd,
-       "show ip bgp vpnv4 all neighbors A.B.C.D routes {json}",
+       "show ip bgp vpnv4 all neighbors A.B.C.D routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -952,7 +952,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
@@ -1023,7 +1023,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_routes,
 
 DEFUN (show_ip_bgp_vpnv4_all_neighbor_advertised_routes,
        show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd,
-       "show ip bgp vpnv4 all neighbors A.B.C.D advertised-routes {json}",
+       "show ip bgp vpnv4 all neighbors A.B.C.D advertised-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -1075,7 +1075,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 37009e1ab9d514665de25289b865a8a134e1549d..e408154f201bc02e45edd29376aa5e78d3d72439 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7941,7 +7941,7 @@ bgp_show_route (struct vty *vty, const char *view_name, const char *ip_str,
 /* BGP route print out function. */
 DEFUN (show_ip_bgp,
        show_ip_bgp_cmd,
-       "show ip bgp {json}",
+       "show ip bgp [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -7952,7 +7952,7 @@ DEFUN (show_ip_bgp,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv4 (unicast|multicast) {json}",
+ * "show bgp ipv4 (unicast|multicast) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -7963,7 +7963,7 @@ DEFUN (show_ip_bgp,
  */
 DEFUN (show_ip_bgp_ipv4,
        show_ip_bgp_ipv4_cmd,
-       "show ip bgp ipv4 (unicast|multicast) {json}",
+       "show ip bgp ipv4 (unicast|multicast) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -7984,7 +7984,7 @@ DEFUN (show_ip_bgp_ipv4,
 
 DEFUN (show_ip_bgp_route,
        show_ip_bgp_route_cmd,
-       "show ip bgp A.B.C.D {json}",
+       "show ip bgp A.B.C.D [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -7996,7 +7996,7 @@ DEFUN (show_ip_bgp_route,
 
 DEFUN (show_ip_bgp_route_pathtype,
        show_ip_bgp_route_pathtype_cmd,
-       "show ip bgp A.B.C.D (bestpath|multipath) {json}",
+       "show ip bgp A.B.C.D (bestpath|multipath) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8015,7 +8015,7 @@ DEFUN (show_ip_bgp_route_pathtype,
 
 DEFUN (show_bgp_ipv4_safi_route_pathtype,
        show_bgp_ipv4_safi_route_pathtype_cmd,
-       "show bgp ipv4 (unicast|multicast) A.B.C.D (bestpath|multipath) {json}",
+       "show bgp ipv4 (unicast|multicast) A.B.C.D (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8042,7 +8042,7 @@ DEFUN (show_bgp_ipv4_safi_route_pathtype,
 
 DEFUN (show_bgp_ipv4_prefix,
        show_bgp_ipv4_prefix_cmd,
-       "show bgp ipv4 A.B.C.D/M {json}",
+       "show bgp ipv4 A.B.C.D/M [json]",
        SHOW_STR
        BGP_STR
        IP_STR
@@ -8054,7 +8054,7 @@ DEFUN (show_bgp_ipv4_prefix,
 
 DEFUN (show_bgp_ipv6_route,
        show_bgp_ipv6_route_cmd,
-       "show bgp ipv6 X:X::X:X {JSON}",
+       "show bgp ipv6 X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8066,7 +8066,7 @@ DEFUN (show_bgp_ipv6_route,
 
 DEFUN (show_bgp_ipv6_prefix,
        show_bgp_ipv6_prefix_cmd,
-       "show bgp ipv6 X:X::X:X/M {json}",
+       "show bgp ipv6 X:X::X:X/M [json]",
        SHOW_STR
        BGP_STR
        IP_STR
@@ -8078,7 +8078,7 @@ DEFUN (show_bgp_ipv6_prefix,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv4 (unicast|multicast) A.B.C.D {json}",
+ * "show bgp ipv4 (unicast|multicast) A.B.C.D [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8090,7 +8090,7 @@ DEFUN (show_bgp_ipv6_prefix,
  */
 DEFUN (show_ip_bgp_ipv4_route,
        show_ip_bgp_ipv4_route_cmd,
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D {json}",
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8111,7 +8111,7 @@ DEFUN (show_ip_bgp_ipv4_route,
 
 DEFUN (show_ip_bgp_vpnv4_all_route,
        show_ip_bgp_vpnv4_all_route_cmd,
-       "show ip bgp vpnv4 all A.B.C.D {json}",
+       "show ip bgp vpnv4 all A.B.C.D [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8125,7 +8125,7 @@ DEFUN (show_ip_bgp_vpnv4_all_route,
 
 DEFUN (show_bgp_ipv4_vpn_route,
        show_bgp_ipv4_vpn_route_cmd,
-       "show bgp ipv4 vpn A.B.C.D {json}",
+       "show bgp ipv4 vpn A.B.C.D [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -8138,7 +8138,7 @@ DEFUN (show_bgp_ipv4_vpn_route,
 
 DEFUN (show_bgp_ipv6_vpn_route,
        show_bgp_ipv6_vpn_route_cmd,
-       "show bgp ipv6 vpn X:X::X:X {json}",
+       "show bgp ipv6 vpn X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -8151,7 +8151,7 @@ DEFUN (show_bgp_ipv6_vpn_route,
 
 DEFUN (show_bgp_ipv4_vpn_rd_route,
        show_bgp_ipv4_vpn_rd_route_cmd,
-       "show bgp ipv4 vpn rd ASN:nn_or_IP-address:nn A.B.C.D {json}",
+       "show bgp ipv4 vpn rd ASN:nn_or_IP-address:nn A.B.C.D [json]",
        SHOW_STR
        BGP_STR
        IP_STR
@@ -8175,7 +8175,7 @@ DEFUN (show_bgp_ipv4_vpn_rd_route,
 
 DEFUN (show_bgp_ipv6_vpn_rd_route,
        show_bgp_ipv6_vpn_rd_route_cmd,
-       "show bgp ipv6 vpn rd ASN:nn_or_IP-address:nn X:X::X:X {json}",
+       "show bgp ipv6 vpn rd ASN:nn_or_IP-address:nn X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        "Address Family\n"
@@ -8199,7 +8199,7 @@ DEFUN (show_bgp_ipv6_vpn_rd_route,
 
 DEFUN (show_ip_bgp_vpnv4_rd_route,
        show_ip_bgp_vpnv4_rd_route_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D {json}",
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8224,7 +8224,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_route,
 
 DEFUN (show_ip_bgp_prefix,
        show_ip_bgp_prefix_cmd,
-       "show ip bgp A.B.C.D/M {json}",
+       "show ip bgp A.B.C.D/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8236,7 +8236,7 @@ DEFUN (show_ip_bgp_prefix,
 
 DEFUN (show_ip_bgp_prefix_pathtype,
        show_ip_bgp_prefix_pathtype_cmd,
-       "show ip bgp A.B.C.D/M (bestpath|multipath) {json}",
+       "show ip bgp A.B.C.D/M (bestpath|multipath) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8254,7 +8254,7 @@ DEFUN (show_ip_bgp_prefix_pathtype,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv4 (unicast|multicast) A.B.C.D/M {json}",
+ * "show bgp ipv4 (unicast|multicast) A.B.C.D/M [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8266,7 +8266,7 @@ DEFUN (show_ip_bgp_prefix_pathtype,
  */
 DEFUN (show_ip_bgp_ipv4_prefix,
        show_ip_bgp_ipv4_prefix_cmd,
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M {json}",
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8287,7 +8287,7 @@ DEFUN (show_ip_bgp_ipv4_prefix,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) {json}",
+ * "show bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8301,7 +8301,7 @@ DEFUN (show_ip_bgp_ipv4_prefix,
  */
 DEFUN (show_ip_bgp_ipv4_prefix_pathtype,
        show_ip_bgp_ipv4_prefix_pathtype_cmd,
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) {json}",
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8330,7 +8330,7 @@ DEFUN (show_ip_bgp_ipv4_prefix_pathtype,
 
 DEFUN (show_ip_bgp_vpnv4_all_prefix,
        show_ip_bgp_vpnv4_all_prefix_cmd,
-       "show ip bgp vpnv4 all A.B.C.D/M {json}",
+       "show ip bgp vpnv4 all A.B.C.D/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8344,7 +8344,7 @@ DEFUN (show_ip_bgp_vpnv4_all_prefix,
 
 DEFUN (show_ip_bgp_vpnv4_rd_prefix,
        show_ip_bgp_vpnv4_rd_prefix_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D/M {json}",
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8368,7 +8368,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 " BGP_INSTANCE_CMD " [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8390,7 +8390,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 " BGP_INSTANCE_ALL_CMD " [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8405,7 +8405,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 " BGP_INSTANCE_CMD " A.B.C.D [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8418,7 +8418,7 @@ DEFUN (show_ip_bgp_instance_route,
 
 DEFUN (show_ip_bgp_instance_route_pathtype,
        show_ip_bgp_instance_route_pathtype_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D (bestpath|multipath) {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D (bestpath|multipath) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8438,7 +8438,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 " BGP_INSTANCE_CMD " A.B.C.D/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8451,7 +8451,7 @@ DEFUN (show_ip_bgp_instance_prefix,
 
 DEFUN (show_ip_bgp_instance_prefix_pathtype,
        show_ip_bgp_instance_prefix_pathtype_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D/M (bestpath|multipath) {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " A.B.C.D/M (bestpath|multipath) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8471,7 +8471,7 @@ DEFUN (show_ip_bgp_instance_prefix_pathtype,
 #ifdef HAVE_IPV6
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 {json}",
+ * "show bgp ipv6 [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8480,7 +8480,7 @@ DEFUN (show_ip_bgp_instance_prefix_pathtype,
  */
 DEFUN (show_bgp,
        show_bgp_cmd,
-       "show bgp {json}",
+       "show bgp [json]",
        SHOW_STR
        BGP_STR
        "JavaScript Object Notation\n")
@@ -8492,7 +8492,7 @@ DEFUN (show_bgp,
 
 DEFUN (show_bgp_ipv6_safi,
        show_bgp_ipv6_safi_cmd,
-       "show bgp ipv6 (unicast|multicast) {json}",
+       "show bgp ipv6 (unicast|multicast) [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8519,7 +8519,7 @@ bgp_show_ipv6_bgp_deprecate_warning (struct vty *vty)
 /* old command */
 DEFUN (show_ipv6_bgp,
        show_ipv6_bgp_cmd,
-       "show ipv6 bgp {json}",
+       "show ipv6 bgp [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8532,7 +8532,7 @@ DEFUN (show_ipv6_bgp,
 
 DEFUN (show_bgp_route,
        show_bgp_route_cmd,
-       "show bgp X:X::X:X {json}",
+       "show bgp X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        "Network in the BGP routing table to display\n"
@@ -8543,7 +8543,7 @@ DEFUN (show_bgp_route,
 
 DEFUN (show_bgp_ipv6_safi_route,
        show_bgp_ipv6_safi_route_cmd,
-       "show bgp ipv6 (unicast|multicast) X:X::X:X {json}",
+       "show bgp ipv6 (unicast|multicast) X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8561,7 +8561,7 @@ DEFUN (show_bgp_ipv6_safi_route,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 X:X::X:X (bestpath|multipath) {json}",
+ * "show bgp ipv6 X:X::X:X (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8573,7 +8573,7 @@ DEFUN (show_bgp_ipv6_safi_route,
  */
 DEFUN (show_bgp_route_pathtype,
        show_bgp_route_pathtype_cmd,
-       "show bgp X:X::X:X (bestpath|multipath) {json}",
+       "show bgp X:X::X:X (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        "Network in the BGP routing table to display\n"
@@ -8591,7 +8591,7 @@ DEFUN (show_bgp_route_pathtype,
 
 DEFUN (show_bgp_ipv6_safi_route_pathtype,
        show_bgp_ipv6_safi_route_pathtype_cmd,
-       "show bgp ipv6 (unicast|multicast) X:X::X:X (bestpath|multipath) {json}",
+       "show bgp ipv6 (unicast|multicast) X:X::X:X (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8618,7 +8618,7 @@ DEFUN (show_bgp_ipv6_safi_route_pathtype,
 /* old command */
 DEFUN (show_ipv6_bgp_route,
        show_ipv6_bgp_route_cmd,
-       "show ipv6 bgp X:X::X:X {json}",
+       "show ipv6 bgp X:X::X:X [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8631,7 +8631,7 @@ DEFUN (show_ipv6_bgp_route,
 
 DEFUN (show_bgp_prefix,
        show_bgp_prefix_cmd,
-       "show bgp X:X::X:X/M {json}",
+       "show bgp X:X::X:X/M [json]",
        SHOW_STR
        BGP_STR
        "IPv6 prefix <network>/<length>\n"
@@ -8642,7 +8642,7 @@ DEFUN (show_bgp_prefix,
 
 DEFUN (show_bgp_ipv6_safi_prefix,
        show_bgp_ipv6_safi_prefix_cmd,
-       "show bgp ipv6 (unicast|multicast) X:X::X:X/M {json}",
+       "show bgp ipv6 (unicast|multicast) X:X::X:X/M [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8660,7 +8660,7 @@ DEFUN (show_bgp_ipv6_safi_prefix,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 X:X::X:X/M (bestpath|multipath) {json}",
+ * "show bgp ipv6 X:X::X:X/M (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -8672,7 +8672,7 @@ DEFUN (show_bgp_ipv6_safi_prefix,
  */
 DEFUN (show_bgp_prefix_pathtype,
        show_bgp_prefix_pathtype_cmd,
-       "show bgp X:X::X:X/M (bestpath|multipath) {json}",
+       "show bgp X:X::X:X/M (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        "IPv6 prefix <network>/<length>\n"
@@ -8690,7 +8690,7 @@ DEFUN (show_bgp_prefix_pathtype,
 
 DEFUN (show_bgp_ipv6_safi_prefix_pathtype,
        show_bgp_ipv6_safi_prefix_pathtype_cmd,
-       "show bgp ipv6 (unicast|multicast) X:X::X:X/M (bestpath|multipath) {json}",
+       "show bgp ipv6 (unicast|multicast) X:X::X:X/M (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -8717,7 +8717,7 @@ DEFUN (show_bgp_ipv6_safi_prefix_pathtype,
 /* old command */
 DEFUN (show_ipv6_bgp_prefix,
        show_ipv6_bgp_prefix_cmd,
-       "show ipv6 bgp X:X::X:X/M {json}",
+       "show ipv6 bgp X:X::X:X/M [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8730,7 +8730,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 " BGP_INSTANCE_CMD " ipv6 [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8740,7 +8740,7 @@ DEFUN (show_ipv6_bgp_prefix,
  */
 DEFUN (show_bgp_view,
        show_bgp_instance_cmd,
-       "show bgp " BGP_INSTANCE_CMD " {json}",
+       "show bgp " BGP_INSTANCE_CMD " [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8761,7 +8761,7 @@ DEFUN (show_bgp_view,
 
 DEFUN (show_bgp_instance_all,
        show_bgp_instance_all_cmd,
-       "show bgp " BGP_INSTANCE_ALL_CMD " {json}",
+       "show bgp " BGP_INSTANCE_ALL_CMD " [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_ALL_HELP_STR
@@ -8776,7 +8776,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 " BGP_INSTANCE_CMD " ipv6 X:X::X:X [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8787,7 +8787,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 " BGP_INSTANCE_CMD " X:X::X:X [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8800,7 +8800,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 " BGP_INSTANCE_CMD " ipv6 X:X::X:X (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8813,7 +8813,7 @@ DEFUN (show_bgp_instance_route,
  */
 DEFUN (show_bgp_instance_route_pathtype,
        show_bgp_instance_route_pathtype_cmd,
-       "show bgp " BGP_INSTANCE_CMD " X:X::X:X (bestpath|multipath) {json}",
+       "show bgp " BGP_INSTANCE_CMD " X:X::X:X (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8832,7 +8832,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 " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8843,7 +8843,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 " BGP_INSTANCE_CMD " X:X::X:X/M [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -8856,7 +8856,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 " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M (bestpath|multipath) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -8869,7 +8869,7 @@ DEFUN (show_bgp_instance_prefix,
  */
 DEFUN (show_bgp_instance_prefix_pathtype,
        show_bgp_instance_prefix_pathtype_cmd,
-       "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M (bestpath|multipath) {json}",
+       "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M (bestpath|multipath) [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -9015,7 +9015,7 @@ DEFUN (show_bgp_instance_prefix_longer,
 /* old command */
 DEFUN (show_ipv6_mbgp,
        show_ipv6_mbgp_cmd,
-       "show ipv6 mbgp {json}",
+       "show ipv6 mbgp [json]",
        SHOW_STR
        IP_STR
        MBGP_STR
@@ -9029,7 +9029,7 @@ DEFUN (show_ipv6_mbgp,
 /* old command */
 DEFUN (show_ipv6_mbgp_route,
        show_ipv6_mbgp_route_cmd,
-       "show ipv6 mbgp X:X::X:X {json}",
+       "show ipv6 mbgp X:X::X:X [json]",
        SHOW_STR
        IP_STR
        MBGP_STR
@@ -9043,7 +9043,7 @@ DEFUN (show_ipv6_mbgp_route,
 /* old command */
 DEFUN (show_ipv6_mbgp_prefix,
        show_ipv6_mbgp_prefix_cmd,
-       "show ipv6 mbgp X:X::X:X/M {json}",
+       "show ipv6 mbgp X:X::X:X/M [json]",
        SHOW_STR
        IP_STR
        MBGP_STR
@@ -12045,7 +12045,7 @@ bgp_peer_counts (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, u_c
 
 DEFUN (show_ip_bgp_neighbor_prefix_counts,
        show_ip_bgp_neighbor_prefix_counts_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12068,7 +12068,7 @@ DEFUN (show_ip_bgp_neighbor_prefix_counts,
 
 DEFUN (show_ip_bgp_instance_neighbor_prefix_counts,
        show_ip_bgp_instance_neighbor_prefix_counts_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12092,7 +12092,7 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts,
 
 DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
        show_bgp_ipv6_neighbor_prefix_counts_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
+       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -12115,7 +12115,7 @@ DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
 
 DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts,
        show_bgp_instance_ipv6_neighbor_prefix_counts_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
+       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12139,7 +12139,7 @@ DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts,
 
 DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
        show_ip_bgp_ipv4_neighbor_prefix_counts_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12168,7 +12168,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
 
 DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
        show_ip_bgp_vpnv4_neighbor_prefix_counts_cmd,
-       "show ip bgp vpnv4 all neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
+       "show ip bgp vpnv4 all neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12434,7 +12434,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 " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12449,7 +12449,7 @@ peer_adj_routes (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
  */
 DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
        show_ip_bgp_instance_neighbor_advertised_route_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12476,7 +12476,7 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
+ * "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12490,7 +12490,7 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
  */
 DEFUN (show_ip_bgp_neighbor_advertised_route,
        show_ip_bgp_neighbor_advertised_route_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12521,7 +12521,7 @@ DEFUN (show_ip_bgp_neighbor_advertised_route,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
+ * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12539,7 +12539,7 @@ DEFUN (show_ip_bgp_neighbor_advertised_route,
  */
 DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
        show_ip_bgp_ipv4_neighbor_advertised_route_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12574,7 +12574,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -12589,7 +12589,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
  */
 DEFUN (show_bgp_instance_neighbor_advertised_route,
        show_bgp_instance_neighbor_advertised_route_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12617,7 +12617,7 @@ DEFUN (show_bgp_instance_neighbor_advertised_route,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -12628,7 +12628,7 @@ DEFUN (show_bgp_instance_neighbor_advertised_route,
  *     "Display the routes advertised to a BGP neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+ * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
  *     SHOW_STR
  *     IPV6_STR
  *     BGP_STR
@@ -12642,7 +12642,7 @@ DEFUN (show_bgp_instance_neighbor_advertised_route,
  */
 DEFUN (show_bgp_neighbor_advertised_route,
        show_bgp_neighbor_advertised_route_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
        SHOW_STR
        BGP_STR
        "Detailed information on TCP and BGP neighbor connections\n"
@@ -12674,7 +12674,7 @@ DEFUN (show_bgp_neighbor_advertised_route,
 /* old command */
 DEFUN (ipv6_mbgp_neighbor_advertised_route,
        ipv6_mbgp_neighbor_advertised_route_cmd,
-       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes [json]",
        SHOW_STR
        IPV6_STR
        MBGP_STR
@@ -12700,7 +12700,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -12715,7 +12715,7 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route,
  */
 DEFUN (show_bgp_instance_neighbor_received_routes,
        show_bgp_instance_neighbor_received_routes_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12738,7 +12738,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 " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12753,7 +12753,7 @@ DEFUN (show_bgp_instance_neighbor_received_routes,
  */
 DEFUN (show_ip_bgp_instance_neighbor_received_routes,
        show_ip_bgp_instance_neighbor_received_routes_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12778,7 +12778,7 @@ DEFUN (show_ip_bgp_instance_neighbor_received_routes,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
+ * "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12792,7 +12792,7 @@ DEFUN (show_ip_bgp_instance_neighbor_received_routes,
  */
 DEFUN (show_ip_bgp_neighbor_received_routes,
        show_ip_bgp_neighbor_received_routes_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12823,7 +12823,7 @@ DEFUN (show_ip_bgp_neighbor_received_routes,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
+ * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12840,7 +12840,7 @@ DEFUN (show_ip_bgp_neighbor_received_routes,
  */
 DEFUN (show_ip_bgp_ipv4_neighbor_received_routes,
        show_ip_bgp_ipv4_neighbor_received_routes_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12874,7 +12874,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_routes,
 
 DEFUN (show_bgp_instance_afi_safi_neighbor_adv_recd_routes,
        show_bgp_instance_afi_safi_neighbor_adv_recd_routes_cmd,
-       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) (advertised-routes|received-routes) {json}",
+       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) (advertised-routes|received-routes) [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -12910,7 +12910,7 @@ DEFUN (show_bgp_instance_afi_safi_neighbor_adv_recd_routes,
 
 DEFUN (show_ip_bgp_neighbor_received_prefix_filter,
        show_ip_bgp_neighbor_received_prefix_filter_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12997,7 +12997,7 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter,
 
 DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter,
        show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13114,7 +13114,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter,
 #ifdef HAVE_IPV6
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -13125,7 +13125,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter,
  *     "Display the received routes from neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+ * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
  *     SHOW_STR
  *     IPV6_STR
  *     BGP_STR
@@ -13139,7 +13139,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter,
  */
 DEFUN (show_bgp_neighbor_received_routes,
        show_bgp_neighbor_received_routes_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
        SHOW_STR
        BGP_STR
        "Detailed information on TCP and BGP neighbor connections\n"
@@ -13167,7 +13167,7 @@ DEFUN (show_bgp_neighbor_received_routes,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -13182,7 +13182,7 @@ DEFUN (show_bgp_neighbor_received_routes,
  */
 DEFUN (show_bgp_neighbor_received_prefix_filter,
        show_bgp_neighbor_received_prefix_filter_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
        SHOW_STR
        BGP_STR
        "Detailed information on TCP and BGP neighbor connections\n"
@@ -13272,7 +13272,7 @@ DEFUN (show_bgp_neighbor_received_prefix_filter,
 /* old command */
 DEFUN (ipv6_mbgp_neighbor_received_routes,
        ipv6_mbgp_neighbor_received_routes_cmd,
-       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes [json]",
        SHOW_STR
        IPV6_STR
        MBGP_STR
@@ -13296,7 +13296,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13312,7 +13312,7 @@ DEFUN (ipv6_mbgp_neighbor_received_routes,
  */
 DEFUN (show_bgp_instance_neighbor_received_prefix_filter,
        show_bgp_instance_neighbor_received_prefix_filter_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13428,7 +13428,7 @@ bgp_show_neighbor_route (struct vty *vty, struct peer *peer, afi_t afi,
 
 DEFUN (show_ip_bgp_neighbor_routes,
        show_ip_bgp_neighbor_routes_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13452,7 +13452,7 @@ DEFUN (show_ip_bgp_neighbor_routes,
 
 DEFUN (show_ip_bgp_instance_neighbor_routes,
        show_ip_bgp_instance_neighbor_routes_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13477,7 +13477,7 @@ DEFUN (show_ip_bgp_instance_neighbor_routes,
 
 DEFUN (show_ip_bgp_neighbor_flap,
        show_ip_bgp_neighbor_flap_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13501,7 +13501,7 @@ DEFUN (show_ip_bgp_neighbor_flap,
 
 DEFUN (show_ip_bgp_neighbor_damp,
        show_ip_bgp_neighbor_damp_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13525,7 +13525,7 @@ DEFUN (show_ip_bgp_neighbor_damp,
 
 DEFUN (show_ip_bgp_ipv4_neighbor_routes,
        show_ip_bgp_ipv4_neighbor_routes_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13557,7 +13557,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13572,7 +13572,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes,
  */
 DEFUN (show_bgp_instance_neighbor_routes,
        show_bgp_instance_neighbor_routes_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13597,7 +13597,7 @@ DEFUN (show_bgp_instance_neighbor_routes,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+ * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Detailed information on TCP and BGP neighbor connections\n"
@@ -13607,7 +13607,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13619,7 +13619,7 @@ DEFUN (show_bgp_instance_neighbor_routes,
  *     "Display the dampened routes received from neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -13633,7 +13633,7 @@ DEFUN (show_bgp_instance_neighbor_routes,
  */
 DEFUN (show_bgp_instance_neighbor_damp,
        show_bgp_instance_neighbor_damp_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13663,7 +13663,7 @@ DEFUN (show_bgp_instance_neighbor_damp,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+ * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Detailed information on TCP and BGP neighbor connections\n"
@@ -13673,7 +13673,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13685,7 +13685,7 @@ DEFUN (show_bgp_instance_neighbor_damp,
  *     "Display flap statistics of the routes learned from neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -13699,7 +13699,7 @@ DEFUN (show_bgp_instance_neighbor_damp,
  */
 DEFUN (show_bgp_instance_neighbor_flap,
        show_bgp_instance_neighbor_flap_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -13729,7 +13729,7 @@ DEFUN (show_bgp_instance_neighbor_flap,
        
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+ * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
  *     SHOW_STR
  *     IPV6_STR
  *     BGP_STR
@@ -13740,7 +13740,7 @@ DEFUN (show_bgp_instance_neighbor_flap,
  *     "Display routes learned from neighbor\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -13754,7 +13754,7 @@ DEFUN (show_bgp_instance_neighbor_flap,
  */
 DEFUN (show_bgp_neighbor_routes,
        show_bgp_neighbor_routes_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
        SHOW_STR
        BGP_STR
        "Detailed information on TCP and BGP neighbor connections\n"
@@ -13782,7 +13782,7 @@ DEFUN (show_bgp_neighbor_routes,
 /* old command */
 DEFUN (ipv6_mbgp_neighbor_routes,
        ipv6_mbgp_neighbor_routes_cmd,
-       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) routes [json]",
        SHOW_STR
        IPV6_STR
        MBGP_STR

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 60e8d36c98def6e17ce9ca9f9b5fcd454aa40bfc..5a06dd8e8a4ffba59c5dfb8f3f40a955b1571c5b 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -10115,7 +10115,7 @@ DEFUN (show_bgp_views,
 
 DEFUN (show_bgp_vrfs,
        show_bgp_vrfs_cmd,
-       "show bgp vrfs {json}",
+       "show bgp vrfs [json]",
        SHOW_STR
        BGP_STR
        "Show BGP VRFs\n"
@@ -10761,7 +10761,7 @@ bgp_show_all_instances_summary_vty (struct vty *vty, afi_t afi, safi_t safi,
 /* `show ip bgp summary' commands. */
 DEFUN (show_ip_bgp_summary,
        show_ip_bgp_summary_cmd,
-       "show ip bgp summary {json}",
+       "show ip bgp summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10774,7 +10774,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 " BGP_INSTANCE_CMD " summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10788,7 +10788,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 " BGP_INSTANCE_ALL_CMD " summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10804,7 +10804,7 @@ DEFUN (show_ip_bgp_instance_all_summary,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv4 (unicast|multicast) summary {json}",
+ * "show bgp ipv4 (unicast|multicast) summary [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -10815,7 +10815,7 @@ DEFUN (show_ip_bgp_instance_all_summary,
  */
 DEFUN (show_ip_bgp_ipv4_summary,
        show_ip_bgp_ipv4_summary_cmd,
-       "show ip bgp ipv4 (unicast|multicast) summary {json}",
+       "show ip bgp ipv4 (unicast|multicast) summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10835,7 +10835,7 @@ DEFUN (show_ip_bgp_ipv4_summary,
 
 DEFUN (show_bgp_ipv4_vpn_summary,
        show_bgp_ipv4_vpn_summary_cmd,
-       "show bgp ipv4 vpn summary {json}",
+       "show bgp ipv4 vpn summary [json]",
        SHOW_STR
        BGP_STR
        "IPv4\n"
@@ -10849,7 +10849,7 @@ DEFUN (show_bgp_ipv4_vpn_summary,
 /* `show ip bgp summary' commands. */
 DEFUN (show_bgp_ipv6_vpn_summary,
        show_bgp_ipv6_vpn_summary_cmd,
-       "show bgp ipv6 vpn summary {json}",
+       "show bgp ipv6 vpn summary [json]",
        SHOW_STR
        BGP_STR
        "IPv6\n"
@@ -10862,7 +10862,7 @@ DEFUN (show_bgp_ipv6_vpn_summary,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp view WORD ipv4 (unicast|multicast) summary {json}",
+ * "show bgp view WORD ipv4 (unicast|multicast) summary [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "BGP view\n"
@@ -10875,7 +10875,7 @@ DEFUN (show_bgp_ipv6_vpn_summary,
  */
 DEFUN (show_ip_bgp_instance_ipv4_summary,
        show_ip_bgp_instance_ipv4_summary_cmd,
-       "show ip bgp view WORD ipv4 (unicast|multicast) summary {json}",
+       "show ip bgp view WORD ipv4 (unicast|multicast) summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10897,7 +10897,7 @@ DEFUN (show_ip_bgp_instance_ipv4_summary,
 
 DEFUN (show_ip_bgp_vpnv4_all_summary,
        show_ip_bgp_vpnv4_all_summary_cmd,
-       "show ip bgp vpnv4 all summary {json}",
+       "show ip bgp vpnv4 all summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10912,7 +10912,7 @@ DEFUN (show_ip_bgp_vpnv4_all_summary,
 
 DEFUN (show_ip_bgp_vpnv4_rd_summary,
        show_ip_bgp_vpnv4_rd_summary_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn summary {json}",
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -10939,7 +10939,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_summary,
 #ifdef HAVE_IPV6
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show bgp ipv6 summary {json}",
+ * "show bgp ipv6 summary [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -10948,7 +10948,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_summary,
  */
 DEFUN (show_bgp_summary,
        show_bgp_summary_cmd,
-       "show bgp summary {json}",
+       "show bgp summary [json]",
        SHOW_STR
        BGP_STR
        "Summary of BGP neighbor status\n"
@@ -10959,7 +10959,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 " BGP_INSTANCE_CMD " ipv6 summary [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -10969,7 +10969,7 @@ DEFUN (show_bgp_summary,
  */
 DEFUN (show_bgp_instance_summary,
        show_bgp_instance_summary_cmd,
-       "show bgp " BGP_INSTANCE_CMD " summary {json}",
+       "show bgp " BGP_INSTANCE_CMD " summary [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -10981,7 +10981,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 " BGP_INSTANCE_ALL_CMD " summary [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_ALL_HELP_STR
@@ -10998,7 +10998,7 @@ DEFUN (show_bgp_instance_all_summary,
 
 DEFUN (show_bgp_ipv6_safi_summary,
        show_bgp_ipv6_safi_summary_cmd,
-       "show bgp ipv6 (unicast|multicast) summary {json}",
+       "show bgp ipv6 (unicast|multicast) summary [json]",
        SHOW_STR
        BGP_STR
        "Address family\n"
@@ -11016,7 +11016,7 @@ DEFUN (show_bgp_ipv6_safi_summary,
 
 DEFUN (show_bgp_instance_ipv6_safi_summary,
        show_bgp_instance_ipv6_safi_summary_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 (unicast|multicast) summary {json}",
+       "show bgp " BGP_INSTANCE_CMD " ipv6 (unicast|multicast) summary [json]",
        SHOW_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
@@ -11036,7 +11036,7 @@ DEFUN (show_bgp_instance_ipv6_safi_summary,
 /* old command */
 DEFUN (show_ipv6_bgp_summary,
        show_ipv6_bgp_summary_cmd,
-       "show ipv6 bgp summary {json}",
+       "show ipv6 bgp summary [json]",
        SHOW_STR
        IPV6_STR
        BGP_STR
@@ -11050,7 +11050,7 @@ DEFUN (show_ipv6_bgp_summary,
 /* old command */
 DEFUN (show_ipv6_mbgp_summary,
        show_ipv6_mbgp_summary_cmd,
-       "show ipv6 mbgp summary {json}",
+       "show ipv6 mbgp summary [json]",
        SHOW_STR
        IPV6_STR
        MBGP_STR
@@ -12894,7 +12894,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
 /* "show ip bgp neighbors" commands.  */
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors {json}",
+ * "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12904,13 +12904,13 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
  *     "Detailed information on TCP and BGP neighbor connections\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp neighbors {json}",
+ * "show bgp neighbors [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Detailed information on TCP and BGP neighbor connections\n"
  *     "JavaScript Object Notation\n"
  *
- * "show ip bgp vpnv4 all neighbors {json}",
+ * "show ip bgp vpnv4 all neighbors [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12919,7 +12919,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
  *     "Detailed information on TCP and BGP neighbor connections\n"
  *     "JavaScript Object Notation\n"
  *
- * "show ip bgp ipv4 (unicast|multicast) neighbors {json}",
+ * "show ip bgp ipv4 (unicast|multicast) neighbors [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12929,7 +12929,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
  *     "Detailed information on TCP and BGP neighbor connections\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp ipv6 neighbors {json}",
+ * "show bgp ipv6 neighbors [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -12939,7 +12939,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
  */
 DEFUN (show_ip_bgp_neighbors,
        show_ip_bgp_neighbors_cmd,
-       "show ip bgp neighbors {json}",
+       "show ip bgp neighbors [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -12958,7 +12958,7 @@ DEFUN (show_ip_bgp_neighbors,
 
 /*
  * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12971,7 +12971,7 @@ DEFUN (show_ip_bgp_neighbors,
  *     "Neighbor on bgp configured interface\n"
  *     "JavaScript Object Notation\n"
  *
- * "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D {json}",
+ * "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12981,7 +12981,7 @@ DEFUN (show_ip_bgp_neighbors,
  *     "Neighbor to display information about\n"
  *     "JavaScript Object Notation\n"
  *
- * "show ip bgp vpnv4 all neighbors A.B.C.D {json}",
+ * "show ip bgp vpnv4 all neighbors A.B.C.D [json]",
  *     SHOW_STR
  *     IP_STR
  *     BGP_STR
@@ -12991,7 +12991,7 @@ DEFUN (show_ip_bgp_neighbors,
  *     "Neighbor to display information about\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Address family\n"
@@ -13001,7 +13001,7 @@ DEFUN (show_ip_bgp_neighbors,
  *     "Neighbor on bgp configured interface\n"
  *     "JavaScript Object Notation\n"
  *
- * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     "Detailed information on TCP and BGP neighbor connections\n"
@@ -13013,7 +13013,7 @@ DEFUN (show_ip_bgp_neighbors,
  */
 DEFUN (show_ip_bgp_neighbors_peer,
        show_ip_bgp_neighbors_peer_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13035,14 +13035,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 " BGP_INSTANCE_CMD " 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 " BGP_INSTANCE_CMD " ipv6 neighbors [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13053,7 +13053,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 " BGP_INSTANCE_CMD " neighbors [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13068,7 +13068,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 " BGP_INSTANCE_ALL_CMD " neighbors [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -13086,7 +13086,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 " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13097,7 +13097,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 " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
  *     SHOW_STR
  *     BGP_STR
  *     BGP_INSTANCE_HELP_STR
@@ -13110,7 +13110,7 @@ DEFUN (show_ip_bgp_instance_all_neighbors,
  */
 DEFUN (show_ip_bgp_instance_neighbors_peer,
        show_ip_bgp_instance_neighbors_peer_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) [json]",
        SHOW_STR
        IP_STR
        BGP_STR

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index e88f9789e06573843acf9c59796e759589cd2b57..e34c0bbeb395cda9fbcd00c25aeed722b6a2649f 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3601,7 +3601,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
 
 DEFUN (show_ip_ospf,
        show_ip_ospf_cmd,
-       "show ip ospf {json}",
+       "show ip ospf [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -3618,7 +3618,7 @@ DEFUN (show_ip_ospf,
 
 DEFUN (show_ip_ospf_instance,
        show_ip_ospf_instance_cmd,
-       "show ip ospf <1-65535> {json}",
+       "show ip ospf <1-65535> [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4009,7 +4009,7 @@ show_ip_ospf_interface_common (struct vty *vty, struct ospf *ospf, int argc,
 
 DEFUN (show_ip_ospf_interface,
        show_ip_ospf_interface_cmd,
-       "show ip ospf interface [INTERFACE] {json}",
+       "show ip ospf interface [INTERFACE] [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4028,7 +4028,7 @@ DEFUN (show_ip_ospf_interface,
 
 DEFUN (show_ip_ospf_instance_interface,
        show_ip_ospf_instance_interface_cmd,
-       "show ip ospf <1-65535> interface [INTERFACE] {json}",
+       "show ip ospf <1-65535> interface [INTERFACE] [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4166,7 +4166,7 @@ show_ip_ospf_neighbor_common (struct vty *vty, struct ospf *ospf, u_char use_jso
 
 DEFUN (show_ip_ospf_neighbor,
        show_ip_ospf_neighbor_cmd,
-       "show ip ospf neighbor {json}",
+       "show ip ospf neighbor [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4185,7 +4185,7 @@ DEFUN (show_ip_ospf_neighbor,
 
 DEFUN (show_ip_ospf_instance_neighbor,
        show_ip_ospf_instance_neighbor_cmd,
-       "show ip ospf <1-65535> neighbor {json}",
+       "show ip ospf <1-65535> neighbor [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4277,7 +4277,7 @@ show_ip_ospf_neighbor_all_common (struct vty *vty, struct ospf *ospf, u_char use
 
 DEFUN (show_ip_ospf_neighbor_all,
        show_ip_ospf_neighbor_all_cmd,
-       "show ip ospf neighbor all {json}",
+       "show ip ospf neighbor all [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4296,7 +4296,7 @@ DEFUN (show_ip_ospf_neighbor_all,
 
 DEFUN (show_ip_ospf_instance_neighbor_all,
        show_ip_ospf_instance_neighbor_all_cmd,
-       "show ip ospf <1-65535> neighbor all {json}",
+       "show ip ospf <1-65535> neighbor all [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4371,7 +4371,7 @@ show_ip_ospf_neighbor_int_common (struct vty *vty, struct ospf *ospf, int arg_ba
 
 DEFUN (show_ip_ospf_neighbor_int,
        show_ip_ospf_neighbor_int_cmd,
-       "show ip ospf neighbor IFNAME {json}",
+       "show ip ospf neighbor IFNAME [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4390,7 +4390,7 @@ DEFUN (show_ip_ospf_neighbor_int,
 
 DEFUN (show_ip_ospf_instance_neighbor_int,
        show_ip_ospf_instance_neighbor_int_cmd,
-       "show ip ospf <1-65535> neighbor IFNAME {json}",
+       "show ip ospf <1-65535> neighbor IFNAME [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4737,7 +4737,7 @@ show_ip_ospf_neighbor_id_common (struct vty *vty, struct ospf *ospf,
 
 DEFUN (show_ip_ospf_neighbor_id,
        show_ip_ospf_neighbor_id_cmd,
-       "show ip ospf neighbor A.B.C.D {json}",
+       "show ip ospf neighbor A.B.C.D [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4756,7 +4756,7 @@ DEFUN (show_ip_ospf_neighbor_id,
 
 DEFUN (show_ip_ospf_instance_neighbor_id,
        show_ip_ospf_instance_neighbor_id_cmd,
-       "show ip ospf <1-65535> neighbor A.B.C.D {json}",
+       "show ip ospf <1-65535> neighbor A.B.C.D [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4828,7 +4828,7 @@ show_ip_ospf_neighbor_detail_common (struct vty *vty, struct ospf *ospf, u_char
 
 DEFUN (show_ip_ospf_neighbor_detail,
        show_ip_ospf_neighbor_detail_cmd,
-       "show ip ospf neighbor detail {json}",
+       "show ip ospf neighbor detail [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4847,7 +4847,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
 
 DEFUN (show_ip_ospf_instance_neighbor_detail,
        show_ip_ospf_instance_neighbor_detail_cmd,
-       "show ip ospf <1-65535> neighbor detail {json}",
+       "show ip ospf <1-65535> neighbor detail [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4925,7 +4925,7 @@ show_ip_ospf_neighbor_detail_all_common (struct vty *vty, struct ospf *ospf, u_c
 
 DEFUN (show_ip_ospf_neighbor_detail_all,
        show_ip_ospf_neighbor_detail_all_cmd,
-       "show ip ospf neighbor detail all {json}",
+       "show ip ospf neighbor detail all [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -4945,7 +4945,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
 
 DEFUN (show_ip_ospf_instance_neighbor_detail_all,
        show_ip_ospf_instance_neighbor_detail_all_cmd,
-       "show ip ospf <1-65535> neighbor detail all {json}",
+       "show ip ospf <1-65535> neighbor detail all [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -5027,7 +5027,7 @@ show_ip_ospf_neighbor_int_detail_common (struct vty *vty, struct ospf *ospf,
 
 DEFUN (show_ip_ospf_neighbor_int_detail,
        show_ip_ospf_neighbor_int_detail_cmd,
-       "show ip ospf neighbor IFNAME detail {json}",
+       "show ip ospf neighbor IFNAME detail [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -5047,7 +5047,7 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
 
 DEFUN (show_ip_ospf_instance_neighbor_int_detail,
        show_ip_ospf_instance_neighbor_int_detail_cmd,
-       "show ip ospf <1-65535> neighbor IFNAME detail {json}",
+       "show ip ospf <1-65535> neighbor IFNAME detail [json]",
        SHOW_STR
        IP_STR
        "OSPF information\n"

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 491abbba4ab99bd400bf3b5a55a9cc1839e2631c..f4a663ab3abffaa020bc4d896c6c1434290dd458 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -2342,7 +2342,7 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib,
 
 DEFUN (show_ip_route,
        show_ip_route_cmd,
-       "show ip route {json}",
+       "show ip route [json]",
        SHOW_STR
        IP_STR
        "IP routing table\n")
@@ -2436,7 +2436,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_CMD_STR " [json]",
        SHOW_STR
        IP_STR
        "IP routing table\n"
@@ -4776,7 +4776,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_CMD_STR " [json]",
  *     SHOW_STR
  *     IP_STR
  *     "IPv6 routing table\n"
@@ -4785,7 +4785,7 @@ DEFUN (no_ipv6_route_ifname_flags_pref_tag_vrf,
  */
 DEFUN (show_ipv6_route,
        show_ipv6_route_cmd,
-       "show ipv6 route {json}",
+       "show ipv6 route [json]",
        SHOW_STR
        IP_STR
        "IPv6 routing table\n")