diff options
Diffstat (limited to 'templates/traffic-policy')
78 files changed, 315 insertions, 341 deletions
diff --git a/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def index 32db606..fc57c1c 100644 --- a/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def @@ -1,3 +1,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 0 ; "queue limit must be greater than zero" +val_help:<1-4294967295>; Queue size in bytes diff --git a/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def index f0dfee8..5d1a02a 100644 --- a/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def @@ -2,3 +2,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\ "Queue limit must greater than 1 and less than 128" +val_help:<1-127>; Queue size in bytes 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 diff --git a/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def b/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def index 762654e..22b4e23 100644 --- a/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def @@ -1,9 +1,5 @@ type: txt help: Bandwidth limit syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" -comp_help: Allowed values: - <number> Bandwidth in Kbps per second - <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/network-emulator/node.tag/burst/node.def b/templates/traffic-policy/network-emulator/node.tag/burst/node.def index e23bca1..493e0fc 100644 --- a/templates/traffic-policy/network-emulator/node.tag/burst/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/burst/node.def @@ -2,6 +2,5 @@ type: txt help: Burst size 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/network-emulator/node.tag/network-delay/node.def b/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def index 40b8437..7455a38 100644 --- a/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def @@ -1,6 +1,5 @@ type: txt syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)" -help: Setup network delay -comp_help: Additional network delay in milliseconds - <number> Latency in milliseconds - <number><suffix> Time with suffx (secs, ms, us) +help: Additional network delay +val_help:<number>; Time in milliseconds +val_help:<number><suffix>; Time with suffix (secs, ms, us) diff --git a/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def index d8fb6c6..c875ad5 100644 --- a/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def @@ -1,6 +1,5 @@ type: txt help: Emulated packet data corruption rate syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)" -comp_help: Allowed values: - <number>%% Percentage of packets affected +val_help:<number>%%; Percentage of packets affected diff --git a/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def index c0edd1d..4765fd5 100644 --- a/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def @@ -1,6 +1,5 @@ type: txt help: Emulated packet loss rate syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)" -comp_help: Allowed values: - <number>%% Percentage of packets affected +val_help:<number>%%; Percentage of packets affected diff --git a/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def index 365cffd..654bec3 100644 --- a/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def @@ -3,6 +3,5 @@ help: Emulated packet reordering percentage syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)" commit:expression: $VAR(../network-delay) != "" ; \ "Must specify network-delay for packet reordering" -comp_help: Allowed values: - <number>%% Percentage of packets affected +val_help:<number>%%; Percentage of packets affected diff --git a/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def index dd5de38..a1fb213 100644 --- a/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def @@ -1,3 +1,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 0; "Queue limit must be greater than zero" +val_help:<1-4294967295>; Queue size in bytes diff --git a/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def index b2b2206..d7ac169 100644 --- a/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def +++ b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def @@ -3,9 +3,6 @@ help: Available bandwidth for this policy default: "auto" syntax:expression: $VAR(@) == "auto" || \ exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" -comp_help: Allowed values: - auto Set bandwidth based on interface speed (default) - <number> Bandwidth in Kbps - <number><suffix> Value with scaling suffix - bits per sec (kbit, mbit, gbit) - bytes per sec (kbps, mbps, gbps) +val_help:auto; Rate based on interface speed (default) +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/random-detect/node.tag/precedence/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.def index 86f151a..2b6171f 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Precedence values -syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8; "IP precedence value must be between 0 and 7" -comp_help: possible completions - <0-7> IP precedence number +help: IP precedence +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7; \ + "IP precedence value must be between 0 and 7" +val_help:<0-7>; IP precedence value diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def index 23cdb0f..e625ed7 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def @@ -2,3 +2,4 @@ type: u32 help: Average packet size (bytes) default: 1024 syntax:expression: $VAR(@) >= 16 && $VAR(@) <= 10240 ; "Average packet size must be between 16 and 10240" +val_help:<16-10240>; Average packet size in bytes diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def index 8bb75d8..5a7df82 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def @@ -1,5 +1,4 @@ type: u32 help: Mark probability for this precedence syntax:expression: $VAR(@) > 0 ; "Mark probability must be greater than 0" -comp_help: Allowed values: - <number> Numeric value ( 1 / N ) +val_help:<number>; Numeric value ( 1 / N ) diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def index f30769f..3f42375 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def @@ -1,5 +1,5 @@ type: u32 help: Maximum threshold for random detection -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; "Threshold must be between 0 and 4096" -comp_help: Allowed values: - <number> Threshold in packets +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096;\ + "Threshold must be between 0 and 4096" +val_help:<0-4096>; Maximum Threshold in packets diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def index 3114f95..6875bc1 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def @@ -1,5 +1,5 @@ type: u32 help: Minimum threshold for random detection -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; "Threshold must be between 0 and 4096" -comp_help: Allowed values: - <number> Threshold in packets +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; \ + "Threshold must be between 0 and 4096" +val_help:<0-4096>; Minimum Threshold in packets diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def index 2aaf405..b9f0651 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def @@ -1,3 +1,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero" +val_help:<1-4294967295>; Queue size in bytes diff --git a/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def b/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def index 762654e..22b4e23 100644 --- a/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def +++ b/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def @@ -1,9 +1,5 @@ type: txt help: Bandwidth limit syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" -comp_help: Allowed values: - <number> Bandwidth in Kbps per second - <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/rate-control/node.tag/burst/node.def b/templates/traffic-policy/rate-control/node.tag/burst/node.def index e23bca1..b9f3aa0 100644 --- a/templates/traffic-policy/rate-control/node.tag/burst/node.def +++ b/templates/traffic-policy/rate-control/node.tag/burst/node.def @@ -2,6 +2,6 @@ type: txt help: Burst size 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/rate-control/node.tag/latency/node.def b/templates/traffic-policy/rate-control/node.tag/latency/node.def index af35ced..89196dd 100644 --- a/templates/traffic-policy/rate-control/node.tag/latency/node.def +++ b/templates/traffic-policy/rate-control/node.tag/latency/node.def @@ -2,6 +2,5 @@ type: txt syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)" default: "50ms" help: Maximum latency -comp_help: Limit on the queue size based on latency - <number> Latency in milliseconds - <number><suffix> Time with suffx (secs, ms, us) +val_help:<number>; Time in milliseconds +val_help:<number><suffix>; Time with suffix (secs, ms, us) diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.def index 3dbbeeb..171d0a4 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.def @@ -1,6 +1,6 @@ tag: type: u32 help: Class handle -syntax:expression: $VAR(@) > 1 && $VAR(@) < 4096; "Class identifier must be between 3 and 4095" -comp_help: possible completions - <2-4095> Class ID +syntax:expression: $VAR(@) > 1 && $VAR(@) <= 4095; \ + "Class identifier must be between 3 and 4095" +val_help:<1-4095>; Class identifier diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def index 102a12e..ceadb5b 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def index fd145a5..c067ef4 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def index d02dc5c..27d880b 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def index 9c665c2..1451175 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def index 61247fd..89c241e 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def index fd145a5..c067ef4 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def index d02dc5c..27d880b 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def +++ b/templates/traffic-policy/round-robin/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: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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def index 9c665c2..1451175 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def index 61247fd..89c241e 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def +++ b/templates/traffic-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def index f98cda5..65f05a5 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def @@ -1,5 +1,5 @@ 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 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \ + "VLAN ID must be between 0 and 4095" +val_help:<0-4095>; Virtual Local Area Network (VLAN) tag diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def index f0dfee8..5d1a02a 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def @@ -2,3 +2,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\ "Queue limit must greater than 1 and less than 128" +val_help:<1-127>; Queue size in bytes diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def index 9e2227d..7832d71 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def @@ -1,8 +1,8 @@ type: txt default: "drop-tail" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; \ + "Unknown queue-type" help: Queue type for this class -comp_help:Possible completions - fair-queue\tStochastic Fair Queue (SFQ) - drop-tail\tFirst-In-First-Out (FIFO) - priority\tPriority queueing based on DSCP +val_help:fair-queue; Stochastic Fair Queue (SFQ) +val_help:drop-tail; First-In-First-Out (FIFO) +val_help:priority; Priority queueing based on DSCP diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def index 2aaf405..b9f0651 100644 --- a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def +++ b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def @@ -1,3 +1,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero" +val_help:<1-4294967295>; Queue size in bytes diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def index e1d77a3..2785543 100644 --- a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def +++ b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def @@ -1,9 +1,9 @@ type: txt default: "fair-queue" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail";\ + "Unknown queue-type" help: Queue type for this class -comp_help:Possible completions - fair-queue\tStochastic Fair Queue (SFQ) - drop-tail\tFirst-In-First-Out (FIFO) - priority\tPriority queueing based on DSCP +val_help:fair-queue; Stochastic Fair Queue (SFQ) +val_help:drop-tail; First-In-First-Out (FIFO) +val_help:priority; Priority queueing based on DSCP diff --git a/templates/traffic-policy/round-robin/node.tag/quantum/node.def b/templates/traffic-policy/round-robin/node.tag/quantum/node.def index 05db7c0..a2b41df 100644 --- a/templates/traffic-policy/round-robin/node.tag/quantum/node.def +++ b/templates/traffic-policy/round-robin/node.tag/quantum/node.def @@ -1,2 +1,4 @@ type: u32 -help: Packet scheduling quantum (bytes) +help: Packet scheduling quantum +syntax:expression: $VAR(@) > 0 ; "Quantum must be greater than zero" +val_help:<1-4294967295>; Packet scheduling quantum (bytes) diff --git a/templates/traffic-policy/shaper/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/bandwidth/node.def index b2b2206..f865a59 100644 --- a/templates/traffic-policy/shaper/node.tag/bandwidth/node.def +++ b/templates/traffic-policy/shaper/node.tag/bandwidth/node.def @@ -3,9 +3,7 @@ help: Available bandwidth for this policy default: "auto" syntax:expression: $VAR(@) == "auto" || \ exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" -comp_help: Allowed values: - auto Set bandwidth based on interface speed (default) - <number> Bandwidth in Kbps - <number><suffix> Value with scaling suffix - bits per sec (kbit, mbit, gbit) - bytes per sec (kbps, mbps, gbps) + +val_help:auto; Rate matches interface speed (default) +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/shaper/node.tag/class/node.def b/templates/traffic-policy/shaper/node.tag/class/node.def index 9e73e14..1662f26 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.def @@ -1,6 +1,6 @@ tag: type: u32 help: Class handle -syntax:expression: $VAR(@) > 1 && $VAR(@) < 4096; "Class identifier must be between 2 and 4095" -comp_help: possible completions - <2-4095> Class ID +syntax:expression: $VAR(@) > 1 && $VAR(@) <= 4095; \ + "Class identifier must be between 2 and 4095" +val_help:<1-4095>; Class identifier diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def index 0f65b6c..3df631d 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def @@ -2,9 +2,6 @@ type: txt default: "100%" help: Bandwidth used for this class syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)" -comp_help: Allowed values: - <number> Bandwidth in Kbps - <number>%% Percentage of overall rate (default 100%%) - <number><suffix> Value with scaling suffix - bits per sec (kbit, mbit, gbit) - bytes per sec (kbps, mbps, gbps) +val_help:<number>; Bandwidth in Kbps +val_help:<number>%%; Percentage of overall rate (default 100%%) +val_help:<number><suffix>; Value with scaling suffix (kbit, kbps, ...) diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def index f6bca12..4e0efa1 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/ceiling/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def index d80f618..f186eba 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def @@ -1,8 +1,7 @@ type: txt help: Bandwidth limit for this class syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)" -comp_help: Allowed values: - <number> Limit in Kbps - <number>%% Percentage of overall rate - <number><suffix> Value with scaling suffix - bits per sec (kbit, mbit, gbit) + +val_help:<number>; Bandwidth in Kbps +val_help:<number>%%; Percentage of overall rate (default 100%%) +val_help:<number><suffix>; Value with scaling suffix (kbit, kbps, ...) diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def index 102a12e..9da50a6 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def @@ -4,12 +4,12 @@ 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/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def index fd145a5..c067ef4 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def index d02dc5c..27d880b 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def index 2405ca6..7c9e022 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def +++ b/templates/traffic-policy/shaper/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 } { if($1 != "ip") 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/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def index 61247fd..89c241e 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def index fd145a5..c067ef4 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def index d02dc5c..27d880b 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def +++ b/templates/traffic-policy/shaper/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: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/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def index 9c665c2..1451175 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def index 61247fd..89c241e 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def +++ b/templates/traffic-policy/shaper/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/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def index f98cda5..e0e11aa 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def @@ -1,5 +1,5 @@ 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 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \ + "VLAN ID must be between 0 and 4095" +val_help:<0-4095>; Virtual Local Area Network (VLAN) tag diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def index 0013044..a3edd88 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def @@ -1,5 +1,5 @@ type: u32 help: Priority for usage of excess bandwidth -syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7" -comp_help: Priority for usage of excess bandwidth - <0-7> (default 0) +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7 ;\ + "priority must be between 0 than 7" +val_help:<0-7>; Priority order for bandwidth pool diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def index f0dfee8..5d1a02a 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def @@ -2,3 +2,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\ "Queue limit must greater than 1 and less than 128" +val_help:<1-127>; Queue size in bytes diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def index b2c6b9a..3db969a 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def @@ -1,10 +1,11 @@ type: txt default: "fair-queue" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\ + "Unknown queue-type" help: Queue type for this class -comp_help:Possible completions - fair-queue\tStochastic Fair Queue (SFQ) - drop-tail\tFirst-In-First-Out (FIFO) - priority\tPriority queueing based on DSCP - random-detect\tRandom Early Detection (RED) + +val_help:fair-queue; Stochastic Fair Queue (SFQ) +val_help:drop-tail; First-In-First-Out (FIFO) +val_help:priority; Priority queueing based on DSCP +val_help:random-detect; Random Early Detection (RED) diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def index 2fbddac..26106d6 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/set-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 set DSCP to (000000) - reliability set DSCP to (000001) - throughput set DSCP to (000010) - lowdelay set DSCP to (000100) - priority set DSCP to (001000) - immediate set DSCP to (010000) - flash set DSCP to (011000) - flash-override set DSCP to (100000) - critical set DSCP to (101000) - internet set DSCP to (110000) - network set DSCP to (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/shaper/node.tag/default/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def index cb7e989..512e447 100644 --- a/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def @@ -1,10 +1,7 @@ type: txt help: Bandwidth used for default traffic [REQUIRED] syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \$VAR(@)" -comp_help: Allowed values: - <number> Bandwidth in Kbps per second - <number>%% Percentage of overall rate - <number><suffix> Value with scaling suffix - bits per sec (kbit, mbit, gbit) - bytes per sec (kbps, mbps, gbps) +val_help:<number>; Bandwidth in Kbps +val_help:<number>%%; Percentage of overall rate (default 100%%) +val_help:<number><suffix>; Value with scaling suffix (kbit, kbps, ...) diff --git a/templates/traffic-policy/shaper/node.tag/default/burst/node.def b/templates/traffic-policy/shaper/node.tag/default/burst/node.def index 42b1de6..e7e89ec 100644 --- a/templates/traffic-policy/shaper/node.tag/default/burst/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/burst/node.def @@ -2,6 +2,6 @@ type: txt help: Burst size for default traffic 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/shaper/node.tag/default/ceiling/node.def b/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def index 974b5d2..922cb73 100644 --- a/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def @@ -1,8 +1,7 @@ type: txt help: Bandwidth limit for default traffic syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)" -comp_help: Allowed values: - <number> Limit in Kbps - <number>%% Percentage of overall rate - <number><suffix> Value with scaling suffix - bits per sec (kbit, mbit, gbit) + +val_help:<number>; Bandwidth in Kbps +val_help:<number>%%; Percentage of overall rate (default 100%%) +val_help:<number><suffix>; Value with scaling suffix (kbit, kbps, ...) diff --git a/templates/traffic-policy/shaper/node.tag/default/priority/node.def b/templates/traffic-policy/shaper/node.tag/default/priority/node.def index 348794e..11fcfd9 100644 --- a/templates/traffic-policy/shaper/node.tag/default/priority/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/priority/node.def @@ -1,5 +1,5 @@ type: u32 help: Priority for usage of extra bandwidth -syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7" -comp_help: Priority for usage of excess bandwidth - <0-7> (default 0) +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7 ;\ + "priority must be between 0 than 7" +val_help:<0-7>; Priority order for bandwidth pool diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def index 8574d42..63c3206 100644 --- a/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def @@ -1,3 +1,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 0; "Queue limit must be greater than zero" +val_help:<1-4294967295>; Queue size in bytes diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def index 10928c1..f4bf0d4 100644 --- a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def @@ -1,10 +1,9 @@ type: txt default: "fair-queue" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\ + "Unknown queue-type" help: Queue type for default traffic -comp_help:Possible completions - fair-queue\tStochastic Fair Queue (SFQ) - drop-tail\tFirst-In-First-Out (FIFO) - priority\tPriority queueing based on DSCP - random-detect\tRandom Early Detection (RED) - +val_help:fair-queue; Stochastic Fair Queue (SFQ) +val_help:drop-tail; First-In-First-Out (FIFO) +val_help:priority; Priority queueing based on DSCP +val_help:random-detect; Random Early Detection (RED) diff --git a/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def b/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def index 55d43c3..9161e2f 100644 --- a/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/set-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 set DSCP to (000000) - reliability set DSCP to (000001) - throughput set DSCP to (000010) - lowdelay set DSCP to (000100) - priority set DSCP to (001000) - immediate set DSCP to (010000) - flash set DSCP to (011000) - flash-override set DSCP to (100000) - critical set DSCP to (101000) - internet set DSCP to (110000) - network set DSCP to (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) |