From 26023ecd7ce913e3878f2d286b21268184d23b67 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 17 Sep 2009 10:59:55 +0200
Subject: [PATCH] =?UTF-8?q?Unify=20the=20=E2=80=9C--no-nics=E2=80=9D=20opt?=
=?UTF-8?q?ion?=
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: Guido Trotter <ultrotter@google.com>
---
lib/cli.py | 5 +++++
scripts/gnt-backup | 3 +--
scripts/gnt-instance | 3 +--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 3b1156c7a..be7164869 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -51,6 +51,7 @@ __all__ = [
"FIELDS_OPT",
"FORCE_OPT",
"NOHDR_OPT",
+ "NONICS_OPT",
"NWSYNC_OPT",
"SEP_OPT",
"SUBMIT_OPT",
@@ -482,6 +483,10 @@ DISK_TEMPLATE_OPT = cli_option("-t", "--disk-template", dest="disk_template",
default=None, metavar="TEMPL",
choices=list(constants.DISK_TEMPLATES))
+NONICS_OPT = cli_option("--no-nics", default=False, action="store_true",
+ help="Do not create any network cards for"
+ " the instance")
+
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index 8ee9b6745..372389dcc 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -231,8 +231,7 @@ import_opts = [
default=[], dest="nics",
action="append",
type="identkeyval"),
- cli_option("--no-nics", default=False, action="store_true",
- help="Do not create any network cards for the instance"),
+ NONICS_OPT,
NWSYNC_OPT,
cli_option("--src-node", dest="src_node", help="Source node",
metavar="<node>",
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 05b2a45a7..b4470db71 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1388,8 +1388,7 @@ add_opts = [
default=[], dest="nics",
action="append",
type="identkeyval"),
- cli_option("--no-nics", default=False, action="store_true",
- help="Do not create any network cards for the instance"),
+ NONICS_OPT,
NWSYNC_OPT,
cli_option("--no-start", dest="start", default=True,
action="store_false", help="Don't start the instance after"
--
GitLab