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

Merge pull request #3926 from samveen/fix_3904

Browse Source 
Improvements to `nodediscoverls`
This commit is contained in:
zet809 2017-09-18 18:03:00 +08:00 committed by GitHub
commit 3818dbb396
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst
View File

@ -19,7 +19,7 @@ SYNOPSIS
********
\ **nodediscoverls**\ [\ **-t seq | profile | switch | blade | manual | undef | all**\ ] [\ **-l**\ ]
\ **nodediscoverls**\ [\ **-t seq | profile | switch | blade | manual | mtms | undef | all**\ ] [\ **-l**\ ]
\ **nodediscoverls**\ [\ **-u**\ \ *uuid*\ ] [\ **-l**\ ]
@ -47,7 +47,7 @@ OPTIONS
\ **-t seq|profile|switch|blade|manual|undef|all**\
\ **-t seq|profile|switch|blade|manual|mtms|undef|all**\
Display the nodes that have been discovered by the specified discovery method:
@ -72,6 +72,10 @@ OPTIONS
\* \ **mtms**\ - MTMS discovery (used when node mtm and serial fields are filled in).
\* \ **undef**\ - Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request.

8
xCAT-server/lib/xcat/plugins/seqdiscovery.pm
View File

@ -808,7 +808,7 @@ sub nodediscoverls {
Usage:
nodediscoverls
nodediscoverls [-h|--help|-v|--version]
nodediscoverls [-t seq|profile|switch|blade|manual|undef|all] [-l]
nodediscoverls [-t seq|profile|switch|blade|manual|mtms|undef|all] [-l]
nodediscoverls [-u uuid] [-l]
";
$rsp = ();
@ -843,7 +843,7 @@ Usage:
# If the type is specified, display the corresponding type of nodes
my @SEQDiscover;
if ($type) {
if ($type !~ /^(seq|profile|switch|blade|manual|undef|all)$/) {
if ($type !~ /^(seq|profile|switch|blade|manual|mtms|undef|all)$/) {
$usage->($callback, "The discovery type \'$type\' is not supported.");
return;
}
@ -917,7 +917,7 @@ Usage:
} else {
$ent->{'node'} = 'undef' unless ($ent->{'node'});
$ent->{'method'} = 'undef' unless ($ent->{'method'});
push @discoverednodes, sprintf(" %-40s%-20s%-15s%-10s%-20s", $ent->{'uuid'}, $ent->{'node'}, $ent->{'method'}, $ent->{'mtm'}, substr($ent->{'serial'}, 0, 19));
push @discoverednodes, sprintf(" %-40s%-20s%-15s%-10s %-20s", $ent->{'uuid'}, $ent->{'node'}, $ent->{'method'}, $ent->{'mtm'}, substr($ent->{'serial'}, 0, 19));
}
}
@ -927,7 +927,7 @@ Usage:
}
if (@discoverednodes) {
unless ($long) {
push @{ $rsp->{data} }, sprintf(" %-40s%-20s%-15s%-10s%-13s", 'UUID', 'NODE', 'METHOD', 'MTM', 'SERIAL');
push @{ $rsp->{data} }, sprintf(" %-40s%-20s%-15s%-10s %-20s", 'UUID', 'NODE', 'METHOD', 'MTM', 'SERIAL');
}
foreach (@discoverednodes) {
push @{ $rsp->{data} }, "$_";