remove .new files

diff --git a/PVE/API2/Network/SDN.pm b/PVE/API2/Network/SDN.pm
index 65c8d5270fcb63ce8f9a2440aadb6ada385e435a..4af2b6f908790188ab8110ef3d61593342480595 100644 (file)
--- a/PVE/API2/Network/SDN.pm
+++ b/PVE/API2/Network/SDN.pm
@@ -97,21 +97,6 @@ __PACKAGE__->register_method ({
         my $rpcenv = PVE::RPCEnvironment::get();
         my $authuser = $rpcenv->get_user();
 
-       if (-e "/etc/pve/sdn/controllers.cfg.new") {
-           rename("/etc/pve/sdn/controllers.cfg.new", "/etc/pve/sdn/controllers.cfg")
-               || die "applying sdn/controllers.cfg changes failed - $!\n";
-       }
-
-       if (-e "/etc/pve/sdn/zones.cfg.new") {
-           rename("/etc/pve/sdn/zones.cfg.new", "/etc/pve/sdn/zones.cfg")
-               || die "applying sdn/zones.cfg changes failed - $!\n";
-       }
-
-       if (-e "/etc/pve/sdn/vnets.cfg.new") {
-           rename("/etc/pve/sdn/vnets.cfg.new", "/etc/pve/sdn/vnets.cfg")
-               || die "applying sdn/vnets.cfg changes failed - $!\n";
-       }
-
         my $code = sub {
             $rpcenv->{type} = 'priv'; # to start tasks in background
            PVE::Cluster::check_cfs_quorum();

diff --git a/PVE/API2/Network/SDN/Controllers.pm b/PVE/API2/Network/SDN/Controllers.pm
index e16619c6862e430751807ca88dd37f8c0b7cd7a7..50491ebd3b81eafa6c7d30e3cf0fa9a4f0226c50 100644 (file)
--- a/PVE/API2/Network/SDN/Controllers.pm
+++ b/PVE/API2/Network/SDN/Controllers.pm
@@ -156,28 +156,6 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
-__PACKAGE__->register_method ({
-    name => 'revert_configuration',
-    protected => 1,
-    path => '',
-    method => 'DELETE',
-    description => "Revert sdn controller changes.",
-    permissions => {
-       check => ['perm', '/sdn/controllers', ['SDN.Allocate']],
-    },
-    parameters => {
-       additionalProperties => 0,
-    },
-    returns => { type => 'null' },
-    code => sub {
-       my ($param) = @_;
-
-       die "no sdn controllers changes to revert" if !-e "/etc/pve/sdn/controllers.cfg.new";
-       unlink "/etc/pve/sdn/controllers.cfg.new";
-
-       return undef;
-    }});
-
 __PACKAGE__->register_method ({
     name => 'update',
     protected => 1,

diff --git a/PVE/API2/Network/SDN/Vnets.pm b/PVE/API2/Network/SDN/Vnets.pm
index cef631c68cc5e2bd803a45883d3ec086ed37abc9..a9561f188a77c98709df2d69cc618b08201cfc43 100644 (file)
--- a/PVE/API2/Network/SDN/Vnets.pm
+++ b/PVE/API2/Network/SDN/Vnets.pm
@@ -137,28 +137,6 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
-__PACKAGE__->register_method ({
-    name => 'revert_configuration',
-    protected => 1,
-    path => '',
-    method => 'DELETE',
-    description => "Revert sdn vnet changes.",
-    permissions => {
-       check => ['perm', '/sdn/vnets', ['SDN.Allocate']],
-    },
-    parameters => {
-       additionalProperties => 0,
-    },
-    returns => { type => 'null' },
-    code => sub {
-       my ($param) = @_;
-
-       die "no sdn vnets changes to revert" if !-e "/etc/pve/sdn/vnets.cfg.new";
-       unlink "/etc/pve/sdn/vnets.cfg.new";
-
-       return undef;
-    }});
-
 __PACKAGE__->register_method ({
     name => 'update',
     protected => 1,

diff --git a/PVE/API2/Network/SDN/Zones.pm b/PVE/API2/Network/SDN/Zones.pm
index 293880a51b57d4ff19fa5f4e6e7a6254788e2131..9ea21895ab98676f0f4a8ada048096284664a34e 100644 (file)
--- a/PVE/API2/Network/SDN/Zones.pm
+++ b/PVE/API2/Network/SDN/Zones.pm
@@ -164,28 +164,6 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
-__PACKAGE__->register_method ({
-    name => 'revert_configuration',
-    protected => 1,
-    path => '',
-    method => 'DELETE',
-    description => "Revert sdn zone changes.",
-    permissions => {
-       check => ['perm', '/sdn/zones', ['SDN.Allocate']],
-    },
-    parameters => {
-       additionalProperties => 0,
-    },
-    returns => { type => 'null' },
-    code => sub {
-       my ($param) = @_;
-
-       die "no sdn zones changes to revert" if !-e "/etc/pve/sdn/zones.cfg.new";
-       unlink "/etc/pve/sdn/zones.cfg.new";
-
-       return undef;
-    }});
-
 __PACKAGE__->register_method ({
     name => 'update',
     protected => 1,

diff --git a/PVE/Network/SDN/Controllers.pm b/PVE/Network/SDN/Controllers.pm
index 16c664d5c3833510f757ad0f1c0cfa9dde8cc79d..91a74d887d830f23e547d126e50357727d461c3e 100644 (file)
--- a/PVE/Network/SDN/Controllers.pm
+++ b/PVE/Network/SDN/Controllers.pm
@@ -32,7 +32,7 @@ sub sdn_controllers_config {
 }
 
 sub config {
-    my $config = cfs_read_file("sdn/controllers.cfg.new");
+    my $config = cfs_read_file("sdn/controllers.cfg");
     $config = cfs_read_file("sdn/controllers.cfg") if !keys %{$config->{ids}};
     return $config;
 }
@@ -40,13 +40,13 @@ sub config {
 sub write_config {
     my ($cfg) = @_;
 
-    cfs_write_file("sdn/controllers.cfg.new", $cfg);
+    cfs_write_file("sdn/controllers.cfg", $cfg);
 }
 
 sub lock_sdn_controllers_config {
     my ($code, $errmsg) = @_;
 
-    cfs_lock_file("sdn/controllers.cfg.new", undef, $code);
+    cfs_lock_file("sdn/controllers.cfg", undef, $code);
     if (my $err = $@) {
         $errmsg ? die "$errmsg: $err" : die $err;
     }

diff --git a/PVE/Network/SDN/Controllers/Plugin.pm b/PVE/Network/SDN/Controllers/Plugin.pm
index 04eddca95e30df41702287eb5d41f83578cbe305..06cd576bcdf2344f459052f1033e3a1db3c7b482 100644 (file)
--- a/PVE/Network/SDN/Controllers/Plugin.pm
+++ b/PVE/Network/SDN/Controllers/Plugin.pm
@@ -12,9 +12,6 @@ use PVE::JSONSchema qw(get_standard_option);
 use base qw(PVE::SectionConfig);
 
 PVE::Cluster::cfs_register_file('sdn/controllers.cfg',
-                                sub { __PACKAGE__->parse_config(@_); });
-
-PVE::Cluster::cfs_register_file('sdn/controllers.cfg.new',
                                 sub { __PACKAGE__->parse_config(@_); },
                                 sub { __PACKAGE__->write_config(@_); });
 

diff --git a/PVE/Network/SDN/VnetPlugin.pm b/PVE/Network/SDN/VnetPlugin.pm
index bd612092eb410545556307dfc66fa6a269e1b81e..b0280fcaab554860e85e7b46a95b86baa5f55120 100644 (file)
--- a/PVE/Network/SDN/VnetPlugin.pm
+++ b/PVE/Network/SDN/VnetPlugin.pm
@@ -8,9 +8,6 @@ use base qw(PVE::SectionConfig);
 use PVE::JSONSchema qw(get_standard_option);
 
 PVE::Cluster::cfs_register_file('sdn/vnets.cfg',
-                                 sub { __PACKAGE__->parse_config(@_); });
-
-PVE::Cluster::cfs_register_file('sdn/vnets.cfg.new',
                                  sub { __PACKAGE__->parse_config(@_); },
                                  sub { __PACKAGE__->write_config(@_); });
 

diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm
index 725605bbc0cf985c9eed24d60dc69e3bcba37062..ef698e8617f418022a7ac56b2f76bbdec50e4a46 100644 (file)
--- a/PVE/Network/SDN/Vnets.pm
+++ b/PVE/Network/SDN/Vnets.pm
@@ -22,21 +22,19 @@ sub sdn_vnets_config {
 }
 
 sub config {
-    my $config = cfs_read_file("sdn/vnets.cfg.new");
-    $config = cfs_read_file("sdn/vnets.cfg") if !keys %{$config->{ids}};
-    return $config;
+    my $config = cfs_read_file("sdn/vnets.cfg");
 }
 
 sub write_config {
     my ($cfg) = @_;
 
-    cfs_write_file("sdn/vnets.cfg.new", $cfg);
+    cfs_write_file("sdn/vnets.cfg", $cfg);
 }
 
 sub lock_sdn_vnets_config {
     my ($code, $errmsg) = @_;
 
-    cfs_lock_file("sdn/vnets.cfg.new", undef, $code);
+    cfs_lock_file("sdn/vnets.cfg", undef, $code);
     if (my $err = $@) {
         $errmsg ? die "$errmsg: $err" : die $err;
     }

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index e1a7081f4ed0ef6bca21968ff6b8016adcb55484..97914949e81e63839d703e770f2fd38a0c9708de 100644 (file)
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -38,8 +38,7 @@ sub sdn_zones_config {
 }
 
 sub config {
-    my $config = cfs_read_file("sdn/zones.cfg.new");
-    $config = cfs_read_file("sdn/zones.cfg") if !keys %{$config->{ids}};
+    my $config = cfs_read_file("sdn/zones.cfg");
     return $config;
 }
 
@@ -53,13 +52,13 @@ sub get_plugin_config {
 sub write_config {
     my ($cfg) = @_;
 
-    cfs_write_file("sdn/zones.cfg.new", $cfg);
+    cfs_write_file("sdn/zones.cfg", $cfg);
 }
 
 sub lock_sdn_zones_config {
     my ($code, $errmsg) = @_;
 
-    cfs_lock_file("sdn/zones.cfg.new", undef, $code);
+    cfs_lock_file("sdn/zones.cfg", undef, $code);
     if (my $err = $@) {
         $errmsg ? die "$errmsg: $err" : die $err;
     }

diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm
index e4adcbd73927473c7048dd0e2204c267012e733f..aa53cce5921f27e3fa6e0958279f543ba6959540 100644 (file)
--- a/PVE/Network/SDN/Zones/Plugin.pm
+++ b/PVE/Network/SDN/Zones/Plugin.pm
@@ -13,9 +13,6 @@ use PVE::JSONSchema qw(get_standard_option);
 use base qw(PVE::SectionConfig);
 
 PVE::Cluster::cfs_register_file('sdn/zones.cfg',
-                                sub { __PACKAGE__->parse_config(@_); });
-
-PVE::Cluster::cfs_register_file('sdn/zones.cfg.new',
                                 sub { __PACKAGE__->parse_config(@_); },
                                 sub { __PACKAGE__->write_config(@_); });