Use val_help: to show command options

Replace all usage in this package of comp_help with new val_help

17 files changed, 70 insertions, 81 deletions

diff --git a/templates/traffic-policy/limiter/node.tag/class/node.def b/templates/traffic-policy/limiter/node.tag/class/node.def
index 1e06b05..3cf3191 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.def
@@ -1,6 +1,5 @@
 tag:
 type: u32
-help: Class handle
+help: Class ID
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4090; "Class identifier must be between 1 and 4090"
-comp_help: possible completions
- <1-4095>	Class ID
+val_help:<1-4090>; Class Identifier
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
index 994480c..153c1fc 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
@@ -1,8 +1,5 @@
 type: txt
 help: Traffic-limit used for this class [REQUIRED]
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-comp_help: Allowed values:
- <number>          Bandwidth in Kbps
- <number><suffix>  Value with scaling suffix
-                   bits per sec (kbit, mbit, gbit)
-                   bytes per sec (kbps, mbps, gbps)
+val_help:<number>; Rate in k (1000) bytes per second 
+val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
index f6bca12..4e0efa1 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
@@ -2,6 +2,5 @@ type: txt
 help: Burst size for this class (default: 15kb)
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
-comp_help: Allowed values:
- <number>		Burst size in bytes
- <number><suffix>	Size with scaling suffix (kb, mb, gb)
+val_help:<number>; Bytes
+val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
index 102a12e..ceadb5b 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
@@ -3,13 +3,12 @@ help: Ethernet protocol for this match
 allowed: echo \
     all 802.1Q 802_2 802_3 aarp aoe arp atalk \
     dec ip ipv6 ipx lat localtalk rarp snap x25
-
-comp_help: <0-65536> Ethernet protocol value or name
-Common names:
-	all	Any protocol
-	ip      Internet IP (IPv4)
-	ipv6    Internet IP (IPv6)
-	arp	Address Resolution Protocol
-	atalk	Appletalk
-	ipx	Novell Internet Packet Exchange
-	802.1Q	802.1Q VLAN tag
+val_help: u32:0-65535; Ethernet protocol number
+val_help: txt; Ethernet protocol name
+val_help: all; Any protocol
+val_help: ip; Internet IP (IPv4)
+val_help: _ipv6; Internet IP (IPv6)
+val_help: arp; Address Resolution Protocol
+val_help: atalk; Appletalk
+val_help: ipx; Novell Internet Packet Exchange
+val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index fd145a5..c067ef4 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,3 +1,4 @@
 type: u32
 help: IP destination port for this match
 syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
+val_help:<1-65535>; IP port
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index d02dc5c..27d880b 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-comp_help: <0-63> Differentiated Services Codepoint (DSCP) value
-    default  		match DSCP (000000)
-    reliability		match DSCP (000001)
-    throughput		match DSCP (000010)
-    lowdelay		match DSCP (000100)
-    priority		match DSCP (001000)
-    immediate		match DSCP (010000)
-    flash       	match DSCP (011000)
-    flash-override 	match DSCP (100000)
-    critical 		match DSCP (101000)
-    internet		match DSCP (110000)
-    network		match DSCP (111000)
+val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help:default; match DSCP (000000)
+val_help:reliability; match; DSCP (000001)
+val_help:throughput; match; DSCP (000010)
+val_help:lowdelay; match; DSCP (000100)
+val_help:priority; match; DSCP (001000)
+val_help:immediate; match; DSCP (010000)
+val_help:flash; match DSCP (011000)
+val_help:flash-override; match DSCP (100000)
+val_help:critical; match DSCP (101000)
+val_help:internet; match; DSCP (110000)
+val_help:network; match; DSCP (111000)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 9c665c2..1451175 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -4,14 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-comp_help: <0-255> IP protocol value or name
-Common names:
-	icmp	 Internet Control Message Protocol
-	igmp	 Internet Group Management Protocol
-	ggp	 Gateway-Gateway protocol
-	tcp	 Transmission Control Protocol
-	egp	 Exterior Gateway Protocol
-	udp	 User Datagram Protocol
-	gre	 General Routing Encapsulation
-	ospf	 Open Shortest Path First IGP
-	sctp	 Stream Control Transmission Protocol
+val_help:<0-255>; IP protocol value
+val_help:icmp; Internet Control Message Protocol
+val_help:igmp; Internet Group Management Protocol
+val_help:ggp; Gateway-Gateway protocol
+val_help:tcp; Transmission Control Protocol
+val_help:egp; Exterior Gateway Protocol
+val_help:udp; User Datagram Protocol
+val_help:gre; General Routing Encapsulation
+val_help:ospf; Open Shortest Path First IGP
+val_help:sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index 61247fd..89c241e 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,3 +1,4 @@
 type: u32
 help: IP source port for this match
 syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
+val_help:<1-65535>; IP port
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index fd145a5..c067ef4 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -1,3 +1,4 @@
 type: u32
 help: IP destination port for this match
 syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
+val_help:<1-65535>; IP port
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index d02dc5c..4dd11ae 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-comp_help: <0-63> Differentiated Services Codepoint (DSCP) value
-    default  		match DSCP (000000)
-    reliability		match DSCP (000001)
-    throughput		match DSCP (000010)
-    lowdelay		match DSCP (000100)
-    priority		match DSCP (001000)
-    immediate		match DSCP (010000)
-    flash       	match DSCP (011000)
-    flash-override 	match DSCP (100000)
-    critical 		match DSCP (101000)
-    internet		match DSCP (110000)
-    network		match DSCP (111000)
+val_help:<0-63>; Differentiated Services Codepoint (DSCP) value
+val_help:default; match DSCP (000000)
+val_help:reliability; match DSCP (000001)
+val_help:throughput; match DSCP (000010)
+val_help:lowdelay; match DSCP (000100)
+val_help:priority; match DSCP (001000)
+val_help:immediate; match DSCP (010000)
+val_help:flash; match DSCP (011000)
+val_help:flash; -override 	match DSCP (100000)
+val_help:critical; match DSCP (101000)
+val_help:internet; match DSCP (110000)
+val_help:network; match DSCP (111000)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 9c665c2..1451175 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -4,14 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-comp_help: <0-255> IP protocol value or name
-Common names:
-	icmp	 Internet Control Message Protocol
-	igmp	 Internet Group Management Protocol
-	ggp	 Gateway-Gateway protocol
-	tcp	 Transmission Control Protocol
-	egp	 Exterior Gateway Protocol
-	udp	 User Datagram Protocol
-	gre	 General Routing Encapsulation
-	ospf	 Open Shortest Path First IGP
-	sctp	 Stream Control Transmission Protocol
+val_help:<0-255>; IP protocol value
+val_help:icmp; Internet Control Message Protocol
+val_help:igmp; Internet Group Management Protocol
+val_help:ggp; Gateway-Gateway protocol
+val_help:tcp; Transmission Control Protocol
+val_help:egp; Exterior Gateway Protocol
+val_help:udp; User Datagram Protocol
+val_help:gre; General Routing Encapsulation
+val_help:ospf; Open Shortest Path First IGP
+val_help:sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index 61247fd..89c241e 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,3 +1,4 @@
 type: u32
 help: IP source port for this match
 syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
+val_help:<1-65535>; IP port
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
index f98cda5..e3621c4 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Virtual Local Area Network (VLAN) ID for this match
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; "VLAN ID must be between 0 and 4095"
-comp_help: possible completions:
- <0-4095>           Set VLAN ID
+val_help:<0-4095>; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
index 38390ca..8f4fa87 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
@@ -3,5 +3,4 @@ help: Ordering for rule evaluation
 default: 20
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255 ; \
 		   "precedence must be between 0 and 255"
-comp_help: Precedence in traffic limiter rule evaluation
- <0-255> (default 20)
+val_help:<0-255>; Rule evaluation order
diff --git a/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def b/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def
index f584270..4fdd8f9 100644
--- a/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def
+++ b/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def
@@ -1,8 +1,5 @@
 type: txt
 help: Traffic-limit used for this class
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-comp_help: Allowed values:
- <number>          Bandwidth in Kbps
- <number><suffix>  Value with scaling suffix
-                   bits per sec (kbit, mbit, gbit)
-                   bytes per sec (kbps, mbps, gbps)
+val_help:<number>; Rate in k (1000) bytes per second 
+val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/limiter/node.tag/default/burst/node.def b/templates/traffic-policy/limiter/node.tag/default/burst/node.def
index f6bca12..4e0efa1 100644
--- a/templates/traffic-policy/limiter/node.tag/default/burst/node.def
+++ b/templates/traffic-policy/limiter/node.tag/default/burst/node.def
@@ -2,6 +2,5 @@ type: txt
 help: Burst size for this class (default: 15kb)
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
-comp_help: Allowed values:
- <number>		Burst size in bytes
- <number><suffix>	Size with scaling suffix (kb, mb, gb)
+val_help:<number>; Bytes
+val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/limiter/node.tag/default/priority/node.def b/templates/traffic-policy/limiter/node.tag/default/priority/node.def
index 768f084..b088129 100644
--- a/templates/traffic-policy/limiter/node.tag/default/priority/node.def
+++ b/templates/traffic-policy/limiter/node.tag/default/priority/node.def
@@ -4,5 +4,4 @@ default: 20
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 20 ; \
 		   "priority must be between 0 and 20"
 help: Priority for rule evaluation
-comp_help: Priority for traffic limiting evaluation
- <0-20> (default 20)
+val_help:<0-20>; Rule evaluation order