From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id D24DE1FF15C
for <inbox@lore.proxmox.com>; Wed, 19 Feb 2025 17:37:09 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B422E2F77A;
Wed, 19 Feb 2025 17:37:05 +0100 (CET)
Message-ID: <d4f35a7b-9972-44b4-8c98-8cc8343b7430@proxmox.com>
Date: Wed, 19 Feb 2025 17:37:03 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
References: <20250108121529.5813-1-lou.lecrivain@wdz.de>
<mailman.143.1736338573.441.pve-devel@lists.proxmox.com>
Content-Language: en-US
From: =?UTF-8?Q?Hannes_D=C3=BCrr?= <h.duerr@proxmox.com>
In-Reply-To: <mailman.143.1736338573.441.pve-devel@lists.proxmox.com>
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
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
Subject: Re: [pve-devel] SPAM: [PATCH pve-network v2 2/7] ipam: nautobot:
implement plain prefix allocation
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
On 1/8/25 13:15, Lou Lecrivain via pve-devel wrote:
>
>
> add support for subnet allocation without ranges, where it was
> previously not supported. Signed-off-by: lou lecrivain
> <lou.lecrivain@wdz.de>--- src/PVE/Network/SDN/Ipams/NautobotPlugin.pm
> | 68 +++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git
> a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm
> b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm index 69e7897..22867df
> 100644 --- a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm +++
> b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm @@ -5,6 +5,7 @@ use
> warnings; use PVE::INotify; use PVE::Cluster; use PVE::Tools; +use
> NetAddr::IP; use base('PVE::Network::SDN::Ipams::NetboxPlugin'); @@
> -95,6 +96,66 @@ sub add_ip { } } +sub add_next_freeip { + my ($class,
> $plugin_config, $subnetid, $subnet, $hostname, $mac, $vmid, $noerr) = @_;
$subnetid and $vmid are unused
> + + my $cidr = $subnet->{cidr}; + + my $url = $plugin_config->{url}; +
> my $namespace = $plugin_config->{namespace}; + my $headers =
> default_headers($plugin_config); + + my $internalid =
> PVE::Network::SDN::Ipams::NetboxPlugin::get_prefix_id($url, $cidr,
> $headers); + + my $description = "mac:$mac" if $mac; + + my $params =
> { type => "dhcp", dns_name => $hostname, description => $description,
> namespace => $namespace, status => default_ip_status() };
please break the line
> + + 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; + };
> + + if ($@) { + die "can't find free ip in subnet $cidr: $@" if
> !$noerr; + } + return $ip; +} + +sub add_range_next_freeip { + my
> ($class, $plugin_config, $subnet, $range, $data, $noerr) = @_; + + my
> $url = $plugin_config->{url}; + my $namespace =
> $plugin_config->{namespace}; + my $headers =
> default_headers($plugin_config); + my $cidr = $subnet->{cidr}; + + #
> ranges are not supported natively in nautobot, hence why we have to
> get a little hacky. + my $minimal_size =
> NetAddr::IP->new($range->{'start-address'}) - NetAddr::IP->new($cidr);
> + my $internalid =
> PVE::Network::SDN::Ipams::NetboxPlugin::get_prefix_id($url, $cidr,
> $headers); + + my $ip = eval { + my $result =
> PVE::Network::SDN::api_request("GET",
> "$url/ipam/prefixes/$internalid/available-ips/?limit=$minimal_size",
> $headers); + # v important for NetAddr::IP comparison! + my @ips =
> map((split(/\//,$_->{address}))[0], @{$result}); + # get 1st result +
> my $ip = (get_ips_within_range($range->{'start-address'},
> $range->{'end-address'}, @ips))[0]; + + if ($ip) { + print "found free
> ip $ip in range $range->{'start-address'}-$range->{'end-address'}\n"
prints are not shown anywhere in the GUI?
> + } else { die "prefix out of space in range"; } + +
> $class->add_ip($plugin_config, undef, $subnet, $ip, $data->{hostname},
> $data->{mac}, undef, 0, 0); + return $ip; + }; + + if ($@) { + die
> "can't find free ip in range
> $range->{'start-address'}-$range->{'end-address'}: $@" if !$noerr; + }
> + return $ip; +} + sub update_ip { my ($class, $plugin_config,
> $subnetid, $subnet, $ip, $hostname, $mac, $vmid, $is_gateway, $noerr)
> = @_; @@ -174,6 +235,13 @@ sub on_update_hook { } # helpers +sub
> get_ips_within_range { + my ($start_address, $end_address, @list) =
> @_; + $start_address = NetAddr::IP->new($start_address); +
> $end_address = NetAddr::IP->new($end_address); + return
> grep($start_address <= NetAddr::IP->new($_) <= $end_address, @list);
> +} + sub get_namespace_id { my ($url, $namespace, $headers) = @_;
> -- 2.39.5
>
> _______________________________________________ pve-devel mailing list
> pve-devel@lists.proxmox.comhttps://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel