all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Hannes Dürr" <h.duerr@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] SPAM: [PATCH pve-network v2 2/7] ipam: nautobot: implement plain prefix allocation
Date: Thu, 20 Feb 2025 14:24:03 +0100	[thread overview]
Message-ID: <ca6340ea-26a5-46bb-941c-cfca2e7499a6@proxmox.com> (raw)
In-Reply-To: <mailman.143.1736338573.441.pve-devel@lists.proxmox.com>


On 1/8/25 13:15, Lou Lecrivain 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) = @_;
>   


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


  parent reply	other threads:[~2025-02-20 13:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20250108121529.5813-1-lou.lecrivain@wdz.de>
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 1/7] ipam: nautobot support initial commit Lou Lecrivain via pve-devel
2025-02-19 16:36   ` Hannes Dürr
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 2/7] ipam: nautobot: implement plain prefix allocation Lou Lecrivain via pve-devel
2025-02-19 16:37   ` Hannes Dürr
2025-02-20 13:24   ` Hannes Dürr [this message]
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 3/7] ipam: nautobot: add testing for nautobot plugin Lou Lecrivain via pve-devel
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 4/7] ipam: nautobot: base plugin + enhance errors Lou Lecrivain via pve-devel
2025-02-19 16:37   ` Hannes Dürr
2025-02-19 17:18   ` Hannes Dürr
2025-02-20 13:27   ` Hannes Dürr
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 5/7] ipam: nautobot: add checks for prefix deletion Lou Lecrivain via pve-devel
2025-02-19 16:37   ` Hannes Dürr
2025-02-19 17:15   ` Hannes Dürr
2025-02-20 13:29   ` Hannes Dürr
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 6/7] ipam: nautobot: add documentation Lou Lecrivain via pve-devel
2025-01-08 12:15 ` [pve-devel] SPAM: [PATCH pve-network v2 7/7] ipam: nautobot: systematically use namespace Lou Lecrivain via pve-devel
     [not found] ` <20250108121529.5813-3-lou.lecrivain@wdz.de>
2025-02-19 17:08   ` [pve-devel] SPAM: [PATCH pve-network v2 2/7] ipam: nautobot: implement plain prefix allocation Hannes Dürr
     [not found] <20250108120903.5344-1-lou.lecrivain@wdz.de>
2025-01-08 12:08 ` Lou Lecrivain via pve-devel

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=ca6340ea-26a5-46bb-941c-cfca2e7499a6@proxmox.com \
    --to=h.duerr@proxmox.com \
    --cc=pve-devel@lists.proxmox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal