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

fix bug 3340664: lsvm/rmvm failed on node created by mkvm, 3339340:rscan -w cannot write the nodetype table in 2.6.6 6/28 build

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9973 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-06-28 13:43:00 +00:00
parent 03533e3102
commit bbc0bfddbc
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
perl-xCAT/xCAT/PPCdb.pm
View File

@ -43,6 +43,15 @@ my %defaultgrp = (
cec => "cec",
);
my %globlehwtype = (
fsp => $::NODETYPE_FSP,
bpa => $::NODETYPE_BPA,
lpar => $::NODETYPE_LPAR,
hmc => $::NODETYPE_HMC,
ivm => $::NODETYPE_IVM,
frame => $::NODETYPE_FRAME,
cec => $::NODETYPE_CEC,
);
##########################################################################
@ -56,16 +65,6 @@ sub add_ppc {
my $otherinterfaces = shift;
my @tabs = qw(ppc vpd nodehm nodelist nodetype hosts mac);
my %db = ();
my %nodetype = (
fsp => $::NODETYPE_FSP,
bpa => $::NODETYPE_BPA,
lpar =>"$::NODETYPE_LPAR,$::NODETYPE_OSI",
hmc => $::NODETYPE_HMC,
ivm => $::NODETYPE_IVM,
frame => $::NODETYPE_FRAME,
cec => $::NODETYPE_CEC,
);
###################################
# Open database needed
###################################
@ -97,6 +96,9 @@ sub add_ppc {
if ( $type =~ /^(fsp|bpa|hmc|ivm|frame|cec)$/ ) {
$db{nodetype}->setNodeAttribs( $name,{nodetype=>'ppc'} );
$db{nodetype}{commit} = 1;
} elsif ($type =~ /^lpar$/) {
$db{nodetype}->setNodeAttribs( $name,{nodetype=>'ppc,osi'} );
$db{nodetype}{commit} = 1;
}
###############################
# If cannot be overwroten, get
@ -147,7 +149,7 @@ sub add_ppc {
id=>$id,
pprofile=>$pprofile,
parent=>$parent,
nodetype=>$nodetype{$type},
nodetype=>$globlehwtype{$type},
});
$db{ppc}{commit} = 1;
@ -228,13 +230,6 @@ sub update_ppc {
my $not_overwrite = shift;
my @tabs = qw(ppc vpd nodehm nodelist nodetype ppcdirect hosts mac);
my %db = ();
my %nodetype = (
fsp => $::NODETYPE_FSP,
bpa => $::NODETYPE_BPA,
lpar =>"$::NODETYPE_LPAR,$::NODETYPE_OSI",
hmc => $::NODETYPE_HMC,
ivm => $::NODETYPE_IVM,
);
my @update_list = ();
###################################