2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-11-20 17:32:15 +00:00

fix(ipv6): honor disjoint DHCP ownership in Kea

(cherry picked from commit 3df86595a3e0e2a9e2b6d2e30ba3e4a5c4e5cf3a)
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Vinícius Ferrão
2026-10-21 18:59:07 -03:00
committed by Daniel Hilst
parent f95a9ecb29
commit 54e07fc597
2 changed files with 135 additions and 2 deletions
+82
View File
@@ -73,6 +73,10 @@ my $iscsients;
my $nodetypeents;
my $chainents;
my $tftpdir = xCAT::TableUtils->getTftpDir();
my $kea_disjoint_reservations = 0;
my $kea_local_dynamic_dhcp_owner = 0;
my %kea_effective_service_owners;
my %kea_local_server_cache;
our $dhcpconffile = $^O eq 'aix' ? '/etc/dhcpsd.cnf' : '/etc/dhcpd.conf';
my %dynamicranges; #track dynamic ranges defined to see if a host that resolves is actually a dynamic address
my %netcfgs;
@@ -3779,6 +3783,8 @@ sub kea_build_node_reservations
{
my ( $backend, $config, $nodes ) = @_;
kea_prepare_reservation_ownership($nodes);
my $nrtab = xCAT::Table->new('noderes');
my $chaintab = xCAT::Table->new('chain');
my $nodetypetab = xCAT::Table->new('nodetype', -create => 0);
@@ -3804,6 +3810,8 @@ sub kea_build_node_reservations6
{
my ( $backend, $config, $nodes ) = @_;
kea_prepare_reservation_ownership($nodes);
my $nrtab = xCAT::Table->new('noderes');
my $mactab = xCAT::Table->new('mac');
my $vpdtab = xCAT::Table->new('vpd', -create => 0);
@@ -3820,6 +3828,75 @@ sub kea_build_node_reservations6
return \@reservations;
}
sub kea_prepare_reservation_ownership
{
my ($nodes) = @_;
$kea_disjoint_reservations = 0;
$kea_local_dynamic_dhcp_owner = 0;
%kea_effective_service_owners = ();
%kea_local_server_cache = ();
my @settings = xCAT::TableUtils->get_site_attribute('disjointdhcps');
return unless defined($settings[0]) && $settings[0] eq '1';
my @dhcp_servers = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
return unless @dhcp_servers;
$kea_disjoint_reservations = 1;
my $owners = xCAT::ServiceNodeUtils->getSNformattedhash($nodes, 'xcat', 'MN');
if (ref($owners) eq 'HASH') {
foreach my $owner (keys %$owners) {
foreach my $node (@{ $owners->{$owner} || [] }) {
push @{ $kea_effective_service_owners{$node} }, $owner;
}
}
}
my $nettab = xCAT::Table->new('networks');
return unless $nettab;
foreach my $entry ($nettab->getAllAttribs('net', 'mask', 'dynamicrange', 'dhcpserver')) {
next unless $entry->{dynamicrange} && $entry->{dhcpserver};
if (kea_server_list_is_local($entry->{dhcpserver})) {
$kea_local_dynamic_dhcp_owner = 1;
last;
}
}
$nettab->close();
}
sub kea_server_list_is_local
{
my ($servers) = @_;
return 0 unless $servers;
foreach my $server (split /,/, $servers) {
$server =~ s/^\s+|\s+$//g;
next unless length($server);
if (!exists($kea_local_server_cache{$server})) {
$kea_local_server_cache{$server} =
xCAT::NetworkUtils->thishostisnot($server) ? 0 : 1;
}
return 1 if $kea_local_server_cache{$server};
}
return 0;
}
sub kea_reservation_is_local
{
my ( $node, $ip ) = @_;
return 1 unless $kea_disjoint_reservations;
return 1 if $kea_local_dynamic_dhcp_owner;
my $owners = $kea_effective_service_owners{$node};
if ($owners && @$owners) {
return 1 if kea_server_list_is_local(join(',', @$owners));
return 0;
}
return 1;
}
sub kea_node_reservations
{
my ( $backend, $config, $node ) = @_;
@@ -3863,6 +3940,7 @@ sub kea_node_reservations
$callback->({ warning => ["The hostname $hname of node $node could not be resolved."] });
next;
}
next unless kea_reservation_is_local($node, $ip);
if ( _reject_dynamic_node_ip( $node, $ip, 'IPv4', $callback ) ) {
next;
@@ -4089,6 +4167,8 @@ sub kea_node_client_classes_for_nodes
{
my ($nodes) = @_;
kea_prepare_reservation_ownership($nodes);
my $nrtab = xCAT::Table->new('noderes');
my $mactab = xCAT::Table->new('mac');
return { classes => [], noip => [], localboot => [] } unless $nrtab && $mactab;
@@ -4140,6 +4220,7 @@ sub kea_node_client_classes_for_nodes
# an IPv6-only node leaves the DHCPv4 boot classes here.
next if defined($hname) and $hname ne '*NOIP*'
and xCAT::NetworkUtils->node_is_ipv6_only($hname);
next unless kea_reservation_is_local($node);
$mac = kea_normalize_mac($mac);
next unless $mac;
my %record = ( node => $node, mac => $mac );
@@ -4284,6 +4365,7 @@ sub kea_node_reservations6
my $ip = getipaddr($hname, OnlyV6 => 1);
next unless $ip;
next unless kea_reservation_is_local($node, $ip);
if ( _reject_dynamic_node_ip( $node, $ip, 'IPv6', $callback ) ) {
next;
+53 -2
View File
@@ -83,6 +83,7 @@ BEGIN {
return $host;
}
sub thishostisnot { return 0; }
sub ishostinsubnet { return 0; }
sub ip_forwarding_enabled { return 0; }
sub nodeonmynet { return 1; }
sub formatNetmask {
@@ -116,7 +117,14 @@ BEGIN {
$INC{'xCAT/NetworkUtils.pm'} = __FILE__;
package xCAT::ServiceNodeUtils;
sub getSNList { return; }
our $service_nodes = {};
our $dhcp_servers = [];
sub getSNList {
return @{ $dhcp_servers || [] } if $_[-1] eq 'dhcpserver';
return;
}
sub get_ServiceNode { return $service_nodes; }
sub getSNformattedhash { return $service_nodes; }
$INC{'xCAT/ServiceNodeUtils.pm'} = __FILE__;
package xCAT::NodeRange;
@@ -2324,7 +2332,7 @@ for my $case (['80', ''], ['080', ':080'], ['8080', ':8080']) {
my %res_tables = (
noderes => DHCPKeaResTable->new(
{
'nodev6' => { netboot => 'grub2', tftpserver => '<xcatmaster>' },
'nodev6' => { netboot => 'grub2', tftpserver => '<xcatmaster>', servicenode => 'sn01' },
'nodev6http' => { netboot => 'grub2-http', tftpserver => 'boot6.example.test' },
'nodev6tftp' => { netboot => 'grub2-tftp', tftpserver => 'boot6.example.test' },
'nodev6xnba' => { netboot => 'xnba', tftpserver => 'boot6.example.test' },
@@ -2475,6 +2483,49 @@ for my $case (['80', ''], ['080', ':080'], ['8080', ':8080']) {
);
}
{
local *xCAT::TableUtils::get_site_attribute = sub {
return $_[-1] eq 'disjointdhcps' ? ('1') : ();
};
local $xCAT::ServiceNodeUtils::dhcp_servers = ['configured-dhcp-service'];
local $xCAT::ServiceNodeUtils::service_nodes = {
'sn01' => ['nodev6'],
};
local *xCAT::NetworkUtils::thishostisnot = sub { return 1; };
@errors = ();
my $remote = xCAT_plugin::dhcp::kea_build_node_reservations6(
$backend, {}, ['nodev6']
);
is( scalar(@$remote), 0, 'disjoint DHCPv6 omits a node owned by another service node' );
is( scalar(@errors), 0, 'non-owning DHCPv6 server skips the node without an error' );
}
{
local *xCAT::TableUtils::get_site_attribute = sub {
return $_[-1] eq 'disjointdhcps' ? ('1') : ();
};
local $xCAT::ServiceNodeUtils::dhcp_servers = ['configured-dhcp-service'];
local $xCAT::ServiceNodeUtils::service_nodes = {
'remote-service-node' => ['nodev6'],
};
local *xCAT::NetworkUtils::thishostisnot = sub {
return $_[-1] eq 'dynamic-dhcp6-owner' ? 0 : 1;
};
$res_tables{networks} = DHCPKeaIntentNetTable->new(
{
net => '2001:db8:99::/64',
dynamicrange => '2001:db8:99::100/120',
dhcpserver => 'dynamic-dhcp6-owner',
}
);
my $owned = xCAT_plugin::dhcp::kea_build_node_reservations6(
$backend, {}, ['nodev6']
);
delete $res_tables{networks};
is( scalar(@$owned), 1, 'global dynamic-range DHCP owner retains an unrelated IPv6 reservation like legacy dispatch' );
}
}
done_testing();