to reduce my confusion..
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{controllers};
} else {
$cfg = PVE::Network::SDN::Controllers::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{controllers};
} else {
$cfg = PVE::Network::SDN::Controllers::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{subnets};
} else {
$cfg = PVE::Network::SDN::Subnets::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{subnets};
} else {
$cfg = PVE::Network::SDN::Subnets::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{vnets};
} else {
$cfg = PVE::Network::SDN::Vnets::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{vnets};
} else {
$cfg = PVE::Network::SDN::Vnets::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{zones};
} else {
$cfg = PVE::Network::SDN::Zones::config();
my $cfg = {};
if($param->{pending}) {
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 $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();
$cfg = $running_cfg->{zones};
} else {
$cfg = PVE::Network::SDN::Zones::config();
return($zone_status, $vnet_status);
}
return($zone_status, $vnet_status);
}
return cfs_read_file($running_cfg);
}
return cfs_read_file($running_cfg);
}
my $nodename = PVE::INotify::nodename();
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};
my $vnets_cfg = $cfg->{vnets};
my $zones_cfg = $cfg->{zones};
sub complete_sdn_controller {
my ($cmdname, $pname, $cvalue) = @_;
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 {
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};
my $vnet_cfg = $cfg->{vnets};
my $zone_cfg = $cfg->{zones};
my $controller_cfg = $cfg->{controllers};
- my $cfg = PVE::Network::SDN::config();
+ my $cfg = PVE::Network::SDN::running_config();
my $controller_cfg = $cfg->{controllers};
return if !$controller_cfg;
my $controller_cfg = $cfg->{controllers};
return if !$controller_cfg;
sub generate_controller_rawconfig {
my ($config) = @_;
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;
my $controller_cfg = $cfg->{controllers};
return if !$controller_cfg;
sub write_controller_config {
my ($config) = @_;
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;
my $controller_cfg = $cfg->{controllers};
return if !$controller_cfg;
my $cfg = {};
if($running) {
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();
$cfg = $cfg->{subnets};
} else {
$cfg = PVE::Network::SDN::Subnets::config();
my $cfg = {};
if($running) {
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();
$cfg = $cfg->{vnets};
} else {
$cfg = PVE::Network::SDN::Vnets::config();
sub complete_sdn_zone {
my ($cmdname, $pname, $cvalue) = @_;
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) ];
}
return $cmdname eq 'add' ? [] : [ PVE::Network::SDN::sdn_zones_ids($cfg) ];
}
my $cfg = {};
if($running) {
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();
$cfg = $cfg->{vnets};
} else {
$cfg = PVE::Network::SDN::Zones::config();
sub generate_etc_network_config {
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};
my $version = $cfg->{version};
my $vnet_cfg = $cfg->{vnets};
my $err_config = undef;
my $local_version = PVE::Network::SDN::Zones::read_etc_network_config_version();
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;
my $sdn_version = $cfg->{version};
return if !$sdn_version;
my $sdn_module = Test::MockModule->new("PVE::Network::SDN");
$sdn_module->mock(
my $sdn_module = Test::MockModule->new("PVE::Network::SDN");
$sdn_module->mock(
+ running_config => sub {
return $sdn_config;
},
);
return $sdn_config;
},
);