mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-20 17:32:15 +00:00
refactor(ipv6): reuse IPv6 server selection in boot paths
(cherry picked from commit ba57caee8816a6118ada50f0745f8ffd7be5b9fd)
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
(cherry picked from commit 8149ddbe2f)
This commit is contained in:
committed by
Daniel Hilst
parent
9649199fd3
commit
375b50a371
@@ -37,7 +37,7 @@ sub _resolve_server_for_node
|
||||
{
|
||||
my ($node, $server) = @_;
|
||||
my $family = xCAT::NetworkUtils->node_address_family($node);
|
||||
return xCAT::NetworkUtils->getipaddr($server, OnlyV6 => 1)
|
||||
return xCAT::NetworkUtils->ipv6_server_for_node($node, $server)
|
||||
if defined($family) && $family == 6;
|
||||
return xCAT::NetworkUtils->getipaddr($server, OnlyV4 => 1)
|
||||
if defined($family) && $family == 4;
|
||||
|
||||
@@ -71,20 +71,38 @@ sub grub2_server_for_node {
|
||||
# not resolve in either family.
|
||||
$family = 4 unless defined($family);
|
||||
|
||||
if ($family == 6) {
|
||||
my $cachekey = "6:$tftpserver";
|
||||
return (0, $tftpserverip{$cachekey})
|
||||
if $tftpserver ne '<xcatmaster>'
|
||||
&& defined($tftpserverip{$cachekey});
|
||||
|
||||
my $serverip = xCAT::NetworkUtils->ipv6_server_for_node(
|
||||
$node, $tftpserver
|
||||
);
|
||||
if ($serverip) {
|
||||
$tftpserverip{$cachekey} = $serverip
|
||||
if $tftpserver ne '<xcatmaster>';
|
||||
return (0, $serverip);
|
||||
}
|
||||
|
||||
if ($tftpserver eq '<xcatmaster>') {
|
||||
my @facing = xCAT::NetworkUtils->my_ip_facing_family($node, 6);
|
||||
return (1, $facing[1]) if @facing > 1;
|
||||
}
|
||||
return (1, "xCAT unable to resolve $tftpserver");
|
||||
}
|
||||
|
||||
if ($tftpserver eq '<xcatmaster>') {
|
||||
my @facing = $family == 6
|
||||
? xCAT::NetworkUtils->my_ip_facing_family($node, 6)
|
||||
: xCAT::NetworkUtils->my_ip_facing($node);
|
||||
my @facing = xCAT::NetworkUtils->my_ip_facing($node);
|
||||
return (0, $facing[1]) unless $facing[0];
|
||||
return (1, $facing[1]);
|
||||
}
|
||||
|
||||
my $cachekey = $family == 6 ? "6:$tftpserver" : $tftpserver;
|
||||
my $cachekey = $tftpserver;
|
||||
return (0, $tftpserverip{$cachekey}) if defined($tftpserverip{$cachekey});
|
||||
|
||||
my $serverip = $family == 6
|
||||
? xCAT::NetworkUtils->getipaddr($tftpserver, OnlyV6 => 1)
|
||||
: xCAT::NetworkUtils->getipaddr($tftpserver);
|
||||
my $serverip = xCAT::NetworkUtils->getipaddr($tftpserver);
|
||||
return (1, "xCAT unable to resolve $tftpserver") unless $serverip;
|
||||
|
||||
$tftpserverip{$cachekey} = $serverip;
|
||||
|
||||
@@ -79,6 +79,18 @@ BEGIN {
|
||||
return (0, '2001:db8::1');
|
||||
}
|
||||
|
||||
sub ipv6_server_for_node {
|
||||
my $node = shift;
|
||||
$node = shift if defined($node) && $node eq __PACKAGE__;
|
||||
my $server = shift;
|
||||
if (!defined($server) || $server eq '!myipfn!' || $server eq '<xcatmaster>') {
|
||||
my @facing = my_ip_facing_family(__PACKAGE__, $node, 6);
|
||||
return unless @facing && !$facing[0];
|
||||
return $facing[1];
|
||||
}
|
||||
return getipaddr(__PACKAGE__, $server, OnlyV6 => 1);
|
||||
}
|
||||
|
||||
sub format_uri_host {
|
||||
my $host = shift;
|
||||
$host = shift if defined($host) && $host eq __PACKAGE__;
|
||||
|
||||
@@ -39,7 +39,6 @@ my @facing_calls;
|
||||
push @facing_calls, [$node, $family];
|
||||
return (0, '2001:db8:1::1');
|
||||
};
|
||||
|
||||
is_deeply(
|
||||
[ xCAT::Postage::_facing_addresses_for_node('nodev6') ],
|
||||
[0, '2001:db8:1::1'],
|
||||
|
||||
Reference in New Issue
Block a user