From 4f12cc5f730a7759bc668b56165fe79b058dcfcd Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 7 Jun 2010 10:31:08 -0700
Subject: Revert "Move traffic-limiter to input-policy"

This reverts commit b75a66a4d5768f22a4b995d49ba442de8762a800.
---
 .../input-policy/limit/class/node.def              |  6 --
 .../limit/class/node.tag/bandwidth/node.def        |  8 --
 .../limit/class/node.tag/burst/node.def            |  7 --
 .../limit/class/node.tag/description/node.def      |  2 -
 .../limit/class/node.tag/match/node.def            |  4 -
 .../node.tag/match/node.tag/description/node.def   |  2 -
 .../match/node.tag/ether/destination/node.def      |  2 -
 .../match/node.tag/ether/protocol/node.def         |  3 -
 .../node.tag/match/node.tag/ether/source/node.def  |  2 -
 .../match/node.tag/ip/destination/address/node.def |  2 -
 .../match/node.tag/ip/destination/node.def         |  1 -
 .../match/node.tag/ip/destination/port/node.def    |  3 -
 .../class/node.tag/match/node.tag/ip/dscp/node.def | 18 -----
 .../node.tag/match/node.tag/ip/protocol/node.def   | 17 ----
 .../match/node.tag/ip/source/address/node.def      |  2 -
 .../node.tag/match/node.tag/ip/source/node.def     |  1 -
 .../match/node.tag/ip/source/port/node.def         |  3 -
 .../node.tag/ipv6/destination/address/node.def     |  2 -
 .../match/node.tag/ipv6/destination/node.def       |  1 -
 .../match/node.tag/ipv6/destination/port/node.def  |  3 -
 .../node.tag/match/node.tag/ipv6/dscp/node.def     | 18 -----
 .../node.tag/match/node.tag/ipv6/protocol/node.def | 17 ----
 .../match/node.tag/ipv6/source/address/node.def    |  2 -
 .../node.tag/match/node.tag/ipv6/source/node.def   |  1 -
 .../match/node.tag/ipv6/source/port/node.def       |  3 -
 .../class/node.tag/match/node.tag/vif/node.def     |  5 --
 .../limit/class/node.tag/priority/node.def         |  8 --
 .../input-policy/limit/description/node.def        |  2 -
 interface-templates/qos-policy/in/node.def         |  5 ++
 lib/Vyatta/Qos/IngressLimit.pm                     | 87 --------------------
 lib/Vyatta/Qos/TrafficLimiter.pm                   | 93 ++++++++++++++++++++++
 templates/qos-policy/traffic-limiter/node.def      |  8 ++
 .../traffic-limiter/node.tag/class/node.def        |  6 ++
 .../node.tag/class/node.tag/bandwidth/node.def     |  8 ++
 .../node.tag/class/node.tag/burst/node.def         |  7 ++
 .../node.tag/class/node.tag/description/node.def   |  2 +
 .../node.tag/class/node.tag/match/node.def         |  4 +
 .../node.tag/match/node.tag/description/node.def   |  2 +
 .../match/node.tag/ether/destination/node.def      |  2 +
 .../match/node.tag/ether/protocol/node.def         |  3 +
 .../node.tag/match/node.tag/ether/source/node.def  |  2 +
 .../match/node.tag/ip/destination/address/node.def |  2 +
 .../match/node.tag/ip/destination/node.def         |  1 +
 .../match/node.tag/ip/destination/port/node.def    |  3 +
 .../class/node.tag/match/node.tag/ip/dscp/node.def | 18 +++++
 .../node.tag/match/node.tag/ip/protocol/node.def   | 17 ++++
 .../match/node.tag/ip/source/address/node.def      |  2 +
 .../node.tag/match/node.tag/ip/source/node.def     |  1 +
 .../match/node.tag/ip/source/port/node.def         |  3 +
 .../node.tag/ipv6/destination/address/node.def     |  2 +
 .../match/node.tag/ipv6/destination/node.def       |  1 +
 .../match/node.tag/ipv6/destination/port/node.def  |  3 +
 .../node.tag/match/node.tag/ipv6/dscp/node.def     | 18 +++++
 .../node.tag/match/node.tag/ipv6/protocol/node.def | 17 ++++
 .../match/node.tag/ipv6/source/address/node.def    |  2 +
 .../node.tag/match/node.tag/ipv6/source/node.def   |  1 +
 .../match/node.tag/ipv6/source/port/node.def       |  3 +
 .../class/node.tag/match/node.tag/vif/node.def     |  5 ++
 .../node.tag/class/node.tag/priority/node.def      |  8 ++
 .../traffic-limiter/node.tag/description/node.def  |  2 +
 60 files changed, 251 insertions(+), 232 deletions(-)
 delete mode 100644 interface-templates/input-policy/limit/class/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/bandwidth/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/burst/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/description/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/description/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/destination/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/protocol/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/source/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/address/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/port/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/protocol/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/address/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/port/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/dscp/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/protocol/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/address/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/port/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/match/node.tag/vif/node.def
 delete mode 100644 interface-templates/input-policy/limit/class/node.tag/priority/node.def
 delete mode 100644 interface-templates/input-policy/limit/description/node.def
 create mode 100644 interface-templates/qos-policy/in/node.def
 delete mode 100644 lib/Vyatta/Qos/IngressLimit.pm
 create mode 100644 lib/Vyatta/Qos/TrafficLimiter.pm
 create mode 100644 templates/qos-policy/traffic-limiter/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/description/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/description/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/class/node.tag/priority/node.def
 create mode 100644 templates/qos-policy/traffic-limiter/node.tag/description/node.def

diff --git a/interface-templates/input-policy/limit/class/node.def b/interface-templates/input-policy/limit/class/node.def
deleted file mode 100644
index 2a77af0..0000000
--- a/interface-templates/input-policy/limit/class/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-tag:
-type: u32
-help: Set class handle
-syntax:expression: $VAR(@) >= 1 && $VAR(@) < 4096; "Class identifier must be between 1 and 4095"
-comp_help: possible completions
- <1-4095>	Class ID
diff --git a/interface-templates/input-policy/limit/class/node.tag/bandwidth/node.def b/interface-templates/input-policy/limit/class/node.tag/bandwidth/node.def
deleted file mode 100644
index 13c70ee..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/bandwidth/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/burst/node.def b/interface-templates/input-policy/limit/class/node.tag/burst/node.def
deleted file mode 100644
index e22453c..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/burst/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/description/node.def b/interface-templates/input-policy/limit/class/node.tag/description/node.def
deleted file mode 100644
index d4241e7..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Set description for this traffic class
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.def
deleted file mode 100644
index 2a5d021..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
-help: Set class matching rule name
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/description/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/description/node.def
deleted file mode 100644
index a56c59c..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Set description for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/destination/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/destination/node.def
deleted file mode 100644
index e8be347..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Set the Ethernet destination address for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/protocol/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/protocol/node.def
deleted file mode 100644
index 05d6511..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/protocol/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/source/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/source/node.def
deleted file mode 100644
index b993af6..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ether/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Set the Ethernet source address for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/address/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/address/node.def
deleted file mode 100644
index ccd2d14..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: Set IP destination address for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/port/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/port/node.def
deleted file mode 100644
index 561899c..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/dscp/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/dscp/node.def
deleted file mode 100644
index d02dc5c..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/protocol/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/protocol/node.def
deleted file mode 100644
index 9c665c2..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/protocol/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/address/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/address/node.def
deleted file mode 100644
index 0bc690a..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: Set IP source address for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/port/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/port/node.def
deleted file mode 100644
index ecd96ab..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ip/source/port/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/address/node.def
deleted file mode 100644
index 2f608f8..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: Set IP destination address for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/port/node.def
deleted file mode 100644
index 561899c..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/dscp/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/dscp/node.def
deleted file mode 100644
index d02dc5c..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/protocol/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/protocol/node.def
deleted file mode 100644
index 9c665c2..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/address/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/address/node.def
deleted file mode 100644
index 23c96c2..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: Set IP source address for this match
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/port/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/port/node.def
deleted file mode 100644
index ecd96ab..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/match/node.tag/vif/node.def b/interface-templates/input-policy/limit/class/node.tag/match/node.tag/vif/node.def
deleted file mode 100644
index e22250d..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/match/node.tag/vif/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-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/interface-templates/input-policy/limit/class/node.tag/priority/node.def b/interface-templates/input-policy/limit/class/node.tag/priority/node.def
deleted file mode 100644
index a99400d..0000000
--- a/interface-templates/input-policy/limit/class/node.tag/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-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/interface-templates/input-policy/limit/description/node.def b/interface-templates/input-policy/limit/description/node.def
deleted file mode 100644
index 1e8e64f..0000000
--- a/interface-templates/input-policy/limit/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Set description for this queuing policy
diff --git a/interface-templates/qos-policy/in/node.def b/interface-templates/qos-policy/in/node.def
new file mode 100644
index 0000000..67d3e4b
--- /dev/null
+++ b/interface-templates/qos-policy/in/node.def
@@ -0,0 +1,5 @@
+type: txt
+help: Set inbound QOS policy for interface
+allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy in
+update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $IFNAME in $VAR(@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $IFNAME in
diff --git a/lib/Vyatta/Qos/IngressLimit.pm b/lib/Vyatta/Qos/IngressLimit.pm
deleted file mode 100644
index e9e2fbb..0000000
--- a/lib/Vyatta/Qos/IngressLimit.pm
+++ /dev/null
@@ -1,87 +0,0 @@
-# Ingress traffic limit
-#
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2010 Vyatta, Inc.
-# All Rights Reserved.
-# **** End License ****
-
-package Vyatta::Qos::IngressLimit;
-use strict;
-use warnings;
-
-require Vyatta::Config;
-require Vyatta::Qos::LimiterClass;
-
-
-# Create a new instance based on config information
-sub new {
-    my ( $that, $config, $name ) = @_;
-    my $self = {};
-    my $class = ref($that) || $that;
-
-    bless $self, $class;
-    $self->_define($config);
-
-    return $self;
-}
-
-# Setup new instance.
-sub _define {
-    my ( $self, $config ) = @_;
-    my $level   = $config->setLevel();
-    my @classes = ();
-
-    $self->{_level} = $level;
-
-    # make sure no clash of different types of tc filters
-    my %matchTypes = ();
-    foreach my $class ( $config->listNodes("class") ) {
-        foreach my $match ( $config->listNodes("class $class match") ) {
-            foreach my $type ( $config->listNodes("class $class match $match") ) {
-		next if ($type eq 'description');
-                $matchTypes{$type} = "$class match $match";
-            }
-        }
-    }
-
-    if ( scalar keys %matchTypes > 1 && $matchTypes{ip} ) {
-        print "Match type conflict:\n";
-        while ( my ( $type, $usage ) = each(%matchTypes) ) {
-            print "   class $usage $type\n";
-        }
-        die "$level can not match on both ip and other types\n";
-    }
-
-    foreach my $id ( $config->listNodes("class") ) {
-        $config->setLevel("$level class $id");
-        push @classes, new Vyatta::Qos::LimiterClass( $config, $id );
-    }
-    $self->{_classes} = \@classes;
-}
-
-sub commands {
-    my ( $self, $dev, $parent ) = @_;
-    my $classes = $self->{_classes};
-
-    foreach my $class (@$classes) {
-        foreach my $match ( $class->matchRules() ) {
-	    my $police = " police rate " . $class->{rate}
-	    	. " action drop burst " . $class->{burst};
-
-	    $match->filter( $dev, $parent, $class->{id}, $class->{priority},
-			    undef, $police );
-        }
-    }
-}
-
-1;
diff --git a/lib/Vyatta/Qos/TrafficLimiter.pm b/lib/Vyatta/Qos/TrafficLimiter.pm
new file mode 100644
index 0000000..246d593
--- /dev/null
+++ b/lib/Vyatta/Qos/TrafficLimiter.pm
@@ -0,0 +1,93 @@
+# Traffic limiter
+# This is a rate limiter based on ingress qdisc
+#
+# **** License ****
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# This code was originally developed by Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc.
+# All Rights Reserved.
+# **** End License ****
+
+package Vyatta::Qos::TrafficLimiter;
+use strict;
+use warnings;
+
+require Vyatta::Config;
+require Vyatta::Qos::LimiterClass;
+
+my %fields = (
+    _level   => undef,
+    _classes => undef,
+);
+
+# Create a new instance based on config information
+sub new {
+    my ( $that, $config, $name ) = @_;
+    my $self = {%fields};
+    my $class = ref($that) || $that;
+
+    bless $self, $class;
+    $self->_define($config);
+
+    return $self;
+}
+
+# Setup new instance.
+# Assumes caller has done $config->setLevel to "traffic-limiter $name"
+sub _define {
+    my ( $self, $config ) = @_;
+    my $level   = $config->setLevel();
+    my @classes = ();
+
+    $self->{_level} = $level;
+
+    # make sure no clash of different types of tc filters
+    my %matchTypes = ();
+    foreach my $class ( $config->listNodes("class") ) {
+        foreach my $match ( $config->listNodes("class $class match") ) {
+            foreach my $type ( $config->listNodes("class $class match $match") ) {
+		next if ($type eq 'description');
+                $matchTypes{$type} = "$class match $match";
+            }
+        }
+    }
+
+    if ( scalar keys %matchTypes > 1 && $matchTypes{ip} ) {
+        print "Match type conflict:\n";
+        while ( my ( $type, $usage ) = each(%matchTypes) ) {
+            print "   class $usage $type\n";
+        }
+        die "$level can not match on both ip and other types\n";
+    }
+
+    foreach my $id ( $config->listNodes("class") ) {
+        $config->setLevel("$level class $id");
+        push @classes, new Vyatta::Qos::LimiterClass( $config, $id );
+    }
+    $self->{_classes} = \@classes;
+}
+
+sub commands {
+    my ( $self, $dev, $parent ) = @_;
+    my $classes = $self->{_classes};
+
+    foreach my $class (@$classes) {
+        foreach my $match ( $class->matchRules() ) {
+	    my $police = " police rate " . $class->{rate}
+	    	. " action drop burst " . $class->{burst};
+
+	    $match->filter( $dev, $parent, $class->{id}, $class->{priority},
+			    undef, $police );
+        }
+    }
+}
+
+1;
diff --git a/templates/qos-policy/traffic-limiter/node.def b/templates/qos-policy/traffic-limiter/node.def
new file mode 100644
index 0000000..f8bdf26
--- /dev/null
+++ b/templates/qos-policy/traffic-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/qos-policy/traffic-limiter/node.tag/class/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.def
new file mode 100644
index 0000000..2a77af0
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.def
@@ -0,0 +1,6 @@
+tag:
+type: u32
+help: Set class handle
+syntax:expression: $VAR(@) >= 1 && $VAR(@) < 4096; "Class identifier must be between 1 and 4095"
+comp_help: possible completions
+ <1-4095>	Class ID
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def
new file mode 100644
index 0000000..13c70ee
--- /dev/null
+++ b/templates/qos-policy/traffic-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-limiter/node.tag/class/node.tag/burst/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def
new file mode 100644
index 0000000..e22453c
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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-limiter/node.tag/class/node.tag/description/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..d4241e7
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..2a5d021
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/description/node.def
new file mode 100644
index 0000000..a56c59c
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
new file mode 100644
index 0000000..e8be347
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
new file mode 100644
index 0000000..05d6511
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
new file mode 100644
index 0000000..b993af6
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
new file mode 100644
index 0000000..ccd2d14
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
new file mode 100644
index 0000000..54eef5b
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
new file mode 100644
index 0000000..561899c
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
new file mode 100644
index 0000000..d02dc5c
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
new file mode 100644
index 0000000..9c665c2
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
new file mode 100644
index 0000000..0bc690a
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
new file mode 100644
index 0000000..4271b94
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
new file mode 100644
index 0000000..ecd96ab
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
new file mode 100644
index 0000000..2f608f8
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
new file mode 100644
index 0000000..54eef5b
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
new file mode 100644
index 0000000..561899c
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
new file mode 100644
index 0000000..d02dc5c
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
new file mode 100644
index 0000000..9c665c2
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
new file mode 100644
index 0000000..23c96c2
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
new file mode 100644
index 0000000..4271b94
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
new file mode 100644
index 0000000..ecd96ab
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
new file mode 100644
index 0000000..e22250d
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/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-limiter/node.tag/class/node.tag/priority/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/priority/node.def
new file mode 100644
index 0000000..a99400d
--- /dev/null
+++ b/templates/qos-policy/traffic-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/traffic-limiter/node.tag/description/node.def b/templates/qos-policy/traffic-limiter/node.tag/description/node.def
new file mode 100644
index 0000000..1e8e64f
--- /dev/null
+++ b/templates/qos-policy/traffic-limiter/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this queuing policy
-- 
cgit v1.2.3