Revert "Move traffic-limiter to input-policy"

This reverts commit b75a66a4d5768f22a4b995d49ba442de8762a800.

29 files changed, 5 insertions, 145 deletions

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