[pve-devel] [PATCH v4 pve-container 29/33] vm_create|restore: create ips in ipam

[Stefan Hanreich]

From: Alexandre Derumier <aderum...@odiso.com>

also delete ips on create failure

Co-Authored-by: Stefan Hanreich <s.hanre...@proxmox.com>
Signed-off-by: Alexandre Derumier <aderum...@odiso.com>
---
 src/PVE/API2/LXC.pm |  4 ++++
 src/PVE/LXC.pm      | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 8839105..e15de28 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -475,9 +475,11 @@ __PACKAGE__->register_method({
                    if ($restore) {
                        print "merging backed-up and given configuration..\n";
                        PVE::LXC::Create::restore_configuration($vmid, 
$storage_cfg, $archive, $rootdir, $conf, !$is_root, $unique, 
$skip_fw_config_restore);
+                       PVE::LXC::create_ifaces_ipams_ips($conf, $vmid) if 
$unique;
                        my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir);
                        $lxc_setup->template_fixup($conf);
                    } else {
+                       PVE::LXC::create_ifaces_ipams_ips($conf, $vmid);
                        my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); 
# detect OS
                        PVE::LXC::Config->write_config($vmid, $conf); # safe 
config (after OS detection)
                        $lxc_setup->post_create_hook($password, $ssh_keys);
@@ -503,6 +505,8 @@ __PACKAGE__->register_method({
                PVE::LXC::Config->write_config($vmid, $conf);
            };
            if (my $err = $@) {
+               eval { PVE::LXC::delete_ifaces_ipams_ips($conf, $vmid) };
+               warn $@ if $@;
                PVE::LXC::destroy_disks($storage_cfg, $vollist);
                if ($destroy_config_on_error) {
                    eval { PVE::LXC::Config->destroy_config($vmid) };
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 4472e0f..2dad83d 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -2758,6 +2758,19 @@ sub thaw($) {
     }
 }
 
+sub create_ifaces_ipams_ips {
+    my ($conf, $vmid) = @_;
+
+    return if !$have_sdn;
+
+    for my $opt (keys %$conf) {
+       next if $opt !~ m/^net(\d+)$/;
+       my $net = PVE::QemuServer::parse_net($conf->{$opt});
+       next if $net->{type} ne 'veth';
+        PVE::Network::SDN::Vnets::add_next_free_cidr($net->{bridge}, 
$conf->{hostname}, $net->{hwaddr}, $vmid, undef, 1);
+    }
+}
+
 sub delete_ifaces_ipams_ips {
     my ($conf, $vmid) = @_;
 
-- 
2.39.2


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel