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 [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 43E151FF16B
for <inbox@lore.proxmox.com>; Thu, 20 Feb 2025 14:30:32 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AF951126C8;
Thu, 20 Feb 2025 14:30:26 +0100 (CET)
Message-ID: <98fc3b09-1dca-42bc-93e3-0cc6d9aadfbf@proxmox.com>
Date: Thu, 20 Feb 2025 14:29:52 +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.137.1736338560.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.137.1736338560.441.pve-devel@lists.proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 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 5/7] ipam: nautobot:
add checks for prefix deletion
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 wrote:
> check that prefix/subnet is empty (only gateway IPs should remain)
> before deletion.
>
> Signed-off-by: lou lecrivain <lou.lecrivain@wdz.de>
> ---
> src/PVE/Network/SDN/Ipams/NautobotPlugin.pm | 60 ++++++++++++++++++++-
> 1 file changed, 58 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm
> index 79ac04d..f736bad 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 List::Util qw(all);
> use NetAddr::IP;
>
> use base('PVE::Network::SDN::Ipams::Plugin');
> @@ -76,8 +77,11 @@ sub del_subnet {
> my $internalid = get_prefix_id($url, $cidr, $headers, $noerr);
> return if !$internalid;
>
> - # TODO check that prefix is empty before deletion
> - return;
> + if (!subnet_is_deletable($class, $plugin_config, $subnetid, $subnet, $internalid, $noerr)) {
> + die "cannot delete prefix $cidr, not empty!";
> + }
> +
> + empty_subnet($class, $plugin_config, $subnetid, $subnet, $internalid, $noerr);
>
> eval {
> PVE::Network::SDN::api_request("DELETE", "$url/ipam/prefixes/$internalid/", $headers);
> @@ -227,6 +231,58 @@ sub del_ip {
> }
> }
>
> +sub empty_subnet {
> + my ($class, $plugin_config, $subnetid, $subnet, $subnetuuid, $noerr) = @_;
$class is unused
> +
> + my $url = $plugin_config->{url};
> + my $namespace = $plugin_config->{namespace};
> + my $headers = default_headers($plugin_config);
> +
> + my $response = eval {
> + return PVE::Network::SDN::api_request("GET", "$url/ipam/ip-addresses/?namespace=$namespace&parent=$subnetuuid", $headers)
> + };
> + if ($@) {
> + die "error querying prefix $subnet: $@" if !$noerr;
> + }
> +
> + for my $ip (@{$response->{results}}) {
> + del_ip($class, $plugin_config, $subnetid, $subnet, $ip->{host}, $noerr);
> + }
> +}
> +
> +sub subnet_is_deletable {
> + my ($class, $plugin_config, $subnetid, $subnet, $subnetuuid, $noerr) = @_;
$subnetid, $class and $subnet are unused
> +
> + my $url = $plugin_config->{url};
> + my $namespace = $plugin_config->{namespace};
> + my $headers = default_headers($plugin_config);
> +
> +
> + my $response = eval {
> + return PVE::Network::SDN::api_request("GET", "$url/ipam/ip-addresses/?namespace=$namespace&parent=$subnetuuid", $headers)
> + };
> + if ($@) {
> + die "error querying prefix $subnet: $@" if !$noerr;
> + }
> + my $n_ips = scalar $response->{results}->@*;
> +
> + # least costly check operation 1st
> + if ($n_ips == 0) {
> + # completely empty, delete ok
> + return 1;
> + } elsif (
> + !(all {$_ == 1} (
> + map {
> + is_ip_gateway($url, $_->{host}, $headers, $noerr)
> + } $response->{results}->@*
> + ))) {
> + # some remaining IPs are not gateway, nok
> + return 0;
> + } else {
> + # remaining IPs are all gateway, delete ok
> + return 1;
> + }
> +}
>
> sub verify_api {
> my ($class, $plugin_config) = @_;
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel