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 C8D939C004 for ; Tue, 21 Nov 2023 15:56:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B06A2C21C for ; Tue, 21 Nov 2023 15:56:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 21 Nov 2023 15:56:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 179B2418A2; Tue, 21 Nov 2023 15:56:09 +0100 (CET) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Tue, 21 Nov 2023 15:55:54 +0100 Message-ID: <20231121145556.436743-2-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121145556.436743-1-s.lendl@proxmox.com> References: <20231121145556.436743-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.056 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 1/3] sdn: register MAC in IPAM if not found 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, 21 Nov 2023 14:56:09 -0000 if inside add_dhcp_mapping, which is called at VM or LCX start, we do not find an IP in IPAM, register the MAC. This is very useful as a fallback if for some reason an IP mapping was deleted or there is a bug somewhere that does not register an IP. This acts more like DHCP to allocate an IP on demand. In order to properly register the IP, the VMID and hostname is required as a parameter. Signed-off-by: Stefan Lendl --- src/PVE/Network/SDN/Vnets.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm index 09378ff..0dfdfd7 100644 --- a/src/PVE/Network/SDN/Vnets.pm +++ b/src/PVE/Network/SDN/Vnets.pm @@ -186,7 +186,7 @@ sub del_ips_from_mac { } sub add_dhcp_mapping { - my ($vnetid, $mac) = @_; + my ($vnetid, $mac, $vmid, $name) = @_; my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); return if !$vnet; @@ -195,7 +195,13 @@ sub add_dhcp_mapping { return if !$zone->{ipam} || !$zone->{dhcp}; - my ($ip4,$ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac); + my ($ip4, $ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac); + if ( ! ($ip4 || $ip6) ) { + print "No IP found for MAC: $mac for VMID:$vmid\n"; + add_next_free_cidr($vnetid, $name, $mac, "$vmid", undef, 1); + ($ip4, $ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac); + print "got new IP from IPAM: $ip4 $ip6\n"; + } PVE::Network::SDN::Dhcp::add_mapping($vnetid, $mac, $ip4, $ip6) if $ip4 || $ip6; } -- 2.42.0