Add Weighted RED Qos

Bug 4296
Ehancement to allow configuring GRED as form of weighted RED.

43 files changed, 401 insertions, 0 deletions

diff --git a/Makefile.am b/Makefile.am
index 22120fa..5ff8e87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ share_perl5_DATA += lib/Vyatta/Qos/DropTail.pm
 share_perl5_DATA += lib/Vyatta/Qos/TrafficLimiter.pm
 share_perl5_DATA += lib/Vyatta/Qos/LimiterClass.pm
 share_perl5_DATA += lib/Vyatta/Qos/RoundRobin.pm
+share_perl5_DATA += lib/Vyatta/Qos/WeightedRandom.pm
 
 etcdir           = /etc
 etc_SCRIPTS      =
diff --git a/lib/Vyatta/Qos/WeightedRandom.pm b/lib/Vyatta/Qos/WeightedRandom.pm
new file mode 100644
index 0000000..12e591a
--- /dev/null
+++ b/lib/Vyatta/Qos/WeightedRandom.pm
@@ -0,0 +1,177 @@
+# Weighted Random i.e. GRED (Generic Random Early Detect)
+#
+# **** 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::WeightedRandom;
+use strict;
+use warnings;
+
+require Vyatta::Config;
+require Vyatta::Qos::ShaperClass;
+
+my $wred = 'weighted-random-detect';
+
+# Create a new instance based on config information
+sub new {
+    my ( $that, $config, $name ) = @_;
+    my $level = $config->setLevel();
+    my $rate  = $config->returnValue("bandwidth");
+
+    my @classes = _getClasses($level);
+
+    _checkClasses( $level, $rate, @classes );
+
+    my $self = {};
+    my $class = ref($that) || $that;
+    bless $self, $class;
+    $self->{_classes} = \@classes;
+
+    return $self;
+}
+
+sub _getClasses {
+    my $level = shift;
+    my @classes;
+    my $config = new Vyatta::Config;
+
+    $config->setLevel($level);
+    $config->exists("default")
+      or die "$level configuration not complete: missing default class\n";
+
+    $config->setLevel("$level default");
+    push @classes, new Vyatta::Qos::ShaperClass($config);
+    $config->setLevel($level);
+
+    foreach my $id ( $config->listNodes("class") ) {
+        $config->setLevel("$level class $id");
+        push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
+    }
+
+    return @classes;
+}
+
+# Check constraints on class bandwidth values
+sub _checkClasses {
+    my $level   = shift;
+    my $rate    = shift;
+    my $default = shift;
+
+    # if auto, can't check at create must wait for policy to be applied
+    $rate = ( $rate eq "auto" ) ? undef : getRate($rate);
+    $default->rateCheck( $rate, "$level default" ) if $rate;
+
+    foreach my $class (@_) {
+        die "$class->{level} bandwidth not defined\n" unless $class->{_rate};
+        $class->rateCheck( $rate, "$level class $class->{id}" ) if $rate;
+    }
+}
+
+sub commands {
+    my ( $self, $dev ) = @_;
+    my $rate    = getAutoRate( $self->{_rate}, $dev );
+    my $classes = $self->{_classes};
+    my $default = shift @$classes;
+    my $maxid   = 1;
+
+    $default->rateCheck( $rate, "$self->{_level} default" );
+    foreach my $class (@$classes) {
+        $class->rateCheck( $rate, "$self->{_level} class $class->{id}" );
+
+        # find largest class id
+        if ( defined $class->{id} && $class->{id} > $maxid ) {
+            $maxid = $class->{id};
+        }
+    }
+
+    # fill in id of default
+    $default->{id} = ++$maxid;
+    unshift @$classes, $default;
+
+    print "qdisc add dev $dev root handle 1: gred";
+    print " setup DPs $maxid default $maxid";
+
+    foreach my $class (@$classes) {
+        my $classbw = $class->get_rate($rate);
+        my $avg     = $class->{_avgpkt};
+        my $latency = $class->{_latency};
+
+        my ( $qmin, $qmax, $burst ) = RedParam( $classbw, $latency, $avg );
+
+        print "qdisc chang dev $dev root gred ";
+        printf "limit %d min %d max %d avpkt %d", 4 * $qmax, $qmin, $qmax, $avg;
+        printf " burst %d probability 0.02 bandwidth %d ecn\n",
+          $burst, $classbw / 1000;
+
+        foreach my $match ( $class->matchRules() ) {
+            $match->filter( $dev, 1, $class->{_priority} );
+            printf " flowid :%x\n", $class->{id};
+        }
+    }
+}
+
+# Walk configuration tree and look for changed nodes
+# The configuration system should do this but doesn't do it right
+sub isChanged {
+    my ( $self, $name ) = @_;
+    my $config = new Vyatta::Config;
+    my @attributes =
+      qw(bandwidth burst latency packet-length priority queue-limit);
+
+    $config->setLevel("qos-policy $wred $name");
+
+    return 'bandwidth' if ( $config->isChanged('bandwidth') );
+
+    foreach my $attr (@attributes) {
+	return "default $attr" if ( $config->isChanged("default $attr") );
+    }
+
+    my %classNodes = $config->listNodeStatus('class');
+    while ( my ( $class, $status ) = each %classNodes ) {
+        return "class $class" if ( $status ne 'static' );
+
+        foreach my $attr (@attributes) {
+            return "class $class $attr"
+              if ( $config->isChanged("class $class $attr") );
+        }
+
+        my %matchNodes = $config->listNodeStatus("class $class match");
+        while ( my ( $match, $status ) = each %matchNodes ) {
+            my $level = "class $class match $match";
+            return $level if ( $status ne 'static' );
+
+            foreach my $parm (
+                'vif',
+                'ether destination',
+                'ether source',
+                'ether protocol',
+                'interface',
+                'ip dscp',
+                'ip protocol',
+                'ip source address',
+                'ip destination address',
+                'ip source port',
+                'ip destination port'
+              )
+            {
+                return "$level $parm" if ( $config->isChanged("$level $parm") );
+            }
+        }
+    }
+
+    return;    # false
+}
+
+1;
diff --git a/scripts/vyatta-qos.pl b/scripts/vyatta-qos.pl
index 241925a..aa67127 100755
--- a/scripts/vyatta-qos.pl
+++ b/scripts/vyatta-qos.pl
@@ -34,6 +34,7 @@ my %policies = (
         'network-emulator' => 'NetworkEmulator',
 	'round-robin'	   => 'RoundRobin',
 	'priority-queue'   => 'Priority',
+	'weighted-random-detect' => 'WeightedRandom',
     },
     'in' => { 'traffic-limiter' => 'TrafficLimiter', }
 );
diff --git a/templates/qos-policy/weighted-random-detect/node.def b/templates/qos-policy/weighted-random-detect/node.def
new file mode 100644
index 0000000..02911a1
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Set Weighted Random Early Detect 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/weighted-random-detect/node.tag/bandwidth/node.def b/templates/qos-policy/weighted-random-detect/node.tag/bandwidth/node.def
new file mode 100644
index 0000000..76fa6e2
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/bandwidth/node.def
@@ -0,0 +1,11 @@
+type: txt
+help: Set the available bandwidth for this policy
+default: "auto"
+syntax:expression: exec "[[ \"$VAR(@)\" == \"auto\" ]] || \
+	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
+comp_help: Allowed values:
+ auto              Set bandwidth based on interface speed (default)
+ <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/weighted-random-detect/node.tag/class/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.def
new file mode 100644
index 0000000..d606de1
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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 3 and 4095"
+comp_help: possible completions
+ <2-4095>	Class ID
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/bandwidth/node.def
new file mode 100644
index 0000000..6f15037
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/bandwidth/node.def
@@ -0,0 +1,10 @@
+type: txt
+default: "100%"
+help: Set the bandwidth used for this class
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\""
+comp_help: Allowed values:
+ <number>          Bandwidth in Kbps
+ <number>%%        Percentage of overall rate (default 100%%)
+ <number><suffix>  Value with scaling suffix
+                   bits per sec (kbit, mbit, gbit)
+                   bytes per sec (kbps, mbps, gbps)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/burst/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/burst/node.def
new file mode 100644
index 0000000..54ae4f3
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/description/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..d4241e7
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/latency/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/latency/node.def
new file mode 100644
index 0000000..97501c5
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/latency/node.def
@@ -0,0 +1,8 @@
+type: txt
+help: Set maximum desired latency
+default: "100ms"
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time \"$VAR(@)\""
+comp_help: Define maximum desired latency in milliseconds
+  <number>         Latency in milliseconds
+  <number><suffix> Time with suffx (secs, ms, us)
+
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..2a5d021
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/description/node.def
new file mode 100644
index 0000000..a56c59c
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/interface/node.def
new file mode 100644
index 0000000..bb0c1e3
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/interface/node.def
@@ -0,0 +1,7 @@
+type: txt
+help: Set 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/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
new file mode 100644
index 0000000..4f3f18e
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
new file mode 100644
index 0000000..1938d04
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
new file mode 100644
index 0000000..4f3f18e
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
new file mode 100644
index 0000000..1938d04
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/vif/node.def
new file mode 100644
index 0000000..e22250d
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/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/weighted-random-detect/node.tag/class/node.tag/packet-length/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/packet-length/node.def
new file mode 100644
index 0000000..852bad4
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/packet-length/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Set average packet length
+default: 1460
+comp_help: Define average packet length in bytes for bandwidth calculation
+   (default 1460)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/priority/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/priority/node.def
new file mode 100644
index 0000000..db3f1ec
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/priority/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Set priority 
+syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7"
+comp_help: Priority
+ <0-7> (default 0)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/queue-limit/node.def b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/queue-limit/node.def
new file mode 100644
index 0000000..49c47b4
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/queue-limit/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Set maximum queue size (packets)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/bandwidth/node.def b/templates/qos-policy/weighted-random-detect/node.tag/default/bandwidth/node.def
new file mode 100644
index 0000000..4d454d4
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/default/bandwidth/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Set the bandwidth used for default traffic
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\""
+comp_help: Allowed values:
+ <number>	   Bandwidth in Kbps per second
+ <number>%%        Percentage of overall rate
+ <number><suffix>  Value with scaling suffix
+                   bits per sec (kbit, mbit, gbit)
+                   bytes per sec (kbps, mbps, gbps)
+
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/burst/node.def b/templates/qos-policy/weighted-random-detect/node.tag/default/burst/node.def
new file mode 100644
index 0000000..81e468a
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/default/burst/node.def
@@ -0,0 +1,7 @@
+type: txt
+help: Set the burst size for default traffic
+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/weighted-random-detect/node.tag/default/latency/node.def b/templates/qos-policy/weighted-random-detect/node.tag/default/latency/node.def
new file mode 100644
index 0000000..97501c5
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/default/latency/node.def
@@ -0,0 +1,8 @@
+type: txt
+help: Set maximum desired latency
+default: "100ms"
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time \"$VAR(@)\""
+comp_help: Define maximum desired latency in milliseconds
+  <number>         Latency in milliseconds
+  <number><suffix> Time with suffx (secs, ms, us)
+
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/packet-length/node.def b/templates/qos-policy/weighted-random-detect/node.tag/default/packet-length/node.def
new file mode 100644
index 0000000..852bad4
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/default/packet-length/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Set average packet length
+default: 1460
+comp_help: Define average packet length in bytes for bandwidth calculation
+   (default 1460)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/priority/node.def b/templates/qos-policy/weighted-random-detect/node.tag/default/priority/node.def
new file mode 100644
index 0000000..db3f1ec
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/default/priority/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Set priority 
+syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7"
+comp_help: Priority
+ <0-7> (default 0)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/queue-limit/node.def b/templates/qos-policy/weighted-random-detect/node.tag/default/queue-limit/node.def
new file mode 100644
index 0000000..49c47b4
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/default/queue-limit/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Set maximum queue size (packets)
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/description/node.def b/templates/qos-policy/weighted-random-detect/node.tag/description/node.def
new file mode 100644
index 0000000..1e8e64f
--- /dev/null
+++ b/templates/qos-policy/weighted-random-detect/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this queuing policy