kvm: get more accurate info from qmp, if possible

[ganeti-local] / lib / cli.py

diff --git a/lib/cli.py b/lib/cli.py
index 8dd8732..5cceb7b 100644 (file)
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -29,6 +29,7 @@ import time
 import logging
 import errno
 import itertools
 import logging
 import errno
 import itertools

+import shlex

 from cStringIO import StringIO
 
 from ganeti import utils
 from cStringIO import StringIO
 
 from ganeti import utils

@@ -68,6 +69,7 @@ __all__ = [
   "DEBUG_SIMERR_OPT",
   "DISKIDX_OPT",
   "DISK_OPT",
   "DEBUG_SIMERR_OPT",
   "DISKIDX_OPT",
   "DISK_OPT",

+  "DISK_PARAMS_OPT",

   "DISK_TEMPLATE_OPT",
   "DRAINED_OPT",
   "DRY_RUN_OPT",
   "DISK_TEMPLATE_OPT",
   "DRAINED_OPT",
   "DRY_RUN_OPT",

@@ -92,6 +94,7 @@ __all__ = [
   "DEFAULT_IALLOCATOR_OPT",
   "IDENTIFY_DEFAULTS_OPT",
   "IGNORE_CONSIST_OPT",
   "DEFAULT_IALLOCATOR_OPT",
   "IDENTIFY_DEFAULTS_OPT",
   "IGNORE_CONSIST_OPT",

+  "IGNORE_ERRORS_OPT",

   "IGNORE_FAILURES_OPT",
   "IGNORE_OFFLINE_OPT",
   "IGNORE_REMOVE_FAILURES_OPT",
   "IGNORE_FAILURES_OPT",
   "IGNORE_OFFLINE_OPT",
   "IGNORE_REMOVE_FAILURES_OPT",

@@ -101,6 +104,7 @@ __all__ = [
   "MAC_PREFIX_OPT",
   "MAINTAIN_NODE_HEALTH_OPT",
   "MASTER_NETDEV_OPT",
   "MAC_PREFIX_OPT",
   "MAINTAIN_NODE_HEALTH_OPT",
   "MASTER_NETDEV_OPT",

+  "MASTER_NETMASK_OPT",

   "MC_OPT",
   "MIGRATION_MODE_OPT",
   "NET_OPT",
   "MC_OPT",
   "MIGRATION_MODE_OPT",
   "NET_OPT",

@@ -109,6 +113,7 @@ __all__ = [
   "NEW_CONFD_HMAC_KEY_OPT",
   "NEW_RAPI_CERT_OPT",
   "NEW_SECONDARY_OPT",
   "NEW_CONFD_HMAC_KEY_OPT",
   "NEW_RAPI_CERT_OPT",
   "NEW_SECONDARY_OPT",

+  "NEW_SPICE_CERT_OPT",

   "NIC_PARAMS_OPT",
   "NODE_FORCE_JOIN_OPT",
   "NODE_LIST_OPT",
   "NIC_PARAMS_OPT",
   "NODE_FORCE_JOIN_OPT",
   "NODE_LIST_OPT",

@@ -133,6 +138,8 @@ __all__ = [
   "NOVOTING_OPT",
   "NO_REMEMBER_OPT",
   "NWSYNC_OPT",
   "NOVOTING_OPT",
   "NO_REMEMBER_OPT",
   "NWSYNC_OPT",

+  "OFFLINE_INST_OPT",
+  "ONLINE_INST_OPT",

   "ON_PRIMARY_OPT",
   "ON_SECONDARY_OPT",
   "OFFLINE_OPT",
   "ON_PRIMARY_OPT",
   "ON_SECONDARY_OPT",
   "OFFLINE_OPT",

@@ -159,6 +166,8 @@ __all__ = [
   "SHOWCMD_OPT",
   "SHUTDOWN_TIMEOUT_OPT",
   "SINGLE_NODE_OPT",
   "SHOWCMD_OPT",
   "SHUTDOWN_TIMEOUT_OPT",
   "SINGLE_NODE_OPT",

+  "SPICE_CACERT_OPT",
+  "SPICE_CERT_OPT",

   "SRC_DIR_OPT",
   "SRC_NODE_OPT",
   "SUBMIT_OPT",
   "SRC_DIR_OPT",
   "SRC_NODE_OPT",
   "SUBMIT_OPT",

@@ -168,12 +177,16 @@ __all__ = [
   "TAG_ADD_OPT",
   "TAG_SRC_OPT",
   "TIMEOUT_OPT",
   "TAG_ADD_OPT",
   "TAG_SRC_OPT",
   "TIMEOUT_OPT",

+  "TO_GROUP_OPT",

   "UIDPOOL_OPT",
   "USEUNITS_OPT",
   "UIDPOOL_OPT",
   "USEUNITS_OPT",

+  "USE_EXTERNAL_MIP_SCRIPT",

   "USE_REPL_NET_OPT",
   "VERBOSE_OPT",
   "VG_NAME_OPT",
   "YES_DOIT_OPT",
   "USE_REPL_NET_OPT",
   "VERBOSE_OPT",
   "VG_NAME_OPT",
   "YES_DOIT_OPT",

+  "DISK_STATE_OPT",
+  "HV_STATE_OPT",

   # Generic functions for CLI programs
   "ConfirmOperation",
   "GenericMain",
   # Generic functions for CLI programs
   "ConfirmOperation",
   "GenericMain",

@@ -256,9 +269,12 @@ _PRIONAME_TO_VALUE = dict(_PRIORITY_NAMES)
  QR_UNKNOWN,
  QR_INCOMPLETE) = range(3)
 
  QR_UNKNOWN,
  QR_INCOMPLETE) = range(3)
 

+#: Maximum batch size for ChooseJob
+_CHOOSE_BATCH = 25
+

 
 class _Argument:
 
 class _Argument:

-  def __init__(self, min=0, max=None): # pylint: disable-msg=W0622
+  def __init__(self, min=0, max=None): # pylint: disable=W0622

     self.min = min
     self.max = max
 
     self.min = min
     self.max = max
 

@@ -273,7 +289,7 @@ class ArgSuggest(_Argument):
   Value can be any of the ones passed to the constructor.
 
   """
   Value can be any of the ones passed to the constructor.
 
   """

-  # pylint: disable-msg=W0622
+  # pylint: disable=W0622

   def __init__(self, min=0, max=None, choices=None):
     _Argument.__init__(self, min=min, max=max)
     self.choices = choices
   def __init__(self, min=0, max=None, choices=None):
     _Argument.__init__(self, min=min, max=max)
     self.choices = choices

@@ -461,7 +477,7 @@ def RemoveTags(opts, args):
   SubmitOpCode(op, opts=opts)
 
 
   SubmitOpCode(op, opts=opts)
 
 

-def check_unit(option, opt, value): # pylint: disable-msg=W0613
+def check_unit(option, opt, value): # pylint: disable=W0613

   """OptParsers custom converter for units.
 
   """
   """OptParsers custom converter for units.
 
   """

@@ -508,7 +524,7 @@ def _SplitKeyVal(opt, data):
   return kv_dict
 
 
   return kv_dict
 
 

-def check_ident_key_val(option, opt, value):  # pylint: disable-msg=W0613
+def check_ident_key_val(option, opt, value):  # pylint: disable=W0613

   """Custom parser for ident:key=val,key=val options.
 
   This will store the parsed values as a tuple (ident, {key: val}). As such,
   """Custom parser for ident:key=val,key=val options.
 
   This will store the parsed values as a tuple (ident, {key: val}). As such,

@@ -516,7 +532,7 @@ def check_ident_key_val(option, opt, value):  # pylint: disable-msg=W0613
 
   """
   if ":" not in value:
 
   """
   if ":" not in value:

-    ident, rest = value, ''
+    ident, rest = value, ""

   else:
     ident, rest = value.split(":", 1)
 
   else:
     ident, rest = value.split(":", 1)
 

@@ -536,7 +552,7 @@ def check_ident_key_val(option, opt, value):  # pylint: disable-msg=W0613
   return retval
 
 
   return retval
 
 

-def check_key_val(option, opt, value):  # pylint: disable-msg=W0613
+def check_key_val(option, opt, value):  # pylint: disable=W0613

   """Custom parser class for key=val,key=val options.
 
   This will store the parsed values as a dict {key: val}.
   """Custom parser class for key=val,key=val options.
 
   This will store the parsed values as a dict {key: val}.

@@ -545,7 +561,7 @@ def check_key_val(option, opt, value):  # pylint: disable-msg=W0613
   return _SplitKeyVal(opt, value)
 
 
   return _SplitKeyVal(opt, value)
 
 

-def check_bool(option, opt, value): # pylint: disable-msg=W0613
+def check_bool(option, opt, value): # pylint: disable=W0613

   """Custom parser for yes/no options.
 
   This will store the parsed value as either True or False.
   """Custom parser for yes/no options.
 
   This will store the parsed value as either True or False.

@@ -620,7 +636,7 @@ SEP_OPT = cli_option("--separator", default=None,
                            " (defaults to one space)"))
 
 USEUNITS_OPT = cli_option("--units", default=None,
                            " (defaults to one space)"))
 
 USEUNITS_OPT = cli_option("--units", default=None,

-                          dest="units", choices=('h', 'm', 'g', 't'),
+                          dest="units", choices=("h", "m", "g", "t"),

                           help="Specify units for output (one of h/m/g/t)")
 
 FIELDS_OPT = cli_option("-o", "--output", dest="output", action="store",
                           help="Specify units for output (one of h/m/g/t)")
 
 FIELDS_OPT = cli_option("-o", "--output", dest="output", action="store",

@@ -674,6 +690,14 @@ NWSYNC_OPT = cli_option("--no-wait-for-sync", dest="wait_for_sync",
                         default=True, action="store_false",
                         help="Don't wait for sync (DANGEROUS!)")
 
                         default=True, action="store_false",
                         help="Don't wait for sync (DANGEROUS!)")
 

+ONLINE_INST_OPT = cli_option("--online", dest="online_inst",
+                             action="store_true", default=False,
+                             help="Enable offline instance")
+
+OFFLINE_INST_OPT = cli_option("--offline", dest="offline_inst",
+                              action="store_true", default=False,
+                              help="Disable down instance")
+

 DISK_TEMPLATE_OPT = cli_option("-t", "--disk-template", dest="disk_template",
                                help=("Custom disk setup (%s)" %
                                      utils.CommaJoin(constants.DISK_TEMPLATES)),
 DISK_TEMPLATE_OPT = cli_option("-t", "--disk-template", dest="disk_template",
                                help=("Custom disk setup (%s)" %
                                      utils.CommaJoin(constants.DISK_TEMPLATES)),

@@ -727,9 +751,14 @@ BACKEND_OPT = cli_option("-B", "--backend-parameters", dest="beparams",
                          type="keyval", default={},
                          help="Backend parameters")
 
                          type="keyval", default={},
                          help="Backend parameters")
 

-HVOPTS_OPT =  cli_option("-H", "--hypervisor-parameters", type="keyval",
-                         default={}, dest="hvparams",
-                         help="Hypervisor parameters")
+HVOPTS_OPT = cli_option("-H", "--hypervisor-parameters", type="keyval",
+                        default={}, dest="hvparams",
+                        help="Hypervisor parameters")
+
+DISK_PARAMS_OPT = cli_option("-D", "--disk-parameters", dest="diskparams",
+                             help="Disk template parameters, in the format"
+                             " template:option=value,option=value,...",
+                             type="identkeyval", action="append", default=[])

 
 HYPERVISOR_OPT = cli_option("-H", "--hypervisor-parameters", dest="hypervisor",
                             help="Hypervisor and hypervisor options, in the"
 
 HYPERVISOR_OPT = cli_option("-H", "--hypervisor-parameters", dest="hypervisor",
                             help="Hypervisor and hypervisor options, in the"

@@ -803,7 +832,8 @@ NODE_LIST_OPT = cli_option("-n", "--node", dest="nodes", default=[],
                            " times, if not given defaults to all nodes)",
                            completion_suggest=OPT_COMPL_ONE_NODE)
 
                            " times, if not given defaults to all nodes)",
                            completion_suggest=OPT_COMPL_ONE_NODE)
 

-NODEGROUP_OPT = cli_option("-g", "--node-group",
+NODEGROUP_OPT_NAME = "--node-group"
+NODEGROUP_OPT = cli_option("-g", NODEGROUP_OPT_NAME,

                            dest="nodegroup",
                            help="Node group (name or uuid)",
                            metavar="<nodegroup>",
                            dest="nodegroup",
                            help="Node group (name or uuid)",
                            metavar="<nodegroup>",

@@ -979,7 +1009,7 @@ VG_NAME_OPT = cli_option("--vg-name", dest="vg_name",
                                " [%s]" % constants.DEFAULT_VG),
                          metavar="VG", default=None)
 
                                " [%s]" % constants.DEFAULT_VG),
                          metavar="VG", default=None)
 

-YES_DOIT_OPT = cli_option("--yes-do-it", dest="yes_do_it",
+YES_DOIT_OPT = cli_option("--yes-do-it", "--ya-rly", dest="yes_do_it",

                           help="Destroy cluster", action="store_true")
 
 NOVOTING_OPT = cli_option("--no-voting", dest="no_voting",
                           help="Destroy cluster", action="store_true")
 
 NOVOTING_OPT = cli_option("--no-voting", dest="no_voting",

@@ -1000,6 +1030,18 @@ MASTER_NETDEV_OPT = cli_option("--master-netdev", dest="master_netdev",
                                metavar="NETDEV",
                                default=None)
 
                                metavar="NETDEV",
                                default=None)
 

+MASTER_NETMASK_OPT = cli_option("--master-netmask", dest="master_netmask",
+                                help="Specify the netmask of the master IP",
+                                metavar="NETMASK",
+                                default=None)
+
+USE_EXTERNAL_MIP_SCRIPT = cli_option("--use-external-mip-script",
+                                dest="use_external_mip_script",
+                                help="Specify whether to run a user-provided"
+                                " script for the master IP address turnup and"
+                                " turndown operations",
+                                type="bool", metavar=_YORNO, default=None)
+

 GLOBAL_FILEDIR_OPT = cli_option("--file-storage-dir", dest="file_storage_dir",
                                 help="Specify the default directory (cluster-"
                                 "wide) for storing the file-based disks [%s]" %
 GLOBAL_FILEDIR_OPT = cli_option("--file-storage-dir", dest="file_storage_dir",
                                 help="Specify the default directory (cluster-"
                                 "wide) for storing the file-based disks [%s]" %

@@ -1081,6 +1123,21 @@ NEW_RAPI_CERT_OPT = cli_option("--new-rapi-certificate", dest="new_rapi_cert",
                                help=("Generate a new self-signed RAPI"
                                      " certificate"))
 
                                help=("Generate a new self-signed RAPI"
                                      " certificate"))
 

+SPICE_CERT_OPT = cli_option("--spice-certificate", dest="spice_cert",
+                           default=None,
+                           help="File containing new SPICE certificate")
+
+SPICE_CACERT_OPT = cli_option("--spice-ca-certificate", dest="spice_cacert",
+                           default=None,
+                           help="File containing the certificate of the CA"
+                                " which signed the SPICE certificate")
+
+NEW_SPICE_CERT_OPT = cli_option("--new-spice-certificate",
+                               dest="new_spice_cert", default=None,
+                               action="store_true",
+                               help=("Generate a new self-signed SPICE"
+                                     " certificate"))
+

 NEW_CONFD_HMAC_KEY_OPT = cli_option("--new-confd-hmac-key",
                                     dest="new_confd_hmac_key",
                                     default=False, action="store_true",
 NEW_CONFD_HMAC_KEY_OPT = cli_option("--new-confd-hmac-key",
                                     dest="new_confd_hmac_key",
                                     default=False, action="store_true",

@@ -1228,6 +1285,28 @@ STARTUP_PAUSED_OPT = cli_option("--paused", dest="startup_paused",
                                 action="store_true", default=False,
                                 help="Pause instance at startup")
 
                                 action="store_true", default=False,
                                 help="Pause instance at startup")
 

+TO_GROUP_OPT = cli_option("--to", dest="to", metavar="<group>",
+                          help="Destination node group (name or uuid)",
+                          default=None, action="append",
+                          completion_suggest=OPT_COMPL_ONE_NODEGROUP)
+
+IGNORE_ERRORS_OPT = cli_option("-I", "--ignore-errors", default=[],
+                               action="append", dest="ignore_errors",
+                               choices=list(constants.CV_ALL_ECODES_STRINGS),
+                               help="Error code to be ignored")
+
+DISK_STATE_OPT = cli_option("--disk-state", default=[], dest="disk_state",
+                            action="append",
+                            help=("Specify disk state information in the format"
+                                  " storage_type/identifier:option=value,..."),
+                            type="identkeyval")
+
+HV_STATE_OPT = cli_option("--hypervisor-state", default=[], dest="hv_state",
+                          action="append",
+                          help=("Specify hypervisor state information in the"
+                                " format hypervisor:option=value,..."),
+                          type="identkeyval")
+

 
 #: Options provided by all commands
 COMMON_OPTS = [DEBUG_OPT]
 
 #: Options provided by all commands
 COMMON_OPTS = [DEBUG_OPT]

@@ -1257,7 +1336,7 @@ COMMON_CREATE_OPTS = [
   ]
 
 
   ]
 
 

-def _ParseArgs(argv, commands, aliases):
+def _ParseArgs(argv, commands, aliases, env_override):

   """Parser for the command line arguments.
 
   This function parses the arguments and returns the function which
   """Parser for the command line arguments.
 
   This function parses the arguments and returns the function which

@@ -1267,8 +1346,11 @@ def _ParseArgs(argv, commands, aliases):
   @param commands: dictionary with special contents, see the design
       doc for cmdline handling
   @param aliases: dictionary with command aliases {'alias': 'target, ...}
   @param commands: dictionary with special contents, see the design
       doc for cmdline handling
   @param aliases: dictionary with command aliases {'alias': 'target, ...}

+  @param env_override: list of env variables allowed for default args

 
   """
 
   """

+  assert not (env_override - set(commands))
+

   if len(argv) == 0:
     binary = "<command>"
   else:
   if len(argv) == 0:
     binary = "<command>"
   else:

@@ -1322,13 +1404,19 @@ def _ParseArgs(argv, commands, aliases):
 
     cmd = aliases[cmd]
 
 
     cmd = aliases[cmd]
 

+  if cmd in env_override:
+    args_env_name = ("%s_%s" % (binary.replace("-", "_"), cmd)).upper()
+    env_args = os.environ.get(args_env_name)
+    if env_args:
+      argv = utils.InsertAtPos(argv, 1, shlex.split(env_args))
+

   func, args_def, parser_opts, usage, description = commands[cmd]
   parser = OptionParser(option_list=parser_opts + COMMON_OPTS,
                         description=description,
                         formatter=TitledHelpFormatter(),
                         usage="%%prog %s %s" % (cmd, usage))
   parser.disable_interspersed_args()
   func, args_def, parser_opts, usage, description = commands[cmd]
   parser = OptionParser(option_list=parser_opts + COMMON_OPTS,
                         description=description,
                         formatter=TitledHelpFormatter(),
                         usage="%%prog %s %s" % (cmd, usage))
   parser.disable_interspersed_args()

-  options, args = parser.parse_args()
+  options, args = parser.parse_args(args=argv[1:])

 
   if not _CheckArguments(cmd, args_def, args):
     return None, None, None
 
   if not _CheckArguments(cmd, args_def, args):
     return None, None, None

@@ -1411,8 +1499,8 @@ def SplitNodeOption(value):
   """Splits the value of a --node option.
 
   """
   """Splits the value of a --node option.
 
   """

-  if value and ':' in value:
-    return value.split(':', 1)
+  if value and ":" in value:
+    return value.split(":", 1)

   else:
     return (value, None)
 
   else:
     return (value, None)
 

@@ -1429,7 +1517,7 @@ def CalculateOSNames(os_name, os_variants):
 
   """
   if os_variants:
 
   """
   if os_variants:

-    return ['%s+%s' % (os_name, v) for v in os_variants]
+    return ["%s+%s" % (os_name, v) for v in os_variants]

   else:
     return [os_name]
 
   else:
     return [os_name]
 

@@ -1471,12 +1559,12 @@ def AskUser(text, choices=None):
 
   """
   if choices is None:
 
   """
   if choices is None:

-    choices = [('y', True, 'Perform the operation'),
-               ('n', False, 'Do not perform the operation')]
+    choices = [("y", True, "Perform the operation"),
+               ("n", False, "Do not perform the operation")]

   if not choices or not isinstance(choices, list):
     raise errors.ProgrammerError("Invalid choices argument to AskUser")
   for entry in choices:
   if not choices or not isinstance(choices, list):
     raise errors.ProgrammerError("Invalid choices argument to AskUser")
   for entry in choices:

-    if not isinstance(entry, tuple) or len(entry) < 3 or entry[0] == '?':
+    if not isinstance(entry, tuple) or len(entry) < 3 or entry[0] == "?":

       raise errors.ProgrammerError("Invalid choices element to AskUser")
 
   answer = choices[-1][1]
       raise errors.ProgrammerError("Invalid choices element to AskUser")
 
   answer = choices[-1][1]

@@ -1491,18 +1579,18 @@ def AskUser(text, choices=None):
   try:
     chars = [entry[0] for entry in choices]
     chars[-1] = "[%s]" % chars[-1]
   try:
     chars = [entry[0] for entry in choices]
     chars[-1] = "[%s]" % chars[-1]

-    chars.append('?')
+    chars.append("?")

     maps = dict([(entry[0], entry[1]) for entry in choices])
     while True:
       f.write(text)
     maps = dict([(entry[0], entry[1]) for entry in choices])
     while True:
       f.write(text)

-      f.write('\n')
+      f.write("\n")

       f.write("/".join(chars))
       f.write(": ")
       line = f.readline(2).strip().lower()
       if line in maps:
         answer = maps[line]
         break
       f.write("/".join(chars))
       f.write(": ")
       line = f.readline(2).strip().lower()
       if line in maps:
         answer = maps[line]
         break

-      elif line == '?':
+      elif line == "?":

         for entry in choices:
           f.write(" %s - %s\n" % (entry[0], entry[2]))
         f.write("\n")
         for entry in choices:
           f.write(" %s - %s\n" % (entry[0], entry[2]))
         f.write("\n")

@@ -1749,7 +1837,7 @@ class StdioJobPollReportCb(JobPollReportCbBase):
       ToStderr("Job %s is waiting in queue", job_id)
       self.notified_queued = True
 
       ToStderr("Job %s is waiting in queue", job_id)
       self.notified_queued = True
 

-    elif status == constants.JOB_STATUS_WAITLOCK and not self.notified_waitlock:
+    elif status == constants.JOB_STATUS_WAITING and not self.notified_waitlock:

       ToStderr("Job %s is trying to acquire all necessary locks", job_id)
       self.notified_waitlock = True
 
       ToStderr("Job %s is trying to acquire all necessary locks", job_id)
       self.notified_waitlock = True
 

@@ -1959,19 +2047,21 @@ def FormatError(err):
     retcode = 0
   else:
     obuf.write("Unhandled exception: %s" % msg)
     retcode = 0
   else:
     obuf.write("Unhandled exception: %s" % msg)

-  return retcode, obuf.getvalue().rstrip('\n')
+  return retcode, obuf.getvalue().rstrip("\n")

 
 
 
 

-def GenericMain(commands, override=None, aliases=None):
+def GenericMain(commands, override=None, aliases=None,
+                env_override=frozenset()):

   """Generic main function for all the gnt-* commands.
 
   """Generic main function for all the gnt-* commands.
 

-  Arguments:
-    - commands: a dictionary with a special structure, see the design doc
-                for command line handling.
-    - override: if not None, we expect a dictionary with keys that will
-                override command line options; this can be used to pass
-                options from the scripts to generic functions
-    - aliases: dictionary with command aliases {'alias': 'target, ...}
+  @param commands: a dictionary with a special structure, see the design doc
+                   for command line handling.
+  @param override: if not None, we expect a dictionary with keys that will
+                   override command line options; this can be used to pass
+                   options from the scripts to generic functions
+  @param aliases: dictionary with command aliases {'alias': 'target, ...}
+  @param env_override: list of environment names which are allowed to submit
+                       default args for commands

 
   """
   # save the program name and the entire command line for later logging
 
   """
   # save the program name and the entire command line for later logging

@@ -1990,7 +2080,7 @@ def GenericMain(commands, override=None, aliases=None):
     aliases = {}
 
   try:
     aliases = {}
 
   try:

-    func, options, args = _ParseArgs(sys.argv, commands, aliases)
+    func, options, args = _ParseArgs(sys.argv, commands, aliases, env_override)

   except errors.ParameterError, err:
     result, err_msg = FormatError(err)
     ToStderr(err_msg)
   except errors.ParameterError, err:
     result, err_msg = FormatError(err)
     ToStderr(err_msg)

@@ -2142,7 +2232,7 @@ def GenericInstanceCreate(mode, opts, args):
   else:
     tags = []
 
   else:
     tags = []
 

-  utils.ForceDictType(opts.beparams, constants.BES_PARAMETER_TYPES)
+  utils.ForceDictType(opts.beparams, constants.BES_PARAMETER_COMPAT)

   utils.ForceDictType(hvparams, constants.HVS_PARAMETER_TYPES)
 
   if mode == constants.INSTANCE_CREATE:
   utils.ForceDictType(hvparams, constants.HVS_PARAMETER_TYPES)
 
   if mode == constants.INSTANCE_CREATE:

@@ -2254,7 +2344,7 @@ class _RunWhileClusterStoppedHelper:
     """
     # Pause watcher by acquiring an exclusive lock on watcher state file
     self.feedback_fn("Blocking watcher")
     """
     # Pause watcher by acquiring an exclusive lock on watcher state file
     self.feedback_fn("Blocking watcher")

-    watcher_block = utils.FileLock.Open(constants.WATCHER_STATEFILE)
+    watcher_block = utils.FileLock.Open(constants.WATCHER_LOCK_FILE)

     try:
       # TODO: Currently, this just blocks. There's no timeout.
       # TODO: Should it be a shared lock?
     try:
       # TODO: Currently, this just blocks. There's no timeout.
       # TODO: Should it be a shared lock?

@@ -2356,8 +2446,8 @@ def GenerateTable(headers, fields, separator, data,
   if unitfields is None:
     unitfields = []
 
   if unitfields is None:
     unitfields = []
 

-  numfields = utils.FieldSet(*numfields)   # pylint: disable-msg=W0142
-  unitfields = utils.FieldSet(*unitfields) # pylint: disable-msg=W0142
+  numfields = utils.FieldSet(*numfields)   # pylint: disable=W0142
+  unitfields = utils.FieldSet(*unitfields) # pylint: disable=W0142

 
   format_fields = []
   for field in fields:
 
   format_fields = []
   for field in fields:

@@ -2375,7 +2465,7 @@ def GenerateTable(headers, fields, separator, data,
 
   if separator is None:
     mlens = [0 for name in fields]
 
   if separator is None:
     mlens = [0 for name in fields]

-    format_str = ' '.join(format_fields)
+    format_str = " ".join(format_fields)

   else:
     format_str = separator.replace("%", "%%").join(format_fields)
 
   else:
     format_str = separator.replace("%", "%%").join(format_fields)
 

@@ -2414,7 +2504,7 @@ def GenerateTable(headers, fields, separator, data,
   for line in data:
     args = []
     if line is None:
   for line in data:
     args = []
     if line is None:

-      line = ['-' for _ in fields]
+      line = ["-" for _ in fields]

     for idx in range(len(fields)):
       if separator is None:
         args.append(mlens[idx])
     for idx in range(len(fields)):
       if separator is None:
         args.append(mlens[idx])

@@ -2648,26 +2738,15 @@ def GenericList(resource, fields, names, unit, separator, header, cl=None,
   @param verbose: whether to use verbose field descriptions or not
 
   """
   @param verbose: whether to use verbose field descriptions or not
 
   """

-  if cl is None:
-    cl = GetClient()
-

   if not names:
     names = None
 
   if not names:
     names = None
 

-  if (force_filter or
-      (names and len(names) == 1 and qlang.MaybeFilter(names[0]))):
-    try:
-      (filter_text, ) = names
-    except ValueError:
-      raise errors.OpPrereqError("Exactly one argument must be given as a"
-                                 " filter")
+  qfilter = qlang.MakeFilter(names, force_filter)

 
 

-    logging.debug("Parsing '%s' as filter", filter_text)
-    filter_ = qlang.ParseFilter(filter_text)
-  else:
-    filter_ = qlang.MakeSimpleFilter("name", names)
+  if cl is None:
+    cl = GetClient()

 
 

-  response = cl.Query(resource, fields, filter_)
+  response = cl.Query(resource, fields, qfilter)

 
   found_unknown = _WarnUnknownFields(response.fields)
 
 
   found_unknown = _WarnUnknownFields(response.fields)
 

@@ -2819,8 +2898,8 @@ def FormatTimestamp(ts):
   @return: a string with the formatted timestamp
 
   """
   @return: a string with the formatted timestamp
 
   """

-  if not isinstance (ts, (tuple, list)) or len(ts) != 2:
-    return '?'
+  if not isinstance(ts, (tuple, list)) or len(ts) != 2:
+    return "?"

   sec, usec = ts
   return time.strftime("%F %T", time.localtime(sec)) + ".%06d" % usec
 
   sec, usec = ts
   return time.strftime("%F %T", time.localtime(sec)) + ".%06d" % usec
 

@@ -2843,11 +2922,11 @@ def ParseTimespec(value):
   if not value:
     raise errors.OpPrereqError("Empty time specification passed")
   suffix_map = {
   if not value:
     raise errors.OpPrereqError("Empty time specification passed")
   suffix_map = {

-    's': 1,
-    'm': 60,
-    'h': 3600,
-    'd': 86400,
-    'w': 604800,
+    "s": 1,
+    "m": 60,
+    "h": 3600,
+    "d": 86400,
+    "w": 604800,

     }
   if value[-1] not in suffix_map:
     try:
     }
   if value[-1] not in suffix_map:
     try:

@@ -2896,24 +2975,24 @@ def GetOnlineNodes(nodes, cl=None, nowarn=False, secondary_ips=False,
   if cl is None:
     cl = GetClient()
 
   if cl is None:
     cl = GetClient()
 

-  filter_ = []
+  qfilter = []

 
   if nodes:
 
   if nodes:

-    filter_.append(qlang.MakeSimpleFilter("name", nodes))
+    qfilter.append(qlang.MakeSimpleFilter("name", nodes))

 
   if nodegroup is not None:
 
   if nodegroup is not None:

-    filter_.append([qlang.OP_OR, [qlang.OP_EQUAL, "group", nodegroup],
+    qfilter.append([qlang.OP_OR, [qlang.OP_EQUAL, "group", nodegroup],

                                  [qlang.OP_EQUAL, "group.uuid", nodegroup]])
 
   if filter_master:
                                  [qlang.OP_EQUAL, "group.uuid", nodegroup]])
 
   if filter_master:

-    filter_.append([qlang.OP_NOT, [qlang.OP_TRUE, "master"]])
+    qfilter.append([qlang.OP_NOT, [qlang.OP_TRUE, "master"]])

 
 

-  if filter_:
-    if len(filter_) > 1:
-      final_filter = [qlang.OP_AND] + filter_
+  if qfilter:
+    if len(qfilter) > 1:
+      final_filter = [qlang.OP_AND] + qfilter

     else:
     else:

-      assert len(filter_) == 1
-      final_filter = filter_[0]
+      assert len(qfilter) == 1
+      final_filter = qfilter[0]

   else:
     final_filter = None
 
   else:
     final_filter = None
 

@@ -2960,7 +3039,7 @@ def _ToStream(stream, txt, *args):
       stream.write(txt % args)
     else:
       stream.write(txt)
       stream.write(txt % args)
     else:
       stream.write(txt)

-    stream.write('\n')
+    stream.write("\n")

     stream.flush()
   except IOError, err:
     if err.errno == errno.EPIPE:
     stream.flush()
   except IOError, err:
     if err.errno == errno.EPIPE:

@@ -3059,13 +3138,14 @@ class JobExecutor(object):
     """
     assert self.jobs, "_ChooseJob called with empty job list"
 
     """
     assert self.jobs, "_ChooseJob called with empty job list"
 

-    result = self.cl.QueryJobs([i[2] for i in self.jobs], ["status"])
+    result = self.cl.QueryJobs([i[2] for i in self.jobs[:_CHOOSE_BATCH]],
+                               ["status"])

     assert result
 
     for job_data, status in zip(self.jobs, result):
       if (isinstance(status, list) and status and
           status[0] in (constants.JOB_STATUS_QUEUED,
     assert result
 
     for job_data, status in zip(self.jobs, result):
       if (isinstance(status, list) and status and
           status[0] in (constants.JOB_STATUS_QUEUED,

-                        constants.JOB_STATUS_WAITLOCK,
+                        constants.JOB_STATUS_WAITING,

                         constants.JOB_STATUS_CANCELING)):
         # job is still present and waiting
         continue
                         constants.JOB_STATUS_CANCELING)):
         # job is still present and waiting
         continue