From 4b038a1e56dfe234a58bdaa99c28f15116ad9c38 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 17 Sep 2009 12:45:08 +0200
Subject: [PATCH] =?UTF-8?q?Unify=20the=20=E2=80=9C--disks=E2=80=9D=20(disk?=
=?UTF-8?q?=20indices)=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cli.py | 8 +++++++-
scripts/gnt-instance | 12 ++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index dd8f375d8..ac72c3428 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -48,8 +48,9 @@ __all__ = [
"CONFIRM_OPT",
"DEBUG_OPT",
"DEBUG_SIMERR_OPT",
- "DISK_TEMPLATE_OPT",
+ "DISKIDX_OPT",
"DISK_OPT",
+ "DISK_TEMPLATE_OPT",
"FIELDS_OPT",
"FILESTORE_DIR_OPT",
"FILESTORE_DRIVER_OPT",
@@ -548,6 +549,11 @@ NET_OPT = cli_option("--net",
DISK_OPT = cli_option("--disk", help="Disk parameters", default=[],
dest="disks", action="append", type="identkeyval")
+DISKIDX_OPT = cli_option("--disks", dest="disks", default=None,
+ help="Comma-separated list of disks"
+ " indices to act on (e.g. 0,2) (optional,"
+ " defaults to all disks)")
+
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index cd1e651f4..b825dda7b 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1512,10 +1512,7 @@ commands = {
default=False, action="store_true",
help=("Automatically replace faulty disks"
" (only for the drbd template)")),
- cli_option("--disks", dest="disks", default=None,
- help="Comma-separated list of disks"
- " indices to replace (e.g. 0,2) (optional,"
- " defaults to all disks)"),
+ DISKIDX_OPT,
IALLOCATOR_OPT,
SUBMIT_OPT,
],
@@ -1570,12 +1567,7 @@ commands = {
"<instance>",
"Deactivate an instance's disks"),
'recreate-disks': (RecreateDisks, ARGS_ONE_INSTANCE,
- [DEBUG_OPT, SUBMIT_OPT,
- cli_option("--disks", dest="disks", default=None,
- help="Comma-separated list of disks"
- " indices to replace (e.g. 0,2) (optional,"
- " defaults to all disks)"),
- ],
+ [DEBUG_OPT, SUBMIT_OPT, DISKIDX_OPT],
"<instance>",
"Recreate an instance's disks"),
'grow-disk': (GrowDisk,
--
GitLab