sdn: rename config to running_config

to reduce my confusion..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/API2/Network/SDN/Controllers.pm b/PVE/API2/Network/SDN/Controllers.pm
index e761b6c75088ee802545853a410fcf96ac30e0e4..d8f18ab78cb34a35cef8f5049a1c30aae53bdce9 100644 (file)
--- a/PVE/API2/Network/SDN/Controllers.pm
+++ b/PVE/API2/Network/SDN/Controllers.pm
@@ -84,11 +84,11 @@ __PACKAGE__->register_method ({
 
         my $cfg = {};
         if($param->{pending}) {
-            my $running_cfg = PVE::Network::SDN::config();
+            my $running_cfg = PVE::Network::SDN::running_config();
             my $config = PVE::Network::SDN::Controllers::config();
             $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'controllers');
         } elsif ($param->{running}) {
-            my $running_cfg = PVE::Network::SDN::config();
+            my $running_cfg = PVE::Network::SDN::running_config();
             $cfg = $running_cfg->{controllers};
         } else {
             $cfg = PVE::Network::SDN::Controllers::config();
@@ -142,11 +142,11 @@ __PACKAGE__->register_method ({
 
         my $cfg = {};
         if($param->{pending}) {
-            my $running_cfg = PVE::Network::SDN::config();
+            my $running_cfg = PVE::Network::SDN::running_config();
             my $config = PVE::Network::SDN::Controllers::config();
             $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'controllers');
         } elsif ($param->{running}) {
-            my $running_cfg = PVE::Network::SDN::config();
+            my $running_cfg = PVE::Network::SDN::running_config();
             $cfg = $running_cfg->{controllers};
         } else {
             $cfg = PVE::Network::SDN::Controllers::config();

diff --git a/PVE/API2/Network/SDN/Subnets.pm b/PVE/API2/Network/SDN/Subnets.pm
index f7e095fd7ce14178ec4b10fe23ef2b430600ddd5..377a568eb8494b0fc906ae9d07ae831c26115835 100644 (file)
--- a/PVE/API2/Network/SDN/Subnets.pm
+++ b/PVE/API2/Network/SDN/Subnets.pm
@@ -76,11 +76,11 @@ __PACKAGE__->register_method ({
 
         my $cfg = {};
         if($param->{pending}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            my $config = PVE::Network::SDN::Subnets::config();
            $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'subnets');
         } elsif ($param->{running}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            $cfg = $running_cfg->{subnets};
         } else {
            $cfg = PVE::Network::SDN::Subnets::config();
@@ -134,11 +134,11 @@ __PACKAGE__->register_method ({
 
         my $cfg = {};
         if($param->{pending}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            my $config = PVE::Network::SDN::Subnets::config();
            $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'subnets');
         } elsif ($param->{running}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            $cfg = $running_cfg->{subnets};
         } else {
            $cfg = PVE::Network::SDN::Subnets::config();

diff --git a/PVE/API2/Network/SDN/Vnets.pm b/PVE/API2/Network/SDN/Vnets.pm
index 16959dc723214cf260519e5a092f98ce18013b9a..811a2e8a6b7583723e30bff5e8a3d94babafbcc6 100644 (file)
--- a/PVE/API2/Network/SDN/Vnets.pm
+++ b/PVE/API2/Network/SDN/Vnets.pm
@@ -91,11 +91,11 @@ __PACKAGE__->register_method ({
 
        my $cfg = {};
        if($param->{pending}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            my $config = PVE::Network::SDN::Vnets::config();
            $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'vnets');
        } elsif ($param->{running}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            $cfg = $running_cfg->{vnets};
        } else {
            $cfg = PVE::Network::SDN::Vnets::config();
@@ -146,11 +146,11 @@ __PACKAGE__->register_method ({
 
        my $cfg = {};
        if($param->{pending}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            my $config = PVE::Network::SDN::Vnets::config();
            $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'vnets');
        } elsif ($param->{running}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            $cfg = $running_cfg->{vnets};
        } else {
            $cfg = PVE::Network::SDN::Vnets::config();

diff --git a/PVE/API2/Network/SDN/Zones.pm b/PVE/API2/Network/SDN/Zones.pm
index 5bbdd36ef18228b15af63a9f326a505e0bec3dfd..2163374fecb62e6955ab478ec6e994edccaacdc2 100644 (file)
--- a/PVE/API2/Network/SDN/Zones.pm
+++ b/PVE/API2/Network/SDN/Zones.pm
@@ -113,11 +113,11 @@ __PACKAGE__->register_method ({
 
        my $cfg = {};
        if($param->{pending}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            my $config = PVE::Network::SDN::Zones::config();
            $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'zones');
         } elsif ($param->{running}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            $cfg = $running_cfg->{zones};
         } else {
            $cfg = PVE::Network::SDN::Zones::config();
@@ -171,11 +171,11 @@ __PACKAGE__->register_method ({
 
        my $cfg = {};
        if($param->{pending}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            my $config = PVE::Network::SDN::Zones::config();
            $cfg = PVE::Network::SDN::pending_config($running_cfg, $config, 'zones');
         } elsif ($param->{running}) {
-           my $running_cfg = PVE::Network::SDN::config();
+           my $running_cfg = PVE::Network::SDN::running_config();
            $cfg = $running_cfg->{zones};
         } else {
            $cfg = PVE::Network::SDN::Zones::config();

diff --git a/PVE/Network/SDN.pm b/PVE/Network/SDN.pm
index befaaeebefd0d69694870cbc1109c6eb40926c29..314b515b892a2aad078b14106571c9f49747ed68 100644 (file)
--- a/PVE/Network/SDN.pm
+++ b/PVE/Network/SDN.pm
@@ -77,7 +77,7 @@ sub status {
     return($zone_status, $vnet_status);
 }
 
-sub config {
+sub running_config {
     return cfs_read_file($running_cfg);
 }
 
@@ -176,7 +176,7 @@ sub get_local_vnets {
 
     my $nodename = PVE::INotify::nodename();
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $vnets_cfg = $cfg->{vnets};
     my $zones_cfg = $cfg->{zones};
 

diff --git a/PVE/Network/SDN/Controllers.pm b/PVE/Network/SDN/Controllers.pm
index ba67d755969f8a41852d1d74d56f2fb2cb8f525e..d61851b6750f5c8f78dfdc4abe2261c1f556d642 100644 (file)
--- a/PVE/Network/SDN/Controllers.pm
+++ b/PVE/Network/SDN/Controllers.pm
@@ -63,14 +63,14 @@ sub sdn_controllers_ids {
 sub complete_sdn_controller {
     my ($cmdname, $pname, $cvalue) = @_;
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
 
     return  $cmdname eq 'add' ? [] : [ PVE::Network::SDN::sdn_controllers_ids($cfg) ];
 }
 
 sub generate_controller_config {
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $vnet_cfg = $cfg->{vnets};
     my $zone_cfg = $cfg->{zones};
     my $controller_cfg = $cfg->{controllers};
@@ -135,7 +135,7 @@ sub generate_controller_config {
 
 sub reload_controller {
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $controller_cfg = $cfg->{controllers};
 
     return if !$controller_cfg;
@@ -150,7 +150,7 @@ sub reload_controller {
 sub generate_controller_rawconfig {
     my ($config) = @_;
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $controller_cfg = $cfg->{controllers};
     return if !$controller_cfg;
 
@@ -166,7 +166,7 @@ sub generate_controller_rawconfig {
 sub write_controller_config {
     my ($config) = @_;
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $controller_cfg = $cfg->{controllers};
     return if !$controller_cfg;
 

diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm
index 56dcd28f4e1486ce5ed6472464fd649cd96ba85b..0cdadf791cca63a807d08df698499ab8f3bceb84 100644 (file)
--- a/PVE/Network/SDN/Subnets.pm
+++ b/PVE/Network/SDN/Subnets.pm
@@ -63,7 +63,7 @@ sub get_subnet {
 
     my $cfg = {};
     if($running) {
-       my $cfg = PVE::Network::SDN::config();
+       my $cfg = PVE::Network::SDN::running_config();
        $cfg = $cfg->{subnets};
     } else {
        $cfg = PVE::Network::SDN::Subnets::config();

diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm
index ff39eefff46a13aed0ba258e307646118ed5cb95..9d9b1551ce55c3bbbe081bd66304b2db0d450cc6 100644 (file)
--- a/PVE/Network/SDN/Vnets.pm
+++ b/PVE/Network/SDN/Vnets.pm
@@ -54,7 +54,7 @@ sub get_vnet {
 
     my $cfg = {};
     if($running) {
-       my $cfg = PVE::Network::SDN::config();
+       my $cfg = PVE::Network::SDN::running_config();
        $cfg = $cfg->{vnets};
     } else {
        $cfg = PVE::Network::SDN::Vnets::config();

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index bcef427fc0c6bd7c69c33bd98e9e31a2378a9aaa..e5c0240e2be7de919ac1ec3fe99bffa59add0939 100644 (file)
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -66,7 +66,7 @@ sub sdn_zones_ids {
 sub complete_sdn_zone {
     my ($cmdname, $pname, $cvalue) = @_;
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
 
     return  $cmdname eq 'add' ? [] : [ PVE::Network::SDN::sdn_zones_ids($cfg) ];
 }
@@ -76,7 +76,7 @@ sub get_zone {
 
     my $cfg = {};
     if($running) {
-        my $cfg = PVE::Network::SDN::config();
+        my $cfg = PVE::Network::SDN::running_config();
         $cfg = $cfg->{vnets};
     } else {
         $cfg = PVE::Network::SDN::Zones::config();
@@ -90,7 +90,7 @@ sub get_zone {
 
 sub generate_etc_network_config {
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
 
     my $version = $cfg->{version};
     my $vnet_cfg = $cfg->{vnets};
@@ -204,7 +204,7 @@ sub status {
     my $err_config = undef;
 
     my $local_version = PVE::Network::SDN::Zones::read_etc_network_config_version();
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $sdn_version = $cfg->{version};
 
     return if !$sdn_version;

diff --git a/test/run_test_zones.pl b/test/run_test_zones.pl
index 71ead618ecb953e21848cba6f33f7794024458ba..a788553c052512be50ff7a55e45abce928e9c4ad 100755 (executable)
--- a/test/run_test_zones.pl
+++ b/test/run_test_zones.pl
@@ -83,7 +83,7 @@ foreach my $test (@tests) {
 
     my $sdn_module = Test::MockModule->new("PVE::Network::SDN");
     $sdn_module->mock(
-       config => sub {
+       running_config => sub {
            return $sdn_config;
        },
     );