42 files changed, 5 insertions, 4 deletions
diff --git a/lib/Vyatta/Qos/WeightedRandom.pm b/lib/Vyatta/Qos/WeightedRandom.pm
index 9397299..6e30839 100644
--- a/lib/Vyatta/Qos/WeightedRandom.pm
+++ b/lib/Vyatta/Qos/WeightedRandom.pm
@@ -23,13 +23,14 @@ require Vyatta::Config;
 require Vyatta::Qos::ShaperClass;
 use Vyatta::Qos::Util qw/getRate getAutoRate/;
 
-my $wred = 'weighted-random-detect';
+my $wred = 'weighted-random';
 
 # Create a new instance based on config information
 sub new {
     my ( $that, $config, $name ) = @_;
     my $level = $config->setLevel();
     my $rate  = $config->returnValue("bandwidth");
+    die "$level bandwidth configuration missing" unless $rate;
 
     my @classes = _getClasses($level);
 
@@ -111,8 +112,8 @@ sub commands {
 
         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;
+        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;
 
diff --git a/scripts/vyatta-qos.pl b/scripts/vyatta-qos.pl
index aa67127..9d13b59 100755
--- a/scripts/vyatta-qos.pl
+++ b/scripts/vyatta-qos.pl
@@ -34,7 +34,7 @@ my %policies = (
         'network-emulator' => 'NetworkEmulator',
 	'round-robin'	   => 'RoundRobin',
 	'priority-queue'   => 'Priority',
-	'weighted-random-detect' => 'WeightedRandom',
+	'weighted-random'  => 'WeightedRandom',
     },
     'in' => { 'traffic-limiter' => 'TrafficLimiter', }
 );
diff --git a/templates/qos-policy/weighted-random-detect/node.def b/templates/qos-policy/weighted-random/node.def
index 02911a1..02911a1 100644
--- a/templates/qos-policy/weighted-random-detect/node.def
+++ b/templates/qos-policy/weighted-random/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/bandwidth/node.def b/templates/qos-policy/weighted-random/node.tag/bandwidth/node.def
index 76fa6e2..76fa6e2 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/bandwidth/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/bandwidth/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.def
index d606de1..d606de1 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/bandwidth/node.def
index 6f15037..6f15037 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/bandwidth/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/burst/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/burst/node.def
index 54ae4f3..54ae4f3 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/burst/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/burst/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/description/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/description/node.def
index d4241e7..d4241e7 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/description/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/description/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/latency/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/latency/node.def
index 97501c5..97501c5 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/latency/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/latency/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/match/node.def
index 2a5d021..2a5d021 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/match/node.def
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/node.tag/class/node.tag/match/node.tag/description/node.def
index a56c59c..a56c59c 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/description/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/match/node.tag/description/node.def
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/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
index e8be347..e8be347 100644
--- 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/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
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/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
index 05d6511..05d6511 100644
--- 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/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
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/node.tag/class/node.tag/match/node.tag/ether/source/node.def
index b993af6..b993af6 100644
--- 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/node.tag/class/node.tag/match/node.tag/ether/source/node.def
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/node.tag/class/node.tag/match/node.tag/interface/node.def
index bb0c1e3..bb0c1e3 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/match/node.tag/interface/node.def
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/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
index ccd2d14..ccd2d14 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
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/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
index 54eef5b..54eef5b 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
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/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index 561899c..561899c 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
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/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index 4f3f18e..4f3f18e 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
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/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 1938d04..1938d04 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
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/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
index 0bc690a..0bc690a 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
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/node.tag/class/node.tag/match/node.tag/ip/source/node.def
index 4271b94..4271b94 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/source/node.def
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/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index ecd96ab..ecd96ab 100644
--- 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/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
index 2f608f8..2f608f8 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
index 54eef5b..54eef5b 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index 561899c..561899c 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 4f3f18e..4f3f18e 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1938d04..1938d04 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
index 23c96c2..23c96c2 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
index 4271b94..4271b94 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
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/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index ecd96ab..ecd96ab 100644
--- 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/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
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/node.tag/class/node.tag/match/node.tag/vif/node.def
index e22250d..e22250d 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/match/node.tag/vif/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/packet-length/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/packet-length/node.def
index 852bad4..852bad4 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/packet-length/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/packet-length/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/priority/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/priority/node.def
index db3f1ec..db3f1ec 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/priority/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/priority/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/queue-limit/node.def b/templates/qos-policy/weighted-random/node.tag/class/node.tag/queue-limit/node.def
index 49c47b4..49c47b4 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/class/node.tag/queue-limit/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/class/node.tag/queue-limit/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/bandwidth/node.def b/templates/qos-policy/weighted-random/node.tag/default/bandwidth/node.def
index 4d454d4..4d454d4 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/default/bandwidth/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/default/bandwidth/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/burst/node.def b/templates/qos-policy/weighted-random/node.tag/default/burst/node.def
index 81e468a..81e468a 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/default/burst/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/default/burst/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/latency/node.def b/templates/qos-policy/weighted-random/node.tag/default/latency/node.def
index 97501c5..97501c5 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/default/latency/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/default/latency/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/packet-length/node.def b/templates/qos-policy/weighted-random/node.tag/default/packet-length/node.def
index 852bad4..852bad4 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/default/packet-length/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/default/packet-length/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/priority/node.def b/templates/qos-policy/weighted-random/node.tag/default/priority/node.def
index db3f1ec..db3f1ec 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/default/priority/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/default/priority/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/default/queue-limit/node.def b/templates/qos-policy/weighted-random/node.tag/default/queue-limit/node.def
index 49c47b4..49c47b4 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/default/queue-limit/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/default/queue-limit/node.def
diff --git a/templates/qos-policy/weighted-random-detect/node.tag/description/node.def b/templates/qos-policy/weighted-random/node.tag/description/node.def
index 1e8e64f..1e8e64f 100644
--- a/templates/qos-policy/weighted-random-detect/node.tag/description/node.def
+++ b/templates/qos-policy/weighted-random/node.tag/description/node.def