Merge pull request #2 from kouak/lithium

HFSC Configuration support (#428)

57 files changed, 338 insertions, 0 deletions

diff --git a/templates/traffic-policy/shaper-hfsc/node.def b/templates/traffic-policy/shaper-hfsc/node.def
new file mode 100644
index 0000000..9572e38
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Traffic shaping HFSC based 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/shaper-hfsc/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/bandwidth/node.def
new file mode 100644
index 0000000..2812bd0
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/bandwidth/node.def
@@ -0,0 +1,12 @@
+type: txt
+help: Available bandwidth for this policy (sc and ul m2 on root qdisc)
+default: "auto"
+syntax:expression: $VAR(@) == "auto" || \
+		   exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
+
+val_help: auto; Rate matches interface speed (default)
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.def
new file mode 100644
index 0000000..1857c5b
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.def
@@ -0,0 +1,6 @@
+tag:
+type: u32
+help: Class handle
+syntax:expression: $VAR(@) > 1 && $VAR(@) <= 4095; \
+                  "Class identifier must be between 2 and 4095"
+val_help: u32:1-4095; Class identifier
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/description/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..9a24868
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Description for this traffic class
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/d/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/d/node.def
new file mode 100644
index 0000000..61c3650
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/d/node.def
@@ -0,0 +1,6 @@
+type: txt
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
+help: Service curve delay 
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/m1/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/m1/node.def
new file mode 100644
index 0000000..5042d96
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/m1/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Linkshare m1 parameter for class traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/m2/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/m2/node.def
new file mode 100644
index 0000000..e3fbe2b
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/m2/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Linkshare m2 traffic for class traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/node.def
new file mode 100644
index 0000000..0f562a4
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/linkshare/node.def
@@ -0,0 +1 @@
+help: Linkshare class settings
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..cde128f
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/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: Class matching rule name
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def
new file mode 100644
index 0000000..903f260
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Description for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
new file mode 100644
index 0000000..92fb9a9
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
@@ -0,0 +1,2 @@
+type: macaddr
+help: Ethernet destination address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def
new file mode 100644
index 0000000..454c1ed
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def
@@ -0,0 +1 @@
+help: Ethernet header match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
new file mode 100644
index 0000000..9da50a6
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
@@ -0,0 +1,15 @@
+type: txt
+help: Ethernet protocol for this match
+allowed: echo \
+    all 802.1Q 802_2 802_3 aarp aoe arp atalk \
+    dec ip ipv6 ipx lat localtalk rarp snap x25
+
+val_help: u32:0-65535; Ethernet protocol number
+val_help: txt; Ethernet protocol name
+val_help: all; Any protocol
+val_help: ip; Internet IP (IPv4)
+val_help: _ipv6; Internet IP (IPv6)
+val_help: arp; Address Resolution Protocol
+val_help: atalk; Appletalk
+val_help: ipx; Novell Internet Packet Exchange
+val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def
new file mode 100644
index 0000000..3094167
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def
@@ -0,0 +1,2 @@
+type: macaddr
+help: Ethernet source address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def
new file mode 100644
index 0000000..f12c59c
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def
@@ -0,0 +1,7 @@
+type: txt
+help: Interface name for this match
+syntax:expression: exec "[ -f /sys/class/net/$VAR(@)/ifindex ]" ; "Interface must already exist"
+allowed: local -a array
+	 array=( /sys/class/net/* )
+         echo -n ${array[@]##*/}
+
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
new file mode 100644
index 0000000..8d02285
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
@@ -0,0 +1,2 @@
+type: ipv4net
+help: IP destination address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/shaper-hfsc/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-hfsc/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-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
new file mode 100644
index 0000000..fc85c5f
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -0,0 +1,5 @@
+type: txt
+help: TCP (or UDP) destination port for this match
+
+val_help: u32:1-65535; Numeric IP port
+val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
new file mode 100644
index 0000000..224b002
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/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
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def
new file mode 100644
index 0000000..517dc71
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def
@@ -0,0 +1,2 @@
+help: Match IP protocol header
+
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
new file mode 100644
index 0000000..b0ef59f
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -0,0 +1,16 @@
+type: txt
+help: Match IP protocol name or number
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
+allowed: awk '
+	/^#/ { next }
+	     { if($1 != "ip") printf "%s ", $1 }' </etc/protocols
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
new file mode 100644
index 0000000..6053344
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
@@ -0,0 +1,2 @@
+type: ipv4net
+help: IP source address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/shaper-hfsc/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-hfsc/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-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
new file mode 100644
index 0000000..6d211d1
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: TCP (or UDP) source port for this match
+
+val_help: u32:1-65535; Numeric IP port
+val_help: txt; Assigned TCP (or UDP) port name
+
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
new file mode 100644
index 0000000..3fbbc31
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
@@ -0,0 +1,2 @@
+type: ipv6net
+help: IP destination address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/shaper-hfsc/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-hfsc/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-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
new file mode 100644
index 0000000..fc85c5f
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -0,0 +1,5 @@
+type: txt
+help: TCP (or UDP) destination port for this match
+
+val_help: u32:1-65535; Numeric IP port
+val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
new file mode 100644
index 0000000..224b002
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/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
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def
new file mode 100644
index 0000000..8ff47bb
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def
@@ -0,0 +1 @@
+help: Match IPV6 header
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
new file mode 100644
index 0000000..355c6a6
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -0,0 +1,16 @@
+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
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
new file mode 100644
index 0000000..9071a74
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
@@ -0,0 +1,2 @@
+type: ipv6net
+help: IP source address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/shaper-hfsc/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-hfsc/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-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
new file mode 100644
index 0000000..6d211d1
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: TCP (or UDP) source port for this match
+
+val_help: u32:1-65535; Numeric IP port
+val_help: txt; Assigned TCP (or UDP) port name
+
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def
new file mode 100644
index 0000000..a3a805e
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Match on mark applied by firewall
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def
new file mode 100644
index 0000000..d975074
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Virtual Local Area Network (VLAN) ID for this match
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
+                  "VLAN ID must be between 0 and 4095"
+val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/d/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/d/node.def
new file mode 100644
index 0000000..61c3650
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/d/node.def
@@ -0,0 +1,6 @@
+type: txt
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
+help: Service curve delay 
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/m1/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/m1/node.def
new file mode 100644
index 0000000..05f56ff
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/m1/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Realtime m1 traffic for class traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/m2/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/m2/node.def
new file mode 100644
index 0000000..7895416
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/m2/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Realtime m2 traffic for class traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/node.def
new file mode 100644
index 0000000..dbc840b
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/realtime/node.def
@@ -0,0 +1 @@
+help: Realtime class settings
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/d/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/d/node.def
new file mode 100644
index 0000000..61c3650
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/d/node.def
@@ -0,0 +1,6 @@
+type: txt
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
+help: Service curve delay 
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/m1/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/m1/node.def
new file mode 100644
index 0000000..8c72edf
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/m1/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Upperlimit m1 traffic for class traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/m2/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/m2/node.def
new file mode 100644
index 0000000..886e8db
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/m2/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Upperlimit m2 traffic for class traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/node.def
new file mode 100644
index 0000000..76bdafb
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/upperlimit/node.def
@@ -0,0 +1 @@
+help: Upperlimit class settings
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/d/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/d/node.def
new file mode 100644
index 0000000..61c3650
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/d/node.def
@@ -0,0 +1,6 @@
+type: txt
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
+help: Service curve delay 
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/m1/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/m1/node.def
new file mode 100644
index 0000000..ab9048e
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/m1/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Linkshare m1 parameter for default traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/m2/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/m2/node.def
new file mode 100644
index 0000000..45c3cdc
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/m2/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Linkshare m2 parameter for default queue
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/node.def
new file mode 100644
index 0000000..710b9bc
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/linkshare/node.def
@@ -0,0 +1 @@
+help: Linkshare settings for default traffic class
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/node.def
new file mode 100644
index 0000000..142cba3
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/node.def
@@ -0,0 +1 @@
+help: Default policy
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/d/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/d/node.def
new file mode 100644
index 0000000..61c3650
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/d/node.def
@@ -0,0 +1,6 @@
+type: txt
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
+help: Service curve delay 
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/m1/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/m1/node.def
new file mode 100644
index 0000000..b9d4807
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/m1/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Realtime m1 parameter for default traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/m2/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/m2/node.def
new file mode 100644
index 0000000..6d320ce
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/m2/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Realtime m2 parameter default traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/node.def
new file mode 100644
index 0000000..17bfc2a
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/realtime/node.def
@@ -0,0 +1 @@
+help: Realtime settings for default traffic class
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/d/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/d/node.def
new file mode 100644
index 0000000..61c3650
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/d/node.def
@@ -0,0 +1,6 @@
+type: txt
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
+help: Service curve delay 
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/m1/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/m1/node.def
new file mode 100644
index 0000000..fe85bd4
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/m1/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Upperlimit m1 parameter for default traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/m2/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/m2/node.def
new file mode 100644
index 0000000..e90e303
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/m2/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Upperlimit m2 parameter for default traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
+
+val_help: <number>; Bandwidth in Kbps(10^3 bits per second)
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number>bit; bit(1), kbit(10^3), mbit(10^6), gbit, tbit
+val_help: <number>ibit; kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)
+val_help: <number>ibps; kibps(1024*8), mibps(1024^2*8), gibps, tibps *Byte/sec*
+val_help: <number>bps; bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps *Byte/sec*
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/node.def
new file mode 100644
index 0000000..49626ad
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/default/upperlimit/node.def
@@ -0,0 +1 @@
+help: Upperlimit settings for default class traffic
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/description/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/description/node.def
new file mode 100644
index 0000000..1da9e34
--- /dev/null
+++ b/templates/traffic-policy/shaper-hfsc/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Description for this queuing policy