[PATCH pve-network v2 05/11] sdn: ipam: release an address the built-in IPAM no longer holds

[Hannes Laimer <h.laimer@proxmox.com>]

The built-in IPAM died on releasing an address it had no record of,
before the cache entry of the address was cleared. The entry kept
answering with the address, and the API could not delete the mapping
either. NetBox and phpIPAM warn and release nothing in that case. The
built-in IPAM now does the same, so the cache entry is cleared and the
API deletion succeeds.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 src/PVE/Network/SDN/Ipams/PVEPlugin.pm |  7 ++++++-
 src/test/run_test_vnets_blackbox.pl    | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
index a26da57a877a..77a7b2a7c144 100644
--- a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
@@ -265,7 +265,12 @@ sub del_ip {
             die "subnet $cidr don't exist in ipam db" if !$dbzone->{subnets}->{$cidr};
             my $dbsubnet = $dbzone->{subnets}->{$cidr};
 
-            die "IP '$ip' does not exist in IPAM DB\n" if !defined($dbsubnet->{ips}->{$ip});
+            # a record that is gone was released already, and the address still
+            # has to leave the cache, so this is no error
+            if (!defined($dbsubnet->{ips}->{$ip})) {
+                warn "IP '$ip' does not exist in IPAM DB\n";
+                return;
+            }
             delete $dbsubnet->{ips}->{$ip};
             write_db($db);
         },
diff --git a/src/test/run_test_vnets_blackbox.pl b/src/test/run_test_vnets_blackbox.pl
index 368ed5565554..1fa3b55cae18 100755
--- a/src/test/run_test_vnets_blackbox.pl
+++ b/src/test/run_test_vnets_blackbox.pl
@@ -533,6 +533,23 @@ sub test_ipam_cache_lookup {
         { uc($mac) => { ip4 => '10.0.0.50' }, $mac => { ip4 => '10.0.0.50' } },
         "$test_name: and its write brings both spellings in line",
     );
+
+    # a mapping whose record is gone is still deleted, and its cache entry
+    # with it
+    $test_state->{macdb} = {};
+    create_ip({ zone => $zoneid, vnet => $vnetid, mac => $mac, ip => "10.0.0.70" });
+    delete $test_state->{ipamdb}->{zones}->{$zoneid}->{subnets}->{"10.0.0.0/24"}->{ips}
+        ->{"10.0.0.70"};
+    eval {
+        PVE::API2::Network::SDN::Ips->ipdelete(
+            { zone => $zoneid, vnet => $vnetid, mac => $mac, ip => "10.0.0.70" });
+    };
+    is($@, '', "$test_name: a mapping whose record is gone is deleted without an error");
+    is(
+        (PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac))[0],
+        '10.0.0.50',
+        "$test_name: and the cache no longer answers with its address",
+    );
 }
 
 run_test(\&test_ipam_cache_lookup);
-- 
2.47.3