public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "DERUMIER, Alexandre via pve-devel" <pve-devel@lists.proxmox.com>
To: "pve-devel@lists.proxmox.com" <pve-devel@lists.proxmox.com>
Cc: "DERUMIER, Alexandre" <alexandre.derumier@groupe-cyllene.com>,
	"me@nurohman.com" <me@nurohman.com>
Subject: Re: [pve-devel] [PATCH pve-network] Fix #5496: NetBox add ip range
Date: Thu, 12 Dec 2024 07:20:02 +0000	[thread overview]
Message-ID: <mailman.156.1733988042.332.pve-devel@lists.proxmox.com> (raw)
In-Reply-To: <mailman.147.1733961890.332.pve-devel@lists.proxmox.com>

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

From: "DERUMIER, Alexandre" <alexandre.derumier@groupe-cyllene.com>
To: "pve-devel@lists.proxmox.com" <pve-devel@lists.proxmox.com>
Cc: "me@nurohman.com" <me@nurohman.com>
Subject: Re: [pve-devel] [PATCH pve-network] Fix #5496: NetBox add ip range
Date: Thu, 12 Dec 2024 07:20:02 +0000
Message-ID: <b6d41bd46ba97b50da21589f2ea676ab34cac339.camel@groupe-cyllene.com>

Hi,

I don't remember exactly when I have done the code (because dhcp range
has been added after my initial implementation, where I was looking
only the full prefix) 

but shouldn't theses ranges be added when the dhcp ranges are submitted
on subnet create/update api call ? (I'm not 100% sure, but I think it
was missing a hook to call the sdn api when submitting the dhcp ranges
)


-------- Message initial --------
De: nurohman via pve-devel <pve-devel@lists.proxmox.com>
Répondre à: Proxmox VE development discussion <pve-
devel@lists.proxmox.com>
À: pve-devel@lists.proxmox.com
Cc: nurohman <me@nurohman.com>
Objet: [pve-devel] [PATCH pve-network] Fix #5496: NetBox add ip range
Date: 12/12/2024 00:38:04

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;
 
 


[-- 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

  reply	other threads:[~2024-12-12  7:20 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-11 23:38 nurohman via pve-devel
2024-12-12  7:20 ` DERUMIER, Alexandre via pve-devel [this message]
2024-12-13  9:55   ` Lou Lecrivain via pve-devel
     [not found] ` <b6d41bd46ba97b50da21589f2ea676ab34cac339.camel@groupe-cyllene.com>
2024-12-12 13:17   ` Stefan Hanreich
     [not found] <20241211233832.806187-1-me@nurohman.com>
2024-12-12 13:20 ` Stefan Hanreich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=mailman.156.1733988042.332.pve-devel@lists.proxmox.com \
    --to=pve-devel@lists.proxmox.com \
    --cc=alexandre.derumier@groupe-cyllene.com \
    --cc=me@nurohman.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal