diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index a77245eb23..2f5dfca9e8 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -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; diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm index 2e2aa2aa15..c0717dd8d2 100644 --- a/xCAT-server/lib/xcat/plugins/grub2.pm +++ b/xCAT-server/lib/xcat/plugins/grub2.pm @@ -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 '' + && defined($tftpserverip{$cachekey}); + + my $serverip = xCAT::NetworkUtils->ipv6_server_for_node( + $node, $tftpserver + ); + if ($serverip) { + $tftpserverip{$cachekey} = $serverip + if $tftpserver ne ''; + return (0, $serverip); + } + + if ($tftpserver eq '') { + 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 '') { - 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; diff --git a/xCAT-test/unit/grub2_ipv6.t b/xCAT-test/unit/grub2_ipv6.t index a9a58b1641..a2ce8caf7f 100644 --- a/xCAT-test/unit/grub2_ipv6.t +++ b/xCAT-test/unit/grub2_ipv6.t @@ -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 '') { + 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__; diff --git a/xCAT-test/unit/postage_ipv6_master.t b/xCAT-test/unit/postage_ipv6_master.t index a46471f0c8..752542eefa 100644 --- a/xCAT-test/unit/postage_ipv6_master.t +++ b/xCAT-test/unit/postage_ipv6_master.t @@ -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'],