From 8a5dcac2bab1abf8017758c26798c1368a5e6c7c Mon Sep 17 00:00:00 2001 From: yinle Date: Tue, 14 Dec 2010 05:30:33 +0000 Subject: [PATCH] FSP/BPA redundancy: modify code to support CEC operation git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8394 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/PPC.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm index ce0e8a822..da486cb3e 100644 --- a/xCAT-server/lib/perl/xCAT/PPC.pm +++ b/xCAT-server/lib/perl/xCAT/PPC.pm @@ -43,6 +43,7 @@ my %modules = ( }, rscan => { hmc => "xCAT::PPCscan", fsp => "xCAT::FSPscan", + cec => "xCAT::FSPscan", }, mkvm => { hmc => "xCAT::PPCvm", fsp => "xCAT::FSPvm", @@ -1755,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)$/) or (($lasthcp_type =~ /^(fsp|bpa)$/ ) && ($thishcp_type =~ /^(hmc)$/ )) ) { + if ( ($lasthcp_type =~ /^(hmc)$/ && $thishcp_type =~ /^(fsp|bpa|cec)$/) or (($lasthcp_type =~ /^(fsp|bpa|cec)$/ ) && ($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; } @@ -1787,7 +1788,7 @@ sub process_request { process_command( $request_new , \%hcps_will, \@failed_nodes, \%failed_msg); #print "after result:\n"; #print Dumper(\@failed_nodes); - if($lasthcp_type =~ /^(fsp|bpa)$/ && $request->{hwtype} ne 'hmc' ) { + if($lasthcp_type =~ /^(fsp|bpa|cec)$/ && $request->{hwtype} ne 'hmc' ) { my @enableASMI = xCAT::Utils->get_site_attribute("enableASMI"); if (defined($enableASMI[0])) { $enableASMI[0] =~ tr/a-z/A-Z/; # convert to upper