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 3B64990D70 for ; Tue, 13 Feb 2024 09:49:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C3C8328BF for ; Tue, 13 Feb 2024 09:49:08 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Feb 2024 09:49:07 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id A7CFE7D3E; Tue, 13 Feb 2024 09:49:00 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 9CFE9169042; Tue, 13 Feb 2024 09:49:00 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 13 Feb 2024 09:48:53 +0100 Message-Id: <20240213084858.2138416-2-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213084858.2138416-1-aderumier@odiso.com> References: <20240213084858.2138416-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.023 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.249 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] [PATCH v2 pve-network 1/6] ipams : add_next_freeip : return ip not cidr 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, 13 Feb 2024 08:49:38 -0000 we want same result than add_next_free_range Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 13 ++++--------- src/PVE/Network/SDN/Ipams/PVEPlugin.pm | 2 +- src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm index 91010bb..14a69d9 100644 --- a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm @@ -151,17 +151,15 @@ sub add_next_freeip { my $params = { dns_name => $hostname, description => $description }; - my $ip = undef; eval { my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/prefixes/$internalid/available-ips/", $headers, $params); - $ip = $result->{address}; + my ($ip, undef) = split(/\//, $result->{address}); + return $ip; }; if ($@) { die "can't find free ip in subnet $cidr: $@" if !$noerr; } - - return $ip; } sub add_range_next_freeip { @@ -176,19 +174,16 @@ sub add_range_next_freeip { my $params = { dns_name => $data->{hostname}, description => $description }; - my $ip = undef; eval { my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/ip-ranges/$internalid/available-ips/", $headers, $params); - $ip = $result->{address}; + my ($ip, undef) = split(/\//, $result->{address}); print "found ip free $ip in range $range->{'start-address'}-$range->{'end-address'}\n" if $ip; + return $ip; }; if ($@) { die "can't find free ip in range $range->{'start-address'}-$range->{'end-address'}: $@" if !$noerr; } - - return $ip; - } sub del_ip { diff --git a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm index 270fb04..651acfb 100644 --- a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm @@ -176,7 +176,7 @@ sub add_next_freeip { }); die "$@" if $@; - return "$freeip/$mask"; + return $freeip; } sub add_range_next_freeip { diff --git a/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm b/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm index 1b7b666..7b3168d 100644 --- a/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm @@ -181,7 +181,7 @@ sub add_next_freeip { die "can't find free ip in subnet $cidr: $@" if !$noerr; } - return "$ip/$mask" if $ip && $mask; + return $ip; } sub del_ip { -- 2.39.2