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

[ganeti-local] / lib / cli.py

diff --git a/lib/cli.py b/lib/cli.py
index dbea1d7..c81bf54 100644 (file)
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -44,6 +44,7 @@ from optparse import (OptionParser, TitledHelpFormatter,
 
 __all__ = [
   # Command line options
 
 __all__ = [
   # Command line options

+  "BACKEND_OPT",

   "CONFIRM_OPT",
   "DEBUG_OPT",
   "DEBUG_SIMERR_OPT",
   "CONFIRM_OPT",
   "DEBUG_OPT",
   "DEBUG_SIMERR_OPT",

@@ -51,9 +52,13 @@ __all__ = [
   "FIELDS_OPT",
   "FILESTORE_DIR_OPT",
   "FILESTORE_DRIVER_OPT",
   "FIELDS_OPT",
   "FILESTORE_DIR_OPT",
   "FILESTORE_DRIVER_OPT",

+  "HVLIST_OPT",
+  "HVOPTS_OPT",
+  "HYPERVISOR_OPT",

   "IALLOCATOR_OPT",
   "FORCE_OPT",
   "NOHDR_OPT",
   "IALLOCATOR_OPT",
   "FORCE_OPT",
   "NOHDR_OPT",

+  "NOIPCHECK_OPT",

   "NONICS_OPT",
   "NWSYNC_OPT",
   "OS_OPT",
   "NONICS_OPT",
   "NWSYNC_OPT",
   "OS_OPT",

@@ -511,6 +516,30 @@ OS_OPT = cli_option("-o", "--os-type", dest="os", help="What OS to run",
                     metavar="<os>",
                     completion_suggest=OPT_COMPL_ONE_OS)
 
                     metavar="<os>",
                     completion_suggest=OPT_COMPL_ONE_OS)
 

+BACKEND_OPT = cli_option("-B", "--backend-parameters", dest="beparams",
+                         type="keyval", default={},
+                         help="Backend parameters")
+
+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.
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.