ipams : add_next_freeip : return ip not cidr

[pve-network.git] / src / PVE / Network / SDN / Ipams / PVEPlugin.pm

diff --git a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
index a5b4fe7d1e51c5aa060f84e798c955dbbef01044..651acfbb35e9bb88a99b69b67dd3d44b696c87f0 100644 (file)
--- 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};
 
@@ -162,7 +176,7 @@ sub add_next_freeip {
     });
     die "$@" if $@;
 
-    return "$freeip/$mask";
+    return $freeip;
 }
 
 sub add_range_next_freeip {