From c67a44d85fae4fdcf31cb4c78a207fe636eb0ba1 Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Tue, 29 Dec 2009 08:23:20 +0000 Subject: [PATCH] Lead rspconfig to PPCcfg.pm git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4852 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/PPCcfg.pm | 2 +- xCAT-server/lib/perl/xCAT/PPC.pm | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/perl-xCAT/xCAT/PPCcfg.pm b/perl-xCAT/xCAT/PPCcfg.pm index bcb41d206..15a2db5ec 100644 --- a/perl-xCAT/xCAT/PPCcfg.pm +++ b/perl-xCAT/xCAT/PPCcfg.pm @@ -144,7 +144,7 @@ sub parse_args { # Return method to invoke #################################### if ( exists($cmds{frame}) ) { - $request->{hwcp} = "hmc"; + $request->{hcp} = "hmc"; $request->{method} = "cfg"; return( \%opt ); } diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm index c695742f6..26d4e1f12 100644 --- a/xCAT-server/lib/perl/xCAT/PPC.pm +++ b/xCAT-server/lib/perl/xCAT/PPC.pm @@ -50,6 +50,8 @@ my %modules = ( reventlog => { hmc => "xCAT::PPClog", }, rspconfig => { hmc => "xCAT::PPCcfg", + fsp => "xCAT::PPCcfg", + bpa => "xCAT::PPCcfg", }, rflash => { hmc => "xCAT::PPCrflash", fsp => "xCAT::FSPflash", @@ -684,7 +686,7 @@ sub preprocess_nodes { # rscan - Nodes are hardware control pts # FSPpower, FSPinv and FSPrflash ######################################## - if (( !$request->{hwcp} && ($request->{hwcp} ne "hmc" )) + if (( !$request->{hcp} && ($request->{hcp} ne "hmc" )) and ($request->{command} !~ /^renergy$/) and (( $request->{command} =~ /^(rscan|rspconfig)$/ ) or ($request->{hwtype} eq "fsp" or $request->{hwtype} eq "bpa" ) @@ -755,7 +757,7 @@ sub preprocess_nodes { ########################################## while (my ($hcp,$hash) = each(%nodehash) ) { my @cred; - if ($request->{hwcp} && ($request->{hwcp} eq "hmc" )) { + if ($request->{hcp} && ($request->{hcp} eq "hmc" )) { @cred = xCAT::PPCdb::credentials( $hcp, $request->{hcp} ); } else { @cred = xCAT::PPCdb::credentials( $hcp, $request->{hwtype} ); @@ -1117,7 +1119,7 @@ sub invoke_cmd { my $hwtype = $request->{hwtype}; my $verbose = $request->{verbose}; my $cmd = $request->{command}; - my $power = $request->{hwcp}; + my $power = $request->{hcp}; my @exp; my $verbose_log; my @outhash;