From f4d2c8170059e3641c1dcf70d58469a7359a91af Mon Sep 17 00:00:00 2001 From: yinle Date: Thu, 16 Dec 2010 02:52:16 +0000 Subject: [PATCH] FSP/BPA redundancy: add supporting cec and frame git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8429 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/PPC.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm index da486cb3e..07414a168 100644 --- a/xCAT-server/lib/perl/xCAT/PPC.pm +++ b/xCAT-server/lib/perl/xCAT/PPC.pm @@ -964,7 +964,7 @@ sub resolve { # Check for valid "type" ################################# my ($type) = grep( - /^$::NODETYPE_LPAR|$::NODETYPE_OSI|$::NODETYPE_BPA|$::NODETYPE_FSP$/, + /^$::NODETYPE_LPAR|$::NODETYPE_OSI|$::NODETYPE_BPA|$::NODETYPE_FSP|$::NODETYPE_CEC|$::NODETYPE_FRAME$/, split /,/, $ent->{nodetype} ); if ( !defined( $type )) { @@ -1756,7 +1756,7 @@ sub process_request { } #print "lasthcp_type:$lasthcp_type ;thishcp_type:$thishcp_type\n"; if(defined($lasthcp_type)) { - if ( ($lasthcp_type =~ /^(hmc)$/ && $thishcp_type =~ /^(fsp|bpa|cec)$/) or (($lasthcp_type =~ /^(fsp|bpa|cec)$/ ) && ($thishcp_type =~ /^(hmc)$/ )) ) { + if ( ($lasthcp_type =~ /^(hmc)$/ && $thishcp_type =~ /^(fsp|bpa)$/) or (($lasthcp_type =~ /^(fsp|bpa)$/ ) && ($thishcp_type =~ /^(hmc)$/ )) ) { $callback->({data=>["the $node\'s hcp type is different from the other's in the specified noderange in the 'ppc' table."]}); return; }