Merge branch 'jenner' of 192.168.1.9:git/qos into jenner

66 files changed, 640 insertions, 81 deletions

diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index 0c45958..765bcb8 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -27,12 +27,13 @@ sub new {
 
     bless $self, $class;
 
-    $self->{_vif} = $config->returnValue("vif");
-    $self->{_dev} = getIfIndex($config->returnValue("interface"));
-
     foreach my $ip (qw(ip ipv6)) {
 	next unless $config->exists($ip);
 
+	foreach my $t (qw(vif dev)) {
+	    die "can not match on $ip and $t\n" if $config->exists($t);
+	}
+
 	# TODO make this data driven?
 	my %fields;
 	$fields{dsfield} = getDsfield( $config->returnValue("$ip dscp"));
@@ -44,6 +45,9 @@ sub new {
 	$self->{$ip} = \%fields;
     }
 
+    $self->{_vif} = $config->returnValue("vif");
+    $self->{_dev} = getIfIndex($config->returnValue("interface"));
+
     return $self;
 }
 
diff --git a/lib/Vyatta/Qos/Priority.pm b/lib/Vyatta/Qos/Priority.pm
new file mode 100644
index 0000000..f4f01da
--- /dev/null
+++ b/lib/Vyatta/Qos/Priority.pm
@@ -0,0 +1,131 @@
+# Strict Priority
+# This is a deficit round robin scheduler
+#
+# **** 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::Priority;
+use strict;
+use warnings;
+
+require Vyatta::Config;
+require Vyatta::Qos::ShaperClass;
+
+# Create a new instance based on config information
+sub new {
+    my ( $that, $config, $name ) = @_;
+
+    my @classes = _getClasses( $config->setLevel() );
+    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);
+    my $default;
+    if ( $config->exists("default") ) {
+        $config->setLevel("$level default");
+        $default = new Vyatta::Qos::ShaperClass($config);
+        $config->setLevel($level);
+    }
+    else {
+        $default = new Vyatta::Qos::ShaperClass;
+    }
+    push @classes, $default;
+    $default->{id} = 1;
+
+    foreach my $id ( $config->listNodes("class") ) {
+        $config->setLevel("$level class $id");
+        push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
+    }
+
+    return @classes;
+}
+
+sub commands {
+    my ( $self, $dev ) = @_;
+    my $classes = $self->{_classes};
+    my $parent  = 1;
+
+    printf "qdisc add dev %s s handle %x: prio limit %d\n",
+      $dev, 'root', $parent, $self->{_limit};
+
+    foreach my $class (@$classes) {
+        $class->gen_leaf( $dev, $parent );
+        foreach my $match ( $class->matchRules() ) {
+            $match->filter( $dev, $parent, 1 );
+            printf " parent %x:%x\n", $parent, $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;
+
+    $config->setLevel("qos-policy priority-queue $name");
+
+    foreach my $attr (qw(queue-limit queue-type)) {
+        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 (qw(queue-limit queue-type)) {
+            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";
+            if ( $status ne 'static' ) {
+                return $level;
+            }
+
+            foreach my $parm (
+                (
+                    'vif',
+                    'interface',
+                    '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/lib/Vyatta/Qos/RoundRobin.pm b/lib/Vyatta/Qos/RoundRobin.pm
new file mode 100644
index 0000000..b4174d1
--- /dev/null
+++ b/lib/Vyatta/Qos/RoundRobin.pm
@@ -0,0 +1,135 @@
+# Round Robin
+# This is a deficit round robin scheduler
+#
+# **** 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::RoundRobin;
+use strict;
+use warnings;
+
+require Vyatta::Config;
+require Vyatta::Qos::ShaperClass;
+
+# Create a new instance based on config information
+sub new {
+    my ( $that, $config, $name ) = @_;
+
+    my @classes = _getClasses( $config->setLevel() );
+    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);
+    my $default;
+    if ( $config->exists("default") ) {
+        $config->setLevel("$level default");
+        $default = new Vyatta::Qos::ShaperClass($config);
+        $config->setLevel($level);
+    }
+    else {
+        $default = new Vyatta::Qos::ShaperClass;
+    }
+    push @classes, $default;
+    $default->{id} = 1;
+
+    foreach my $id ( $config->listNodes("class") ) {
+        $config->setLevel("$level class $id");
+        push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
+    }
+
+    return @classes;
+}
+
+sub commands {
+    my ( $self, $dev ) = @_;
+    my $classes = $self->{_classes};
+    my $parent  = 1;
+
+    printf "qdisc add dev %s s handle %x: drr", $dev, 'root', $parent;
+    my $quantum = $self->{_quantum};
+    print " quantum $quantum" if ($quantum);
+    print "\n";
+
+    foreach my $class (@$classes) {
+        $class->gen_leaf( $dev, $parent );
+        foreach my $match ( $class->matchRules() ) {
+            $match->filter( $dev, $parent, 1 );
+            printf " classid %x:%x\n", $parent, $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;
+
+    $config->setLevel("qos-policy round-robin $name");
+
+    return 'quantum' if ( $config->isChanged('quantum') );
+
+    foreach my $attr (qw(queue-limit queue-type)) {
+        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 (qw(queue-limit queue-type)) {
+            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";
+            if ( $status ne 'static' ) {
+                return $level;
+            }
+
+            foreach my $parm (
+                (
+                    'vif',
+                    'interface',
+                    '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/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm
index 631fc75..9a0ba00 100644
--- a/lib/Vyatta/Qos/ShaperClass.pm
+++ b/lib/Vyatta/Qos/ShaperClass.pm
@@ -43,7 +43,7 @@ sub new {
     $self->{id} = $id;
 
     bless $self, $class;
-    $self->_define($config);
+    $self->_define($config) if ($config);
 
     return $self;
 }
@@ -135,7 +135,7 @@ sub prioQdisc {
 
     if ($limit) {
         foreach my $i (qw/1 2 3/) {
-            printf "qdisc add dev %s parent %x:%d pfifo limit %d\n",
+            printf "qdisc add dev %s parent %x:%x pfifo limit %d\n",
               $dev, $prio_id, $i, $limit;
         }
     }
@@ -181,8 +181,7 @@ sub redQdisc {
     my $qmax = $qlimit / 8;
     my $qmin = $qmax / 3;
 
-    printf "red limit %d min %d max %d avpkt %d",
-      $qlimit, $qmin, $qmax, $avg;
+    printf "red limit %d min %d max %d avpkt %d", $qlimit, $qmin, $qmax, $avg;
     printf " burst %d probability 0.02 bandwidth %d ecn\n",
       ( 2 * $qmin + $qmax ) / ( 3 * $avg ), $rate / 1000;
 }
@@ -194,29 +193,28 @@ my %qdiscOptions = (
     'drop-tail'     => \&fifoQdisc,
 );
 
-sub htbClass {
-    my ( $self, $dev, $parent, $speed ) = @_;
+sub gen_class {
+    my ( $self, $dev, $qdisc, $parent, $speed ) = @_;
     my $rate = _getPercentRate( $self->{_rate},    $speed );
     my $ceil = _getPercentRate( $self->{_ceiling}, $speed );
 
-    printf "class add dev %s parent %x:1 classid %x:%x htb rate %s",
-      $dev, $parent, $parent, $self->{id}, $rate;
+    printf "class add dev %s parent %x:1 classid %x:%x %s",
+      $dev, $parent, $parent, $self->{id}, $qdisc;
 
+    print " rate $rate"              if ($rate);
     print " ceil $ceil"              if ($ceil);
-    print " burst $self->{_burst}"   if ( defined $self->{_burst} );
-    print " prio $self->{_priority}" if ( defined $self->{_priority} );
+    print " burst $self->{_burst}"   if ( $self->{_burst} );
+    print " prio $self->{_priority}" if ( $self->{_priority} );
     print "\n";
+}
 
-    # create leaf qdisc
+sub gen_leaf {
+    my ( $self, $dev, $parent, $rate ) = @_;
     my $q = $qdiscOptions{ $self->{_qdisc} };
-    if ( defined $q ) {
-        printf "qdisc add dev %s parent %x:%x ",
-          $dev, $parent, $self->{id};
-        $q->( $self, $dev, $rate );
-    }
-    else {
-        die "Unknown queue type $self->{_qdisc}\n";
-    }
+    die "Unknown queue type $self->{_qdisc}\n" unless $q;
+
+    printf "qdisc add dev %s parent %x:%x ", $dev, $parent, $self->{id};
+    $q->( $self, $dev, $rate );
 }
 
 sub dsmarkClass {
diff --git a/lib/Vyatta/Qos/TrafficShaper.pm b/lib/Vyatta/Qos/TrafficShaper.pm
index 8295764..721dac9 100644
--- a/lib/Vyatta/Qos/TrafficShaper.pm
+++ b/lib/Vyatta/Qos/TrafficShaper.pm
@@ -26,43 +26,26 @@ require Vyatta::Config;
 require Vyatta::Qos::ShaperClass;
 use Vyatta::Qos::Util qw/getRate interfaceRate/;
 
-my %fields = (
-    _level   => undef,
-    _rate    => undef,
-    _classes => undef,
-);
-
 # Create a new instance based on config information
 sub new {
     my ( $that, $config, $name ) = @_;
-    my $self = {%fields};
-    my $class = ref($that) || $that;
+    my $rate    = $config->returnValue("bandwidth");
+    my $level   = $config->setLevel();
+    my @classes = _getClasses($level);
 
-    bless $self, $class;
-    $self->_define($config);
+    _checkClasses( $level, getRate($rate), @classes )
+      if ( $rate ne "auto" );
 
-    $self->_validate($config);
+    my $self = {};
+    my $class = ref($that) || $that;
+    bless $self, $class;
 
+    $self->{_rate}    = $rate;
+    $self->{_level}   = $level;
+    $self->{_classes} = \@classes;
     return $self;
 }
 
-sub _validate {
-    my $self = shift;
-
-    if ( $self->{_rate} ne "auto" ) {
-        my $classes = $self->{_classes};
-        my $default = shift @$classes;
-        my $rate    = getRate( $self->{_rate} );
-
-        $default->rateCheck( $rate, "$self->{_level} default" );
-
-        foreach my $class (@$classes) {
-            $class->rateCheck( $rate, "$self->{_level} class $class->{id}" );
-        }
-        unshift @$classes, $default;
-    }
-}
-
 # Rate can be something like "auto" or "10.2mbit"
 sub _getAutoRate {
     my ( $rate, $dev ) = @_;
@@ -82,39 +65,15 @@ sub _getAutoRate {
     return $rate;
 }
 
-# Setup new instance.
-# Assumes caller has done $config->setLevel to "traffic-shaper $name"
-sub _define {
-    my ( $self, $config ) = @_;
-    my $level   = $config->setLevel();
-    my @classes = ();
-
-    $self->{_rate}  = $config->returnValue("bandwidth");
-    $self->{_level} = $level;
+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";
 
-    # make sure no clash of different types of tc filters
-    my %matchTypes = ();
-    foreach my $class ( $config->listNodes("class") ) {
-        foreach my $match ( $config->listNodes("class $class match") ) {
-            foreach my $type ( $config->listNodes("class $class match $match") )
-            {
-                next if ( $type eq 'description' );
-                $matchTypes{$type} = "$class match $match";
-            }
-        }
-    }
-
-    if ( scalar keys %matchTypes > 1 && $matchTypes{ip} ) {
-        print "Match type conflict:\n";
-        while ( my ( $type, $usage ) = each(%matchTypes) ) {
-            print "   class $usage $type\n";
-        }
-        die "$level can not match on both ip and other types\n";
-    }
-
     $config->setLevel("$level default");
     push @classes, new Vyatta::Qos::ShaperClass($config);
     $config->setLevel($level);
@@ -123,7 +82,20 @@ sub _define {
         $config->setLevel("$level class $id");
         push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
     }
-    $self->{_classes} = \@classes;
+
+    return @classes;
+}
+
+sub _checkClasses {
+    my $level   = shift;
+    my $rate    = shift;
+    my $default = shift;
+
+    $default->rateCheck( $rate, "$level default" );
+
+    foreach my $class (@_) {
+        $class->rateCheck( $rate, "$level class $class->{id}" );
+    }
 }
 
 sub commands {
@@ -191,7 +163,8 @@ sub commands {
       $dev, $parent, $parent, $rate;
 
     foreach my $class (@$classes) {
-        $class->htbClass( $dev, $parent, $rate );
+        $class->gen_class( $dev, 'htb', $parent, $rate );
+        $class->gen_leaf( $dev, $parent, $rate );
 
         foreach my $match ( $class->matchRules() ) {
             $match->filter( $dev, $parent, 1, $class->{dsmark} );
diff --git a/templates/qos-policy/priority-queue/node.def b/templates/qos-policy/priority-queue/node.def
new file mode 100644
index 0000000..21f04d9
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Set priority-queue 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/priority-queue/node.tag/class/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.def
new file mode 100644
index 0000000..d606de1
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/description/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..d4241e7
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..2a5d021
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/match/node.tag/description/node.def
new file mode 100644
index 0000000..a56c59c
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/match/node.tag/interface/node.def
new file mode 100644
index 0000000..bb0c1e3
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/qos-policy/priority-queue/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/priority-queue/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/priority-queue/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/match/node.tag/vif/node.def
new file mode 100644
index 0000000..e22250d
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/priority/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/priority/node.def
new file mode 100644
index 0000000..4dfdff6
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.tag/class/node.tag/priority/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: Set priority 
+syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7"
+help: Priority value
diff --git a/templates/qos-policy/priority-queue/node.tag/class/node.tag/queue-limit/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/queue-limit/node.def
new file mode 100644
index 0000000..49c47b4
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/class/node.tag/queue-type/node.def b/templates/qos-policy/priority-queue/node.tag/class/node.tag/queue-type/node.def
new file mode 100644
index 0000000..bb3a24e
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.tag/class/node.tag/queue-type/node.def
@@ -0,0 +1,9 @@
+type: txt
+default: "fair-queue"
+syntax:expression: $VAR(@) in "fair-queue", "drop-tail", "random-detect"; "Unknown queue-type"
+help: Set the queue type for this class
+comp_help:Possible completions
+  fair-queue\tStochastic Fair Queue (SFQ)
+  drop-tail\tFirst-In-First-Out (FIFO)
+  random-detect\tRandom Early Detection (RED)
+
diff --git a/templates/qos-policy/priority-queue/node.tag/default/node.def b/templates/qos-policy/priority-queue/node.tag/default/node.def
new file mode 100644
index 0000000..de9cd5c
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.tag/default/node.def
@@ -0,0 +1 @@
+help: Set default policy
diff --git a/templates/qos-policy/priority-queue/node.tag/default/priority/node.def b/templates/qos-policy/priority-queue/node.tag/default/priority/node.def
new file mode 100644
index 0000000..4dfdff6
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.tag/default/priority/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: Set priority 
+syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7"
+help: Priority value
diff --git a/templates/qos-policy/priority-queue/node.tag/default/queue-limit/node.def b/templates/qos-policy/priority-queue/node.tag/default/queue-limit/node.def
new file mode 100644
index 0000000..49c47b4
--- /dev/null
+++ b/templates/qos-policy/priority-queue/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/priority-queue/node.tag/default/queue-type/node.def b/templates/qos-policy/priority-queue/node.tag/default/queue-type/node.def
new file mode 100644
index 0000000..bb3a24e
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.tag/default/queue-type/node.def
@@ -0,0 +1,9 @@
+type: txt
+default: "fair-queue"
+syntax:expression: $VAR(@) in "fair-queue", "drop-tail", "random-detect"; "Unknown queue-type"
+help: Set the queue type for this class
+comp_help:Possible completions
+  fair-queue\tStochastic Fair Queue (SFQ)
+  drop-tail\tFirst-In-First-Out (FIFO)
+  random-detect\tRandom Early Detection (RED)
+
diff --git a/templates/qos-policy/priority-queue/node.tag/description/node.def b/templates/qos-policy/priority-queue/node.tag/description/node.def
new file mode 100644
index 0000000..1e8e64f
--- /dev/null
+++ b/templates/qos-policy/priority-queue/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this queuing policy
diff --git a/templates/qos-policy/round-robin/node.def b/templates/qos-policy/round-robin/node.def
new file mode 100644
index 0000000..daf795a
--- /dev/null
+++ b/templates/qos-policy/round-robin/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Set deficit round robin 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/qos-policy/round-robin/node.tag/class/node.def b/templates/qos-policy/round-robin/node.tag/class/node.def
new file mode 100644
index 0000000..d606de1
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/description/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/description/node.def
new file mode 100644
index 0000000..d4241e7
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.def
new file mode 100644
index 0000000..2a5d021
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
new file mode 100644
index 0000000..a56c59c
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
new file mode 100644
index 0000000..bb0c1e3
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/qos-policy/round-robin/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/round-robin/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/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
new file mode 100644
index 0000000..e22250d
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/queue-limit/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def
new file mode 100644
index 0000000..49c47b4
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
new file mode 100644
index 0000000..295c04c
--- /dev/null
+++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
@@ -0,0 +1,10 @@
+type: txt
+default: "fair-queue"
+syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type"
+help: Set the queue type for this class
+comp_help:Possible completions
+  fair-queue\tStochastic Fair Queue (SFQ)
+  drop-tail\tFirst-In-First-Out (FIFO)
+  priority\tPriority queueing based on DSCP
+  random-detect\tRandom Early Detection (RED)
+
diff --git a/templates/qos-policy/round-robin/node.tag/default/node.def b/templates/qos-policy/round-robin/node.tag/default/node.def
new file mode 100644
index 0000000..de9cd5c
--- /dev/null
+++ b/templates/qos-policy/round-robin/node.tag/default/node.def
@@ -0,0 +1 @@
+help: Set default policy
diff --git a/templates/qos-policy/round-robin/node.tag/default/queue-limit/node.def b/templates/qos-policy/round-robin/node.tag/default/queue-limit/node.def
new file mode 100644
index 0000000..49c47b4
--- /dev/null
+++ b/templates/qos-policy/round-robin/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/round-robin/node.tag/default/queue-type/node.def b/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def
new file mode 100644
index 0000000..295c04c
--- /dev/null
+++ b/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def
@@ -0,0 +1,10 @@
+type: txt
+default: "fair-queue"
+syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type"
+help: Set the queue type for this class
+comp_help:Possible completions
+  fair-queue\tStochastic Fair Queue (SFQ)
+  drop-tail\tFirst-In-First-Out (FIFO)
+  priority\tPriority queueing based on DSCP
+  random-detect\tRandom Early Detection (RED)
+
diff --git a/templates/qos-policy/round-robin/node.tag/description/node.def b/templates/qos-policy/round-robin/node.tag/description/node.def
new file mode 100644
index 0000000..1e8e64f
--- /dev/null
+++ b/templates/qos-policy/round-robin/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set description for this queuing policy
diff --git a/templates/qos-policy/round-robin/node.tag/quantum/node.def b/templates/qos-policy/round-robin/node.tag/quantum/node.def
new file mode 100644
index 0000000..62e3ce4
--- /dev/null
+++ b/templates/qos-policy/round-robin/node.tag/quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Set the packet scheduling quantum (bytes)