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

mkhwconn -s enhancement,support mkhwconn -s hmc1 or without hmc specified.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9868 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-06-21 06:37:55 +00:00
parent d06de0db68
commit 9c7d314402
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
xCAT-server/lib/perl/xCAT/PPC.pm
View File

@@ -2311,27 +2311,46 @@ sub getHCPsOfNodes
if ( $ppctab ) {
my $typeref = xCAT::DBobjUtils->getnodetype($nodes);
my $i = 0;
for my $n (@$nodes) {
if (@$typeref[$i++] =~ /^fsp|bpa$/) {
my $np = $ppctab->getNodeAttribs( $n, [qw(parent)]);
if ($np) { # use parent(frame/cec)'s sfp attributes first,for high end machine with 2.5/2.6+ database
my $psfp = $ppctab->getNodeAttribs( $np->{parent}, [qw(sfp)]);
$newhcp{$n}{hcp} = [$psfp->{sfp}] if ($psfp);
} else { # if the node don't have a parent,for low end machine with 2.5 database
my $psfp = $ppctab->getNodeAttribs( $n, [qw(sfp)]);
$newhcp{$n}{hcp} = [$psfp->{sfp}] if ($psfp);
unless ( $request->{arg}->[1] ) {
for my $n (@$nodes) {
if (@$typeref[$i++] =~ /^fsp|bpa$/) {
my $np = $ppctab->getNodeAttribs( $n, [qw(parent)]);
if ($np) { # use parent(frame/cec)'s sfp attributes first,for high end machine with 2.5/2.6+ database
my $psfp = $ppctab->getNodeAttribs( $np->{parent}, [qw(sfp)]);
$newhcp{$n}{hcp} = [$psfp->{sfp}] if ($psfp);
} else { # if the node don't have a parent,for low end machine with 2.5 database
my $psfp = $ppctab->getNodeAttribs( $n, [qw(sfp)]);
$newhcp{$n}{hcp} = [$psfp->{sfp}] if ($psfp);
}
} else {
my $psfp = $ppctab->getNodeAttribs( $n, [qw(sfp)]);
$newhcp{$n}{hcp} = [$psfp->{sfp}] if($psfp);
}
} else {
my $psfp = $ppctab->getNodeAttribs( $n, [qw(sfp)]);
$newhcp{$n}{hcp} = [$psfp->{sfp}] if($psfp);
$newhcp{$n}{num} = 1;
}
return \%newhcp;
} else {
my $sfp = $request->{arg}->[1];
my %sfphash;
for my $n (@$nodes) {
# record hcp
$newhcp{$n}{hcp} = [$sfp];
$newhcp{$n}{num} = 1;
# set the sfp attribute to the database
if (@$typeref[$i++] =~ /^fsp|bpa$/) {
my $np = $ppctab->getNodeAttribs( $n, [qw(parent)]);
$sfphash{$np}{sfp} = $sfp if ( $np );
}
$sfphash{$n}{sfp} = $sfp;
}
$newhcp{$n}{num} = 1;
}
} else {
$ppctab->setNodesAttribs(\%sfphash);
return \%newhcp;
}
}else {
$callback->({data=>["Could not open the ppc table"]});
return undef;
}
return \%newhcp;
}
}
}