From 748291024370a0ca094555403362be8b87536225 Mon Sep 17 00:00:00 2001 From: jjhua Date: Wed, 16 Feb 2011 10:32:45 +0000 Subject: [PATCH] modified some special nodes' name git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8856 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPscan.pm | 6 +++--- perl-xCAT/xCAT/FSPvm.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-xCAT/xCAT/FSPscan.pm b/perl-xCAT/xCAT/FSPscan.pm index 24cb8f891..ffc9b2e15 100644 --- a/perl-xCAT/xCAT/FSPscan.pm +++ b/perl-xCAT/xCAT/FSPscan.pm @@ -113,7 +113,7 @@ sub enumerate { push @values, $data; next; } - if($data !~ "Connected") { + if($data !~ "Connected" && $data !~ "LINE UP" ) { $data = "please check if the $node_name is coneected to the hardware server"; #push @output, [$node_name,$data,$Rc]; push @values, $data; @@ -160,13 +160,13 @@ sub enumerate { foreach my $lpar (@list) { $lpar =~ /lparname:\s+(\w+),\s+lparid:\s+(\d+),\s+state:/; my $name = $1; - $name =~ s/\-//g; - $name =~ tr/A-Z/a-z/; my $lparid = $2; my $prof = $1; my $server = $fsp; my $ips = ""; my $port = ""; + $name =~ s/\-//g; + $name =~ tr/A-Z/a-z/; ##################################### # Save LPAR information diff --git a/perl-xCAT/xCAT/FSPvm.pm b/perl-xCAT/xCAT/FSPvm.pm index de69aac16..2f6f2d4db 100644 --- a/perl-xCAT/xCAT/FSPvm.pm +++ b/perl-xCAT/xCAT/FSPvm.pm @@ -193,7 +193,7 @@ sub mkvm_parse_args { } - $opt{target} = @{$request->{node}}; + $opt{target} = $request->{node}; #################################### # No operands - add command name @@ -1389,7 +1389,7 @@ sub create { my $profile; my $starting_lpar_id = $opt->{i}; my $octant_conf_value = $opt->{o}; - my $node_number =$opt->{target}; + my $node_number =@{$opt->{target}}; ##################################### # Get source node information #####################################