The continued fix for the defect 3317678

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9854 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2011-06-20 08:52:49 +00:00
parent 7ad510c9fd
commit 8e35b5bcb5

View File

@ -46,6 +46,7 @@ sub getNodesetStates
my @aixnodes = ();
my @pxenodes = ();
my @yabootnodes = ();
my @xnbanodes= ();
my $tabdata = $tab->getNodesAttribs(\@nodes, ['node', 'netboot']);
foreach my $node (@nodes)
{
@ -56,6 +57,10 @@ sub getNodesetStates
{
push(@yabootnodes, $node);
}
elsif ($nb eq "xnba")
{
push(@xnbanodes, $node);
}
elsif ($nb eq "pxe")
{
push(@pxenodes, $node);
@ -95,6 +100,19 @@ sub getNodesetStates
xCAT::MsgUtils->message('E', $retarray[1]);
}
}
if (@xnbanodes > 0)
{
require xCAT_plugin::xnba;
@retarray =
xCAT_plugin::xnba::getNodesetStates(\@xnbanodes, $hashref);
if ($retarray[0])
{
$retcode = $retarray[0];
$errormsg .= $retarray[1];
xCAT::MsgUtils->message('E', $retarray[1]);
}
}
if (@aixnodes > 0)
{
require xCAT_plugin::aixinstall;
@ -147,9 +165,8 @@ sub get_nodeset_state
my $tmp = xCAT_plugin::pxe::getstate($node);
my @a = split(' ', $tmp);
$state = $a[0];
}
if ($boottype eq "xnba")
elsif ($boottype eq "xnba")
{
require xCAT_plugin::xnba;
my $tmp = xCAT_plugin::xnba::getstate($node);