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

fix defect 4222 [FVT on P8 BE with HMC] rspconfig returns hmc plugin bug

Browse Source
This commit is contained in:
zhaoertao
2014-07-30 19:56:03 -07:00
parent 3c97d11beb
commit f3c2e1f22d
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
perl-xCAT/xCAT/PPCfsp.pm
View File

@@ -144,12 +144,16 @@ sub connect {
##################################
# Set options
##################################
my $hosttab = xCAT::Table->new( 'hosts' );
if ( $hosttab) {
my $hostshash = $hosttab->getNodeAttribs( $server, [qw(ip otherinterfaces)]);
if ( $hostshash ) {
$server = $hostshash->{ip};
}
#my $hosttab = xCAT::Table->new( 'hosts' );
#if ( $hosttab) {
# my $hostshash = $hosttab->getNodeAttribs( $server, [qw(ip otherinterfaces)]);
# if ( $hostshash ) {
# $server = $hostshash->{ip};
# }
#}
$server = xCAT::NetworkUtils::getNodeIPaddress( $server );
unless ($server) {
return( "Unable to get IP address for $server" );
}
# my $serverip = inet_ntoa(inet_aton($server));
my $url = "https://$server/cgi-bin/cgi?form=2";

7
xCAT-server/lib/perl/xCAT/PPC.pm
View File

@@ -2197,9 +2197,10 @@ sub process_request {
#if( $request->{hwtype} ne 'hmc' ) {
if( $request->{hwtype} !~ /hmc|ivm/ ) {
$request->{fsp_api} = 1;
#For using rspconfig to disable/enable dev/celogin1 through ASMI
my $arg = $request->{arg};
if($request->{command} eq "rspconfig" and grep(/^(dev|celogin1)/, @$arg)) {
#For using rspconfig options through ASMI
#my $arg = $request->{arg};
#if($request->{command} eq "rspconfig" and grep(/^(dev|celogin1)/, @$arg)) {
if($request->{command} eq "rspconfig" and ref($request->{method}) eq 'HASH') {
$request->{fsp_api} = 0;
}
} else {