From d73c7c366883f104e938ab29469cb48e958aebc5 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 28 Apr 2021 16:07:54 +0200 Subject: [PATCH] sdn: rename config to running_config to reduce my confusion.. Signed-off-by: Thomas Lamprecht --- PVE/API2/Network/SDN/Controllers.pm | 8 ++++---- PVE/API2/Network/SDN/Subnets.pm | 8 ++++---- PVE/API2/Network/SDN/Vnets.pm | 8 ++++---- PVE/API2/Network/SDN/Zones.pm | 8 ++++---- PVE/Network/SDN.pm | 4 ++-- PVE/Network/SDN/Controllers.pm | 10 +++++----- PVE/Network/SDN/Subnets.pm | 2 +- PVE/Network/SDN/Vnets.pm | 2 +- PVE/Network/SDN/Zones.pm | 8 ++++---- test/run_test_zones.pl | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/PVE/API2/Network/SDN/Controllers.pm b/PVE/API2/Network/SDN/Controllers.pm index e761b6c..d8f18ab 100644 --- 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 f7e095f..377a568 100644 --- 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 16959dc..811a2e8 100644 --- 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 5bbdd36..2163374 100644 --- 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 befaaee..314b515 100644 --- 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 ba67d75..d61851b 100644 --- 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 56dcd28..0cdadf7 100644 --- 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 ff39eef..9d9b155 100644 --- 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 bcef427..e5c0240 100644 --- 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 71ead61..a788553 100755 --- 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; }, ); -- 2.39.5