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

Use GlobalDef $::NODETYPE_XXX definitions - Line #341

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@483 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-02-14 19:47:42 +00:00
parent 6e83969eea
commit 8c334f052a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
perl-xCAT-2.0/xCAT/PPC.pm
View File

@ -10,6 +10,7 @@ use Time::HiRes qw(gettimeofday);
use IO::Select;
use xCAT::PPCcli;
use xCAT::PPCfsp;
use xCAT::GlobalDef;
##########################################
@ -336,8 +337,9 @@ sub resolve {
#################################
# Check for valid "type"
#################################
my @types = split /,/, $ent->{nodetype};
my ($type) = grep( /^fsp|bpa|osi|lpar$/, @types );
my ($type) = grep(
/^$::NODETYPE_LPAR|$::NODETYPE_OSI|$::NODETYPE_BPA|$::NODETYPE_FSP$/,
split /,/, $ent->{nodetype} );
if ( !defined( $type )) {
return( "Invalid node type: $ent->{nodetype}" );
@ -353,7 +355,7 @@ sub resolve {
#################################
# Special lpar processing
#################################
if ( $type =~ /^lpar|osi$/ ) {
if ( $type =~ /^$::NODETYPE_OSI|$::NODETYPE_LPAR$/ ) {
$att->{bpa} = 0;
$att->{type} = "lpar";
$att->{node} = $att->{parent};
@ -395,7 +397,7 @@ sub resolve {
#################################
# Optional and N/A fields
#################################
elsif ( $type =~ /^fsp$/ ) {
elsif ( $type =~ /^$::NODETYPE_FSP$/ ) {
$att->{profile} = 0;
$att->{id} = 0;
$att->{fsp} = 0;
@ -404,7 +406,7 @@ sub resolve {
$att->{parent} = exists($att->{parent}) ? $att->{parent} : 0;
$att->{bpa} = $att->{parent};
}
elsif ( $type =~ /^bpa$/ ) {
elsif ( $type =~ /^$NODETYPE::BPA$/ ) {
$att->{profile} = 0;
$att->{id} = 0;
$att->{bpa} = 0;
@ -714,3 +716,4 @@ sub process_request {