Rearrange Qos commands for Larkspur

Current (Kenwood and earlier):
set qos-policy traffic-shaper TS { ...classes }
set qos-policy traffic-limiter TL { ...classes }
seq qos-policy network-emulator NE ...
set qos-policy random-detect RD ...
set qos-policy rate-limiter RC ...
set qos-policy round-robin RR ...

set interfaces ethernet eth0 qos-policy out TS
set interfaces ethernet eth0 qos-policy in TL

New (Larkspur and later):
set traffic-policy shaper TS { ...classes }
set traffic-policy limiter TL { ...classes }
seq traffic-policy network-emulator NE ...
set traffic-policy random-detect RD ...
set traffic-policy rate-control RC ...
set traffic-policy round-robin RR ...

set interfaces ethernet eth0 traffic-policy out TS
set interfaces ethernet eth0 traffic-policy in TL
set interfaces ethernet eth0 redirect ifb0
set interfaces ethernet eth0 mirror eth2

Note:
 1. Only one of the following is allowed:  "redirect", or "mirror"
 2. Traffic-policy limiter is allowed with redirection/mirror and takes place
    before mirror/redirect action (NEW)
 3. Limiter policy may applied on output (NEW)
 4. Only limiter policies can be applied on input (same as previous releases)

This does add some new functionality (#2, and #3) which are possible because
of how filter classes are implemented.

29 files changed, 153 insertions, 0 deletions

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/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
new file mode 100644
index 0000000..e22453c
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/description/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..d4241e7
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..2a5d021
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..a56c59c
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..e8be347
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
new file mode 100644
index 0000000..05d6511
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..b993af6
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..ccd2d14
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..54eef5b
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
new file mode 100644
index 0000000..561899c
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
new file mode 100644
index 0000000..d02dc5c
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
new file mode 100644
index 0000000..9c665c2
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..0bc690a
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..4271b94
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
new file mode 100644
index 0000000..ecd96ab
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..2f608f8
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..54eef5b
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
new file mode 100644
index 0000000..561899c
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
new file mode 100644
index 0000000..d02dc5c
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
new file mode 100644
index 0000000..9c665c2
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..23c96c2
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/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
new file mode 100644
index 0000000..4271b94
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
new file mode 100644
index 0000000..ecd96ab
--- /dev/null
+++ b/templates/traffic-policy/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/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
new file mode 100644
index 0000000..e22250d
--- /dev/null
+++ b/templates/traffic-policy/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/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/traffic-policy/limiter/node.tag/description/node.def b/templates/traffic-policy/limiter/node.tag/description/node.def
new file mode 100644
index 0000000..1e8e64f
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this queuing policy