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

change the way of finding node type

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9746 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-06-07 05:41:37 +00:00
parent 69d99bc898
commit 274b09d087
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -989,25 +989,28 @@ sub resolve {
#################################
# Get node type
#################################
my $ent = $tabs->{nodetype}->getNodeAttribs($node,[qw(nodetype node)]);
if ( !defined( $ent )) {
return( sprintf( $errmsg{NODE_UNDEF}, "nodetype" ));
}
#my $ent = $tabs->{nodetype}->getNodeAttribs($node,[qw(nodetype node)]);
#if ( !defined( $ent )) {
# return( sprintf( $errmsg{NODE_UNDEF}, "nodetype" ));
#}
#################################
# Check for type
#################################
if ( !exists( $ent->{nodetype} )) {
return( sprintf( $errmsg{NO_ATTR}, "nodetype","nodetype" ));
}
#if ( !exists( $ent->{nodetype} )) {
# return( sprintf( $errmsg{NO_ATTR}, "nodetype","nodetype" ));
#}
#################################
# Check for valid "type"
#################################
my $ttype = xCAT::DBobjUtils->getnodetype($node);
my ($type) = grep(
/^$::NODETYPE_LPAR|$::NODETYPE_OSI|$::NODETYPE_BPA|$::NODETYPE_FSP|$::NODETYPE_CEC|$::NODETYPE_FRAME$/,
split /,/, $ent->{nodetype} );
#split /,/, $ent->{nodetype} );
split /,/, $ttype);
if ( !defined( $type )) {
return( "Invalid node type: $ent->{nodetype}" );
#return( "Invalid node type: $ent->{nodetype}" );
return( "Invalid node type: $ttype" );
}
#################################
# Get attributes