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 7D804BF357 for ; Thu, 4 Jan 2024 17:28:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A9B91266C for ; Thu, 4 Jan 2024 17:27:37 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Thu, 4 Jan 2024 17:27:35 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 6FF967E14; Thu, 4 Jan 2024 17:27:34 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 6EB1B20E6BF; Thu, 4 Jan 2024 17:27:34 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 4 Jan 2024 17:27:32 +0100 Message-Id: <20240104162733.4152467-6-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240104162733.4152467-1-aderumier@odiso.com> References: <20240104162733.4152467-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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 HEADER_FROM_DIFFERENT_DOMAINS 0.248 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 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] [pve-network 3/4] subnets: call add_range_next_freeip only if dhcp is defined 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: Thu, 04 Jan 2024 16:28:07 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Subnets.pm | 13 +++++++++---- src/PVE/Network/SDN/Vnets.pm | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm index 3b08dcd..4767850 100644 --- a/src/PVE/Network/SDN/Subnets.pm +++ b/src/PVE/Network/SDN/Subnets.pm @@ -206,7 +206,7 @@ sub del_subnet { } sub add_next_free_ip { - my ($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns, $dhcprange) = @_; + my ($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns) = @_; my $cidr = undef; my $ip = undef; @@ -227,15 +227,18 @@ sub add_next_free_ip { my $plugin_config = $ipam_cfg->{ids}->{$ipamid}; my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type}); eval { - if ($dhcprange) { + + my $dhcp_ranges = PVE::Network::SDN::Subnets::get_dhcp_ranges($subnet); + if ($zone->{dhcp}) { + + die "no dhcp_range are defined" if @$dhcp_ranges == 0; + my $data = { mac => $mac, hostname => $hostname, vmid => $vmid, }; - my $dhcp_ranges = PVE::Network::SDN::Subnets::get_dhcp_ranges($subnet); - foreach my $range (@$dhcp_ranges) { $ip = $plugin->add_range_next_freeip($plugin_config, $subnet, $range, $data); last if $ip; @@ -247,6 +250,8 @@ sub add_next_free_ip { die $@ if $@; + die "Can't find any free ip" if !$ip; + eval { PVE::Network::SDN::Ipams::add_cache_mac_ip($mac, $ip); }; warn $@ if $@; } diff --git a/src/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm index 0268684..83b79dd 100644 --- a/src/PVE/Network/SDN/Vnets.pm +++ b/src/PVE/Network/SDN/Vnets.pm @@ -95,7 +95,7 @@ sub get_subnet_from_vnet_ip { } sub add_next_free_cidr { - my ($vnetid, $hostname, $mac, $vmid, $skipdns, $dhcprange) = @_; + my ($vnetid, $hostname, $mac, $vmid, $skipdns) = @_; my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); return if !$vnet; @@ -121,7 +121,7 @@ sub add_next_free_cidr { $subnetcount++; eval { - $ip = PVE::Network::SDN::Subnets::add_next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns, $dhcprange); + $ip = PVE::Network::SDN::Subnets::add_next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns); }; die $@ if $@; -- 2.39.2