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 0253F1FF15C
for <inbox@lore.proxmox.com>; Wed, 19 Feb 2025 17:37:49 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 12BC62F926;
Wed, 19 Feb 2025 17:37:45 +0100 (CET)
Message-ID: <d0226ff8-5839-40c4-b7d7-279f18b1ff36@proxmox.com>
Date: Wed, 19 Feb 2025 17:37:11 +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.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 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 via pve-devel 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) = @_;
> -- 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