xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-07-31 10:09:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7673 from VersatusHPC/refactor/network-address-accumulation

Browse Source 
refactor(network): centralize address accumulation
This commit is contained in:
Daniel Hilst
2026-07-27 15:32:09 -03:00
committed by GitHub
parent c8562284ee dbc820780a
commit eb76ddfbb6
2 changed files with 154 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
perl-xCAT/xCAT/NetworkUtils.pm
+15 -20
View File
@@ -901,6 +901,17 @@ sub classful_networks_for_net_and_mask
return @results;
}
# Record an address while preserving the caller's undefined map until needed.
sub _record_network_address
{
my ($mapref, $key, $address, $returnall) = @_;
if ($returnall) {
push @{ ${$mapref}->{$key} }, $address;
} else {
${$mapref}->{$key} = $address;
}
}
#-------------------------------------------------------------------------------
@@ -948,11 +959,7 @@ sub my_hexnets
{
my $nowhex = sprintf("%08x", $nown);
my $hexnet = substr($nowhex, 0, $numchars);
if ($returnall) {
push @{ $rethash->{$hexnet} }, $curnet;
} else {
$rethash->{$hexnet} = $curnet;
}
_record_network_address(\$rethash, $hexnet, $curnet, $returnall);
$nown += 1 << (32 - $maskbits - $bitstoeven);
}
}
@@ -1131,19 +1138,11 @@ sub my_nets
$nown = $nown & $curmask;
my $textnet = inet_ntoa(pack("N", $nown));
$textnet .= "/$maskbits";
if ($returnall) {
push @{ $rethash->{$textnet} }, $curnet;
} else {
$rethash->{$textnet} = $curnet;
}
_record_network_address(\$rethash, $textnet, $curnet, $returnall);
}
else
{
if ($returnall) {
push @{ $rethash->{$v6net} }, $v6ip;
} else {
$rethash->{$v6net} = $v6ip;
}
_record_network_address(\$rethash, $v6net, $v6ip, $returnall);
}
}
@@ -1171,11 +1170,7 @@ sub my_nets
$n .= "/$nm";
#$rethash->{$n} = $if;
if ($returnall) {
push @{ $rethash->{$n} }, $master;
} else {
$rethash->{$n} = $master;
}
_record_network_address(\$rethash, $n, $master, $returnall);
}
}
return $rethash;
xCAT-test/unit/networkutils_first_address.t
+139 -2
View File
@@ -9,7 +9,8 @@ use Test::More;
BEGIN {
package NetworkUtilsTestCommand;
our $ip_addr_output = '';
our $ip_addr_output = '';
our $aix_ifconfig_output = '';
package xCAT::Table;
our @network_entries;
@@ -19,7 +20,7 @@ BEGIN {
package xCAT::TableUtils;
sub get_site_attribute {
my ($attribute) = @_;
my $attribute = $_[-1];
return ('192.0.2.1') if $attribute eq 'master';
return;
}
@@ -30,6 +31,8 @@ BEGIN {
my ($command) = @_;
return $NetworkUtilsTestCommand::ip_addr_output
if $command eq '/sbin/ip addr';
return $NetworkUtilsTestCommand::aix_ifconfig_output
if $command eq '/usr/sbin/ifconfig -a';
die "Unexpected command in NetworkUtils unit test: $command";
};
}
@@ -41,6 +44,17 @@ sub set_ip_addr_output {
@xCAT::Table::network_entries = ();
}
sub set_aix_ifconfig_output {
$NetworkUtilsTestCommand::aix_ifconfig_output = join('', @_);
@xCAT::Table::network_entries = ();
}
sub run_as_aix {
my ($code) = @_;
local $^O = 'aix';
return $code->();
}
set_ip_addr_output(
"2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500\n",
" inet 192.168.148.10/20 brd 192.168.159.255 scope global eth0\n",
@@ -113,4 +127,127 @@ is_deeply(
'Linux IPv6 addresses remain outside the all-address result',
);
set_ip_addr_output(
"2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500\n",
" inet 192.168.148.10/20 brd 192.168.159.255 scope global eth0\n",
" inet 192.168.148.10/20 brd 192.168.159.255 scope global eth0\n",
);
is_deeply(
xCAT::NetworkUtils->my_nets('all'),
{
'192.168.144.0/20' => [
'192.168.148.10',
'192.168.148.10',
],
},
'my_nets all mode retains duplicate addresses',
);
is_deeply(
xCAT::NetworkUtils->my_hexnets('all'),
{
c0a89 => [
'192.168.148.10',
'192.168.148.10',
],
},
'my_hexnets all mode retains duplicate addresses',
);
set_ip_addr_output(
"2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500\n",
" inet 192.168.148.10/20 brd 192.168.159.255 scope global eth0\n",
);
@xCAT::Table::network_entries = (
{
net => '192.168.144.0',
mgtifname => '!remote!',
mask => '255.255.240.0',
},
{
net => '192.168.144.0',
mgtifname => '!remote!',
mask => '255.255.240.0',
},
{
net => '198.51.100.0',
mgtifname => '!remote!',
mask => '255.255.255.0',
},
);
is_deeply(
xCAT::NetworkUtils->my_nets(),
{
'192.168.144.0/20' => '192.0.2.1',
'198.51.100.0/24' => '192.0.2.1',
},
'remote networks keep overwriting earlier addresses in default mode',
);
is_deeply(
xCAT::NetworkUtils->my_nets('all'),
{
'192.168.144.0/20' => [
'192.168.148.10',
'192.0.2.1',
'192.0.2.1',
],
'198.51.100.0/24' => ['192.0.2.1'],
},
'remote networks append in table order and retain duplicates in all mode',
);
set_ip_addr_output();
is(
xCAT::NetworkUtils->my_nets(),
undef,
'my_nets default mode remains undefined when no addresses exist',
);
is(
xCAT::NetworkUtils->my_nets('all'),
undef,
'my_nets all mode remains undefined when no addresses exist',
);
is(
xCAT::NetworkUtils->my_hexnets(),
undef,
'my_hexnets default mode remains undefined when no addresses exist',
);
is(
xCAT::NetworkUtils->my_hexnets('all'),
undef,
'my_hexnets all mode remains undefined when no addresses exist',
);
set_aix_ifconfig_output(
"en0: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN>\n",
" inet 192.168.148.10 netmask 0xfffff000 broadcast 192.168.159.255\n",
" inet 192.168.149.100 netmask 0xfffff000 broadcast 192.168.159.255\n",
" inet6 2001:db8:1::10/64\n",
" inet6 2001:db8:1::10/64\n",
);
is_deeply(
run_as_aix(sub { xCAT::NetworkUtils->my_nets() }),
{
'192.168.144.0/20' => '192.168.149.100',
'2001:db8:1::10/64' => '2001:db8:1::10',
},
'AIX default mode keeps scalar last-address behavior for IPv4 and IPv6',
);
is_deeply(
run_as_aix(sub { xCAT::NetworkUtils->my_nets('all') }),
{
'192.168.144.0/20' => [
'192.168.148.10',
'192.168.149.100',
],
'2001:db8:1::10/64' => [
'2001:db8:1::10',
'2001:db8:1::10',
],
},
'AIX all mode preserves IPv4 order and retains duplicate IPv6 addresses',
);
done_testing();