bgpd: Fixup some vnc cli

Fixup the vnc cli to use the new syntax as well as fixup a bunch
of cli help strings that were wrong.

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

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index faa35503b3960578d297a1b9fb7a2b1b05bdb2a9..5f56f510287948f95317cdd138271a2b0da193ec 100644 (file)
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -291,7 +291,7 @@ bgp_rfapi_is_vnc_configured (struct bgp *bgp)
 
 DEFUN (vnc_advertise_un_method,
        vnc_advertise_un_method_cmd,
-       "vnc advertise-un-method (encap-safi|encap-attr)",
+       "vnc advertise-un-method <encap-safi|encap-attr>",
        VNC_CONFIG_STR
        "Method of advertising UN addresses\n"
        "Via Encapsulation SAFI\n"
@@ -473,7 +473,7 @@ DEFUN (vnc_defaults_rd,
 
 DEFUN (vnc_defaults_l2rd,
        vnc_defaults_l2rd_cmd,
-       "l2rd (ID|auto:vn)",
+       "l2rd <ID|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")
@@ -527,7 +527,7 @@ DEFUN (vnc_defaults_no_l2rd,
 
 DEFUN (vnc_defaults_responselifetime,
        vnc_defaults_responselifetime_cmd,
-       "response-lifetime (LIFETIME|infinite)",
+       "response-lifetime <LIFETIME|infinite>",
        "Specify default response lifetime\n"
        "Response lifetime in seconds\n" "Infinite response lifetime\n")
 {
@@ -779,7 +779,7 @@ vnc_redistribute_postchange (struct bgp *bgp)
 
 DEFUN (vnc_redistribute_rh_roo_localadmin,
        vnc_redistribute_rh_roo_localadmin_cmd,
-       "vnc redistribute resolve-nve roo-ec-local-admin <0-65535>",
+       "vnc redistribute resolve-nve roo-ec-local-admin (0-65535)",
        VNC_CONFIG_STR
        "Redistribute routes into VNC\n"
        "Resolve-NVE mode\n"
@@ -835,7 +835,7 @@ DEFUN (vnc_redistribute_rh_roo_localadmin,
 
 DEFUN (vnc_redistribute_mode,
        vnc_redistribute_mode_cmd,
-       "vnc redistribute mode (nve-group|plain|resolve-nve)",
+       "vnc redistribute mode <nve-group|plain|resolve-nve>",
        VNC_CONFIG_STR
        "Redistribute routes into VNC\n"
        "Redistribution mode\n"
@@ -883,7 +883,7 @@ DEFUN (vnc_redistribute_mode,
 
 DEFUN (vnc_redistribute_protocol,
        vnc_redistribute_protocol_cmd,
-       "vnc redistribute (ipv4|ipv6) (bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static)",
+       "vnc redistribute <ipv4|ipv6> <bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static>",
        VNC_CONFIG_STR
        "Redistribute routes into VNC\n"
        "IPv4 routes\n"
@@ -930,7 +930,7 @@ DEFUN (vnc_redistribute_protocol,
 
 DEFUN (vnc_no_redistribute_protocol,
        vnc_no_redistribute_protocol_cmd,
-       "no vnc redistribute (ipv4|ipv6) (bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static)",
+       "no vnc redistribute <ipv4|ipv6> <bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static>",
        NO_STR
        VNC_CONFIG_STR
        "Redistribute from other protocol\n"
@@ -977,7 +977,7 @@ DEFUN (vnc_no_redistribute_protocol,
 
 DEFUN (vnc_redistribute_bgp_exterior,
        vnc_redistribute_bgp_exterior_cmd,
-       "vnc redistribute (ipv4|ipv6) bgp-direct-to-nve-groups view NAME",
+       "vnc redistribute <ipv4|ipv6> bgp-direct-to-nve-groups view NAME",
        VNC_CONFIG_STR
        "Redistribute routes into VNC\n"
        "IPv4 routes\n"
@@ -1074,10 +1074,12 @@ DEFUN (vnc_redistribute_no_nvegroup,
 
 DEFUN (vnc_redistribute_lifetime,
        vnc_redistribute_lifetime_cmd,
-       "vnc redistribute lifetime (LIFETIME|infinite)",
+       "vnc redistribute lifetime <LIFETIME|infinite>",
        VNC_CONFIG_STR
+       "Redistribute"
        "Assign a lifetime to routes redistributed from another routing protocol\n"
-       "lifetime value (32 bit)\n")
+       "lifetime value (32 bit)\n"
+       "Allow lifetime to never expire\n")
 {
   VTY_DECLVAR_CONTEXT(bgp, bgp);
 
@@ -1108,7 +1110,7 @@ DEFUN (vnc_redistribute_lifetime,
 
 DEFUN (vnc_redist_bgpdirect_no_prefixlist,
        vnc_redist_bgpdirect_no_prefixlist_cmd,
-       "no vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) (ipv4|ipv6) prefix-list",
+       "no vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> <ipv4|ipv6> prefix-list",
        NO_STR
        VNC_CONFIG_STR
        "Redistribute from other protocol\n"
@@ -1160,7 +1162,7 @@ DEFUN (vnc_redist_bgpdirect_no_prefixlist,
 
 DEFUN (vnc_redist_bgpdirect_prefixlist,
        vnc_redist_bgpdirect_prefixlist_cmd,
-       "vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) (ipv4|ipv6) prefix-list NAME",
+       "vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> <ipv4|ipv6> prefix-list NAME",
        VNC_CONFIG_STR
        "Redistribute from other protocol\n"
        "Redistribute from BGP directly\n"
@@ -1213,7 +1215,7 @@ DEFUN (vnc_redist_bgpdirect_prefixlist,
 
 DEFUN (vnc_redist_bgpdirect_no_routemap,
        vnc_redist_bgpdirect_no_routemap_cmd,
-       "no vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) route-map",
+       "no vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> route-map",
        NO_STR
        VNC_CONFIG_STR
        "Redistribute from other protocols\n"
@@ -1254,7 +1256,7 @@ DEFUN (vnc_redist_bgpdirect_no_routemap,
 
 DEFUN (vnc_redist_bgpdirect_routemap,
        vnc_redist_bgpdirect_routemap_cmd,
-       "vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) route-map NAME",
+       "vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> route-map NAME",
        VNC_CONFIG_STR
        "Redistribute from other protocols\n"
        "Redistribute from BGP directly\n"
@@ -1298,7 +1300,7 @@ DEFUN (vnc_redist_bgpdirect_routemap,
 
 DEFUN (vnc_nve_group_redist_bgpdirect_no_prefixlist,
        vnc_nve_group_redist_bgpdirect_no_prefixlist_cmd,
-       "no redistribute bgp-direct (ipv4|ipv6) prefix-list",
+       "no redistribute bgp-direct <ipv4|ipv6> prefix-list",
        NO_STR
        "Redistribute from other protocol\n"
        "Redistribute from BGP directly\n"
@@ -1347,7 +1349,7 @@ DEFUN (vnc_nve_group_redist_bgpdirect_no_prefixlist,
 
 DEFUN (vnc_nve_group_redist_bgpdirect_prefixlist,
        vnc_nve_group_redist_bgpdirect_prefixlist_cmd,
-       "redistribute bgp-direct (ipv4|ipv6) prefix-list NAME",
+       "redistribute bgp-direct <ipv4|ipv6> prefix-list NAME",
        "Redistribute from other protocol\n"
        "Redistribute from BGP directly\n"
        "IPv4 routes\n"
@@ -1478,7 +1480,7 @@ DEFUN (vnc_nve_group_redist_bgpdirect_routemap,
 
 DEFUN (vnc_export_mode,
        vnc_export_mode_cmd,
-       "vnc export (bgp|zebra) mode (group-nve|ce|none|registering-nve)",
+       "vnc export <bgp|zebra> mode <group-nve|ce|none|registering-nve>",
        VNC_CONFIG_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -1603,7 +1605,7 @@ rfgn_free (struct rfapi_rfg_name *rfgn)
 
 DEFUN (vnc_export_nvegroup,
        vnc_export_nvegroup_cmd,
-       "vnc export (bgp|zebra) group-nve group NAME",
+       "vnc export <bgp|zebra> group-nve group NAME",
        VNC_CONFIG_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -1704,7 +1706,7 @@ DEFUN (vnc_export_nvegroup,
  */
 DEFUN (vnc_no_export_nvegroup,
        vnc_no_export_nvegroup_cmd,
-       "vnc export (bgp|zebra) group-nve no group NAME",
+       "vnc export <bgp|zebra> group-nve no group NAME",
        VNC_CONFIG_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -1764,7 +1766,7 @@ DEFUN (vnc_no_export_nvegroup,
 
 DEFUN (vnc_nve_group_export_no_prefixlist,
        vnc_nve_group_export_no_prefixlist_cmd,
-       "no export (bgp|zebra) (ipv4|ipv6) prefix-list [NAME]",
+       "no export <bgp|zebra> <ipv4|ipv6> prefix-list [NAME]",
        NO_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -1834,7 +1836,7 @@ DEFUN (vnc_nve_group_export_no_prefixlist,
 
 DEFUN (vnc_nve_group_export_prefixlist,
        vnc_nve_group_export_prefixlist_cmd,
-       "export (bgp|zebra) (ipv4|ipv6) prefix-list NAME",
+       "export <bgp|zebra> <ipv4|ipv6> prefix-list NAME",
        "Export to other protocols\n"
        "Export to BGP\n"
        "Export to Zebra (experimental)\n"
@@ -1893,7 +1895,7 @@ DEFUN (vnc_nve_group_export_prefixlist,
 
 DEFUN (vnc_nve_group_export_no_routemap,
        vnc_nve_group_export_no_routemap_cmd,
-       "no export (bgp|zebra) route-map [NAME]",
+       "no export <bgp|zebra> route-map [NAME]",
        NO_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -1953,7 +1955,7 @@ DEFUN (vnc_nve_group_export_no_routemap,
 
 DEFUN (vnc_nve_group_export_routemap,
        vnc_nve_group_export_routemap_cmd,
-       "export (bgp|zebra) route-map NAME",
+       "export <bgp|zebra> route-map NAME",
        "Export to other protocols\n"
        "Export to BGP\n"
        "Export to Zebra (experimental)\n"
@@ -1999,7 +2001,7 @@ DEFUN (vnc_nve_group_export_routemap,
 
 DEFUN (vnc_nve_export_no_prefixlist,
        vnc_nve_export_no_prefixlist_cmd,
-       "no vnc export (bgp|zebra) (ipv4|ipv6) prefix-list [NAME]",
+       "no vnc export <bgp|zebra> <ipv4|ipv6> prefix-list [NAME]",
        NO_STR
        VNC_CONFIG_STR
        "Export to other protocols\n"
@@ -2061,7 +2063,7 @@ DEFUN (vnc_nve_export_no_prefixlist,
 
 DEFUN (vnc_nve_export_prefixlist,
        vnc_nve_export_prefixlist_cmd,
-       "vnc export (bgp|zebra) (ipv4|ipv6) prefix-list NAME",
+       "vnc export <bgp|zebra> <ipv4|ipv6> prefix-list NAME",
        VNC_CONFIG_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -2111,7 +2113,7 @@ DEFUN (vnc_nve_export_prefixlist,
 
 DEFUN (vnc_nve_export_no_routemap,
        vnc_nve_export_no_routemap_cmd,
-       "no vnc export (bgp|zebra) route-map [NAME]",
+       "no vnc export <bgp|zebra> route-map [NAME]",
        NO_STR
        VNC_CONFIG_STR
        "Export to other protocols\n"
@@ -2163,7 +2165,7 @@ DEFUN (vnc_nve_export_no_routemap,
 
 DEFUN (vnc_nve_export_routemap,
        vnc_nve_export_routemap_cmd,
-       "vnc export (bgp|zebra) route-map NAME",
+       "vnc export <bgp|zebra> route-map NAME",
        VNC_CONFIG_STR
        "Export to other protocols\n"
        "Export to BGP\n"
@@ -2710,7 +2712,7 @@ DEFUN (vnc_no_nve_group,
 
 DEFUN (vnc_nve_group_prefix,
        vnc_nve_group_prefix_cmd,
-       "prefix (vn|un) (A.B.C.D/M|X:X::X:X/M)",
+       "prefix <vn|un> <A.B.C.D/M|X:X::X:X/M>",
        "Specify prefixes matching NVE VN or UN interfaces\n"
        "VN prefix\n"
        "UN prefix\n"
@@ -3021,7 +3023,7 @@ DEFUN (vnc_nve_group_rt_both,
 
 DEFUN (vnc_nve_group_l2rd,
        vnc_nve_group_l2rd_cmd,
-       "l2rd (ID|auto:vn)",
+       "l2rd <ID|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")
@@ -3168,7 +3170,7 @@ DEFUN (vnc_nve_group_rd,
 
 DEFUN (vnc_nve_group_responselifetime,
        vnc_nve_group_responselifetime_cmd,
-       "response-lifetime (LIFETIME|infinite)",
+       "response-lifetime <LIFETIME|infinite>",
        "Specify response lifetime\n"
        "Response lifetime in seconds\n" "Infinite response lifetime\n")
 {
@@ -3340,7 +3342,7 @@ DEFUN (vnc_no_l2_group,
 
 DEFUN (vnc_l2_group_lni,
        vnc_l2_group_lni_cmd,
-       "logical-network-id <0-4294967295>",
+       "logical-network-id (0-4294967295)",
        "Specify Logical Network ID associated with group\n"
        "value\n")
 {
@@ -3439,7 +3441,7 @@ DEFUN (vnc_l2_group_no_labels,
 
 DEFUN (vnc_l2_group_rt,
        vnc_l2_group_rt_cmd,
-       "rt (both|export|import) ASN:nn_or_IP-address:nn",
+       "rt <both|export|import> ASN:nn_or_IP-address:nn",
        "Specify route targets\n"
        "Export+import filters\n"
        "Export filters\n"

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index 248ba7a63f065b62977b1a739b95900f2bf7e0c4..6d86d48b6e938391304dd70a277409a239aec5aa 100644 (file)
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -3061,13 +3061,15 @@ DEFUN (debug_rfapi_show_nves,
 DEFUN (
   debug_rfapi_show_nves_vn_un,
   debug_rfapi_show_nves_vn_un_cmd,
-  "debug rfapi-dev show nves (vn|un) (A.B.C.D|X:X::X:X)", /* prefix also ok */
+  "debug rfapi-dev show nves <vn|un> <A.B.C.D|X:X::X:X>", /* prefix also ok */
   DEBUG_STR
   DEBUG_RFAPI_STR
   SHOW_STR
   "NVE Information\n"
-  "Specify virtual network or underlay network interface\n"
-  "IPv4 or IPv6 address\n")
+  "Specify virtual network\n"
+  "Specify underlay network interface\n"
+  "IPv4 address\n"
+  "IPv6 address\n")
 {
   struct prefix pfx;
 
@@ -3125,13 +3127,16 @@ test_nexthops_callback (
 
 DEFUN (debug_rfapi_open,
        debug_rfapi_open_cmd,
-       "debug rfapi-dev open vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X)",
+       "debug rfapi-dev open vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_open\n"
        "indicate vn addr follows\n"
-       "virtual network interface address\n"
-       "indicate xt addr follows\n" "underlay network interface address\n")
+       "virtual network interface IPv4 address\n"
+       "virtual network interface IPv6 address\n"
+       "indicate xt addr follows\n"
+       "underlay network interface IPv4 address\n"
+       "underlay network interface IPv6 address\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3167,13 +3172,16 @@ DEFUN (debug_rfapi_open,
 
 DEFUN (debug_rfapi_close_vn_un,
        debug_rfapi_close_vn_un_cmd,
-       "debug rfapi-dev close vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X)",
+       "debug rfapi-dev close vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_close\n"
        "indicate vn addr follows\n"
-       "virtual network interface address\n"
-       "indicate xt addr follows\n" "underlay network interface address\n")
+       "virtual network interface IPv4 address\n"
+       "virtual network interface IPv6 address\n"
+       "indicate xt addr follows\n"
+       "underlay network interface IPv4 address\n"
+       "underlay network interface IPv6 address\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3239,7 +3247,7 @@ DEFUN (debug_rfapi_close_rfd,
 
 DEFUN (debug_rfapi_register_vn_un,
        debug_rfapi_register_vn_un_cmd,
-       "debug rfapi-dev register vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) prefix (A.B.C.D/M|X:X::X:X/M) lifetime SECONDS",
+       "debug rfapi-dev register vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> lifetime SECONDS",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_register\n"
@@ -3251,7 +3259,9 @@ DEFUN (debug_rfapi_register_vn_un,
        "underlay network IPv6 interface address\n"
        "indicate prefix follows\n"
        "IPv4 prefix\n"
-       "IPv6 prefix\n" "indicate lifetime follows\n" "lifetime\n")
+       "IPv6 prefix\n"
+       "indicate lifetime follows\n"
+       "lifetime\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3319,13 +3329,7 @@ DEFUN (debug_rfapi_register_vn_un,
 
 DEFUN (debug_rfapi_register_vn_un_l2o,
        debug_rfapi_register_vn_un_l2o_cmd,
-       "debug rfapi-dev register"
-       " vn (A.B.C.D|X:X::X:X)"
-       " un (A.B.C.D|X:X::X:X)"
-       " prefix (A.B.C.D/M|X:X::X:X/M)"
-       " lifetime SECONDS"
-       " macaddr YY:YY:YY:YY:YY:YY"
-       " lni <0-16777215>",
+       "debug rfapi-dev register vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> lifetime SECONDS macaddr YY:YY:YY:YY:YY:YY lni (0-16777215)",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_register\n"
@@ -3337,7 +3341,13 @@ DEFUN (debug_rfapi_register_vn_un_l2o,
        "underlay network IPv6 interface address\n"
        "indicate prefix follows\n"
        "IPv4 prefix\n"
-       "IPv6 prefix\n" "indicate lifetime follows\n" "lifetime\n")
+       "IPv6 prefix\n"
+       "indicate lifetime follows\n"
+       "Seconds of lifetime\n"
+       "indicate MAC address follows\n"
+       "MAC address\n"
+       "indicate lni follows\n"
+       "lni value range\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3430,7 +3440,7 @@ DEFUN (debug_rfapi_register_vn_un_l2o,
 
 DEFUN (debug_rfapi_unregister_vn_un,
        debug_rfapi_unregister_vn_un_cmd,
-       "debug rfapi-dev unregister vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) prefix (A.B.C.D/M|X:X::X:X/M)",
+       "debug rfapi-dev unregister vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_register\n"
@@ -3490,15 +3500,19 @@ DEFUN (debug_rfapi_unregister_vn_un,
 
 DEFUN (debug_rfapi_query_vn_un,
        debug_rfapi_query_vn_un_cmd,
-       "debug rfapi-dev query vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) target (A.B.C.D|X:X::X:X)",
+       "debug rfapi-dev query vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> target <A.B.C.D|X:X::X:X>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_query\n"
        "indicate vn addr follows\n"
-       "virtual network interface address\n"
-       "indicate xt addr follows\n"
-       "underlay network interface address\n"
-       "indicate target follows\n" "target\n")
+       "virtual network interface IPv4 address\n"
+       "virtual network interface IPv6 address\n"
+       "indicate un addr follows\n"
+       "IPv4 un address\n"
+       "IPv6 un address\n"
+       "indicate target follows\n"
+       "target IPv4 address\n"
+       "target IPv6 address\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3559,17 +3573,20 @@ DEFUN (debug_rfapi_query_vn_un,
 
 DEFUN (debug_rfapi_query_vn_un_l2o,
        debug_rfapi_query_vn_un_l2o_cmd,
-       "debug rfapi-dev query vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) lni LNI target YY:YY:YY:YY:YY:YY",
+       "debug rfapi-dev query vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lni LNI target YY:YY:YY:YY:YY:YY",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_query\n"
        "indicate vn addr follows\n"
-       "virtual network interface address\n"
+       "virtual network interface IPv4 address\n"
+       "virtual network interface IPv6 address\n"
        "indicate xt addr follows\n"
-       "underlay network interface address\n"
+       "underlay network interface IPv4 address\n"
+       "underlay network interface IPv6 address\n"
        "logical network ID follows\n"
        "logical network ID\n"
-       "indicate target MAC addr follows\n" "target MAC addr\n")
+       "indicate target MAC addr follows\n"
+       "target MAC addr\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3666,15 +3683,20 @@ DEFUN (debug_rfapi_query_vn_un_l2o,
 
 DEFUN (debug_rfapi_query_done_vn_un,
        debug_rfapi_query_vn_un_done_cmd,
-       "debug rfapi-dev query done vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) target (A.B.C.D|X:X::X:X)",
+       "debug rfapi-dev query done vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> target <A.B.C.D|X:X::X:X>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "rfapi_query_done\n"
+       "rfapi_query_done\n"
        "indicate vn addr follows\n"
-       "virtual network interface address\n"
+       "virtual network interface IPv4 address\n"
+       "virtual network interface IPv6 address\n"
        "indicate xt addr follows\n"
-       "underlay network interface address\n"
-       "indicate prefix follows\n" "prefix\n")
+       "underlay network interface IPv4 address\n"
+       "underlay network interface IPv6 address\n"
+       "indicate target follows\n"
+       "Target IPv4 address\n"
+       "Target IPv6 address\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3810,14 +3832,17 @@ DEFUN (debug_rfapi_show_import,
 
 DEFUN (debug_rfapi_show_import_vn_un,
        debug_rfapi_show_import_vn_un_cmd,
-       "debug rfapi-dev show import vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X)",
+       "debug rfapi-dev show import vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        SHOW_STR
        "import\n"
        "indicate vn addr follows\n"
-       "virtual network interface address\n"
-       "indicate xt addr follows\n" "underlay network interface address\n")
+       "virtual network interface IPv4 address\n"
+       "virtual network interface IPv6 address\n"
+       "indicate xt addr follows\n"
+       "underlay network interface IPv4 address\n"
+       "underlay network interface IPv6 address\n")
 {
   struct rfapi_ip_addr vn;
   struct rfapi_ip_addr un;
@@ -3862,7 +3887,7 @@ DEFUN (debug_rfapi_show_import_vn_un,
 
 DEFUN (debug_rfapi_response_omit_self,
        debug_rfapi_response_omit_self_cmd,
-       "debug rfapi-dev response-omit-self (on|off)",
+       "debug rfapi-dev response-omit-self <on|off>",
        DEBUG_STR
        DEBUG_RFAPI_STR
        "Omit self in RFP responses\n"

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 0b729ba30c0335afd6204c9141014c30797c20f6..2efe2dec4947d54e1e46df7e1560768dc1254f2f 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -3710,7 +3710,9 @@ DEFUN (clear_vnc_nve_all,
        clear_vnc_nve_all_cmd,
        "clear vnc nve *",
        "clear\n"
-       "VNC Information\n" "Clear per NVE information\n" "For all NVEs\n")
+       "VNC Information\n"
+       "Clear per NVE information\n"
+       "For all NVEs\n")
 {
 
   struct rfapi_local_reg_delete_arg cda;
@@ -3737,10 +3739,13 @@ DEFUN (clear_vnc_nve_vn_un,
        "VNC Information\n"
        "Clear prefix registration information\n"
        "VN address of NVE\n"
+       "For all NVEs\n"
        "VN IPv4 interface address\n"
        "VN IPv6 interface address\n"
        "UN address of NVE\n"
-       "UN IPv4 interface address\n" "UN IPv6 interface address\n")
+       "For all UN addresses\n"
+       "UN IPv4 interface address\n"
+       "UN IPv6 interface address\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -3767,10 +3772,13 @@ DEFUN (clear_vnc_nve_un_vn,
        "VNC Information\n"
        "Clear prefix registration information\n"
        "UN address of NVE\n"
+       "For all un NVEs\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
        "VN address of NVE\n"
-       "VN IPv4 interface address\n" "VN IPv6 interface address\n")
+       "For all vn NVEs\n"
+       "VN IPv4 interface address\n"
+       "VN IPv6 interface address\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -3797,7 +3805,9 @@ DEFUN (clear_vnc_nve_vn,
        "VNC Information\n"
        "Clear prefix registration information\n"
        "VN address of NVE\n"
-       "VN IPv4 interface address\n" "VN IPv6 interface address\n")
+       "All addresses\n"
+       "VN IPv4 interface address\n"
+       "VN IPv6 interface address\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -3822,7 +3832,9 @@ DEFUN (clear_vnc_nve_un,
        "VNC Information\n"
        "Clear prefix registration information\n"
        "UN address of NVE\n"
-       "UN IPv4 interface address\n" "UN IPv6 interface address\n")
+       "All un nves\n"
+       "UN IPv4 interface address\n"
+       "UN IPv6 interface address\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -4158,7 +4170,6 @@ DEFUN (clear_vnc_mac_vn_un_prefix,
        "VNI keyword\n"
        "Any virtual network identifier\n"
        "Virtual network identifier\n"
-       "Virtual network identifier\n"
        "VN address of NVE\n"
        "All VN addresses\n"
        "VN IPv4 interface address\n"
@@ -4204,7 +4215,15 @@ DEFUN (clear_vnc_mac_un_vn_prefix,
        "VN address of NVE\n"
        "All VN addresses\n"
        "VN IPv4 interface address\n"
-       "VN IPv6 interface address\n")
+       "VN IPv6 interface address\n"
+       "Clear prefix registration information\n"
+       "All prefixes\n"
+       "IPv4 prefix\n"
+       "IPv6 prefix\n"
+       "Clear prefix registration information\n"
+       "All prefixes\n"
+       "IPv4 prefix\n"
+       "IPv6 prefix\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -4234,7 +4253,11 @@ DEFUN (clear_vnc_mac_un_prefix,
        "UN address of NVE\n"
        "All UN addresses\n"
        "UN IPv4 interface address\n"
-       "UN IPv6 interface address\n")
+       "UN IPv6 interface address\n"
+       "Clear prefix registration information\n"
+       "All prefixes\n"
+       "IPv4 Prefix\n"
+       "IPv6 Prefix\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -4264,7 +4287,11 @@ DEFUN (clear_vnc_mac_vn_prefix,
        "UN address of NVE\n"
        "All VN addresses\n"
        "VN IPv4 interface address\n"
-       "VN IPv6 interface address\n")
+       "VN IPv6 interface address\n"
+       "Clear prefix registration information\n"
+       "All prefixes\n"
+       "IPv4 Prefix\n"
+       "IPv6 Prefix\n")
 {
   struct rfapi_local_reg_delete_arg cda;
   int rc;
@@ -4652,8 +4679,9 @@ DEFUN (vnc_show_registrations_pfx,
        SHOW_STR
        VNC_SHOW_STR
        "List active prefix registrations\n"
-       "Limit output to a particular prefix or address\n"
-       "Limit output to a particular prefix or address\n")
+       "Limit output to a particular IPv4 prefix\n"
+       "Limit output to a particular IPv6 prefix\n"
+       "Limit output to a particular IPv6 address\n")
 {
   struct prefix p;
   struct prefix *p_addr = NULL;
@@ -4686,7 +4714,8 @@ DEFUN (vnc_show_registrations_some_pfx,
          "show only imported prefixes\n"
          "show only local registrations\n"
          "show only remote registrations\n"
-         "Limit output to a particular prefix or address\n[A"
+         "Limit output to a particular prefix or address\n"
+         "Limit output to a particular prefix or address\n"
          "Limit output to a particular prefix or address\n")
 {
   struct prefix p;
@@ -4743,12 +4772,13 @@ DEFUN (vnc_show_registrations_some_pfx,
 
 DEFUN (vnc_show_responses_pfx,
        vnc_show_responses_pfx_cmd,
-         "show vnc responses [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]",
-         SHOW_STR
-         VNC_SHOW_STR
-         "List recent query responses\n"
-         "Limit output to a particular prefix or address\n"
-         "Limit output to a particular prefix or address\n")
+       "show vnc responses [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]",
+       SHOW_STR
+       VNC_SHOW_STR
+       "List recent query responses\n"
+       "Limit output to a particular IPv4 prefix\n"
+       "Limit output to a particular IPv6 prefix\n"
+       "Limit output to a particular IPv6 address\n" )
 {
   struct prefix p;
   struct prefix *p_addr = NULL;
@@ -4777,14 +4807,15 @@ DEFUN (vnc_show_responses_pfx,
 
 DEFUN (vnc_show_responses_some_pfx,
        vnc_show_responses_some_pfx_cmd,
-         "show vnc responses <active|removed> [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]",
-         SHOW_STR
-         VNC_SHOW_STR
-         "List recent query responses\n"
-         "show only active query responses\n"
-         "show only removed query responses\n"
-         "Limit output to a particular prefix or address\n"
-         "Limit output to a particular prefix or address\n")
+       "show vnc responses <active|removed> [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]",
+       SHOW_STR
+       VNC_SHOW_STR
+       "List recent query responses\n"
+       "show only active query responses\n"
+       "show only removed query responses\n"
+       "Limit output to a particular IPv4 prefix\n"
+       "Limit output to a particular IPv6 prefix\n"
+       "Limit output to a particular IPV6 address\n")
 {
   struct prefix p;
   struct prefix *p_addr = NULL;
@@ -4838,7 +4869,8 @@ DEFUN (show_vnc_queries_pfx,
        VNC_SHOW_STR
        "List active queries\n"
        "Limit output to a particular IPv4 prefix or address\n"
-       "Limit output to a particular IPv6 prefix or address\n")
+       "Limit output to a particular IPv6 prefix\n"
+       "Limit output to a particualr IPV6 address\n")
 {
   struct prefix pfx;
   struct prefix *p = NULL;

diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index bf7a898f58cab0de5bad1bec6cbdc89b56240a9b..ec57176224f20b0c8b5672d333754759236b9fac 100644 (file)
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -95,6 +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"
        BGP_STR
        VNC_STR
        "rfapi query handling\n"
@@ -138,6 +139,7 @@ DEFUN (no_debug_bgp_vnc_all,
        "<no debug|undebug> all bgp vnc",
        NO_STR
        DEBUG_STR
+       "Undebug command\n"
        "Disable all VNC debugging\n"
        BGP_STR
        VNC_STR)

diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c
index b7dfe7987c9c0da7c38568c21ee2beb63406c5f3..d4100c096fcdb6277a679d5db6cb1ec018061758 100644 (file)
--- a/bgpd/rfp-example/librfp/rfp_example.c
+++ b/bgpd/rfp-example/librfp/rfp_example.c
@@ -41,7 +41,9 @@ struct rfp_instance_t global_rfi;       /* dynamically allocate in full implemen
 DEFUN (rfp_example_config_value,
        rfp_example_config_value_cmd,
        "rfp example-config-value VALUE",
-       RFP_SHOW_STR "Example value to be configured\n")
+       RFP_SHOW_STR
+       "Example value to be configured\n"
+       "Value to display")
 {
   uint32_t value = 0;
   struct rfp_instance_t *rfi = NULL;