2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00

Fix issue with using getipmicons for pasu/piflash

getipmicons structures the data differently from getNodesAttribs.
Accomodate by merging each responses data in node by node rather
than simply overwriting with the last data.
This commit is contained in:
jjohnson2 2015-05-18 15:17:54 -04:00
parent 4b426bad0b
commit c9dd5b6aed

View File

@ -283,7 +283,7 @@ sub expandnoderange {
# Contact xcatd to get from the ipmi table for this list of nodes: bmc, username, password
sub getipmiattrs {
my $noderange = shift @_;
my $nodeattrs; # this will be a reference to a hash
my $nodeattrs = {}; # this will be a reference to a hash
my @user = getpwuid($>);
my $homedir=$user[7];
my $client = IO::Socket::SSL->new(
@ -317,7 +317,9 @@ sub getipmiattrs {
die ("ERROR: ".$rsp->{error}."\n");
} elsif ($rsp->{node}) {
#print Dumper($rsp->{node});
$nodeattrs=$rsp->{node}; # this is reference to a hash, each key is the nodename and the value is a reference to a hash of attr values
foreach (keys %{$rsp->{node}}) {
$nodeattrs->{$_} = $rsp->{node}->{$_}; # this is reference to a hash, each key is the nodename and the value is a reference to a hash of attr values
}
}
if ($rsp->{serverdone}) {
last;