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 2BD839A2EA for ; Tue, 14 Nov 2023 19:06:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 36F681F7F3 for ; Tue, 14 Nov 2023 19:06:30 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 14 Nov 2023 19:06:29 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 4871A2C4386; Tue, 14 Nov 2023 19:06:24 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 14 Nov 2023 19:06:20 +0100 Message-Id: <20231114180620.2635449-23-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114180620.2635449-1-s.hanreich@proxmox.com> References: <20231114180620.2635449-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.487 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] [WIP v3 qemu-server 22/22] vm_destroy: delete ip from ipam && dhcp 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: Tue, 14 Nov 2023 18:06:32 -0000 From: Alexandre Derumier Co-Authored-By: Stefan Hanreich Signed-off-by: Stefan Hanreich --- PVE/QemuServer.pm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index fecdb9c..c9c061c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2342,6 +2342,9 @@ sub destroy_vm { }); } + eval { delete_ifaces_ipams_ips($conf, $vmid)}; + warn $@ if $@; + if (defined $replacement_conf) { PVE::QemuConfig->write_config($vmid, $replacement_conf); } else { @@ -6153,6 +6156,18 @@ sub cleanup_pci_devices { PVE::QemuServer::PCI::remove_pci_reservation($vmid); } +sub cleanup_sdn_dhcp { + my ($vmid, $conf) = @_; + + for my $k (keys %$conf) { + next if $k !~ /^net(\d+)/; + my $netconf = $conf->{$k}; + my $net = PVE::QemuServer::parse_net($netconf); + + PVE::Network::SDN::Dhcp::remove_mapping($net->{bridge}, $net->{macaddr}); + } +} + sub vm_stop_cleanup { my ($storecfg, $vmid, $conf, $keepActive, $apply_pending_changes) = @_; @@ -6186,6 +6201,8 @@ sub vm_stop_cleanup { cleanup_pci_devices($vmid, $conf); + cleanup_sdn_dhcp($vmid, $conf); + vmconfig_apply_pending($vmid, $conf, $storecfg) if $apply_pending_changes; }; warn $@ if $@; # avoid errors - just warn -- 2.39.2