From 858940b6affcd403e2d57233acd357d4163bd714 Mon Sep 17 00:00:00 2001 From: jjhua Date: Fri, 13 Aug 2010 04:24:47 +0000 Subject: [PATCH] fixed defect 3043952 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7079 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/PPC.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm index e597e9b92..5edea1dac 100644 --- a/xCAT-server/lib/perl/xCAT/PPC.pm +++ b/xCAT-server/lib/perl/xCAT/PPC.pm @@ -1751,33 +1751,33 @@ sub process_request { %$request_new =%$request; $request_new->{node} = \@next; $request_new->{fsp_api} = 0; - if($lasthcp_type =~ /^(fsp|bpa)$/) { + if($lasthcp_type =~ /^(fsp|bpa)$/ && $request->{hwtype} ne 'hmc' ) { #my $fsp_api = check_fsp_api($request); #if($fsp_api == 0 ) { $request_new->{fsp_api} = 1; + $request_new->{hwtype} = $lasthcp_type; # } } - $request_new->{hwtype} = $lasthcp_type; #print Dumper($request_new); @failed_nodes = () ; process_command( $request_new , \%hcps_will, \@failed_nodes, \%failed_msg); #print "after result:\n"; #print Dumper(\@failed_nodes); - if($lasthcp_type =~ /^(fsp|bpa)$/) { - my @enableASMI = xCAT::Utils->get_site_attribute("enableASMI"); - if (defined($enableASMI[0])) { + if($lasthcp_type =~ /^(fsp|bpa)$/ && $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 - if (($enableASMI[0] eq "1") || ($enableASMI[0] eq "YES")) - { + if (($enableASMI[0] eq "1") || ($enableASMI[0] eq "YES")) + { #through asmi ...... $request_new->{fsp_api} = 0; - if(@failed_nodes != 0) { - my @temp = @failed_nodes; - @failed_nodes = (); - $request_new->{node} = \@temp; + if(@failed_nodes != 0) { + my @temp = @failed_nodes; + @failed_nodes = (); + $request_new->{node} = \@temp; process_command( $request_new , \%hcps_will, \@failed_nodes, \%failed_msg); } #end of if - } # end of if + } # end of if } #end of if } #end of if } #end of while(1)