From a7d074f395cec3987ddad4d9abd28a4458c2907d Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Thu, 10 May 2012 02:00:52 +0000 Subject: [PATCH] fix bug 3524452: rcons to P7 IH LPAR getting Console not ready error git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12590 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPUtils.pm | 2 +- xCAT-server/lib/xcat/plugins/fsp.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm index 9079766aa..8efc2296d 100644 --- a/perl-xCAT/xCAT/FSPUtils.pm +++ b/perl-xCAT/xCAT/FSPUtils.pm @@ -165,7 +165,7 @@ sub getIPaddress } else { return -3; } - } elsif ($type eq "frame" or $type eq "cec" or $type eq "lpar") { + } elsif ($type eq "frame" or $type eq "cec" or ($type =~ /lpar/i)) { #In DFM #1. when the node type is frame, its hcp( $nodetocheck ) is frame, #and it will get the BPAs IPs for the Frame. diff --git a/xCAT-server/lib/xcat/plugins/fsp.pm b/xCAT-server/lib/xcat/plugins/fsp.pm index 605da02a2..b6bb00010 100644 --- a/xCAT-server/lib/xcat/plugins/fsp.pm +++ b/xCAT-server/lib/xcat/plugins/fsp.pm @@ -250,10 +250,10 @@ sub getfspcon { my $fsp_name = $att->{hcp}; my $id = $att->{id}; - my $request; - xCAT::FSPUtils::getHcpAttribs($request, \%tabs); + my %request; + xCAT::FSPUtils::getHcpAttribs(\%request, \%tabs); #my $fsp_ip = xCAT::Utils::getNodeIPaddress( $fsp_name ); - my $fsp_ip = xCAT::FSPUtils::getIPaddress($request, $type, $fsp_name ); + my $fsp_ip = xCAT::FSPUtils::getIPaddress(\%request, $type, $fsp_name ); if(!defined($fsp_ip)) { #return "Failed to get the $fsp_name\'s ip"; $rsp->{node}->[0]->{error}=["Can't get node address"];