all: Fix various syntax errors

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

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index d823b962b83903693a653e922d6aa11876b3d4ec..730dfbda7908167ccbab154a29ac54615c84561a 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3698,15 +3698,13 @@ DEFUN (no_set_weight,
 }
 
 
-DEFUN (set_aspath_prepend,
-       set_aspath_prepend_cmd,
-       "set as-path prepend <(1-4294967295)...|last-as (1-10)>",
+DEFUN (set_aspath_prepend_asn,
+       set_aspath_prepend_asn_cmd,
+       "set as-path prepend (1-4294967295)...",
        SET_STR
        "Transform BGP AS_PATH attribute\n"
        "Prepend to the as-path\n"
-       "AS number\n"
-       "Use the peer's AS-number\n"
-       "Number of times to insert")
+       "AS number\n")
 {
   int idx_asn = 3;
   int ret;
@@ -3719,6 +3717,17 @@ DEFUN (set_aspath_prepend,
   return ret;
 }
 
+DEFUN (set_aspath_prepend_lastas,
+       set_aspath_prepend_lastas_cmd,
+       "set as-path prepend last-as (1-10)",
+       SET_STR
+       "Transform BGP AS_PATH attribute\n"
+       "Prepend to the as-path\n"
+       "Use the peer's AS-number\n"
+       "Number of times to insert")
+{
+  return set_aspath_prepend_asn (self, vty, argc, argv);
+}
 
 DEFUN (no_set_aspath_prepend,
        no_set_aspath_prepend_cmd,
@@ -4516,7 +4525,8 @@ bgp_route_map_init (void)
   install_element (RMAP_NODE, &no_set_weight_cmd);
   install_element (RMAP_NODE, &set_metric_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
-  install_element (RMAP_NODE, &set_aspath_prepend_cmd);
+  install_element (RMAP_NODE, &set_aspath_prepend_asn_cmd);
+  install_element (RMAP_NODE, &set_aspath_prepend_lastas_cmd);
   install_element (RMAP_NODE, &set_aspath_exclude_cmd);
   install_element (RMAP_NODE, &no_set_aspath_prepend_cmd);
   install_element (RMAP_NODE, &no_set_aspath_exclude_cmd);

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 7dc877483506a00acf9b201e3e671556140f3351..b5e2d9e36fa7ea52d75221961edd89a1a221604a 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -943,7 +943,7 @@ DEFUN (no_bgp_confederation_identifier,
 
 DEFUN (bgp_confederation_peers,
        bgp_confederation_peers_cmd,
-       "bgp confederation peers . (1-4294967295)",
+       "bgp confederation peers (1-4294967295)...",
        "BGP specific commands\n"
        "AS confederation parameters\n"
        "Peer ASs in BGP confederation\n"

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index 93c54726098d1a9a48c512dbdcc800e4eb8fa1aa..7fe65e6ca77573a06466de06e50291c4e0641acc 100644 (file)
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -55,7 +55,7 @@ isis_circuit_lookup (struct vty *vty)
 
 DEFUN (ip_router_isis,
        ip_router_isis_cmd,
-       "<ip|ipv6> router isis WORD",
+       "ip router isis WORD",
        "Interface Internet Protocol config commands\n"
        "IP router interface commands\n"
        "IS-IS Routing for IP\n"
@@ -108,6 +108,17 @@ DEFUN (ip_router_isis,
   return CMD_SUCCESS;
 }
 
+DEFUN (ip6_router_isis,
+       ip6_router_isis_cmd,
+       "ipv6 router isis WORD",
+       "Interface Internet Protocol config commands\n"
+       "IP router interface commands\n"
+       "IS-IS Routing for IP\n"
+       "Routing process tag\n")
+{
+  return ip_router_isis (self, vty, argc, argv);
+}
+
 DEFUN (no_ip_router_isis,
        no_ip_router_isis_cmd,
        "no <ip|ipv6> router isis WORD",
@@ -2163,6 +2174,7 @@ void
 isis_vty_init (void)
 {
   install_element (INTERFACE_NODE, &ip_router_isis_cmd);
+  install_element (INTERFACE_NODE, &ip6_router_isis_cmd);
   install_element (INTERFACE_NODE, &no_ip_router_isis_cmd);
 
   install_element (INTERFACE_NODE, &isis_passive_cmd);

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 19c1c667469f75ae50f6856cde0f6754e591f665..359189b345d658d0a13a47a6edbeb803a492bed2 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -8372,7 +8372,7 @@ DEFUN (ospf_default_information_originate,
 
 DEFUN (no_ospf_default_information_originate,
        no_ospf_default_information_originate_cmd,
-       "no default-information originate [<always|metric (0-16777214)|metric-type <1|2>|route-map WORD>]",
+       "no default-information originate [<always|metric (0-16777214)|metric-type (1-2)|route-map WORD>]",
        NO_STR
        "Control distribution of default information\n"
        "Distribute a default route\n"

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 5ee2c0f3128a019dcad4adbfcd7538e9c843e56e..6df219628c853e7dd1df29109e9ba998e5d64e9c 100644 (file)
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -1358,7 +1358,7 @@ DEFUN (ip_rip_receive_version,
 
 DEFUN (ip_rip_receive_version_1,
        ip_rip_receive_version_1_cmd,
-       "ip rip receive version 1 2",
+       "ip rip receive version (1-1) (2-2)",
        IP_STR
        "Routing Information Protocol\n"
        "Advertisement reception\n"

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 7f1a042f56dbc1e02804376de58ce7cc2490036f..d755562759fad0e840c5768e26507863826b72f9 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -3696,7 +3696,7 @@ zebra_ip_config (struct vty *vty)
 
 DEFUN (ip_zebra_import_table_distance,
        ip_zebra_import_table_distance_cmd,
-       "ip import-table (1-252) [distance (1-255)] [route-map WORD>]",
+       "ip import-table (1-252) [distance (1-255)] [route-map WORD]",
        IP_STR
        "import routes from non-main kernel table\n"
        "kernel routing table id\n"