From f9faf9c3727c6175a836884e5f87c42e2b16b517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Tue, 9 Mar 2010 10:40:44 +0100
Subject: [PATCH] cli: Add ArgOs for later use in gnt-os
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
autotools/build-bash-completion | 2 ++
lib/cli.py | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/autotools/build-bash-completion b/autotools/build-bash-completion
index 4a6f66c1d..56204af00 100755
--- a/autotools/build-bash-completion
+++ b/autotools/build-bash-completion
@@ -458,6 +458,8 @@ class CompletionWriter:
choices = "$(_ganeti_nodes)"
elif isinstance(arg, cli.ArgJobId):
choices = "$(_ganeti_jobs)"
+ elif isinstance(arg, cli.ArgOs):
+ choices = "$(_ganeti_os)"
elif isinstance(arg, cli.ArgFile):
choices = ""
compgenargs.append("-f")
diff --git a/lib/cli.py b/lib/cli.py
index f1d2dfc2c..226334d6b 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -146,6 +146,7 @@ __all__ = [
"ARGS_NONE",
"ARGS_ONE_INSTANCE",
"ARGS_ONE_NODE",
+ "ARGS_ONE_OS",
"ArgChoice",
"ArgCommand",
"ArgFile",
@@ -153,6 +154,7 @@ __all__ = [
"ArgInstance",
"ArgJobId",
"ArgNode",
+ "ArgOs",
"ArgSuggest",
"ArgUnknown",
"OPT_COMPL_INST_ADD_NODES",
@@ -246,11 +248,18 @@ class ArgHost(_Argument):
"""
+class ArgOs(_Argument):
+ """OS argument.
+
+ """
+
+
ARGS_NONE = []
ARGS_MANY_INSTANCES = [ArgInstance()]
ARGS_MANY_NODES = [ArgNode()]
ARGS_ONE_INSTANCE = [ArgInstance(min=1, max=1)]
ARGS_ONE_NODE = [ArgNode(min=1, max=1)]
+ARGS_ONE_OS = [ArgOs(min=1, max=1)]
def _ExtractTagsObject(opts, args):
--
GitLab