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

Modify the processing of node range.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9114 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-03-21 09:25:16 +00:00
parent 05882d7e80
commit 8dbd48dbb5
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -11,6 +11,7 @@ use IO::Select;
use XML::Simple;
$XML::Simple::PREFERRED_PARSER='XML::Parser';
use xCAT::PPCdb;
use xCAT::NodeRange;
require xCAT::MacMap;
require xCAT_plugin::blade;
@ -236,9 +237,21 @@ sub parse_args {
#############################################
# Check for switch "-" with no option
#############################################
if ( grep(/^-$/, @ARGV )) {
return(usage( "Missing option: -" ));
#if ( grep(/^-$/, @ARGV )) {
# return(usage( "Missing option: -" ));
#}
#############################################
# Check for node range
#############################################
if ( scalar(@ARGV) eq 1 ) {
my @nodes = xCAT::NodeRange::noderange( @ARGV );
foreach (@nodes) {
push @filternodes, $_;
}
} elsif ( scalar(@ARGV) > 1 ) {
return(usage( "Invalid flag, please check and retry." ));
}
#############################################
# Set convergence
#############################################
@ -3306,15 +3319,7 @@ sub preprocess_request {
my $callback=shift;
my @requests;
####################################
# Prompt for usage if needed
####################################
my $noderange = $req->{node}; #Should be arrayref
foreach (@$noderange)
{
push @filternodes, $_;
}
my $command = $req->{command}->[0];
my $extrargs = $req->{arg};
my @exargs=($req->{arg});
@ -3729,14 +3734,13 @@ sub copypasswd {
sub filter {
my $oldhash = shift;
my $newhash;
foreach (@filternodes)
{
if ( exists($oldhash->{$_} ))
{
$newhash->{$_} = $oldhash->{$_};
foreach my $n(@filternodes) {
for my $foundnode ( keys %$oldhash ) {
if ( $foundnode =~ /\Q$n\E/ ) {
$newhash->{$foundnode} = $oldhash->{$foundnode};
}
}
}
}
return $newhash;
}
1;