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 E952B9B644 for ; Mon, 20 Nov 2023 19:41:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C89611E194 for ; Mon, 20 Nov 2023 19:41:30 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Mon, 20 Nov 2023 19:41:30 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 05D052C425C; Mon, 20 Nov 2023 19:41:30 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 19:41:26 +0100 Message-Id: <20231120184128.552980-2-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120184128.552980-1-s.hanreich@proxmox.com> References: <20231120184128.552980-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.459 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 pve-container 1/3] hotplug network: Only change IPAM when MAC or bridge 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: Mon, 20 Nov 2023 18:41:31 -0000 Currently a new IPAM entry is created everytime a NIC config changes. When editing properties other than MAC or Bridge this could lead to duplicated entries in the IPAM. Only reserve a new IP when the bridge or MAC changes or the NIC is completely new. Signed-off-by: Stefan Hanreich --- src/PVE/LXC.pm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 2dad83d..c239715 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -965,9 +965,12 @@ sub update_net { PVE::Network::veth_delete($veth); - if ($have_sdn) { + if ($have_sdn && safe_string_ne($oldnet->{hwaddr}, $newnet->{hwaddr})) { eval { PVE::Network::SDN::Vnets::del_ips_from_mac($oldnet->{bridge}, $oldnet->{hwaddr}, $conf->{hostname}) }; warn $@ if $@; + + PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, $vmid, undef, 1); + PVE::Network::SDN::Vnets::add_dhcp_mapping($newnet->{bridge}, $newnet->{hwaddr}); } delete $conf->{$opt}; @@ -976,13 +979,15 @@ sub update_net { hotplug_net($vmid, $conf, $opt, $newnet, $netid); } else { - if (safe_string_ne($oldnet->{bridge}, $newnet->{bridge}) || + my $bridge_changed = safe_string_ne($oldnet->{bridge}, $newnet->{bridge}); + + if ($bridge_changed || safe_num_ne($oldnet->{tag}, $newnet->{tag}) || safe_num_ne($oldnet->{firewall}, $newnet->{firewall}) || safe_boolean_ne($oldnet->{link_down}, $newnet->{link_down}) ) { - if ($oldnet->{bridge}) { + my $oldbridge = $oldnet->{bridge}; PVE::Network::tap_unplug($veth); foreach (qw(bridge tag firewall)) { @@ -991,13 +996,13 @@ sub update_net { $conf->{$opt} = PVE::LXC::Config->print_lxc_network($oldnet); PVE::LXC::Config->write_config($vmid, $conf); - if ($have_sdn) { - eval { PVE::Network::SDN::Vnets::del_ips_from_mac($oldnet->{bridge}, $oldnet->{hwaddr}, $conf->{hostname}) }; + if ($have_sdn && $bridge_changed) { + eval { PVE::Network::SDN::Vnets::del_ips_from_mac($oldbridge, $oldnet->{hwaddr}, $conf->{hostname}) }; warn $@ if $@; } } - if ($have_sdn) { + if ($have_sdn && $bridge_changed) { PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, $vmid, undef, 1); } PVE::LXC::net_tap_plug($veth, $newnet); @@ -1016,6 +1021,9 @@ sub update_net { PVE::LXC::Config->write_config($vmid, $conf); } } else { + PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, $vmid, undef, 1); + PVE::Network::SDN::Vnets::add_dhcp_mapping($newnet->{bridge}, $newnet->{hwaddr}); + hotplug_net($vmid, $conf, $opt, $newnet, $netid); } @@ -1030,8 +1038,6 @@ sub hotplug_net { my $eth = $newnet->{name}; if ($have_sdn) { - PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, $vmid, undef, 1); - PVE::Network::SDN::Vnets::add_dhcp_mapping($newnet->{bridge}, $newnet->{hwaddr}); PVE::Network::SDN::Zones::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr}); } else { PVE::Network::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr}); -- 2.39.2