ipam: remove fallback code for ipam.db and mac cache

With the upgrade to PVE 9, those files should have been successfully
migrated on all nodes, so we do not need to fallback on the old files
anymore.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Link: https://lore.proxmox.com/20250801121029.201766-4-s.hanreich@proxmox.com

2 files changed, 2 insertions, 56 deletions

diff --git a/src/PVE/Network/SDN/Ipams.pm b/src/PVE/Network/SDN/Ipams.pm
index 7ec0f06..00aa20c 100644
--- a/src/PVE/Network/SDN/Ipams.pm
+++ b/src/PVE/Network/SDN/Ipams.pm
@@ -21,35 +21,7 @@ PVE::Network::SDN::Ipams::PhpIpamPlugin->register();
 PVE::Network::SDN::Ipams::Plugin->init();
 
 my $macdb_filename = "sdn/mac-cache.json";
-my $macdb_filename_legacy = 'priv/macs.db';
-
-cfs_register_file(
-    $macdb_filename,
-    sub {
-        my ($filename, $data) = @_;
-        if (defined($data)) {
-            return json_reader($filename, $data);
-        } else {
-            # TODO: remove legacy cache file handling with PVE 9+ after ensuring all call sites got
-            # switched over.
-            return cfs_read_file($macdb_filename_legacy);
-        }
-    },
-    sub {
-        my ($filename, $data) = @_;
-        # TODO: remove below with PVE 9+, add a pve8to9 check to allow doing so.
-        if (-e $macdb_filename_legacy && -e $macdb_filename) {
-            # only clean-up if we succeeded to write the new path at least once
-            unlink $macdb_filename_legacy
-                or $!{ENOENT}
-                or warn "failed to unlink legacy MAC cache - $!\n";
-        }
-        return json_writer->($filename, $data);
-    },
-);
-
-# drop reading $macdb_filename_legacy with PVE 9+ - for now do not write it anymore.
-cfs_register_file($macdb_filename_legacy, \&json_reader, undef);
+cfs_register_file($macdb_filename, \&json_reader, \&json_writer);
 
 sub json_reader {
     my ($filename, $data) = @_;
diff --git a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
index 6764d79..d2aba1e 100644
--- a/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
@@ -14,37 +14,11 @@ use Digest::SHA;
 use base('PVE::Network::SDN::Ipams::Plugin');
 
 my $ipamdb_file = "sdn/pve-ipam-state.json";
-my $ipamdb_file_legacy = "priv/ipam.db";
 
 PVE::Cluster::cfs_register_file(
     $ipamdb_file,
-    sub {
-        my ($filename, $data) = @_;
-        if (defined($data)) {
-            return PVE::Network::SDN::Ipams::PVEPlugin->parse_config($filename, $data);
-        } else {
-            # TODO: remove legacy state file handling with PVE 9+ after ensuring all call sites got
-            # switched over.
-            return cfs_read_file($ipamdb_file_legacy);
-        }
-    },
-    sub {
-        my ($filename, $data) = @_;
-        # TODO: remove below with PVE 9+, add a pve8to9 check to allow doing so.
-        if (-e $ipamdb_file_legacy && -e $ipamdb_file) {
-            # only clean-up if we succeeded to write the new path at least once
-            unlink $ipamdb_file_legacy
-                or $!{ENOENT}
-                or warn "failed to unlink legacy IPAM DB - $!\n";
-        }
-        return PVE::Network::SDN::Ipams::PVEPlugin->write_config($filename, $data);
-    },
-);
-
-PVE::Cluster::cfs_register_file(
-    $ipamdb_file_legacy,
     sub { PVE::Network::SDN::Ipams::PVEPlugin->parse_config(@_); },
-    undef, # no writer for legacy file, all must go to the new file.
+    sub { PVE::Network::SDN::Ipams::PVEPlugin->write_config(@_); },
 );
 
 sub type {