bgpd: Some more cleanup of commands found by vtysh

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 6d8f721bfbc933cebfe01a6a90186b2c66d0ce9a..08a4db79fa0e8d949b6e18ff0245287a6a9c6838 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7846,28 +7846,12 @@ bgp_show_route (struct vty *vty, const char *view_name, const char *ip_str,
 /* BGP route print out function. */
 DEFUN (show_ip_bgp_ipv4,
        show_ip_bgp_ipv4_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]]\
-          [<\
-             cidr-only\
-             |dampening <flap-statistics|dampened-paths|parameters>\
-             |route-map WORD\
-             |prefix-list WORD\
-             |filter-list WORD\
-             |community [<AA:NN|local-AS|no-advertise|no-export> [exact-match]]\
-             |community-list <(1-500)|WORD> [exact-match]\
-             |A.B.C.D/M longer-prefixes\
-             |X:X::X:X/M longer-prefixes\
-           >]\
-          [json]",
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6>] [<unicast|multicast|vpn|encap>] [<cidr-only|dampening <flap-statistics|dampened-paths|parameters>|route-map WORD|prefix-list WORD|filter-list WORD|community [<AA:NN|local-AS|no-advertise|no-export> [exact-match]]|community-list <(1-500)|WORD> [exact-match]|A.B.C.D/M longer-prefixes|X:X::X:X/M longer-prefixes>] [json]",
        SHOW_STR
        IP_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
        "Address Family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
@@ -7993,17 +7977,13 @@ DEFUN (show_ip_bgp_ipv4,
 
 DEFUN (show_ip_bgp_route,
        show_ip_bgp_route_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]]"
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6>] [<unicast|multicast|vpn|encap>]"
        "<A.B.C.D|A.B.C.D/M|X:X::X:X|X:X::X:X/M> [<bestpath|multipath>] [json]",
        SHOW_STR
        IP_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
        "Address Family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 5f56f510287948f95317cdd138271a2b0da193ec..b3b3e44d2ce9ef0e267bf5bf0258bd705e8b3d7b 100644 (file)
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -375,7 +375,7 @@ set_ecom_list (
 
 DEFUN (vnc_defaults_rt_import,
        vnc_defaults_rt_import_cmd,
-       "rt import .RTLIST",
+       "rt import RTLIST",
        "Specify default route targets\n"
        "Import filter\n"
        "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n")
@@ -387,7 +387,7 @@ DEFUN (vnc_defaults_rt_import,
 
 DEFUN (vnc_defaults_rt_export,
        vnc_defaults_rt_export_cmd,
-       "rt export .RTLIST",
+       "rt export RTLIST",
        "Configure default route targets\n"
        "Export filter\n"
        "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n")
@@ -399,7 +399,7 @@ DEFUN (vnc_defaults_rt_export,
 
 DEFUN (vnc_defaults_rt_both,
        vnc_defaults_rt_both_cmd,
-       "rt both .RTLIST",
+       "rt both RTLIST",
        "Configure default route targets\n"
        "Export+import filters\n"
        "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n")
@@ -473,7 +473,7 @@ DEFUN (vnc_defaults_rd,
 
 DEFUN (vnc_defaults_l2rd,
        vnc_defaults_l2rd_cmd,
-       "l2rd <ID|auto:vn>",
+       "l2rd <(1-255)|auto-vn>",
        "Specify default Local Nve ID value to use in RD for L2 routes\n"
        "Fixed value 1-255\n"
        "use the low-order octet of the NVE's VN address\n")
@@ -481,7 +481,7 @@ DEFUN (vnc_defaults_l2rd,
   VTY_DECLVAR_CONTEXT(bgp, bgp);
   uint8_t value = 0;
 
-  if (!strcmp (argv[1]->arg, "auto:vn"))
+  if (!strcmp (argv[1]->arg, "auto-vn"))
     {
       value = 0;
     }
@@ -1076,7 +1076,7 @@ DEFUN (vnc_redistribute_lifetime,
        vnc_redistribute_lifetime_cmd,
        "vnc redistribute lifetime <LIFETIME|infinite>",
        VNC_CONFIG_STR
-       "Redistribute"
+       "Redistribute\n"
        "Assign a lifetime to routes redistributed from another routing protocol\n"
        "lifetime value (32 bit)\n"
        "Allow lifetime to never expire\n")
@@ -2833,7 +2833,7 @@ DEFUN (vnc_nve_group_prefix,
 
 DEFUN (vnc_nve_group_rt_import,
        vnc_nve_group_rt_import_cmd,
-       "rt import .RTLIST",
+       "rt import RTLIST",
        "Specify route targets\n"
        "Import filter\n"
        "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n")
@@ -2903,7 +2903,7 @@ DEFUN (vnc_nve_group_rt_import,
 
 DEFUN (vnc_nve_group_rt_export,
        vnc_nve_group_rt_export_cmd,
-       "rt export .RTLIST",
+       "rt export RTLIST",
        "Specify route targets\n"
        "Export filter\n"
        "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n")
@@ -2937,7 +2937,7 @@ DEFUN (vnc_nve_group_rt_export,
 
 DEFUN (vnc_nve_group_rt_both,
        vnc_nve_group_rt_both_cmd,
-       "rt both .RTLIST",
+       "rt both RTLIST",
        "Specify route targets\n"
        "Export+import filters\n"
        "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n")
@@ -3023,7 +3023,7 @@ DEFUN (vnc_nve_group_rt_both,
 
 DEFUN (vnc_nve_group_l2rd,
        vnc_nve_group_l2rd_cmd,
-       "l2rd <ID|auto:vn>",
+       "l2rd <(1-255)|auto-vn>",
        "Specify default Local Nve ID value to use in RD for L2 routes\n"
        "Fixed value 1-255\n"
        "use the low-order octet of the NVE's VN address\n")
@@ -3364,7 +3364,7 @@ DEFUN (vnc_l2_group_lni,
 
 DEFUN (vnc_l2_group_labels,
        vnc_l2_group_labels_cmd,
-       "labels .LABELLIST",
+       "labels LABELLIST",
        "Specify label values associated with group\n"
        "Space separated list of label values <0-1048575>\n")
 {
@@ -3402,7 +3402,7 @@ DEFUN (vnc_l2_group_labels,
 
 DEFUN (vnc_l2_group_no_labels,
        vnc_l2_group_no_labels_cmd,
-       "no labels .LABELLIST",
+       "no labels LABELLIST",
        NO_STR
        "Remove label values associated with L2 group\n"
        "Specify label values associated with L2 group\n"

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 2efe2dec4947d54e1e46df7e1560768dc1254f2f..e8c6c0bae26cec2978b812504d602f20480c4769 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -2546,11 +2546,11 @@ register_add (
 }
 
 /************************************************************************
- *             Add prefix With .LNH_OPTIONS
+ *             Add prefix With LNH_OPTIONS
  ************************************************************************/
 DEFUN (add_vnc_prefix_cost_life_lnh,
        add_vnc_prefix_cost_life_lnh_cmd,
-       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295) .LNH_OPTIONS",
+       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295) LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
        "Add/modify prefix related information\n"
@@ -2576,7 +2576,7 @@ DEFUN (add_vnc_prefix_cost_life_lnh,
 
 DEFUN (add_vnc_prefix_life_cost_lnh,
        add_vnc_prefix_life_cost_lnh_cmd,
-       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) cost (0-255) .LNH_OPTIONS",
+       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) cost (0-255) LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
        "Add/modify prefix related information\n"
@@ -2602,7 +2602,7 @@ DEFUN (add_vnc_prefix_life_cost_lnh,
 
 DEFUN (add_vnc_prefix_cost_lnh,
        add_vnc_prefix_cost_lnh_cmd,
-       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) .LNH_OPTIONS",
+       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
        "Add/modify prefix related information\n"
@@ -2626,7 +2626,7 @@ DEFUN (add_vnc_prefix_cost_lnh,
 
 DEFUN (add_vnc_prefix_life_lnh,
        add_vnc_prefix_life_lnh_cmd,
-       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) .LNH_OPTIONS",
+       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
        "Add/modify prefix related information\n"
@@ -2650,7 +2650,7 @@ DEFUN (add_vnc_prefix_life_lnh,
 
 DEFUN (add_vnc_prefix_lnh,
        add_vnc_prefix_lnh_cmd,
-       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> .LNH_OPTIONS",
+       "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
        "Add/modify prefix related information\n"
@@ -2671,7 +2671,7 @@ DEFUN (add_vnc_prefix_lnh,
 }
 
 /************************************************************************
- *             Add prefix Without .LNH_OPTIONS
+ *             Add prefix Without LNH_OPTIONS
  ************************************************************************/
 DEFUN (add_vnc_prefix_cost_life,
        add_vnc_prefix_cost_life_cmd,

diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index ec57176224f20b0c8b5672d333754759236b9fac..b5ff5bbc8863dcc651593634cae33c5ad2a62273 100644 (file)
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -95,7 +95,7 @@ DEFUN (no_debug_bgp_vnc,
        "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",
        NO_STR
        DEBUG_STR
-       "Undebug"
+       "Undebug\n"
        BGP_STR
        VNC_STR
        "rfapi query handling\n"