From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4FD669A3E8 for ; Fri, 17 Nov 2023 12:40:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 70A3A30D10 for ; Fri, 17 Nov 2023 12:40:26 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 17 Nov 2023 12:40:24 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id DE0342C36CB; Fri, 17 Nov 2023 12:40:18 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 12:40:07 +0100 Message-Id: <20231117114011.834002-30-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231117114011.834002-1-s.hanreich@proxmox.com> References: <20231117114011.834002-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.455 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 pve-container 29/33] vm_create|restore: create ips in ipam X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2023 11:40:59 -0000 From: Alexandre Derumier also delete ips on create failure Co-Authored-by: Stefan Hanreich Signed-off-by: Alexandre Derumier --- 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