arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

snyc from trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15445 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao 2013-03-11 01:57:06 +00:00
parent 10d1f08e23
commit 74db2d9120
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
perl-xCAT/xCAT/FSPvitals.pm
View File

@ -116,6 +116,9 @@ sub enumerate_lcds {
} else {
my @array = split(/\n/, $data);
foreach my $a (@array) {
if ($a !~ /:\s?[^\s]*\s?[0|1]/) {
next;
}
my @t = split(/:/, $a);
my $name = $t[0];
$data = $t[1];

9
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -4561,11 +4561,11 @@ sub get_blades_for_mpa {
my %blades_hash = ();
my $mptab = xCAT::Table->new('mp');
my $ppctab = xCAT::Table->new('ppc');
my @attribs = qw(id pprofile parent hcp);
my @attribs = qw(id nodetype parent hcp);
if (!defined($mptab) or !defined($ppctab)) {
return undef;
}
my @nodearray = $mptab->getAttribs({mpa=>$mpa,nodetype=>"blade"}, qw(node));
my @nodearray = $mptab->getAttribs({mpa=>$mpa}, qw(node));
my @blades = ();
my $nodesattrs;
if (!(@nodearray)) {
@ -4583,12 +4583,11 @@ sub get_blades_for_mpa {
my $att = $nodesattrs->{$node}->[0];
if (!defined($att)) {
next;
} elsif ($att and $att->{parent} and ($att->{parent} ne $mpa)) {
} elsif (!defined($att->{parent}) or ($att->{parent} ne $mpa) or !defined($att->{nodetype}) or ($att->{nodetype} ne "blade")) {
next;
}
my $request;
my $nodetype = "blade";
my $hcp_ip = xCAT::FSPUtils::getIPaddress($request, $nodetype, $att->{hcp});
my $hcp_ip = xCAT::FSPUtils::getIPaddress($request, $att->{nodetype}, $att->{hcp});
if (!defined($hcp_ip) or ($hcp_ip == -3)) {
next;
}