From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 368ED9A8D0 for ; Fri, 17 Nov 2023 15:05:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1960034762 for ; Fri, 17 Nov 2023 15:05:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 17 Nov 2023 15:05:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1FA0043E2C for ; Fri, 17 Nov 2023 15:05:36 +0100 (CET) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 15:02:27 +0100 Message-ID: <20231117140225.3233389-3-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pveplugin.pm] Subject: [pve-devel] [PATCH pve-network] sdn: allow deletion of empty subnet with gateway X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2023 14:05:37 -0000 If the gateway IP is last remaining IP in the subnet (in IPAM), allow deleting the subnet. Signed-off-by: Stefan Lendl --- src/PVE/Network/SDN/Ipams/PVEPlugin.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm index a5b4fe7..270fb04 100644 --- a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm @@ -56,6 +56,16 @@ sub add_subnet { die "$@" if $@; } +sub only_gateway_remains { + my ($ips) = @_; + + if (keys %{$ips} == 1 && + (values %{$ips})[0]->{gateway} == 1) { + return 1; + } + return 0; +}; + sub del_subnet { my ($class, $plugin_config, $subnetid, $subnet) = @_; @@ -71,7 +81,11 @@ sub del_subnet { my $dbsubnet = $dbzone->{subnets}->{$cidr}; die "subnet '$cidr' doesn't exist in IPAM DB\n" if !$dbsubnet; - die "cannot delete subnet '$cidr', not empty\n" if keys %{$dbsubnet->{ips}} > 0; + my $ips = $dbsubnet->{ips}; + + if (keys %{$ips} > 0 && !only_gateway_remains($ips)) { + die "cannot delete subnet '$cidr', not empty\n"; + } delete $dbzone->{subnets}->{$cidr}; -- 2.42.0