OOB commands where we need to be able to specify the timeout are
enhancing over the border of just gnt-node so we move it into cli.py
for easy reuse in other cli parts.
---
lib/cli.py | 5 +++++
lib/client/gnt_node.py | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index a6b6b91..652f388 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -131,6 +131,7 @@ __all__ = [
"OSPARAMS_OPT",
"OS_OPT",
"OS_SIZE_OPT",
+ "OOB_TIMEOUT_OPT",
"PREALLOC_WIPE_DISKS_OPT",
"PRIMARY_IP_VERSION_OPT",
"PRIORITY_OPT",
@@ -1143,6 +1144,10 @@ NODE_POWERED_OPT = cli_option("--node-powered",
default=None,
dest="node_powered",
help="Specify if the SoR for node is powered")
+OOB_TIMEOUT_OPT = cli_option("--oob-timeout", dest="oob_timeout", type="int",
+ default=constants.OOB_TIMEOUT,
+ help="Maximum time to wait for out-of-band helper")
+
#: Options provided by all commands
COMMON_OPTS = [DEBUG_OPT]
diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index fe95a6b..a89d4d1 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -114,9 +114,6 @@ IGNORE_STATUS_OPT = cli_option("--ignore-status",
default=False,
help=("Ignore the Node(s) offline status"
" (potentially DANGEROUS)"))
-OOB_TIMEOUT_OPT = cli_option("--oob-timeout", dest="oob_timeout", type="int",
- default=constants.OOB_TIMEOUT,
- help="Maximum time to wait for out-of-band helper")
def ConvertStorageType(user_storage_type):
"""Converts a user storage type to its internal name.
--
1.7.3.1
