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 8F7849A58C for ; Fri, 17 Nov 2023 12:50:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7146B31B15 for ; Fri, 17 Nov 2023 12:50:04 +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:50:02 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id ECFAC2C3A7B; 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:09 +0100 Message-Id: <20231117114011.834002-32-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.446 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 31/33] vm_apply_pending: add|del ips from ipam for offline changes 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:50:04 -0000 From: Alexandre Derumier Co-Authored-by: Stefan Hanreich Signed-off-by: Alexandre Derumier --- src/PVE/LXC/Config.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index c884313..823a2b9 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -1471,6 +1471,12 @@ sub vmconfig_apply_pending { } elsif ($opt =~ m/^unused(\d+)$/) { PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $conf->{$opt}) if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1); + } elsif ($opt =~ m/^net(\d+)$/) { + if ($have_sdn) { + my $net = $class->parse_lxc_network($conf->{$opt}); + eval { PVE::Network::SDN::Vnets::del_ips_from_mac($net->{bridge}, $net->{hwaddr}, $conf->{hostname}) }; + warn $@ if $@; + } } }; if (my $err = $@) { @@ -1493,6 +1499,15 @@ sub vmconfig_apply_pending { my $netid = $1; my $net = $class->parse_lxc_network($conf->{pending}->{$opt}); $conf->{pending}->{$opt} = $class->print_lxc_network($net); + if ($have_sdn) { + if($conf->{$opt}) { + my $old_net = $class->parse_lxc_network($conf->{$opt}); + if ($old_net->{bridge} ne $net->{bridge} || $old_net->{hwaddr} ne $net->{hwaddr}) { + PVE::Network::SDN::Vnets::del_ips_from_mac($old_net->{bridge}, $old_net->{hwaddr}, $conf->{name}); + } + } + PVE::Network::SDN::Vnets::add_next_free_cidr($net->{bridge}, $conf->{hostname}, $net->{hwaddr}, $vmid, undef, 1); + } } }; if (my $err = $@) { -- 2.39.2