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

Add -s to mkhwconn to support connection between frame and its sfp

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9296 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-04-13 09:42:58 +00:00
parent 16f0f19fab
commit 99f69069ee
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,84 +31,84 @@ my %modules = (
bpa => "xCAT::FSPinv",
cec => "xCAT::FSPinv",
frame => "xCAT::FSPinv",
},
},
rpower => { hmc => "xCAT::PPCpower",
ivm => "xCAT::PPCpower",
fsp => "xCAT::FSPpower",
bpa => "xCAT::FSPpower",
cec => "xCAT::FSPpower",
frame => "xCAT::FSPpower",
},
},
rvitals => { hmc => "xCAT::PPCvitals",
fsp => "xCAT::FSPvitals",
bpa => "xCAT::FSPvitals",
cec => "xCAT::FSPvitals",
frame => "xCAT::FSPvitals",
},
},
rscan => { hmc => "xCAT::PPCscan",
fsp => "xCAT::FSPscan",
cec => "xCAT::FSPscan",
},
},
mkvm => { hmc => "xCAT::PPCvm",
fsp => "xCAT::FSPvm",
cec => "xCAT::FSPvm",
},
},
rmvm => { hmc => "xCAT::PPCvm",
},
},
lsvm => { hmc => "xCAT::PPCvm",
fsp => "xCAT::FSPvm",
cec => "xCAT::FSPvm",
},
},
chvm => { hmc => "xCAT::PPCvm",
fsp => "xCAT::FSPvm",
cec => "xCAT::FSPvm",
},
},
rnetboot => { hmc => "xCAT::PPCboot",
ivm => "xCAT::PPCboot",
fsp => "xCAT::FSPboot",
cec => "xCAT::FSPboot",
},
},
getmacs => { hmc => "xCAT::PPCmac",
ivm => "xCAT::PPCmac",
fsp => "xCAT::FSPmac",
cec => "xCAT::FSPmac",
},
},
reventlog => { hmc => "xCAT::PPClog",
},
},
rspconfig => { hmc => "xCAT::PPCcfg",
fsp => "xCAT::FSPcfg",
bpa => "xCAT::FSPcfg",
cec => "xCAT::FSPcfg",
frame => "xCAT::FSPcfg",
},
},
rflash => { hmc => "xCAT::PPCrflash",
fsp => "xCAT::FSPflash",
bpa => "xCAT::FSPflash",
cec => "xCAT::FSPflash",
frame => "xCAT::FSPflash",
},
},
mkhwconn => { hmc => "xCAT::PPCconn",
fsp => "xCAT::FSPconn",
cec => "xCAT::FSPconn",
bpa => "xCAT::FSPconn",
frame => "xCAT::FSPconn",
},
},
rmhwconn => { hmc => "xCAT::PPCconn",
fsp => "xCAT::FSPconn",
cec => "xCAT::FSPconn",
bpa => "xCAT::FSPconn",
frame => "xCAT::FSPconn",
},
},
lshwconn => { hmc => "xCAT::PPCconn",
fsp => "xCAT::FSPconn",
cec => "xCAT::FSPconn",
bpa => "xCAT::FSPconn",
frame => "xCAT::FSPconn",
},
},
renergy => { hmc => "xCAT::PPCenergy",
fsp => "xCAT::PPCenergy",
cec => "xCAT::PPCenergy",
},
},
rbootseq => { fsp => "xCAT::FSPbootseq",
cec => "xCAT::FSPbootseq",
},
@@ -1741,6 +1741,23 @@ sub process_request {
#print "-------failed nodes-------\n";
#print Dumper(\@failed_nodes);
my $hcps = getHCPsOfNodes(\@failed_nodes, $callback);
if ($request->{command} eq "mkhwconn" ) {
if ( grep ("-s", @$request{arg}) ) {
my $ppctab = xCAT::Table->new('ppc');
my %newhcp;
if ( $ppctab ) {
for my $n (@failed_nodes) {
my $pptmp = $ppctab->getNodeAttribs( $n, [qw(sfp)]);
if ($pptmp)
{
$newhcp{$n}{hcp} = [$pptmp->{sfp}];
$newhcp{$n}{num} = 1;
}
}
$hcps = \%newhcp;
}
}
}
if( !defined($hcps)) {
#Not found the hcp for one node
$request = {};