From 5216f62d4b5901fa15c3c82d875fb3bc572f06cc Mon Sep 17 00:00:00 2001 From: Samveen Gulati Date: Fri, 15 Sep 2017 00:06:32 +0000 Subject: [PATCH] Fix #3904 : Add ability to list discoverydata by type `mtms` --- .../admin-guides/references/man1/nodediscoverls.1.rst | 8 ++++++-- xCAT-server/lib/xcat/plugins/seqdiscovery.pm | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst index 8d1458b64..666477d78 100644 --- a/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst @@ -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. diff --git a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm index ea114681f..0a18969cc 100755 --- a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm +++ b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm @@ -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; }