Convert VyattaConfig to Vyatta::Config

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/Vyatta/IpTables/Rule.pm b/lib/Vyatta/IpTables/Rule.pm
index 196a3ca..fa7a0e5 100644
--- a/lib/Vyatta/IpTables/Rule.pm
+++ b/lib/Vyatta/IpTables/Rule.pm
@@ -1,6 +1,6 @@
 package Vyatta::IpTables::Rule;
 
-use VyattaConfig;
+use Vyatta::Config;
 require Vyatta::IpTables::AddressFilter;
 
 my $src = new Vyatta::IpTables::AddressFilter;
@@ -73,7 +73,7 @@ sub setupDummy {
 
 sub setup {
   my ( $self, $level ) = @_;
-  my $config = new VyattaConfig;
+  my $config = new Vyatta::Config;
 
   $config->setLevel("$level");
 
@@ -100,7 +100,7 @@ sub setup {
   $self->{_recent_time} = $config->returnValue('recent time');
   $self->{_recent_cnt} = $config->returnValue('recent count');
 
-  # TODO: need $config->exists("$level source") in VyattaConfig.pm
+  # TODO: need $config->exists("$level source") in Vyatta::Config.pm
   $src->setup("$level source");
   $dst->setup("$level destination");
 
@@ -109,7 +109,7 @@ sub setup {
 
 sub setupOrig {
   my ( $self, $level ) = @_;
-  my $config = new VyattaConfig;
+  my $config = new Vyatta::Config;
 
   $config->setLevel("$level");
 
@@ -137,7 +137,7 @@ sub setupOrig {
   $self->{_recent_time} = $config->returnOrigValue('recent time');
   $self->{_recent_cnt} = $config->returnOrigValue('recent count');
 
-  # TODO: need $config->exists("$level source") in VyattaConfig.pm
+  # TODO: need $config->exists("$level source") in Vyatta::Config.pm
   $src->setupOrig("$level source");
   $dst->setupOrig("$level destination");
 
diff --git a/scripts/firewall/vyatta-firewall.pl b/scripts/firewall/vyatta-firewall.pl
index 950bb1a..f688e78 100755
--- a/scripts/firewall/vyatta-firewall.pl
+++ b/scripts/firewall/vyatta-firewall.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 use lib "/opt/vyatta/share/perl5";
-use VyattaConfig;
+use Vyatta::Config;
 use Vyatta::IpTables::Rule;
 use Vyatta::IpTables::AddressFilter;
 use Getopt::Long;
@@ -98,7 +98,7 @@ sub help() {
 sub update_rules($) {
   my $tree = shift;
   my $table = $table_hash{$tree};
-  my $config = new VyattaConfig;
+  my $config = new Vyatta::Config;
   my $name = undef;
   my %nodes = ();
 
@@ -263,7 +263,7 @@ sub update_rules($) {
 sub chain_configured($$$) {
   my ($mode, $chain, $tree) = @_;
   
-  my $config = new VyattaConfig;
+  my $config = new Vyatta::Config;
   my %chains = ();
   foreach (keys %table_hash) {
     next if ($mode == 1 && $_ ne $tree);