Convert interface templates to use val_help:

21 files changed, 46 insertions, 57 deletions

diff --git a/interface-templates/ip/node.def b/interface-templates/ip/node.def
index 92e252e1..85dfeded 100644
--- a/interface-templates/ip/node.def
+++ b/interface-templates/ip/node.def
@@ -1 +1 @@
-help: Set IPv4 parameters for specified interface
+help: IPv4 routing parameters
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
index 5ff617e6..bc47e563 100644
--- a/interface-templates/ip/ospf/authentication/md5/key-id/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
@@ -1,13 +1,10 @@
 tag:
-
 type: u32
-
-help: Set MD5 key id
+help: MD5 key id
 
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
+val_help: u32:1-255; MD5 key id
 
 commit:expression: $VAR(md5-key/) != ""; \
        "Must add the md5-key for key-id $VAR(@)"
 
-comp_help: possible completions:
- <1-255>            Set the key id
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
index 97d1f693..4c58f20d 100644
--- a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
@@ -1,11 +1,7 @@
 type: txt
-
-help: Set md5 key
-
+help: MD5 key
 syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$"; "MD5 key must be 16 characters or less"
-
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
+val_help: MD5 Key (16 characters or less)
 
 # If this node is created 
 create:
diff --git a/interface-templates/ip/ospf/authentication/md5/node.def b/interface-templates/ip/ospf/authentication/md5/node.def
index 1f3c8519..184fa321 100644
--- a/interface-templates/ip/ospf/authentication/md5/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/node.def
@@ -1,4 +1,4 @@
-help: Set MD5 key id
+help: MD5 parameters
 
 create: vtysh -c "configure terminal" \
 	-c "interface $IFNAME" \
diff --git a/interface-templates/ip/ospf/authentication/node.def b/interface-templates/ip/ospf/authentication/node.def
index ff352a01..abf04eab 100644
--- a/interface-templates/ip/ospf/authentication/node.def
+++ b/interface-templates/ip/ospf/authentication/node.def
@@ -1,2 +1,2 @@
-help: Set OSPF interface authentication
+help: OSPF interface authentication
 
diff --git a/interface-templates/ip/ospf/authentication/plaintext-password/node.def b/interface-templates/ip/ospf/authentication/plaintext-password/node.def
index 41ead9f0..d6b10e35 100644
--- a/interface-templates/ip/ospf/authentication/plaintext-password/node.def
+++ b/interface-templates/ip/ospf/authentication/plaintext-password/node.def
@@ -1,10 +1,10 @@
 type: txt
-help: Configure plain text password
+help: Plain text password
 syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$" ; "Password must be 8 characters or less"
+val_help: Plain text password (8 characters or less)
+
 update:vtysh -c "configure terminal" -c "interface $IFNAME" \
 	 -c "no ip ospf authentication " -c "ip ospf authentication " \
 	 -c "ip ospf authentication-key $VAR(@)"
 delete:vtysh -c "configure terminal" -c "interface $IFNAME" \
 	 -c "no ip ospf authentication " -c "no ip ospf authentication-key"
-comp_help: possible completions:
- <text>             Plain text password (8 characters or less)
diff --git a/interface-templates/ip/ospf/bandwidth/node.def b/interface-templates/ip/ospf/bandwidth/node.def
index 64c3801d..9de76350 100644
--- a/interface-templates/ip/ospf/bandwidth/node.def
+++ b/interface-templates/ip/ospf/bandwidth/node.def
@@ -1,7 +1,7 @@
 type: u32
-help: Set bandwidth for specified interface (kilobits/sec)
+help: Bandwidth of interface (kilobits/sec)
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; "Must be between 1-10000000"
+val_help: u32:1-10000000; Bandwidth in kilobits/sec (for calculating OSPF cost)
+
 update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "bandwidth $VAR(@)" 
 delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no bandwidth" 
-comp_help: possible completions:
- <1-10000000>          Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/interface-templates/ip/ospf/cost/node.def b/interface-templates/ip/ospf/cost/node.def
index b5a1baed..fd6d125a 100644
--- a/interface-templates/ip/ospf/cost/node.def
+++ b/interface-templates/ip/ospf/cost/node.def
@@ -1,11 +1,11 @@
 type: u32
-help: Set interface cost
+help: Interface cost
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+val_help: u32:1-65535; OSPF interface cost
+
 update:vtysh -c "configure terminal" \
 	-c "interface $IFNAME" \
 	-c "ip ospf cost $VAR(@)"
 delete:vtysh -c "configure terminal" \
 	-c "interface $IFNAME" \
 	-c "no ip ospf cost"
-comp_help: possible completions:
- <1-65535>          Set Cost
diff --git a/interface-templates/ip/ospf/dead-interval/node.def b/interface-templates/ip/ospf/dead-interval/node.def
index 28d63232..7cb7da8a 100644
--- a/interface-templates/ip/ospf/dead-interval/node.def
+++ b/interface-templates/ip/ospf/dead-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: Set interval after which a neighbor is declared dead
+help: Interval after which neighbor is dead
 default: 40
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+val_help: u32:1-65535; OSPF dead interval in seconds (default 40)
+
 update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf dead-interval $VAR(@)"
 delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf dead-interval"
-comp_help: possible completions:
- <1-65535>          Seconds (default 40)
diff --git a/interface-templates/ip/ospf/hello-interval/node.def b/interface-templates/ip/ospf/hello-interval/node.def
index 6b777b62..35cb00e2 100644
--- a/interface-templates/ip/ospf/hello-interval/node.def
+++ b/interface-templates/ip/ospf/hello-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: Set interval between hello packets
+help: Interval between hello packets
 default: 10
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+val_help: u32:1-65535; Interval between OSPF hello packets in seconds (default 10)
+
 update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf hello-interval $VAR(@)"
 delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf hello-interval"
-comp_help: possible completions:
- <1-65535>          Seconds (default 10)
diff --git a/interface-templates/ip/ospf/network/node.def b/interface-templates/ip/ospf/network/node.def
index 806987be..8922eae1 100644
--- a/interface-templates/ip/ospf/network/node.def
+++ b/interface-templates/ip/ospf/network/node.def
@@ -1,11 +1,11 @@
 type: txt
-help: Set network type
+help: Network type
 syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
        "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
 update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf network $VAR(@)"
 delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf network"
-comp_help: possible completions:
- broadcast              Set broadcast network type
- non-broadcast          Set non-broadcast network type
- point-to-multipoint    Set point-to-multipoint network type
- point-to-point         Set point-to-point network type
+
+val_help: broadcast; Broadcast network type
+val_help: non-broadcast; Non-broadcast network type
+val_help: point-to-multipoint; Point-to-multipoint network type
+val_help: point-to-point; Point-to-point network type
diff --git a/interface-templates/ip/ospf/node.def b/interface-templates/ip/ospf/node.def
index 1702547a..8eaece24 100644
--- a/interface-templates/ip/ospf/node.def
+++ b/interface-templates/ip/ospf/node.def
@@ -1 +1 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
+help: Open Shortest Path First (OSPF) parameters
diff --git a/interface-templates/ip/ospf/priority/node.def b/interface-templates/ip/ospf/priority/node.def
index bd59276c..f7f83d94 100644
--- a/interface-templates/ip/ospf/priority/node.def
+++ b/interface-templates/ip/ospf/priority/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: Set router priority
+help: Router priority
 default: 1
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+val_help: u32:0-255; Priority (default 1)
+
 update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf priority $VAR(@)"
 delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf priority"
-comp_help: possible completions:
- <0-255>            Priority (default 1)
diff --git a/interface-templates/ip/ospf/retransmit-interval/node.def b/interface-templates/ip/ospf/retransmit-interval/node.def
index d0ccfab5..ca4de11e 100644
--- a/interface-templates/ip/ospf/retransmit-interval/node.def
+++ b/interface-templates/ip/ospf/retransmit-interval/node.def
@@ -1,10 +1,10 @@
 type: u32
-help: Set interval between retransmitting lost link state advertisements
+help: Interval between retransmitting lost link state advertisements
 default: 5
 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+val_help: u32: 3-65535; Retransmit interval in seconds (default 5)
+
 update: vtysh -c "configure terminal" -c "interface $IFNAME" \
 	-c "ip ospf retransmit-interval $VAR(@)"
 delete: vtysh -c "configure terminal" -c "interface $IFNAME" \
 	-c "no ip ospf retransmit-interval"
-comp_help: possible completions:
- <3-65535>          Seconds (default 5)
diff --git a/interface-templates/ip/ospf/transmit-delay/node.def b/interface-templates/ip/ospf/transmit-delay/node.def
index bb22659b..ea9b24a4 100644
--- a/interface-templates/ip/ospf/transmit-delay/node.def
+++ b/interface-templates/ip/ospf/transmit-delay/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: Set link state transmit delay
+help: Link state transmit delay
 default: 1
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+val_help: u32:1-65535; Transmit delay in seconds (default 1)
+
 update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf transmit-delay $VAR(@)"
 delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf transmit-delay"
-comp_help: possible completions:
- <1-65535>          Seconds (default 1)
diff --git a/interface-templates/ip/rip/authentication/md5/node.def b/interface-templates/ip/rip/authentication/md5/node.def
index 8d165fe6..ad45eb1b 100644
--- a/interface-templates/ip/rip/authentication/md5/node.def
+++ b/interface-templates/ip/rip/authentication/md5/node.def
@@ -1,6 +1,6 @@
 tag:
 type: u32
-help: Set MD5 authentication key ID
+help: MD5 authentication parameters
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \
                    "ID must be between 1 and 255"
 
diff --git a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
index 8ee5c39f..07ca2a41 100644
--- a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
@@ -1,6 +1,7 @@
 type: txt
-help: Set authentication password
+help: Authentication password
 syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$" ; "MD5 key must be 16 characters or less"
+val_help: MD5 Key (16 characters or less)
 
 update:vtysh                                     \
        -c "configure terminal" -c "interface $IFNAME"   \
@@ -14,6 +15,3 @@ delete:vtysh --noerror                              \
        -c "no ip rip authentication mode md5"              \
        -c "no ip rip authentication key-chain $IFNAME-rip" \
        -c "no key chain $IFNAME-rip"
-
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/interface-templates/ip/rip/authentication/node.def b/interface-templates/ip/rip/authentication/node.def
index 8756de35..22039cf7 100644
--- a/interface-templates/ip/rip/authentication/node.def
+++ b/interface-templates/ip/rip/authentication/node.def
@@ -1 +1 @@
-help: Set authentication method
+help: Authentication method
diff --git a/interface-templates/ip/rip/authentication/plaintext-password/node.def b/interface-templates/ip/rip/authentication/plaintext-password/node.def
index addf2473..b294ebd0 100644
--- a/interface-templates/ip/rip/authentication/plaintext-password/node.def
+++ b/interface-templates/ip/rip/authentication/plaintext-password/node.def
@@ -1,7 +1,8 @@
 type: txt
-help: Set plain text password
+help: Plain text password
 syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$" ; "Password must be 16 characters or less"
 commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
+val_help: Password (16 characters or less)
 
 update: vtysh -c "configure terminal" -c "interface $IFNAME" \
 	-c "ip rip authentication mode text" \
@@ -10,6 +11,3 @@ update: vtysh -c "configure terminal" -c "interface $IFNAME" \
 delete: vtysh -c "configure terminal" -c "interface $IFNAME" \
 	-c "no ip rip authentication mode" \
 	-c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text>             Password (16 characters or less)
diff --git a/interface-templates/ip/rip/node.def b/interface-templates/ip/rip/node.def
index d1f72a5f..d6a4eb34 100644
--- a/interface-templates/ip/rip/node.def
+++ b/interface-templates/ip/rip/node.def
@@ -1 +1 @@
-help: Set Routing Information Protocol (RIP) for specified interface
+help: Routing Information Protocol (RIP)
diff --git a/interface-templates/ip/rip/split-horizon/node.def b/interface-templates/ip/rip/split-horizon/node.def
index ba39b616..c4fb5ddc 100644
--- a/interface-templates/ip/rip/split-horizon/node.def
+++ b/interface-templates/ip/rip/split-horizon/node.def
@@ -1 +1 @@
-help: Set to control split horizon parameters on this interface
+help: Split horizon parameters