xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

checking for wrong node names for switchdiscover

Browse Source
This commit is contained in:
linggao 2015-05-21 17:04:48 -04:00
parent 8d5c71def8
commit 5c31791e71
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/switchdiscover.pm
View File

@ -144,7 +144,10 @@ sub parse_args {
#############################################
if ( scalar(@ARGV) eq 1 ) {
my @nodes = xCAT::NodeRange::noderange( @ARGV );
foreach (@nodes) {
if (nodesmissed) {
return (usage( "The following nodes are not defined in xCAT DB:\n " . join(',', nodesmissed)));
}
foreach (@nodes) {
push @filternodes, $_;
}
unless (@filternodes) {
@ -540,8 +543,9 @@ sub nmap_scan {
send_msg($request, 0, "Discovering switches using nmap...");
#################################################
# If --range options, take iprange, otherwise
# use noderange to discover switches.
# If --range options, take iprange, if noderange is defined
# us the ip addresses of the nodes. If none is define, use the
# subnets for all the interfaces.
##################################################
my $ranges = get_ip_ranges($request);
@ -745,7 +749,7 @@ sub get_ip_ranges {
if (@filternodes > 0) {
my @ipranges=();
foreach my $node (@filternodes) {
my $ip = xCAT::NetworkUtils->getipaddr($node);
my $ip = xCAT::NetworkUtils->getipaddr($node);
push(@ipranges, $ip);
}
return \@ipranges;