[pve-devel] [PATCH pve-network] sdn: allow deletion of empty subnet with gateway

[pve-devel] [PATCH pve-network] sdn: allow deletion of empty subnet with gateway

[Stefan Lendl]

If the gateway IP is last remaining IP in the subnet (in IPAM), allow
deleting the subnet.

Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
 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

[pve-devel] applied: [PATCH pve-network] sdn: allow deletion of empty subnet with gateway

[Wolfgang Bumiller]

applied, thanks