sdn: use new helper methods to update config

and do a breaks on older network package as we do not depend on it
due to it being an optional/experimental feature, so reverse the
depends with the breaks.

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

diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index 32ab8ebd3706a7b5cab454a1f925040d5a894e73..9ac289c411f0c8d60f80729f5fb174739789c801 100644 (file)
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -19,8 +19,6 @@ use base qw(PVE::RESTHandler);
 my $have_sdn;
 eval {
     require PVE::Network::SDN;
-    require PVE::Network::SDN::Zones;
-    require PVE::Network::SDN::Controllers;
     $have_sdn = 1;
 };
 
@@ -610,8 +608,7 @@ __PACKAGE__->register_method({
            rename($new_config_file, $current_config_file) if -e $new_config_file;
 
            if ($have_sdn) {
-               my $network_sdn_config = PVE::Network::SDN::Zones::generate_etc_network_config();
-               PVE::Network::SDN::Zones::write_etc_network_config($network_sdn_config);
+               PVE::Network::SDN::generate_zone_config();
            }
 
            my $err = sub {
@@ -623,9 +620,7 @@ __PACKAGE__->register_method({
            PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err);
 
            if ($have_sdn) {
-               my $controller_config = PVE::Network::SDN::Controllers::generate_controller_config();
-               PVE::Network::SDN::Controllers::write_controller_config($controller_config) if ($controller_config);
-               PVE::Network::SDN::Controllers::reload_controller();
+               PVE::Network::SDN::generate_controller_config(1);
            }
        };
        return $rpcenv->fork_worker('srvreload', 'networking', $authuser, $worker);

diff --git a/debian/control b/debian/control
index b0d3097e4d0c84fa576294903800d0b4f90575b9..36d0c272bb0593462d2479c3c88fc6ee0b55acb9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -91,5 +91,6 @@ Replaces: vlan,
           vzdump,
 Provides: vlan,
           vzdump,
+Breaks: libpve-network-perl (<< 0.4-6)
 Description: Proxmox Virtual Environment Management Tools
  This package contains the Proxmox Virtual Environment management tools.