136 files changed, 153 insertions, 0 deletions
diff --git a/templates/qos-policy/drop-tail/node.def b/templates/traffic-policy/drop-tail/node.def
index 1bbb25f..1bbb25f 100644
--- a/templates/qos-policy/drop-tail/node.def
+++ b/templates/traffic-policy/drop-tail/node.def
diff --git a/templates/qos-policy/drop-tail/node.tag/description/node.def b/templates/traffic-policy/drop-tail/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/drop-tail/node.tag/description/node.def
+++ b/templates/traffic-policy/drop-tail/node.tag/description/node.def
diff --git a/templates/qos-policy/drop-tail/node.tag/queue-limit/node.def b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def
index fe3b4dd..fe3b4dd 100644
--- a/templates/qos-policy/drop-tail/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def
diff --git a/templates/qos-policy/fair-queue/node.def b/templates/traffic-policy/fair-queue/node.def
index 1966ab6..1966ab6 100644
--- a/templates/qos-policy/fair-queue/node.def
+++ b/templates/traffic-policy/fair-queue/node.def
diff --git a/templates/qos-policy/fair-queue/node.tag/description/node.def b/templates/traffic-policy/fair-queue/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/fair-queue/node.tag/description/node.def
+++ b/templates/traffic-policy/fair-queue/node.tag/description/node.def
diff --git a/templates/qos-policy/fair-queue/node.tag/hash-interval/node.def b/templates/traffic-policy/fair-queue/node.tag/hash-interval/node.def
index f670274..f670274 100644
--- a/templates/qos-policy/fair-queue/node.tag/hash-interval/node.def
+++ b/templates/traffic-policy/fair-queue/node.tag/hash-interval/node.def
diff --git a/templates/qos-policy/fair-queue/node.tag/queue-limit/node.def b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def
index 471bd5b..471bd5b 100644
--- a/templates/qos-policy/fair-queue/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def
diff --git a/templates/traffic-policy/limiter/node.def b/templates/traffic-policy/limiter/node.def
new file mode 100644
index 0000000..f8bdf26
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Set traffic input limiting policy
+syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
+                   ; "only alpha-numeric policy name allowed"
+create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.def b/templates/traffic-policy/limiter/node.tag/class/node.def
new file mode 100644
index 0000000..24d7260
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.tag/class/node.def
@@ -0,0 +1,6 @@
+tag:
+type: u32
+help: Set class handle
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4090; "Class identifier must be between 1 and 4090"
+comp_help: possible completions
+ <1-4095>	Class ID
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
new file mode 100644
index 0000000..13c70ee
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
@@ -0,0 +1,8 @@
+type: txt
+help: Set the 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)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
index e22453c..e22453c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/description/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/description/node.def
index d4241e7..d4241e7 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/description/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/description/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def
index 2a5d021..2a5d021 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/description/node.def
index a56c59c..a56c59c 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/description/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
index e8be347..e8be347 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
diff --git a/templates/qos-policy/round-robin/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 05d6511..05d6511 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
index b993af6..b993af6 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
index ccd2d14..ccd2d14 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
index 54eef5b..54eef5b 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
diff --git a/templates/qos-policy/round-robin/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 561899c..561899c 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/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..d02dc5c 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/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..9c665c2 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
index 0bc690a..0bc690a 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
index 4271b94..4271b94 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
diff --git a/templates/qos-policy/round-robin/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 ecd96ab..ecd96ab 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
index 2f608f8..2f608f8 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
index 54eef5b..54eef5b 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
diff --git a/templates/qos-policy/round-robin/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 561899c..561899c 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/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..d02dc5c 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/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..9c665c2 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
index 23c96c2..23c96c2 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
index 4271b94..4271b94 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
diff --git a/templates/qos-policy/round-robin/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 ecd96ab..ecd96ab 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/qos-policy/round-robin/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 e22250d..e22250d 100644
--- a/templates/qos-policy/round-robin/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
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def
new file mode 100644
index 0000000..a99400d
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set priority for rule evaluation
+default: 20
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 20 ; \
+		   "priority must be between 0 and 20"
+help: Priority value
+comp_help: Priority for traffic limiting evaluation
+ <0-20> (default 20)
diff --git a/templates/qos-policy/network-emulator/node.tag/description/node.def b/templates/traffic-policy/limiter/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/network-emulator/node.tag/description/node.def
+++ b/templates/traffic-policy/limiter/node.tag/description/node.def
diff --git a/templates/qos-policy/network-emulator/node.def b/templates/traffic-policy/network-emulator/node.def
index 9a89c53..9a89c53 100644
--- a/templates/qos-policy/network-emulator/node.def
+++ b/templates/traffic-policy/network-emulator/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/bandwidth/node.def b/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def
index db8ca65..db8ca65 100644
--- a/templates/qos-policy/network-emulator/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/burst/node.def b/templates/traffic-policy/network-emulator/node.tag/burst/node.def
index 4df45de..4df45de 100644
--- a/templates/qos-policy/network-emulator/node.tag/burst/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/burst/node.def
diff --git a/templates/qos-policy/random-detect/node.tag/description/node.def b/templates/traffic-policy/network-emulator/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/random-detect/node.tag/description/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/description/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/network-delay/node.def b/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def
index 40b8437..40b8437 100644
--- a/templates/qos-policy/network-emulator/node.tag/network-delay/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/packet-corruption/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def
index fb0e975..fb0e975 100644
--- a/templates/qos-policy/network-emulator/node.tag/packet-corruption/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/packet-loss/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def
index 6501d7a..6501d7a 100644
--- a/templates/qos-policy/network-emulator/node.tag/packet-loss/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/packet-reordering/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def
index ee5c64a..ee5c64a 100644
--- a/templates/qos-policy/network-emulator/node.tag/packet-reordering/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def
diff --git a/templates/qos-policy/network-emulator/node.tag/queue-limit/node.def b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def
index 49c47b4..49c47b4 100644
--- a/templates/qos-policy/network-emulator/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def
diff --git a/templates/qos-policy/node.def b/templates/traffic-policy/node.def
index e6a2afc..e6a2afc 100644
--- a/templates/qos-policy/node.def
+++ b/templates/traffic-policy/node.def
diff --git a/templates/qos-policy/random-detect/node.def b/templates/traffic-policy/random-detect/node.def
index 7dc1caa..7dc1caa 100644
--- a/templates/qos-policy/random-detect/node.def
+++ b/templates/traffic-policy/random-detect/node.def
diff --git a/templates/qos-policy/random-detect/node.tag/bandwidth/node.def b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def
index eb0d4d9..eb0d4d9 100644
--- a/templates/qos-policy/random-detect/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def
diff --git a/templates/qos-policy/rate-control/node.tag/description/node.def b/templates/traffic-policy/random-detect/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/rate-control/node.tag/description/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/description/node.def
diff --git a/templates/qos-policy/random-detect/node.tag/precedence/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.def
index ac63dd6..ac63dd6 100644
--- a/templates/qos-policy/random-detect/node.tag/precedence/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.def
diff --git a/templates/qos-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..23cdb0f 100644
--- a/templates/qos-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
diff --git a/templates/qos-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 34964af..34964af 100644
--- a/templates/qos-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
diff --git a/templates/qos-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 3032d80..3032d80 100644
--- a/templates/qos-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
diff --git a/templates/qos-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 fe86423..fe86423 100644
--- a/templates/qos-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
diff --git a/templates/qos-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 49c47b4..49c47b4 100644
--- a/templates/qos-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
diff --git a/templates/qos-policy/rate-control/node.def b/templates/traffic-policy/rate-control/node.def
index 57bf98e..57bf98e 100644
--- a/templates/qos-policy/rate-control/node.def
+++ b/templates/traffic-policy/rate-control/node.def
diff --git a/templates/qos-policy/rate-control/node.tag/bandwidth/node.def b/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def
index db8ca65..db8ca65 100644
--- a/templates/qos-policy/rate-control/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def
diff --git a/templates/qos-policy/rate-control/node.tag/burst/node.def b/templates/traffic-policy/rate-control/node.tag/burst/node.def
index 4df45de..4df45de 100644
--- a/templates/qos-policy/rate-control/node.tag/burst/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/burst/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/description/node.def b/templates/traffic-policy/rate-control/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/round-robin/node.tag/description/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/description/node.def
diff --git a/templates/qos-policy/rate-control/node.tag/latency/node.def b/templates/traffic-policy/rate-control/node.tag/latency/node.def
index bef5491..bef5491 100644
--- a/templates/qos-policy/rate-control/node.tag/latency/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/latency/node.def
diff --git a/templates/qos-policy/round-robin/node.def b/templates/traffic-policy/round-robin/node.def
index 4427e1a..4427e1a 100644
--- a/templates/qos-policy/round-robin/node.def
+++ b/templates/traffic-policy/round-robin/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.def
index d606de1..d606de1 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/description/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/description/node.def
index d4241e7..d4241e7 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/description/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/description/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.def
index 2a5d021..2a5d021 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
index a56c59c..a56c59c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/description/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
index e8be347..e8be347 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
diff --git a/templates/qos-policy/traffic-shaper/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 05d6511..05d6511 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def
index b993af6..b993af6 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
index bb0c1e3..bb0c1e3 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
index ccd2d14..ccd2d14 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
index 54eef5b..54eef5b 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
diff --git a/templates/qos-policy/traffic-shaper/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 561899c..561899c 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/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..d02dc5c 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/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..9c665c2 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
index 0bc690a..0bc690a 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def
index 4271b94..4271b94 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def
diff --git a/templates/qos-policy/traffic-shaper/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 ecd96ab..ecd96ab 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
index 2f608f8..2f608f8 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
index 54eef5b..54eef5b 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
diff --git a/templates/qos-policy/traffic-shaper/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 561899c..561899c 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/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..d02dc5c 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/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..9c665c2 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
index 23c96c2..23c96c2 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
index 4271b94..4271b94 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
diff --git a/templates/qos-policy/traffic-shaper/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 ecd96ab..ecd96ab 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-policy/traffic-shaper/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 e22250d..e22250d 100644
--- a/templates/qos-policy/traffic-shaper/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
diff --git a/templates/qos-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 49c47b4..49c47b4 100644
--- a/templates/qos-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
diff --git a/templates/qos-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 ecbcede..ecbcede 100644
--- a/templates/qos-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
diff --git a/templates/qos-policy/round-robin/node.tag/default/node.def b/templates/traffic-policy/round-robin/node.tag/default/node.def
index de9cd5c..de9cd5c 100644
--- a/templates/qos-policy/round-robin/node.tag/default/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/default/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/default/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def
index 49c47b4..49c47b4 100644
--- a/templates/qos-policy/round-robin/node.tag/default/queue-limit/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
index 61f9506..61f9506 100644
--- a/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/description/node.def b/templates/traffic-policy/round-robin/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/description/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/description/node.def
diff --git a/templates/qos-policy/round-robin/node.tag/quantum/node.def b/templates/traffic-policy/round-robin/node.tag/quantum/node.def
index 62e3ce4..62e3ce4 100644
--- a/templates/qos-policy/round-robin/node.tag/quantum/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/quantum/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.def b/templates/traffic-policy/shaper/node.def
index cd7b07d..cd7b07d 100644
--- a/templates/qos-policy/traffic-shaper/node.def
+++ b/templates/traffic-policy/shaper/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/bandwidth/node.def
index eb0d4d9..eb0d4d9 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/shaper/node.tag/bandwidth/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.def b/templates/traffic-policy/shaper/node.tag/class/node.def
index 8d2bbf4..8d2bbf4 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def
index 91d7762..91d7762 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def
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
new file mode 100644
index 0000000..e22453c
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def
@@ -0,0 +1,7 @@
+type: txt
+help: Set the 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)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def
index 09ba853..09ba853 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/description/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..d4241e7
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this traffic class
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..2a5d021
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def
@@ -0,0 +1,4 @@
+tag:
+type: txt
+syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
+help: Set class matching rule name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def
new file mode 100644
index 0000000..a56c59c
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
new file mode 100644
index 0000000..e8be347
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
@@ -0,0 +1,2 @@
+type: macaddr
+help: Set the Ethernet destination address for this match
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
new file mode 100644
index 0000000..05d6511
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: Set Ethernet protocol for this match
+syntax:expression: ($VAR(@) >= 0 && $VAR(@) < 65536) ; "protocol must be between 0 and 65535"
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def
new file mode 100644
index 0000000..b993af6
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def
@@ -0,0 +1,2 @@
+type: macaddr
+help: Set the Ethernet source address for this match
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/interface/node.def
index bb0c1e3..bb0c1e3 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/interface/node.def
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
new file mode 100644
index 0000000..ccd2d14
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
@@ -0,0 +1,2 @@
+type: ipv4net
+help: Set IP destination address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
new file mode 100644
index 0000000..54eef5b
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
@@ -0,0 +1 @@
+help: Match on destination port or address
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
new file mode 100644
index 0000000..561899c
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: Set IP destination port for this match
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
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
new file mode 100644
index 0000000..d02dc5c
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -0,0 +1,18 @@
+type: txt
+help: Match on Differentiated Services Codepoint (DSCP)
+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)
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
new file mode 100644
index 0000000..9c665c2
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -0,0 +1,17 @@
+type: txt
+help: Match IP protocol name or number
+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
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
new file mode 100644
index 0000000..0bc690a
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
@@ -0,0 +1,2 @@
+type: ipv4net
+help: Set IP source address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def
new file mode 100644
index 0000000..4271b94
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def
@@ -0,0 +1 @@
+help: Match on source port or address
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
new file mode 100644
index 0000000..ecd96ab
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: Set IP source port for this match
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
new file mode 100644
index 0000000..2f608f8
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
@@ -0,0 +1,2 @@
+type: ipv6net
+help: Set IP destination address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
new file mode 100644
index 0000000..54eef5b
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
@@ -0,0 +1 @@
+help: Match on destination port or address
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
new file mode 100644
index 0000000..561899c
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: Set IP destination port for this match
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
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
new file mode 100644
index 0000000..d02dc5c
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -0,0 +1,18 @@
+type: txt
+help: Match on Differentiated Services Codepoint (DSCP)
+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)
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
new file mode 100644
index 0000000..9c665c2
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -0,0 +1,17 @@
+type: txt
+help: Match IP protocol name or number
+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
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
new file mode 100644
index 0000000..23c96c2
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
@@ -0,0 +1,2 @@
+type: ipv6net
+help: Set IP source address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
new file mode 100644
index 0000000..4271b94
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
@@ -0,0 +1 @@
+help: Match on source port or address
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
new file mode 100644
index 0000000..ecd96ab
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: Set IP source port for this match
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
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
new file mode 100644
index 0000000..e22250d
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Set 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
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def
index bcf8d0d..bcf8d0d 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def
diff --git a/templates/qos-policy/traffic-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 49c47b4..49c47b4 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def
diff --git a/templates/qos-policy/traffic-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 295c04c..295c04c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
diff --git a/templates/qos-policy/traffic-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..2fbddac 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def
index f0bc773..f0bc773 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def b/templates/traffic-policy/shaper/node.tag/default/burst/node.def
index f21eb9b..f21eb9b 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/burst/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def b/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def
index a0cc58b..a0cc58b 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/node.def b/templates/traffic-policy/shaper/node.tag/default/node.def
index de9cd5c..de9cd5c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def b/templates/traffic-policy/shaper/node.tag/default/priority/node.def
index 54f529b..54f529b 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/priority/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def
index 49c47b4..49c47b4 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/queue-limit/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
index 295c04c..295c04c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def b/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def
index a469ae8..a469ae8 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def
diff --git a/templates/traffic-policy/shaper/node.tag/description/node.def b/templates/traffic-policy/shaper/node.tag/description/node.def
new file mode 100644
index 0000000..1e8e64f
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this queuing policy