From 40deac5774c99a2852143ef3b959ca1867b2f663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Fri, 31 Jul 2026 22:29:58 -0300
Subject: [PATCH] fix(dhcp): correct inconsistent Kea reservation updates

(cherry picked from commit 6d26cf7fff811b18faccbd7ad19c89443a0ddf7d)
---
 perl-xCAT/xCAT/DHCP/Backend/Kea.pm   | 36 ----------------------------
 xCAT-server/lib/xcat/plugins/dhcp.pm | 29 ++++------------------
 2 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/perl-xCAT/xCAT/DHCP/Backend/Kea.pm b/perl-xCAT/xCAT/DHCP/Backend/Kea.pm
index 30f6a028f..2525ae7d3 100644
--- a/perl-xCAT/xCAT/DHCP/Backend/Kea.pm
+++ b/perl-xCAT/xCAT/DHCP/Backend/Kea.pm
@@ -630,42 +630,6 @@ sub query_reservations {
     return \@found;
 }
 
-sub preserve_reservations {
-    my ( $self, $config, $intent ) = @_;
-
-    my $target_subnets = $intent->{subnets} || [];
-    return $intent unless @$target_subnets;
-
-    my $target_config = $config->{Dhcp6}
-      ? { Dhcp6 => { subnet6 => $target_subnets } }
-      : { Dhcp4 => { subnet4 => $target_subnets } };
-
-    foreach my $source_subnet ( _subnets_for_config($config) ) {
-        foreach my $reservation ( @{ $source_subnet->{reservations} || [] } ) {
-            my $ip = $reservation->{'ip-address'};
-            $ip = $reservation->{'ip-addresses'}[0]
-              if !$ip && ref( $reservation->{'ip-addresses'} ) eq 'ARRAY';
-
-            my $target_subnet;
-            if ($ip) {
-                my $subnet_id = $self->subnet_id_for_ip( $target_config, $ip );
-                $target_subnet = _find_subnet_by_id( $target_config, $subnet_id ) if defined($subnet_id);
-            }
-            if ( !$target_subnet && $source_subnet->{subnet} ) {
-                ($target_subnet) = grep {
-                    ( $_->{subnet} || '' ) eq $source_subnet->{subnet}
-                } @$target_subnets;
-            }
-            next unless $target_subnet;
-
-            $target_subnet->{reservations} ||= [];
-            push @{ $target_subnet->{reservations} }, { %$reservation };
-        }
-    }
-
-    return $intent;
-}
-
 sub subnet_id_for_ip {
     my ( $self, $config, $ip ) = @_;
 
diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index ccb865afa..28ec0c68b 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2380,24 +2380,6 @@ sub kea_process_request
     }
 
     if ($opt->{n}) {
-        my $loaded4 = $backend->load_dhcp4_config();
-        if ($loaded4->{error}) {
-            $callback->({ error => [ $loaded4->{error} ], errorcode => [1] });
-            flock($dhcplockfd, LOCK_UN);
-            return;
-        }
-        $backend->preserve_reservations($loaded4, $intent4);
-
-        if ($using_dhcp6) {
-            my $loaded6 = $backend->load_dhcp6_config();
-            if ($loaded6->{error}) {
-                $callback->({ error => [ $loaded6->{error} ], errorcode => [1] });
-                flock($dhcplockfd, LOCK_UN);
-                return;
-            }
-            $backend->preserve_reservations($loaded6, $intent6);
-        }
-
         my $result = $backend->write_dhcp4_config($intent4, backup_existing => 1);
         if ($result->{error}) {
             $callback->({ error => [ $result->{error} ], errorcode => [1] });
@@ -2494,11 +2476,6 @@ sub kea_process_request
         $client_classes_changed = kea_remove_xnba_client_classes($loaded4, $nodes);
     } else {
         $reservations4 = kea_build_node_reservations($backend, $loaded4, $nodes);
-        if (ref($reservations4) eq 'HASH' && $reservations4->{error}) {
-            $callback->({ error => [ $reservations4->{error} ], errorcode => [1] });
-            flock($dhcplockfd, LOCK_UN);
-            return;
-        }
         $backend->upsert_reservations($loaded4, $reservations4);
         $client_classes_changed = kea_sync_xnba_client_classes($loaded4, $nodes);
         if ($loaded6) {
@@ -3116,7 +3093,6 @@ sub kea_build_node_reservations
     my @reservations;
     foreach my $node (@$nodes) {
         my $node_reservations = kea_node_reservations($backend, $config, $node);
-        return $node_reservations if ref($node_reservations) eq 'HASH' && $node_reservations->{error};
         push @reservations, @$node_reservations;
     }
 
@@ -3178,7 +3154,10 @@ sub kea_node_reservations
         $mac = $normalized_mac;
 
         my $ip = getipaddr($hname, OnlyV4 => 1);
-        return { error => "Unable to resolve $hname for the Kea DHCP reservation for $node." } unless $ip;
+        unless ($ip) {
+            $callback->({ warning => ["The hostname $hname of node $node could not be resolved."] });
+            next;
+        }
 
         if (ipIsDynamic($ip)) {
             $callback->({ error => ["Node $node has IP $ip which is inside the DHCP dynamic range. Move the node IP outside the dynamic range or adjust the range in the networks table."], errorcode => [1] });