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 07633751DF for ; Mon, 12 Jul 2021 00:47:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0555AEB6D for ; Mon, 12 Jul 2021 00:47:18 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2D2CBEB1A for ; Mon, 12 Jul 2021 00:47:15 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id D3063AD9; Mon, 12 Jul 2021 00:47:08 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 12 Jul 2021 00:47:07 +0200 Message-Id: <20210711224707.63089-10-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210711224707.63089-1-aderumier@odiso.com> References: <20210711224707.63089-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.051 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different 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 KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records 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 Subject: [pve-devel] [PATCH v2 qemu-server 9/9] ipam : add destroy vm support 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: Sun, 11 Jul 2021 22:47:18 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 7d34a74..f6f14a6 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2215,6 +2215,8 @@ sub destroy_vm { }; PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive); + PVE::QemuServer::vmconfig_destroy_nets_ip($conf); + for my $snap (values %{$conf->{snapshots}}) { next if !defined($snap->{vmstate}); my $drive = PVE::QemuConfig->parse_volume('vmstate', $snap->{vmstate}, 1); @@ -4922,7 +4924,6 @@ sub vmconfig_update_net_ip { $ipconfig->{gw6} = $net->{gw6} if $net->{gw6}; my $value = PVE::QemuServer::print_ipconfig($ipconfig); $conf->{pending}->{$ipconfigid} = $value; - } sub vmconfig_delete_net_ip { @@ -5028,6 +5029,37 @@ sub vmconfig_delete_pendingnet_ip { } } +sub vmconfig_destroy_nets_ip { + my ($conf) = @_; + + foreach my $snapname (keys %{$conf->{snapshots}}) { + my $snapconf = $conf->{snapshots}->{$snapname}; + foreach my $opt (keys %{$snapconf}) { + next if $opt !~ m/^net(\d+)$/; + my $hostname = $snapconf->{name}; + my $net = PVE::QemuServer::parse_net($snapconf->{$opt}); + eval { + PVE::QemuServer::Ipam::delete_net_ip(4, $net, $hostname); + }; + eval { + PVE::QemuServer::Ipam::delete_net_ip(6, $net, $hostname); + }; + } + } + + foreach my $opt (keys %{$conf}) { + next if $opt !~ m/^net(\d+)$/; + my $net = PVE::QemuServer::parse_net($conf->{$opt}); + my $hostname = $conf->{name}; + eval { + PVE::QemuServer::Ipam::delete_net_ip(4, $net, $hostname); + }; + eval { + PVE::QemuServer::Ipam::delete_net_ip(6, $net, $hostname); + }; + } +} + sub vmconfig_update_net { my ($storecfg, $conf, $hotplug, $vmid, $opt, $value, $arch, $machine_type) = @_; @@ -6121,6 +6153,7 @@ my $restore_cleanup_oldconf = sub { } } } + }; # Helper to parse vzdump backup device hints -- 2.30.2