Unify the “--no-ip-check” option

[ganeti-local] / lib / cli.py

diff --git a/lib/cli.py b/lib/cli.py
index 2fed4cf..c81bf54 100644 (file)
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -52,10 +52,13 @@ __all__ = [
   "FIELDS_OPT",
   "FILESTORE_DIR_OPT",
   "FILESTORE_DRIVER_OPT",
+  "HVLIST_OPT",
   "HVOPTS_OPT",
+  "HYPERVISOR_OPT",
   "IALLOCATOR_OPT",
   "FORCE_OPT",
   "NOHDR_OPT",
+  "NOIPCHECK_OPT",
   "NONICS_OPT",
   "NWSYNC_OPT",
   "OS_OPT",
@@ -521,6 +524,22 @@ HVOPTS_OPT =  cli_option("-H", "--hypervisor-parameters", type="keyval",
                          default={}, dest="hvparams",
                          help="Hypervisor parameters")
 
+HYPERVISOR_OPT = cli_option("-H", "--hypervisor-parameters", dest="hypervisor",
+                            help="Hypervisor and hypervisor options, in the"
+                            " format hypervisor:option=value,option=value,...",
+                            default=None, type="identkeyval")
+
+HVLIST_OPT = cli_option("-H", "--hypervisor-parameters", dest="hvparams",
+                        help="Hypervisor and hypervisor options, in the"
+                        " format hypervisor:option=value,option=value,...",
+                        default=[], action="append", type="identkeyval")
+
+NOIPCHECK_OPT = cli_option("--no-ip-check", dest="ip_check", default=True,
+                           action="store_false",
+                           help="Don't check that the instance's IP"
+                           " is alive")
+
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.