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

Fix bug 3346280: rcons can't work with the lpar node

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9999 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-07-02 01:49:18 +00:00
parent 0eef3d1836
commit 40f2a6ca62
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,15 @@ my %globlehwtype = (
cec => $::NODETYPE_CEC,
);
my %globalnodetype = (
fsp => $::NODETYPE_PPC,
bpa => $::NODETYPE_PPC,
cec => $::NODETYPE_PPC,
frame=> $::NODETYPE_PPC,
hmc => $::NODETYPE_PPC,
ivm => $::NODETYPE_PPC,
lpar =>"$::NODETYPE_PPC,$::NODETYPE_OSI"
);
##########################################################################
# Adds a node to the xCAT databases
@ -178,14 +187,20 @@ sub add_ppc {
###############################
# Update vpd table
###############################
if ( $type =~ /^(fsp|bpa|frame|cec)$/ ) {
if ( $type =~ /^(fsp|bpa)$/ ) {
$db{vpd}->setNodeAttribs( $name,
{ mtm=>$model,
serial=>$serial,
side=>$side
});
$db{vpd}{commit} = 1;
}
if ( $type =~ /^(frame|cec)$/ ) {
$db{vpd}->setNodeAttribs( $name,
{ mtm=>$model,
serial=>$serial,
});
}
$db{vpd}{commit} = 1;
###############################
# Update hosts table
@ -460,7 +475,7 @@ sub update_node_attribs
id=>$id,
pprofile=>$pprofile,
parent=>$parent,
nodetype=>$type,
nodetype=>$globlehwtype{$type},
});
if ( $namediff)
{
@ -496,7 +511,7 @@ sub update_node_attribs
if ( $type ne $nodetypehash->{nodetype} or $namediff)
{
$db->{nodetype}->delEntries( $key_col) if ( $namediff);
$db->{nodetype}->setNodeAttribs( $name,{nodetype=>$type} );
$db->{nodetype}->setNodeAttribs( $name,{nodetype=>$globalnodetype{$type}} );
$db->{nodetype}->{commit} = 1;
$updated = 1;
}
@ -587,7 +602,7 @@ sub add_ppchcp {
my $hwtype = shift;
my $values = shift;
my @tabs = qw(ppchcp nodehm nodelist nodetype mac);
my @tabs = qw(ppchcp nodehm nodelist nodetype mac ppc);
my %db = ();
my ($name, $mac) = split ',', $values;
@ -619,7 +634,8 @@ sub add_ppchcp {
###################################
# Update nodetype table
###################################
$db{nodetype}->setNodeAttribs( $name, {nodetype=>lc($hwtype)});
$db{nodetype}->setNodeAttribs( $name, {nodetype=>$globalnodetype{$hwtype}});
$db{ppc}->setNodeAttribs( $name, {nodetype=>$globlehwtype{$hwtype}});
###################################
# Update mac table