Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-qos into jenner

2 files changed, 6 insertions, 5 deletions

diff --git a/lib/Vyatta/Qos/TrafficLimiter.pm b/lib/Vyatta/Qos/TrafficLimiter.pm
index e9deda9..5aea0f9 100644
--- a/lib/Vyatta/Qos/TrafficLimiter.pm
+++ b/lib/Vyatta/Qos/TrafficLimiter.pm
@@ -21,7 +21,7 @@ use strict;
 use warnings;
 
 require Vyatta::Config;
-use Vyatta::Qos::LimiterClass;
+require Vyatta::Qos::LimiterClass;
 
 my %fields = (
     _level   => undef,
@@ -70,7 +70,7 @@ sub _define {
 
     foreach my $id ( $config->listNodes("class") ) {
         $config->setLevel("$level class $id");
-        push @classes, new LimiterClass( $config, $id );
+        push @classes, new Vyatta::Qos::LimiterClass( $config, $id );
     }
     $self->{_classes} = \@classes;
 }
diff --git a/lib/Vyatta/Qos/TrafficShaper.pm b/lib/Vyatta/Qos/TrafficShaper.pm
index 0cfb305..f7bfc35 100644
--- a/lib/Vyatta/Qos/TrafficShaper.pm
+++ b/lib/Vyatta/Qos/TrafficShaper.pm
@@ -20,10 +20,11 @@
 
 package Vyatta::Qos::TrafficShaper;
 use strict;
+use warnings;
 
 require Vyatta::Config;
+require Vyatta::Qos::ShaperClass;
 use Vyatta::Qos::Util qw/getRate interfaceRate/;
-use Vyatta::Qos::ShaperClass;
 
 
 my %fields = (
@@ -114,12 +115,12 @@ sub _define {
 
 
     $config->setLevel("$level default");
-    push @classes, new ShaperClass($config, -1);
+    push @classes, new Vyatta::Qos::Vyatta::Qos::ShaperClass($config);
     $config->setLevel($level);
 
     foreach my $id ( $config->listNodes("class") ) {
         $config->setLevel("$level class $id");
-	push @classes, new ShaperClass( $config, $id );
+	push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
     }
     $self->{_classes} = \@classes;
 }