[pve-devel] [PATCH pve-network] Fix #5496: NetBox add ip range

* [pve-devel] [PATCH pve-network] Fix #5496: NetBox add ip range
@ 2024-12-11 23:38 nurohman via pve-devel
  2024-12-12  7:20 ` DERUMIER, Alexandre via pve-devel
       [not found] ` <b6d41bd46ba97b50da21589f2ea676ab34cac339.camel@groupe-cyllene.com>
  0 siblings, 2 replies; 5+ messages in thread
From: nurohman via pve-devel @ 2024-12-11 23:38 UTC (permalink / raw)
  To: pve-devel; +Cc: nurohman

[-- Attachment #1: Type: message/rfc822, Size: 6541 bytes --]

From: nurohman <me@nurohman.com>
To: pve-devel@lists.proxmox.com
Cc: nurohman <me@nurohman.com>
Subject: [PATCH pve-network] Fix #5496: NetBox add ip range
Date: Thu, 12 Dec 2024 06:38:04 +0700
Message-ID: <20241211233832.806187-1-me@nurohman.com>

when ip range not available in the NetBox, function response "can't find free ip in range". 
Add new ip range if can't find ip range ID and response new ip range ID.  

Co-authored-by: Jacob Green <jacobgreen at corporatetools.com>
Co-authored-by: Lou Lecrivain <lou.lecrivain at wdz.de>
Signed-off-by: Nurohman <me at nurohman.com>
---
 src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
index d923269..5591b0b 100644
--- a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
@@ -151,7 +151,7 @@ sub add_next_freeip {
 
     my $params = { dns_name => $hostname, description => $description };
 
-    eval {
+    my $ip = eval {
 	my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/prefixes/$internalid/available-ips/", $headers, $params);
 	my ($ip, undef) = split(/\//, $result->{address});
 	return $ip;
@@ -160,6 +160,8 @@ sub add_next_freeip {
     if ($@) {
 	die "can't find free ip in subnet $cidr: $@" if !$noerr;
     }
+
+    return $ip;
 }
 
 sub add_range_next_freeip {
@@ -170,11 +172,14 @@ sub add_range_next_freeip {
     my $headers = ['Content-Type' => 'application/json; charset=UTF-8', 'Authorization' => "token $token"];
 
     my $internalid = get_iprange_id($url, $range, $headers);
+    if ($internalid eq "") {
+	$internalid = add_iprange($url, $range, $subnet, $headers);
+    }
     my $description = "mac:$data->{mac}" if $data->{mac};
 
     my $params = { dns_name => $data->{hostname}, description => $description };
 
-    eval {
+    my $ip = eval {
 	my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/ip-ranges/$internalid/available-ips/", $headers, $params);
 	my ($ip, undef) = split(/\//, $result->{address});
 	print "found ip free $ip in range $range->{'start-address'}-$range->{'end-address'}\n" if $ip;
@@ -184,6 +189,8 @@ sub add_range_next_freeip {
     if ($@) {
 	die "can't find free ip in range $range->{'start-address'}-$range->{'end-address'}: $@" if !$noerr;
     }
+
+    return $ip;
 }
 
 sub del_ip {
@@ -290,6 +297,29 @@ sub is_ip_gateway {
     return $is_gateway;
 }
 
+sub add_iprange {
+    my ($url, $range, $subnet, $headers) = @_;
+
+    my ($start, $smask)= split('/', $range->{'start-address'});
+    my ($end, $emask)= split('/', $range->{'end-address'});
+    my $params = {
+	start_address => "$start/$subnet->{mask}",
+	end_address => "$end/$subnet->{mask}",
+	description => "prefix:$subnet->{cidr}"
+    };
+
+    my $data = eval {
+        my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/ip-ranges/", $headers, $params);
+	return $result;
+    };
+
+    if ($@) {
+        die "Can't add ip range $start/$subnet->{mask} -> $end/$subnet->{mask} $@";
+    }
+
+    return $data->{id};
+}
+
 1;
 
 
-- 
2.47.1



[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread