proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 03:58:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api2 : reload : use zones/controllers sdn plugins

Browse Source
This commit is contained in:
Alexandre Derumier 2019-11-26 15:20:10 +01:00 committed by Thomas Lamprecht
parent 7405805780
commit 20dc8bbeb8
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PVE/API2/Network.pm
View File

@ -18,7 +18,8 @@ use base qw(PVE::RESTHandler);
my $have_sdn; my $have_sdn;
eval { eval {
require PVE::API2::Network::SDN; require PVE::Network::SDN::Zones;
require PVE::Network::SDN::Controllers;
$have_sdn = 1; $have_sdn = 1;
}; };
@ -578,16 +579,11 @@ __PACKAGE__->register_method({
rename($new_config_file, $current_config_file) if -e $new_config_file; rename($new_config_file, $current_config_file) if -e $new_config_file;
my $frr_config;
if ($have_sdn) { if ($have_sdn) {
my $network_config = PVE::Network::SDN::generate_etc_network_config(); my $network_sdn_config = PVE::Network::SDN::Zones::generate_etc_network_config();
PVE::Network::SDN::write_etc_network_config($network_config); PVE::Network::SDN::Zones::write_etc_network_config($network_sdn_config);
$frr_config = PVE::Network::SDN::generate_frr_config();
PVE::Network::SDN::write_frr_config($frr_config) if $frr_config;
} }
my $err = sub { my $err = sub {
my $line = shift; my $line = shift;
if ($line =~ /(warning|error): (\S+):/) { if ($line =~ /(warning|error): (\S+):/) {
@ -596,15 +592,10 @@ __PACKAGE__->register_method({
}; };
PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err); PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err);
my $err_frr = sub { if ($have_sdn) {
my $line = shift; my $controller_config = PVE::Network::SDN::Controllers::generate_controller_config();
if ($line =~ /^line (\S+)/) { PVE::Network::SDN::Controllers::write_controller_config($controller_config) if ($controller_config);
print "$line \n"; PVE::Network::SDN::Controllers::reload_controller();
}
};
if ($frr_config && -e "/usr/bin/vtysh") {
PVE::Tools::run_command(['/usr/bin/vtysh', '-m', '-f', '/etc/frr/frr.conf'], outfunc => {}, errfunc => $err_frr);
} }
}; };
return $rpcenv->fork_worker('srvreload', 'networking', $authuser, $worker); return $rpcenv->fork_worker('srvreload', 'networking', $authuser, $worker);