opcodes: Annotate the OP_RESULT of query operations
[ganeti-local] / lib / opcodes.py
index 6d0e8aa..e266079 100644 (file)
@@ -1,7 +1,7 @@
 #
 #
 
 #
 #
 
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,344 @@ opcodes.
 
 # this are practically structures, so disable the message about too
 # few public methods:
 
 # this are practically structures, so disable the message about too
 # few public methods:
-# pylint: disable-msg=R0903
+# pylint: disable=R0903
+
+import logging
+import re
+
+from ganeti import constants
+from ganeti import errors
+from ganeti import ht
+from ganeti import objects
+from ganeti import query
+
+
+# Common opcode attributes
+
+#: output fields for a query operation
+_POutputFields = ("output_fields", ht.NoDefault, ht.TListOf(ht.TNonEmptyString),
+                  "Selected output fields")
+
+#: the shutdown timeout
+_PShutdownTimeout = \
+  ("shutdown_timeout", constants.DEFAULT_SHUTDOWN_TIMEOUT, ht.TPositiveInt,
+   "How long to wait for instance to shut down")
+
+#: the force parameter
+_PForce = ("force", False, ht.TBool, "Whether to force the operation")
+
+#: a required instance name (for single-instance LUs)
+_PInstanceName = ("instance_name", ht.NoDefault, ht.TNonEmptyString,
+                  "Instance name")
+
+#: Whether to ignore offline nodes
+_PIgnoreOfflineNodes = ("ignore_offline_nodes", False, ht.TBool,
+                        "Whether to ignore offline nodes")
+
+#: a required node name (for single-node LUs)
+_PNodeName = ("node_name", ht.NoDefault, ht.TNonEmptyString, "Node name")
+
+#: a required node group name (for single-group LUs)
+_PGroupName = ("group_name", ht.NoDefault, ht.TNonEmptyString, "Group name")
+
+#: Migration type (live/non-live)
+_PMigrationMode = ("mode", None,
+                   ht.TOr(ht.TNone, ht.TElemOf(constants.HT_MIGRATION_MODES)),
+                   "Migration mode")
+
+#: Obsolete 'live' migration mode (boolean)
+_PMigrationLive = ("live", None, ht.TMaybeBool,
+                   "Legacy setting for live migration, do not use")
+
+#: Tag type
+_PTagKind = ("kind", ht.NoDefault, ht.TElemOf(constants.VALID_TAG_TYPES), None)
+
+#: List of tag strings
+_PTags = ("tags", ht.NoDefault, ht.TListOf(ht.TNonEmptyString), None)
+
+_PForceVariant = ("force_variant", False, ht.TBool,
+                  "Whether to force an unknown OS variant")
+
+_PWaitForSync = ("wait_for_sync", True, ht.TBool,
+                 "Whether to wait for the disk to synchronize")
+
+_PIgnoreConsistency = ("ignore_consistency", False, ht.TBool,
+                       "Whether to ignore disk consistency")
+
+_PStorageName = ("name", ht.NoDefault, ht.TMaybeString, "Storage name")
+
+_PUseLocking = ("use_locking", False, ht.TBool,
+                "Whether to use synchronization")
+
+_PNameCheck = ("name_check", True, ht.TBool, "Whether to check name")
+
+_PNodeGroupAllocPolicy = \
+  ("alloc_policy", None,
+   ht.TOr(ht.TNone, ht.TElemOf(constants.VALID_ALLOC_POLICIES)),
+   "Instance allocation policy")
+
+_PGroupNodeParams = ("ndparams", None, ht.TMaybeDict,
+                     "Default node parameters for group")
+
+_PQueryWhat = ("what", ht.NoDefault, ht.TElemOf(constants.QR_VIA_OP),
+               "Resource(s) to query for")
+
+_PEarlyRelease = ("early_release", False, ht.TBool,
+                  "Whether to release locks as soon as possible")
+
+_PIpCheckDoc = "Whether to ensure instance's IP address is inactive"
+
+#: Do not remember instance state changes
+_PNoRemember = ("no_remember", False, ht.TBool,
+                "Do not remember the state change")
+
+#: Target node for instance migration/failover
+_PMigrationTargetNode = ("target_node", None, ht.TMaybeString,
+                         "Target node for shared-storage instances")
+
+_PStartupPaused = ("startup_paused", False, ht.TBool,
+                   "Pause instance at startup")
+
+_PVerbose = ("verbose", False, ht.TBool, "Verbose mode")
+
+# Parameters for cluster verification
+_PDebugSimulateErrors = ("debug_simulate_errors", False, ht.TBool,
+                         "Whether to simulate errors (useful for debugging)")
+_PErrorCodes = ("error_codes", False, ht.TBool, "Error codes")
+_PSkipChecks = ("skip_checks", ht.EmptyList,
+                ht.TListOf(ht.TElemOf(constants.VERIFY_OPTIONAL_CHECKS)),
+                "Which checks to skip")
+_PIgnoreErrors = ("ignore_errors", ht.EmptyList,
+                  ht.TListOf(ht.TElemOf(constants.CV_ALL_ECODES_STRINGS)),
+                  "List of error codes that should be treated as warnings")
+
+# Disk parameters
+_PDiskParams = ("diskparams", None,
+                ht.TOr(
+                  ht.TDictOf(ht.TElemOf(constants.DISK_TEMPLATES), ht.TDict),
+                  ht.TNone),
+                "Disk templates' parameter defaults")
+
+# Parameters for node resource model
+_PHvState = ("hv_state", None, ht.TMaybeDict, "Set hypervisor states")
+_PDiskState = ("disk_state", None, ht.TMaybeDict, "Set disk states")
+
+
+_PIgnoreIpolicy = ("ignore_ipolicy", False, ht.TBool,
+                   "Whether to ignore ipolicy violations")
+
+# Allow runtime changes while migrating
+_PAllowRuntimeChgs = ("allow_runtime_changes", True, ht.TBool,
+                      "Allow runtime changes (eg. memory ballooning)")
+
+
+#: OP_ID conversion regular expression
+_OPID_RE = re.compile("([a-z])([A-Z])")
+
+#: Utility function for L{OpClusterSetParams}
+_TestClusterOsListItem = \
+  ht.TAnd(ht.TIsLength(2), ht.TItems([
+    ht.TElemOf(constants.DDMS_VALUES),
+    ht.TNonEmptyString,
+    ]))
+
+_TestClusterOsList = ht.TMaybeListOf(_TestClusterOsListItem)
+
+# TODO: Generate check from constants.INIC_PARAMS_TYPES
+#: Utility function for testing NIC definitions
+_TestNicDef = \
+  ht.Comment("NIC parameters")(ht.TDictOf(ht.TElemOf(constants.INIC_PARAMS),
+                                          ht.TOr(ht.TNone, ht.TNonEmptyString)))
+
+_TSetParamsResultItemItems = [
+  ht.Comment("name of changed parameter")(ht.TNonEmptyString),
+  ht.Comment("new value")(ht.TAny),
+  ]
+
+_TSetParamsResult = \
+  ht.TListOf(ht.TAnd(ht.TIsLength(len(_TSetParamsResultItemItems)),
+                     ht.TItems(_TSetParamsResultItemItems)))
+
+# TODO: Generate check from constants.IDISK_PARAMS_TYPES (however, not all users
+# of this check support all parameters)
+_TDiskParams = \
+  ht.Comment("Disk parameters")(ht.TDictOf(ht.TElemOf(constants.IDISK_PARAMS),
+                                           ht.TOr(ht.TNonEmptyString, ht.TInt)))
+
+_TQueryRow = \
+  ht.TListOf(ht.TAnd(ht.TIsLength(2),
+                     ht.TItems([ht.TElemOf(constants.RS_ALL),
+                                ht.TAny])))
+
+_TQueryResult = ht.TListOf(_TQueryRow)
+
+_TOldQueryRow = ht.TListOf(ht.TAny)
+
+_TOldQueryResult = ht.TListOf(_TOldQueryRow)
+
+
+_SUMMARY_PREFIX = {
+  "CLUSTER_": "C_",
+  "GROUP_": "G_",
+  "NODE_": "N_",
+  "INSTANCE_": "I_",
+  }
+
+#: Attribute name for dependencies
+DEPEND_ATTR = "depends"
+
+#: Attribute name for comment
+COMMENT_ATTR = "comment"
+
+
+def _NameToId(name):
+  """Convert an opcode class name to an OP_ID.
+
+  @type name: string
+  @param name: the class name, as OpXxxYyy
+  @rtype: string
+  @return: the name in the OP_XXXX_YYYY format
+
+  """
+  if not name.startswith("Op"):
+    return None
+  # Note: (?<=[a-z])(?=[A-Z]) would be ideal, since it wouldn't
+  # consume any input, and hence we would just have all the elements
+  # in the list, one by one; but it seems that split doesn't work on
+  # non-consuming input, hence we have to process the input string a
+  # bit
+  name = _OPID_RE.sub(r"\1,\2", name)
+  elems = name.split(",")
+  return "_".join(n.upper() for n in elems)
+
+
+def _GenerateObjectTypeCheck(obj, fields_types):
+  """Helper to generate type checks for objects.
+
+  @param obj: The object to generate type checks
+  @param fields_types: The fields and their types as a dict
+  @return: A ht type check function
+
+  """
+  assert set(obj.GetAllSlots()) == set(fields_types.keys()), \
+    "%s != %s" % (set(obj.GetAllSlots()), set(fields_types.keys()))
+  return ht.TStrictDict(True, True, fields_types)
+
+
+_TObjFdefs = \
+    _GenerateObjectTypeCheck(objects.QueryFieldDefinition, {
+      "name": ht.TRegex(query.FIELD_NAME_RE),
+      "title": ht.TRegex(query.TITLE_RE),
+      "kind": ht.TElemOf(constants.QFT_ALL),
+      "doc": ht.TRegex(query.DOC_RE),
+      })
+
+
+def RequireFileStorage():
+  """Checks that file storage is enabled.
+
+  While it doesn't really fit into this module, L{utils} was deemed too large
+  of a dependency to be imported for just one or two functions.
+
+  @raise errors.OpPrereqError: when file storage is disabled
+
+  """
+  if not constants.ENABLE_FILE_STORAGE:
+    raise errors.OpPrereqError("File storage disabled at configure time",
+                               errors.ECODE_INVAL)
+
+
+def RequireSharedFileStorage():
+  """Checks that shared file storage is enabled.
+
+  While it doesn't really fit into this module, L{utils} was deemed too large
+  of a dependency to be imported for just one or two functions.
+
+  @raise errors.OpPrereqError: when shared file storage is disabled
+
+  """
+  if not constants.ENABLE_SHARED_FILE_STORAGE:
+    raise errors.OpPrereqError("Shared file storage disabled at"
+                               " configure time", errors.ECODE_INVAL)
+
+
+@ht.WithDesc("CheckFileStorage")
+def _CheckFileStorage(value):
+  """Ensures file storage is enabled if used.
+
+  """
+  if value == constants.DT_FILE:
+    RequireFileStorage()
+  elif value == constants.DT_SHARED_FILE:
+    RequireSharedFileStorage()
+  return True
+
+
+def _BuildDiskTemplateCheck(accept_none):
+  """Builds check for disk template.
+
+  @type accept_none: bool
+  @param accept_none: whether to accept None as a correct value
+  @rtype: callable
+
+  """
+  template_check = ht.TElemOf(constants.DISK_TEMPLATES)
+
+  if accept_none:
+    template_check = ht.TOr(template_check, ht.TNone)
+
+  return ht.TAnd(template_check, _CheckFileStorage)
+
+
+def _CheckStorageType(storage_type):
+  """Ensure a given storage type is valid.
+
+  """
+  if storage_type not in constants.VALID_STORAGE_TYPES:
+    raise errors.OpPrereqError("Unknown storage type: %s" % storage_type,
+                               errors.ECODE_INVAL)
+  if storage_type == constants.ST_FILE:
+    RequireFileStorage()
+  return True
+
+
+#: Storage type parameter
+_PStorageType = ("storage_type", ht.NoDefault, _CheckStorageType,
+                 "Storage type")
+
+
+class _AutoOpParamSlots(type):
+  """Meta class for opcode definitions.
+
+  """
+  def __new__(mcs, name, bases, attrs):
+    """Called when a class should be created.
+
+    @param mcs: The meta class
+    @param name: Name of created class
+    @param bases: Base classes
+    @type attrs: dict
+    @param attrs: Class attributes
+
+    """
+    assert "__slots__" not in attrs, \
+      "Class '%s' defines __slots__ when it should use OP_PARAMS" % name
+    assert "OP_ID" not in attrs, "Class '%s' defining OP_ID" % name
+
+    attrs["OP_ID"] = _NameToId(name)
+
+    # Always set OP_PARAMS to avoid duplicates in BaseOpCode.GetAllParams
+    params = attrs.setdefault("OP_PARAMS", [])
+
+    # Use parameter names as slots
+    slots = [pname for (pname, _, _, _) in params]
+
+    assert "OP_DSC_FIELD" not in attrs or attrs["OP_DSC_FIELD"] in slots, \
+      "Class '%s' uses unknown field in OP_DSC_FIELD" % name
+
+    attrs["__slots__"] = slots
+
+    return type.__new__(mcs, name, bases, attrs)
 
 
 class BaseOpCode(object):
 
 
 class BaseOpCode(object):
@@ -41,7 +378,9 @@ class BaseOpCode(object):
   field handling.
 
   """
   field handling.
 
   """
-  __slots__ = []
+  # pylint: disable=E1101
+  # as OP_ID is dynamically defined
+  __metaclass__ = _AutoOpParamSlots
 
   def __init__(self, **kwargs):
     """Constructor for BaseOpCode.
 
   def __init__(self, **kwargs):
     """Constructor for BaseOpCode.
@@ -106,6 +445,91 @@ class BaseOpCode(object):
       slots.extend(getattr(parent, "__slots__", []))
     return slots
 
       slots.extend(getattr(parent, "__slots__", []))
     return slots
 
+  @classmethod
+  def GetAllParams(cls):
+    """Compute list of all parameters for an opcode.
+
+    """
+    slots = []
+    for parent in cls.__mro__:
+      slots.extend(getattr(parent, "OP_PARAMS", []))
+    return slots
+
+  def Validate(self, set_defaults):
+    """Validate opcode parameters, optionally setting default values.
+
+    @type set_defaults: bool
+    @param set_defaults: Whether to set default values
+    @raise errors.OpPrereqError: When a parameter value doesn't match
+                                 requirements
+
+    """
+    for (attr_name, default, test, _) in self.GetAllParams():
+      assert test == ht.NoType or callable(test)
+
+      if not hasattr(self, attr_name):
+        if default == ht.NoDefault:
+          raise errors.OpPrereqError("Required parameter '%s.%s' missing" %
+                                     (self.OP_ID, attr_name),
+                                     errors.ECODE_INVAL)
+        elif set_defaults:
+          if callable(default):
+            dval = default()
+          else:
+            dval = default
+          setattr(self, attr_name, dval)
+
+      if test == ht.NoType:
+        # no tests here
+        continue
+
+      if set_defaults or hasattr(self, attr_name):
+        attr_val = getattr(self, attr_name)
+        if not test(attr_val):
+          logging.error("OpCode %s, parameter %s, has invalid type %s/value %s",
+                        self.OP_ID, attr_name, type(attr_val), attr_val)
+          raise errors.OpPrereqError("Parameter '%s.%s' fails validation" %
+                                     (self.OP_ID, attr_name),
+                                     errors.ECODE_INVAL)
+
+
+def _BuildJobDepCheck(relative):
+  """Builds check for job dependencies (L{DEPEND_ATTR}).
+
+  @type relative: bool
+  @param relative: Whether to accept relative job IDs (negative)
+  @rtype: callable
+
+  """
+  if relative:
+    job_id = ht.TOr(ht.TJobId, ht.TRelativeJobId)
+  else:
+    job_id = ht.TJobId
+
+  job_dep = \
+    ht.TAnd(ht.TIsLength(2),
+            ht.TItems([job_id,
+                       ht.TListOf(ht.TElemOf(constants.JOBS_FINALIZED))]))
+
+  return ht.TMaybeListOf(job_dep)
+
+
+TNoRelativeJobDependencies = _BuildJobDepCheck(False)
+
+#: List of submission status and job ID as returned by C{SubmitManyJobs}
+_TJobIdListItem = \
+  ht.TAnd(ht.TIsLength(2),
+          ht.TItems([ht.Comment("success")(ht.TBool),
+                     ht.Comment("Job ID if successful, error message"
+                                " otherwise")(ht.TOr(ht.TString,
+                                                     ht.TJobId))]))
+TJobIdList = ht.TListOf(_TJobIdListItem)
+
+#: Result containing only list of submitted jobs
+TJobIdListOnly = ht.TStrictDict(True, True, {
+  constants.JOB_IDS_KEY: ht.Comment("List of submitted jobs")(TJobIdList),
+  })
+
 
 class OpCode(BaseOpCode):
   """Abstract OpCode.
 
 class OpCode(BaseOpCode):
   """Abstract OpCode.
@@ -118,13 +542,32 @@ class OpCode(BaseOpCode):
   @cvar OP_DSC_FIELD: The name of a field whose value will be included in the
                       string returned by Summary(); see the docstring of that
                       method for details).
   @cvar OP_DSC_FIELD: The name of a field whose value will be included in the
                       string returned by Summary(); see the docstring of that
                       method for details).
+  @cvar OP_PARAMS: List of opcode attributes, the default values they should
+                   get if not already defined, and types they must match.
+  @cvar OP_RESULT: Callable to verify opcode result
+  @cvar WITH_LU: Boolean that specifies whether this should be included in
+      mcpu's dispatch table
   @ivar dry_run: Whether the LU should be run in dry-run mode, i.e. just
                  the check steps
   @ivar priority: Opcode priority for queue
 
   """
   @ivar dry_run: Whether the LU should be run in dry-run mode, i.e. just
                  the check steps
   @ivar priority: Opcode priority for queue
 
   """
-  OP_ID = "OP_ABSTRACT"
-  __slots__ = ["dry_run", "debug_level", "priority"]
+  # pylint: disable=E1101
+  # as OP_ID is dynamically defined
+  WITH_LU = True
+  OP_PARAMS = [
+    ("dry_run", None, ht.TMaybeBool, "Run checks only, don't execute"),
+    ("debug_level", None, ht.TOr(ht.TNone, ht.TPositiveInt), "Debug level"),
+    ("priority", constants.OP_PRIO_DEFAULT,
+     ht.TElemOf(constants.OP_PRIO_SUBMIT_VALID), "Opcode priority"),
+    (DEPEND_ATTR, None, _BuildJobDepCheck(True),
+     "Job dependencies; if used through ``SubmitManyJobs`` relative (negative)"
+     " job IDs can be used; see :doc:`design document <design-chained-jobs>`"
+     " for details"),
+    (COMMENT_ATTR, None, ht.TMaybeString,
+     "Comment describing the purpose of the opcode"),
+    ]
+  OP_RESULT = None
 
   def __getstate__(self):
     """Specialized getstate for opcodes.
 
   def __getstate__(self):
     """Specialized getstate for opcodes.
@@ -173,12 +616,14 @@ class OpCode(BaseOpCode):
   def Summary(self):
     """Generates a summary description of this opcode.
 
   def Summary(self):
     """Generates a summary description of this opcode.
 
-    The summary is the value of the OP_ID attribute (without the "OP_" prefix),
-    plus the value of the OP_DSC_FIELD attribute, if one was defined; this field
-    should allow to easily identify the operation (for an instance creation job,
-    e.g., it would be the instance name).
+    The summary is the value of the OP_ID attribute (without the "OP_"
+    prefix), plus the value of the OP_DSC_FIELD attribute, if one was
+    defined; this field should allow to easily identify the operation
+    (for an instance creation job, e.g., it would be the instance
+    name).
 
     """
 
     """
+    assert self.OP_ID is not None and len(self.OP_ID) > 3
     # all OP_ID start with OP_, we remove that
     txt = self.OP_ID[3:]
     field_name = getattr(self, "OP_DSC_FIELD", None)
     # all OP_ID start with OP_, we remove that
     txt = self.OP_ID[3:]
     field_name = getattr(self, "OP_DSC_FIELD", None)
@@ -189,39 +634,78 @@ class OpCode(BaseOpCode):
       txt = "%s(%s)" % (txt, field_value)
     return txt
 
       txt = "%s(%s)" % (txt, field_value)
     return txt
 
+  def TinySummary(self):
+    """Generates a compact summary description of the opcode.
+
+    """
+    assert self.OP_ID.startswith("OP_")
+
+    text = self.OP_ID[3:]
+
+    for (prefix, supplement) in _SUMMARY_PREFIX.items():
+      if text.startswith(prefix):
+        return supplement + text[len(prefix):]
+
+    return text
+
 
 # cluster opcodes
 
 
 # cluster opcodes
 
-class OpPostInitCluster(OpCode):
+class OpClusterPostInit(OpCode):
   """Post cluster initialization.
 
   This opcode does not touch the cluster at all. Its purpose is to run hooks
   after the cluster has been initialized.
 
   """
   """Post cluster initialization.
 
   This opcode does not touch the cluster at all. Its purpose is to run hooks
   after the cluster has been initialized.
 
   """
-  OP_ID = "OP_CLUSTER_POST_INIT"
-  __slots__ = []
+  OP_RESULT = ht.TBool
 
 
 
 
-class OpDestroyCluster(OpCode):
+class OpClusterDestroy(OpCode):
   """Destroy the cluster.
 
   This opcode has no other parameters. All the state is irreversibly
   lost after the execution of this opcode.
 
   """
   """Destroy the cluster.
 
   This opcode has no other parameters. All the state is irreversibly
   lost after the execution of this opcode.
 
   """
-  OP_ID = "OP_CLUSTER_DESTROY"
-  __slots__ = []
+  OP_RESULT = ht.TNonEmptyString
 
 
 
 
-class OpQueryClusterInfo(OpCode):
+class OpClusterQuery(OpCode):
   """Query cluster information."""
   """Query cluster information."""
-  OP_ID = "OP_CLUSTER_QUERY"
-  __slots__ = []
+  OP_RESULT = ht.TDictOf(ht.TNonEmptyString, ht.TAny)
+
+
+class OpClusterVerify(OpCode):
+  """Submits all jobs necessary to verify the cluster.
+
+  """
+  OP_PARAMS = [
+    _PDebugSimulateErrors,
+    _PErrorCodes,
+    _PSkipChecks,
+    _PIgnoreErrors,
+    _PVerbose,
+    ("group_name", None, ht.TMaybeString, "Group to verify")
+    ]
+  OP_RESULT = TJobIdListOnly
 
 
 
 
-class OpVerifyCluster(OpCode):
-  """Verify the cluster state.
+class OpClusterVerifyConfig(OpCode):
+  """Verify the cluster config.
+
+  """
+  OP_PARAMS = [
+    _PDebugSimulateErrors,
+    _PErrorCodes,
+    _PIgnoreErrors,
+    _PVerbose,
+    ]
+  OP_RESULT = ht.TBool
+
+
+class OpClusterVerifyGroup(OpCode):
+  """Run verify on a node group from the cluster.
 
   @type skip_checks: C{list}
   @ivar skip_checks: steps to be skipped from the verify process; this
 
   @type skip_checks: C{list}
   @ivar skip_checks: steps to be skipped from the verify process; this
@@ -230,19 +714,30 @@ class OpVerifyCluster(OpCode):
                      only L{constants.VERIFY_NPLUSONE_MEM} can be passed
 
   """
                      only L{constants.VERIFY_NPLUSONE_MEM} can be passed
 
   """
-  OP_ID = "OP_CLUSTER_VERIFY"
-  __slots__ = ["skip_checks", "verbose", "error_codes",
-               "debug_simulate_errors"]
+  OP_DSC_FIELD = "group_name"
+  OP_PARAMS = [
+    _PGroupName,
+    _PDebugSimulateErrors,
+    _PErrorCodes,
+    _PSkipChecks,
+    _PIgnoreErrors,
+    _PVerbose,
+    ]
+  OP_RESULT = ht.TBool
 
 
 
 
-class OpVerifyDisks(OpCode):
+class OpClusterVerifyDisks(OpCode):
   """Verify the cluster disks.
 
   """Verify the cluster disks.
 
-  Parameters: none
+  """
+  OP_RESULT = TJobIdListOnly
+
 
 
-  Result: a tuple of four elements:
-    - list of node names with bad data returned (unreachable, etc.)
-    - dict of node names with broken volume groups (values: error msg)
+class OpGroupVerifyDisks(OpCode):
+  """Verifies the status of all disks in a node group.
+
+  Result: a tuple of three elements:
+    - dict of node names with issues (values: error msg)
     - list of instances with degraded disks (that should be activated)
     - dict of instances with missing logical volumes (values: (node, vol)
       pairs with details about the missing volumes)
     - list of instances with degraded disks (that should be activated)
     - dict of instances with missing logical volumes (values: (node, vol)
       pairs with details about the missing volumes)
@@ -256,11 +751,19 @@ class OpVerifyDisks(OpCode):
   consideration. This might need to be revisited in the future.
 
   """
   consideration. This might need to be revisited in the future.
 
   """
-  OP_ID = "OP_CLUSTER_VERIFY_DISKS"
-  __slots__ = []
+  OP_DSC_FIELD = "group_name"
+  OP_PARAMS = [
+    _PGroupName,
+    ]
+  OP_RESULT = \
+    ht.TAnd(ht.TIsLength(3),
+            ht.TItems([ht.TDictOf(ht.TString, ht.TString),
+                       ht.TListOf(ht.TString),
+                       ht.TDictOf(ht.TString,
+                                  ht.TListOf(ht.TListOf(ht.TString)))]))
 
 
 
 
-class OpRepairDiskSizes(OpCode):
+class OpClusterRepairDiskSizes(OpCode):
   """Verify the disk sizes of the instances and fixes configuration
   mimatches.
 
   """Verify the disk sizes of the instances and fixes configuration
   mimatches.
 
@@ -276,17 +779,24 @@ class OpRepairDiskSizes(OpCode):
   @ivar instances: the list of instances to check, or empty for all instances
 
   """
   @ivar instances: the list of instances to check, or empty for all instances
 
   """
-  OP_ID = "OP_CLUSTER_REPAIR_DISK_SIZES"
-  __slots__ = ["instances"]
+  OP_PARAMS = [
+    ("instances", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), None),
+    ]
+  OP_RESULT = ht.TListOf(ht.TAnd(ht.TIsLength(3),
+                                 ht.TItems([ht.TNonEmptyString,
+                                            ht.TPositiveInt,
+                                            ht.TPositiveInt])))
 
 
 
 
-class OpQueryConfigValues(OpCode):
+class OpClusterConfigQuery(OpCode):
   """Query cluster configuration values."""
   """Query cluster configuration values."""
-  OP_ID = "OP_CLUSTER_CONFIG_QUERY"
-  __slots__ = ["output_fields"]
+  OP_PARAMS = [
+    _POutputFields
+    ]
+  OP_RESULT = ht.TListOf(ht.TAny)
 
 
 
 
-class OpRenameCluster(OpCode):
+class OpClusterRename(OpCode):
   """Rename the cluster.
 
   @type name: C{str}
   """Rename the cluster.
 
   @type name: C{str}
@@ -295,93 +805,167 @@ class OpRenameCluster(OpCode):
               address.
 
   """
               address.
 
   """
-  OP_ID = "OP_CLUSTER_RENAME"
   OP_DSC_FIELD = "name"
   OP_DSC_FIELD = "name"
-  __slots__ = ["name"]
+  OP_PARAMS = [
+    ("name", ht.NoDefault, ht.TNonEmptyString, None),
+    ]
+  OP_RESULT = ht.TNonEmptyString
 
 
 
 
-class OpSetClusterParams(OpCode):
+class OpClusterSetParams(OpCode):
   """Change the parameters of the cluster.
 
   @type vg_name: C{str} or C{None}
   @ivar vg_name: The new volume group name or None to disable LVM usage.
 
   """
   """Change the parameters of the cluster.
 
   @type vg_name: C{str} or C{None}
   @ivar vg_name: The new volume group name or None to disable LVM usage.
 
   """
-  OP_ID = "OP_CLUSTER_SET_PARAMS"
-  __slots__ = [
-    "vg_name",
-    "drbd_helper",
-    "enabled_hypervisors",
-    "hvparams",
-    "os_hvp",
-    "beparams",
-    "osparams",
-    "nicparams",
-    "ndparams",
-    "candidate_pool_size",
-    "maintain_node_health",
-    "uid_pool",
-    "add_uids",
-    "remove_uids",
-    "default_iallocator",
-    "reserved_lvs",
-    "hidden_os",
-    "blacklisted_os",
-    "prealloc_wipe_disks",
-    ]
-
-
-class OpRedistributeConfig(OpCode):
+  OP_PARAMS = [
+    _PHvState,
+    _PDiskState,
+    ("vg_name", None, ht.TMaybeString, "Volume group name"),
+    ("enabled_hypervisors", None,
+     ht.TOr(ht.TAnd(ht.TListOf(ht.TElemOf(constants.HYPER_TYPES)), ht.TTrue),
+            ht.TNone),
+     "List of enabled hypervisors"),
+    ("hvparams", None, ht.TOr(ht.TDictOf(ht.TNonEmptyString, ht.TDict),
+                              ht.TNone),
+     "Cluster-wide hypervisor parameter defaults, hypervisor-dependent"),
+    ("beparams", None, ht.TOr(ht.TDict, ht.TNone),
+     "Cluster-wide backend parameter defaults"),
+    ("os_hvp", None, ht.TOr(ht.TDictOf(ht.TNonEmptyString, ht.TDict),
+                            ht.TNone),
+     "Cluster-wide per-OS hypervisor parameter defaults"),
+    ("osparams", None, ht.TOr(ht.TDictOf(ht.TNonEmptyString, ht.TDict),
+                              ht.TNone),
+     "Cluster-wide OS parameter defaults"),
+    _PDiskParams,
+    ("candidate_pool_size", None, ht.TOr(ht.TStrictPositiveInt, ht.TNone),
+     "Master candidate pool size"),
+    ("uid_pool", None, ht.NoType,
+     "Set UID pool, must be list of lists describing UID ranges (two items,"
+     " start and end inclusive)"),
+    ("add_uids", None, ht.NoType,
+     "Extend UID pool, must be list of lists describing UID ranges (two"
+     " items, start and end inclusive) to be added"),
+    ("remove_uids", None, ht.NoType,
+     "Shrink UID pool, must be list of lists describing UID ranges (two"
+     " items, start and end inclusive) to be removed"),
+    ("maintain_node_health", None, ht.TMaybeBool,
+     "Whether to automatically maintain node health"),
+    ("prealloc_wipe_disks", None, ht.TMaybeBool,
+     "Whether to wipe disks before allocating them to instances"),
+    ("nicparams", None, ht.TMaybeDict, "Cluster-wide NIC parameter defaults"),
+    ("ndparams", None, ht.TMaybeDict, "Cluster-wide node parameter defaults"),
+    ("ipolicy", None, ht.TMaybeDict,
+     "Cluster-wide :ref:`instance policy <rapi-ipolicy>` specs"),
+    ("drbd_helper", None, ht.TOr(ht.TString, ht.TNone), "DRBD helper program"),
+    ("default_iallocator", None, ht.TOr(ht.TString, ht.TNone),
+     "Default iallocator for cluster"),
+    ("master_netdev", None, ht.TOr(ht.TString, ht.TNone),
+     "Master network device"),
+    ("master_netmask", None, ht.TOr(ht.TInt, ht.TNone),
+     "Netmask of the master IP"),
+    ("reserved_lvs", None, ht.TMaybeListOf(ht.TNonEmptyString),
+     "List of reserved LVs"),
+    ("hidden_os", None, _TestClusterOsList,
+     "Modify list of hidden operating systems. Each modification must have"
+     " two items, the operation and the OS name. The operation can be"
+     " ``%s`` or ``%s``." % (constants.DDM_ADD, constants.DDM_REMOVE)),
+    ("blacklisted_os", None, _TestClusterOsList,
+     "Modify list of blacklisted operating systems. Each modification must have"
+     " two items, the operation and the OS name. The operation can be"
+     " ``%s`` or ``%s``." % (constants.DDM_ADD, constants.DDM_REMOVE)),
+    ("use_external_mip_script", None, ht.TMaybeBool,
+     "Whether to use an external master IP address setup script"),
+    ]
+  OP_RESULT = ht.TNone
+
+
+class OpClusterRedistConf(OpCode):
   """Force a full push of the cluster configuration.
 
   """
   """Force a full push of the cluster configuration.
 
   """
-  OP_ID = "OP_CLUSTER_REDIST_CONF"
-  __slots__ = []
+  OP_RESULT = ht.TNone
+
+
+class OpClusterActivateMasterIp(OpCode):
+  """Activate the master IP on the master node.
+
+  """
+  OP_RESULT = ht.TNone
+
+
+class OpClusterDeactivateMasterIp(OpCode):
+  """Deactivate the master IP on the master node.
+
+  """
+  OP_RESULT = ht.TNone
 
 
 class OpQuery(OpCode):
   """Query for resources/items.
 
 
 
 class OpQuery(OpCode):
   """Query for resources/items.
 
-  @ivar what: Resources to query for, must be one of L{constants.QR_OP_QUERY}
+  @ivar what: Resources to query for, must be one of L{constants.QR_VIA_OP}
   @ivar fields: List of fields to retrieve
   @ivar fields: List of fields to retrieve
-  @ivar filter: Query filter
+  @ivar qfilter: Query filter
 
   """
 
   """
-  OP_ID = "OP_QUERY"
-  __slots__ = [
-    "what",
-    "fields",
-    "filter",
+  OP_DSC_FIELD = "what"
+  OP_PARAMS = [
+    _PQueryWhat,
+    _PUseLocking,
+    ("fields", ht.NoDefault, ht.TListOf(ht.TNonEmptyString),
+     "Requested fields"),
+    ("qfilter", None, ht.TOr(ht.TNone, ht.TListOf),
+     "Query filter"),
     ]
     ]
+  OP_RESULT = \
+      _GenerateObjectTypeCheck(objects.QueryResponse, {
+        "fields": ht.TListOf(_TObjFdefs),
+        "data": _TQueryResult,
+        })
 
 
 class OpQueryFields(OpCode):
   """Query for available resource/item fields.
 
 
 
 class OpQueryFields(OpCode):
   """Query for available resource/item fields.
 
-  @ivar what: Resources to query for, must be one of L{constants.QR_OP_QUERY}
+  @ivar what: Resources to query for, must be one of L{constants.QR_VIA_OP}
   @ivar fields: List of fields to retrieve
 
   """
   @ivar fields: List of fields to retrieve
 
   """
-  OP_ID = "OP_QUERY_FIELDS"
-  __slots__ = [
-    "what",
-    "fields",
+  OP_DSC_FIELD = "what"
+  OP_PARAMS = [
+    _PQueryWhat,
+    ("fields", None, ht.TMaybeListOf(ht.TNonEmptyString),
+     "Requested fields; if not given, all are returned"),
     ]
     ]
+  OP_RESULT = \
+      _GenerateObjectTypeCheck(objects.QueryFieldsResponse, {
+        "fields": ht.TListOf(_TObjFdefs),
+        })
 
 
 
 
-class OpOutOfBand(OpCode):
+class OpOobCommand(OpCode):
   """Interact with OOB."""
   """Interact with OOB."""
-  OP_ID = "OP_OUT_OF_BAND"
-  __slots__ = [
-    "node_name",
-    "command",
-    "timeout",
+  OP_PARAMS = [
+    ("node_names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "List of nodes to run the OOB command against"),
+    ("command", None, ht.TElemOf(constants.OOB_COMMANDS),
+     "OOB command to be run"),
+    ("timeout", constants.OOB_TIMEOUT, ht.TInt,
+     "Timeout before the OOB helper will be terminated"),
+    ("ignore_status", False, ht.TBool,
+     "Ignores the node offline status for power off"),
+    ("power_delay", constants.OOB_POWER_DELAY, ht.TPositiveFloat,
+     "Time in seconds to wait between powering on nodes"),
     ]
     ]
+  # Fixme: Make it more specific with all the special cases in LUOobCommand
+  OP_RESULT = _TQueryResult
 
 
 # node opcodes
 
 
 
 # node opcodes
 
-class OpRemoveNode(OpCode):
+class OpNodeRemove(OpCode):
   """Remove a node.
 
   @type node_name: C{str}
   """Remove a node.
 
   @type node_name: C{str}
@@ -389,12 +973,14 @@ class OpRemoveNode(OpCode):
                    instances on it, the operation will fail.
 
   """
                    instances on it, the operation will fail.
 
   """
-  OP_ID = "OP_NODE_REMOVE"
   OP_DSC_FIELD = "node_name"
   OP_DSC_FIELD = "node_name"
-  __slots__ = ["node_name"]
+  OP_PARAMS = [
+    _PNodeName,
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpAddNode(OpCode):
+class OpNodeAdd(OpCode):
   """Add a node to the cluster.
 
   @type node_name: C{str}
   """Add a node to the cluster.
 
   @type node_name: C{str}
@@ -422,107 +1008,151 @@ class OpAddNode(OpCode):
   @ivar master_capable: The master_capable node attribute
 
   """
   @ivar master_capable: The master_capable node attribute
 
   """
-  OP_ID = "OP_NODE_ADD"
   OP_DSC_FIELD = "node_name"
   OP_DSC_FIELD = "node_name"
-  __slots__ = ["node_name", "primary_ip", "secondary_ip", "readd", "group",
-               "vm_capable", "master_capable", "ndparams"]
+  OP_PARAMS = [
+    _PNodeName,
+    _PHvState,
+    _PDiskState,
+    ("primary_ip", None, ht.NoType, "Primary IP address"),
+    ("secondary_ip", None, ht.TMaybeString, "Secondary IP address"),
+    ("readd", False, ht.TBool, "Whether node is re-added to cluster"),
+    ("group", None, ht.TMaybeString, "Initial node group"),
+    ("master_capable", None, ht.TMaybeBool,
+     "Whether node can become master or master candidate"),
+    ("vm_capable", None, ht.TMaybeBool,
+     "Whether node can host instances"),
+    ("ndparams", None, ht.TMaybeDict, "Node parameters"),
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpQueryNodes(OpCode):
+class OpNodeQuery(OpCode):
   """Compute the list of nodes."""
   """Compute the list of nodes."""
-  OP_ID = "OP_NODE_QUERY"
-  __slots__ = ["output_fields", "names", "use_locking"]
+  OP_PARAMS = [
+    _POutputFields,
+    _PUseLocking,
+    ("names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Empty list to query all nodes, node names otherwise"),
+    ]
+  OP_RESULT = _TOldQueryResult
 
 
 
 
-class OpQueryNodeVolumes(OpCode):
+class OpNodeQueryvols(OpCode):
   """Get list of volumes on node."""
   """Get list of volumes on node."""
-  OP_ID = "OP_NODE_QUERYVOLS"
-  __slots__ = ["nodes", "output_fields"]
+  OP_PARAMS = [
+    _POutputFields,
+    ("nodes", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Empty list to query all nodes, node names otherwise"),
+    ]
+  OP_RESULT = ht.TListOf(ht.TAny)
 
 
 
 
-class OpQueryNodeStorage(OpCode):
+class OpNodeQueryStorage(OpCode):
   """Get information on storage for node(s)."""
   """Get information on storage for node(s)."""
-  OP_ID = "OP_NODE_QUERY_STORAGE"
-  __slots__ = [
-    "nodes",
-    "storage_type",
-    "name",
-    "output_fields",
+  OP_PARAMS = [
+    _POutputFields,
+    _PStorageType,
+    ("nodes", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), "List of nodes"),
+    ("name", None, ht.TMaybeString, "Storage name"),
     ]
     ]
+  OP_RESULT = _TOldQueryResult
 
 
 
 
-class OpModifyNodeStorage(OpCode):
+class OpNodeModifyStorage(OpCode):
   """Modifies the properies of a storage unit"""
   """Modifies the properies of a storage unit"""
-  OP_ID = "OP_NODE_MODIFY_STORAGE"
-  __slots__ = [
-    "node_name",
-    "storage_type",
-    "name",
-    "changes",
+  OP_PARAMS = [
+    _PNodeName,
+    _PStorageType,
+    _PStorageName,
+    ("changes", ht.NoDefault, ht.TDict, "Requested changes"),
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 class OpRepairNodeStorage(OpCode):
   """Repairs the volume group on a node."""
 
 
 class OpRepairNodeStorage(OpCode):
   """Repairs the volume group on a node."""
-  OP_ID = "OP_REPAIR_NODE_STORAGE"
   OP_DSC_FIELD = "node_name"
   OP_DSC_FIELD = "node_name"
-  __slots__ = [
-    "node_name",
-    "storage_type",
-    "name",
-    "ignore_consistency",
+  OP_PARAMS = [
+    _PNodeName,
+    _PStorageType,
+    _PStorageName,
+    _PIgnoreConsistency,
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpSetNodeParams(OpCode):
+class OpNodeSetParams(OpCode):
   """Change the parameters of a node."""
   """Change the parameters of a node."""
-  OP_ID = "OP_NODE_SET_PARAMS"
   OP_DSC_FIELD = "node_name"
   OP_DSC_FIELD = "node_name"
-  __slots__ = [
-    "node_name",
-    "force",
-    "master_candidate",
-    "offline",
-    "drained",
-    "auto_promote",
-    "master_capable",
-    "vm_capable",
-    "secondary_ip",
-    "ndparams",
+  OP_PARAMS = [
+    _PNodeName,
+    _PForce,
+    _PHvState,
+    _PDiskState,
+    ("master_candidate", None, ht.TMaybeBool,
+     "Whether the node should become a master candidate"),
+    ("offline", None, ht.TMaybeBool,
+     "Whether the node should be marked as offline"),
+    ("drained", None, ht.TMaybeBool,
+     "Whether the node should be marked as drained"),
+    ("auto_promote", False, ht.TBool,
+     "Whether node(s) should be promoted to master candidate if necessary"),
+    ("master_capable", None, ht.TMaybeBool,
+     "Denote whether node can become master or master candidate"),
+    ("vm_capable", None, ht.TMaybeBool,
+     "Denote whether node can host instances"),
+    ("secondary_ip", None, ht.TMaybeString,
+     "Change node's secondary IP address"),
+    ("ndparams", None, ht.TMaybeDict, "Set node parameters"),
+    ("powered", None, ht.TMaybeBool,
+     "Whether the node should be marked as powered"),
     ]
     ]
+  OP_RESULT = _TSetParamsResult
 
 
 
 
-class OpPowercycleNode(OpCode):
+class OpNodePowercycle(OpCode):
   """Tries to powercycle a node."""
   """Tries to powercycle a node."""
-  OP_ID = "OP_NODE_POWERCYCLE"
   OP_DSC_FIELD = "node_name"
   OP_DSC_FIELD = "node_name"
-  __slots__ = [
-    "node_name",
-    "force",
+  OP_PARAMS = [
+    _PNodeName,
+    _PForce,
     ]
     ]
+  OP_RESULT = ht.TMaybeString
 
 
 
 
-class OpMigrateNode(OpCode):
+class OpNodeMigrate(OpCode):
   """Migrate all instances from a node."""
   """Migrate all instances from a node."""
-  OP_ID = "OP_NODE_MIGRATE"
   OP_DSC_FIELD = "node_name"
   OP_DSC_FIELD = "node_name"
-  __slots__ = [
-    "node_name",
-    "mode",
-    "live",
+  OP_PARAMS = [
+    _PNodeName,
+    _PMigrationMode,
+    _PMigrationLive,
+    _PMigrationTargetNode,
+    _PAllowRuntimeChgs,
+    _PIgnoreIpolicy,
+    ("iallocator", None, ht.TMaybeString,
+     "Iallocator for deciding the target node for shared-storage instances"),
     ]
     ]
+  OP_RESULT = TJobIdListOnly
 
 
 
 
-class OpNodeEvacuationStrategy(OpCode):
-  """Compute the evacuation strategy for a list of nodes."""
-  OP_ID = "OP_NODE_EVAC_STRATEGY"
-  OP_DSC_FIELD = "nodes"
-  __slots__ = ["nodes", "iallocator", "remote_node"]
+class OpNodeEvacuate(OpCode):
+  """Evacuate instances off a number of nodes."""
+  OP_DSC_FIELD = "node_name"
+  OP_PARAMS = [
+    _PEarlyRelease,
+    _PNodeName,
+    ("remote_node", None, ht.TMaybeString, "New secondary node"),
+    ("iallocator", None, ht.TMaybeString, "Iallocator for computing solution"),
+    ("mode", ht.NoDefault, ht.TElemOf(constants.NODE_EVAC_MODES),
+     "Node evacuation mode"),
+    ]
+  OP_RESULT = TJobIdListOnly
 
 
 # instance opcodes
 
 
 
 # instance opcodes
 
-class OpCreateInstance(OpCode):
+class OpInstanceCreate(OpCode):
   """Create an instance.
 
   @ivar instance_name: Instance name
   """Create an instance.
 
   @ivar instance_name: Instance name
@@ -534,98 +1164,179 @@ class OpCreateInstance(OpCode):
     (remote import only)
 
   """
     (remote import only)
 
   """
-  OP_ID = "OP_INSTANCE_CREATE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name",
-    "os_type", "force_variant", "no_install",
-    "pnode", "disk_template", "snode", "mode",
-    "disks", "nics",
-    "src_node", "src_path", "start", "identify_defaults",
-    "wait_for_sync", "ip_check", "name_check",
-    "file_storage_dir", "file_driver",
-    "iallocator",
-    "hypervisor", "hvparams", "beparams", "osparams",
-    "source_handshake",
-    "source_x509_ca",
-    "source_instance_name",
-    "source_shutdown_timeout",
-    ]
-
-
-class OpReinstallInstance(OpCode):
+  OP_PARAMS = [
+    _PInstanceName,
+    _PForceVariant,
+    _PWaitForSync,
+    _PNameCheck,
+    _PIgnoreIpolicy,
+    ("beparams", ht.EmptyDict, ht.TDict, "Backend parameters for instance"),
+    ("disks", ht.NoDefault, ht.TListOf(_TDiskParams),
+     "Disk descriptions, for example ``[{\"%s\": 100}, {\"%s\": 5}]``;"
+     " each disk definition must contain a ``%s`` value and"
+     " can contain an optional ``%s`` value denoting the disk access mode"
+     " (%s)" %
+     (constants.IDISK_SIZE, constants.IDISK_SIZE, constants.IDISK_SIZE,
+      constants.IDISK_MODE,
+      " or ".join("``%s``" % i for i in sorted(constants.DISK_ACCESS_SET)))),
+    ("disk_template", ht.NoDefault, _BuildDiskTemplateCheck(True),
+     "Disk template"),
+    ("file_driver", None, ht.TOr(ht.TNone, ht.TElemOf(constants.FILE_DRIVER)),
+     "Driver for file-backed disks"),
+    ("file_storage_dir", None, ht.TMaybeString,
+     "Directory for storing file-backed disks"),
+    ("hvparams", ht.EmptyDict, ht.TDict,
+     "Hypervisor parameters for instance, hypervisor-dependent"),
+    ("hypervisor", None, ht.TMaybeString, "Hypervisor"),
+    ("iallocator", None, ht.TMaybeString,
+     "Iallocator for deciding which node(s) to use"),
+    ("identify_defaults", False, ht.TBool,
+     "Reset instance parameters to default if equal"),
+    ("ip_check", True, ht.TBool, _PIpCheckDoc),
+    ("mode", ht.NoDefault, ht.TElemOf(constants.INSTANCE_CREATE_MODES),
+     "Instance creation mode"),
+    ("nics", ht.NoDefault, ht.TListOf(_TestNicDef),
+     "List of NIC (network interface) definitions, for example"
+     " ``[{}, {}, {\"%s\": \"198.51.100.4\"}]``; each NIC definition can"
+     " contain the optional values %s" %
+     (constants.INIC_IP,
+      ", ".join("``%s``" % i for i in sorted(constants.INIC_PARAMS)))),
+    ("no_install", None, ht.TMaybeBool,
+     "Do not install the OS (will disable automatic start)"),
+    ("osparams", ht.EmptyDict, ht.TDict, "OS parameters for instance"),
+    ("os_type", None, ht.TMaybeString, "Operating system"),
+    ("pnode", None, ht.TMaybeString, "Primary node"),
+    ("snode", None, ht.TMaybeString, "Secondary node"),
+    ("source_handshake", None, ht.TOr(ht.TList, ht.TNone),
+     "Signed handshake from source (remote import only)"),
+    ("source_instance_name", None, ht.TMaybeString,
+     "Source instance name (remote import only)"),
+    ("source_shutdown_timeout", constants.DEFAULT_SHUTDOWN_TIMEOUT,
+     ht.TPositiveInt,
+     "How long source instance was given to shut down (remote import only)"),
+    ("source_x509_ca", None, ht.TMaybeString,
+     "Source X509 CA in PEM format (remote import only)"),
+    ("src_node", None, ht.TMaybeString, "Source node for import"),
+    ("src_path", None, ht.TMaybeString, "Source directory for import"),
+    ("start", True, ht.TBool, "Whether to start instance after creation"),
+    ("tags", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), "Instance tags"),
+    ]
+  OP_RESULT = ht.Comment("instance nodes")(ht.TListOf(ht.TNonEmptyString))
+
+
+class OpInstanceReinstall(OpCode):
   """Reinstall an instance's OS."""
   """Reinstall an instance's OS."""
-  OP_ID = "OP_INSTANCE_REINSTALL"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "os_type", "force_variant", "osparams"]
+  OP_PARAMS = [
+    _PInstanceName,
+    _PForceVariant,
+    ("os_type", None, ht.TMaybeString, "Instance operating system"),
+    ("osparams", None, ht.TMaybeDict, "Temporary OS parameters"),
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpRemoveInstance(OpCode):
+class OpInstanceRemove(OpCode):
   """Remove an instance."""
   """Remove an instance."""
-  OP_ID = "OP_INSTANCE_REMOVE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name",
-    "ignore_failures",
-    "shutdown_timeout",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PShutdownTimeout,
+    ("ignore_failures", False, ht.TBool,
+     "Whether to ignore failures during removal"),
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpRenameInstance(OpCode):
+class OpInstanceRename(OpCode):
   """Rename an instance."""
   """Rename an instance."""
-  OP_ID = "OP_INSTANCE_RENAME"
-  __slots__ = [
-    "instance_name", "ip_check", "new_name", "name_check",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PNameCheck,
+    ("new_name", ht.NoDefault, ht.TNonEmptyString, "New instance name"),
+    ("ip_check", False, ht.TBool, _PIpCheckDoc),
     ]
     ]
+  OP_RESULT = ht.Comment("New instance name")(ht.TNonEmptyString)
 
 
 
 
-class OpStartupInstance(OpCode):
+class OpInstanceStartup(OpCode):
   """Startup an instance."""
   """Startup an instance."""
-  OP_ID = "OP_INSTANCE_STARTUP"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "force", "hvparams", "beparams", "ignore_offline_nodes",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PForce,
+    _PIgnoreOfflineNodes,
+    ("hvparams", ht.EmptyDict, ht.TDict,
+     "Temporary hypervisor parameters, hypervisor-dependent"),
+    ("beparams", ht.EmptyDict, ht.TDict, "Temporary backend parameters"),
+    _PNoRemember,
+    _PStartupPaused,
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpShutdownInstance(OpCode):
+class OpInstanceShutdown(OpCode):
   """Shutdown an instance."""
   """Shutdown an instance."""
-  OP_ID = "OP_INSTANCE_SHUTDOWN"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "timeout", "ignore_offline_nodes",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PIgnoreOfflineNodes,
+    ("timeout", constants.DEFAULT_SHUTDOWN_TIMEOUT, ht.TPositiveInt,
+     "How long to wait for instance to shut down"),
+    _PNoRemember,
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpRebootInstance(OpCode):
+class OpInstanceReboot(OpCode):
   """Reboot an instance."""
   """Reboot an instance."""
-  OP_ID = "OP_INSTANCE_REBOOT"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "reboot_type", "ignore_secondaries", "shutdown_timeout",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PShutdownTimeout,
+    ("ignore_secondaries", False, ht.TBool,
+     "Whether to start the instance even if secondary disks are failing"),
+    ("reboot_type", ht.NoDefault, ht.TElemOf(constants.REBOOT_TYPES),
+     "How to reboot instance"),
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpReplaceDisks(OpCode):
+class OpInstanceReplaceDisks(OpCode):
   """Replace the disks of an instance."""
   """Replace the disks of an instance."""
-  OP_ID = "OP_INSTANCE_REPLACE_DISKS"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "remote_node", "mode", "disks", "iallocator",
-    "early_release",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PEarlyRelease,
+    _PIgnoreIpolicy,
+    ("mode", ht.NoDefault, ht.TElemOf(constants.REPLACE_MODES),
+     "Replacement mode"),
+    ("disks", ht.EmptyList, ht.TListOf(ht.TPositiveInt),
+     "Disk indexes"),
+    ("remote_node", None, ht.TMaybeString, "New secondary node"),
+    ("iallocator", None, ht.TMaybeString,
+     "Iallocator for deciding new secondary node"),
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpFailoverInstance(OpCode):
+class OpInstanceFailover(OpCode):
   """Failover an instance."""
   """Failover an instance."""
-  OP_ID = "OP_INSTANCE_FAILOVER"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "ignore_consistency", "shutdown_timeout",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PShutdownTimeout,
+    _PIgnoreConsistency,
+    _PMigrationTargetNode,
+    _PIgnoreIpolicy,
+    ("iallocator", None, ht.TMaybeString,
+     "Iallocator for deciding the target node for shared-storage instances"),
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpMigrateInstance(OpCode):
+class OpInstanceMigrate(OpCode):
   """Migrate an instance.
 
   This migrates (without shutting down an instance) to its secondary
   """Migrate an instance.
 
   This migrates (without shutting down an instance) to its secondary
@@ -635,12 +1346,25 @@ class OpMigrateInstance(OpCode):
   @ivar mode: the migration mode (live, non-live or None for auto)
 
   """
   @ivar mode: the migration mode (live, non-live or None for auto)
 
   """
-  OP_ID = "OP_INSTANCE_MIGRATE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "mode", "cleanup", "live"]
+  OP_PARAMS = [
+    _PInstanceName,
+    _PMigrationMode,
+    _PMigrationLive,
+    _PMigrationTargetNode,
+    _PAllowRuntimeChgs,
+    _PIgnoreIpolicy,
+    ("cleanup", False, ht.TBool,
+     "Whether a previously failed migration should be cleaned up"),
+    ("iallocator", None, ht.TMaybeString,
+     "Iallocator for deciding the target node for shared-storage instances"),
+    ("allow_failover", False, ht.TBool,
+     "Whether we can fallback to failover if migration is not possible"),
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpMoveInstance(OpCode):
+class OpInstanceMove(OpCode):
   """Move an instance.
 
   This move (with shutting down an instance and data copying) to an
   """Move an instance.
 
   This move (with shutting down an instance and data copying) to an
@@ -650,118 +1374,313 @@ class OpMoveInstance(OpCode):
   @ivar target_node: the destination node
 
   """
   @ivar target_node: the destination node
 
   """
-  OP_ID = "OP_INSTANCE_MOVE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "target_node", "shutdown_timeout",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PShutdownTimeout,
+    _PIgnoreIpolicy,
+    ("target_node", ht.NoDefault, ht.TNonEmptyString, "Target node"),
+    _PIgnoreConsistency,
     ]
     ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpConnectConsole(OpCode):
+class OpInstanceConsole(OpCode):
   """Connect to an instance's console."""
   """Connect to an instance's console."""
-  OP_ID = "OP_INSTANCE_CONSOLE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name"]
+  OP_PARAMS = [
+    _PInstanceName
+    ]
+  OP_RESULT = ht.TDict
 
 
 
 
-class OpActivateInstanceDisks(OpCode):
+class OpInstanceActivateDisks(OpCode):
   """Activate an instance's disks."""
   """Activate an instance's disks."""
-  OP_ID = "OP_INSTANCE_ACTIVATE_DISKS"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "ignore_size"]
+  OP_PARAMS = [
+    _PInstanceName,
+    ("ignore_size", False, ht.TBool, "Whether to ignore recorded size"),
+    ]
+  OP_RESULT = ht.TListOf(ht.TAnd(ht.TIsLength(3),
+                                 ht.TItems([ht.TNonEmptyString,
+                                            ht.TNonEmptyString,
+                                            ht.TNonEmptyString])))
 
 
 
 
-class OpDeactivateInstanceDisks(OpCode):
+class OpInstanceDeactivateDisks(OpCode):
   """Deactivate an instance's disks."""
   """Deactivate an instance's disks."""
-  OP_ID = "OP_INSTANCE_DEACTIVATE_DISKS"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name"]
+  OP_PARAMS = [
+    _PInstanceName,
+    _PForce,
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpRecreateInstanceDisks(OpCode):
-  """Deactivate an instance's disks."""
-  OP_ID = "OP_INSTANCE_RECREATE_DISKS"
+class OpInstanceRecreateDisks(OpCode):
+  """Recreate an instance's disks."""
+  _TDiskChanges = \
+    ht.TAnd(ht.TIsLength(2),
+            ht.TItems([ht.Comment("Disk index")(ht.TPositiveInt),
+                       ht.Comment("Parameters")(_TDiskParams)]))
+
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "disks"]
+  OP_PARAMS = [
+    _PInstanceName,
+    ("disks", ht.EmptyList,
+     ht.TOr(ht.TListOf(ht.TPositiveInt), ht.TListOf(_TDiskChanges)),
+     "List of disk indexes (deprecated) or a list of tuples containing a disk"
+     " index and a possibly empty dictionary with disk parameter changes"),
+    ("nodes", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "New instance nodes, if relocation is desired"),
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpQueryInstances(OpCode):
+class OpInstanceQuery(OpCode):
   """Compute the list of instances."""
   """Compute the list of instances."""
-  OP_ID = "OP_INSTANCE_QUERY"
-  __slots__ = ["output_fields", "names", "use_locking"]
+  OP_PARAMS = [
+    _POutputFields,
+    _PUseLocking,
+    ("names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Empty list to query all instances, instance names otherwise"),
+    ]
+  OP_RESULT = _TOldQueryResult
 
 
 
 
-class OpQueryInstanceData(OpCode):
+class OpInstanceQueryData(OpCode):
   """Compute the run-time status of instances."""
   """Compute the run-time status of instances."""
-  OP_ID = "OP_INSTANCE_QUERY_DATA"
-  __slots__ = ["instances", "static"]
+  OP_PARAMS = [
+    _PUseLocking,
+    ("instances", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Instance names"),
+    ("static", False, ht.TBool,
+     "Whether to only return configuration data without querying"
+     " nodes"),
+    ]
+  OP_RESULT = ht.TDictOf(ht.TNonEmptyString, ht.TDict)
+
+
+def _TestInstSetParamsModList(fn):
+  """Generates a check for modification lists.
+
+  """
+  # Old format
+  # TODO: Remove in version 2.8 including support in LUInstanceSetParams
+  old_mod_item_fn = \
+    ht.TAnd(ht.TIsLength(2), ht.TItems([
+      ht.TOr(ht.TElemOf(constants.DDMS_VALUES), ht.TPositiveInt),
+      fn,
+      ]))
+
+  # New format, supporting adding/removing disks/NICs at arbitrary indices
+  mod_item_fn = \
+    ht.TAnd(ht.TIsLength(3), ht.TItems([
+      ht.TElemOf(constants.DDMS_VALUES_WITH_MODIFY),
+      ht.Comment("Disk index, can be negative, e.g. -1 for last disk")(ht.TInt),
+      fn,
+      ]))
 
 
+  return ht.TOr(ht.Comment("Recommended")(ht.TListOf(mod_item_fn)),
+                ht.Comment("Deprecated")(ht.TListOf(old_mod_item_fn)))
+
+
+class OpInstanceSetParams(OpCode):
+  """Change the parameters of an instance.
+
+  """
+  TestNicModifications = _TestInstSetParamsModList(_TestNicDef)
+  TestDiskModifications = _TestInstSetParamsModList(_TDiskParams)
 
 
-class OpSetInstanceParams(OpCode):
-  """Change the parameters of an instance."""
-  OP_ID = "OP_INSTANCE_SET_PARAMS"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name",
-    "hvparams", "beparams", "osparams", "force",
-    "nics", "disks", "disk_template",
-    "remote_node", "os_name", "force_variant",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PForce,
+    _PForceVariant,
+    _PIgnoreIpolicy,
+    ("nics", ht.EmptyList, TestNicModifications,
+     "List of NIC changes. Each item is of the form ``(op, index, settings)``."
+     " ``op`` is one of ``%s``, ``%s`` or ``%s``. ``index`` can be either -1 to"
+     " refer to the last position, or a zero-based index number. A deprecated"
+     " version of this parameter used the form ``(op, settings)``, where "
+     " ``op`` can be ``%s`` to add a new NIC with the specified settings,"
+     " ``%s`` to remove the last NIC or a number to modify the settings"
+     " of the NIC with that index." %
+     (constants.DDM_ADD, constants.DDM_MODIFY, constants.DDM_REMOVE,
+      constants.DDM_ADD, constants.DDM_REMOVE)),
+    ("disks", ht.EmptyList, TestDiskModifications,
+     "List of disk changes. See ``nics``."),
+    ("beparams", ht.EmptyDict, ht.TDict, "Per-instance backend parameters"),
+    ("runtime_mem", None, ht.TMaybeStrictPositiveInt, "New runtime memory"),
+    ("hvparams", ht.EmptyDict, ht.TDict,
+     "Per-instance hypervisor parameters, hypervisor-dependent"),
+    ("disk_template", None, ht.TOr(ht.TNone, _BuildDiskTemplateCheck(False)),
+     "Disk template for instance"),
+    ("remote_node", None, ht.TMaybeString,
+     "Secondary node (used when changing disk template)"),
+    ("os_name", None, ht.TMaybeString,
+     "Change instance's OS name. Does not reinstall the instance."),
+    ("osparams", None, ht.TMaybeDict, "Per-instance OS parameters"),
+    ("wait_for_sync", True, ht.TBool,
+     "Whether to wait for the disk to synchronize, when changing template"),
+    ("offline", None, ht.TMaybeBool, "Whether to mark instance as offline"),
     ]
     ]
+  OP_RESULT = _TSetParamsResult
 
 
 
 
-class OpGrowDisk(OpCode):
+class OpInstanceGrowDisk(OpCode):
   """Grow a disk of an instance."""
   """Grow a disk of an instance."""
-  OP_ID = "OP_INSTANCE_GROW_DISK"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "disk", "amount", "wait_for_sync",
+  OP_PARAMS = [
+    _PInstanceName,
+    _PWaitForSync,
+    ("disk", ht.NoDefault, ht.TInt, "Disk index"),
+    ("amount", ht.NoDefault, ht.TInt,
+     "Amount of disk space to add (megabytes)"),
+    ]
+  OP_RESULT = ht.TNone
+
+
+class OpInstanceChangeGroup(OpCode):
+  """Moves an instance to another node group."""
+  OP_DSC_FIELD = "instance_name"
+  OP_PARAMS = [
+    _PInstanceName,
+    _PEarlyRelease,
+    ("iallocator", None, ht.TMaybeString, "Iallocator for computing solution"),
+    ("target_groups", None, ht.TMaybeListOf(ht.TNonEmptyString),
+     "Destination group names or UUIDs (defaults to \"all but current group\""),
     ]
     ]
+  OP_RESULT = TJobIdListOnly
 
 
 # Node group opcodes
 
 
 
 # Node group opcodes
 
-class OpAddGroup(OpCode):
+class OpGroupAdd(OpCode):
   """Add a node group to the cluster."""
   """Add a node group to the cluster."""
-  OP_ID = "OP_GROUP_ADD"
   OP_DSC_FIELD = "group_name"
   OP_DSC_FIELD = "group_name"
-  __slots__ = ["group_name"]
+  OP_PARAMS = [
+    _PGroupName,
+    _PNodeGroupAllocPolicy,
+    _PGroupNodeParams,
+    _PDiskParams,
+    _PHvState,
+    _PDiskState,
+    ("ipolicy", None, ht.TMaybeDict,
+     "Group-wide :ref:`instance policy <rapi-ipolicy>` specs"),
+    ]
+  OP_RESULT = ht.TNone
 
 
 
 
-class OpQueryGroups(OpCode):
+class OpGroupAssignNodes(OpCode):
+  """Assign nodes to a node group."""
+  OP_DSC_FIELD = "group_name"
+  OP_PARAMS = [
+    _PGroupName,
+    _PForce,
+    ("nodes", ht.NoDefault, ht.TListOf(ht.TNonEmptyString),
+     "List of nodes to assign"),
+    ]
+  OP_RESULT = ht.TNone
+
+
+class OpGroupQuery(OpCode):
   """Compute the list of node groups."""
   """Compute the list of node groups."""
-  OP_ID = "OP_GROUP_QUERY"
-  __slots__ = ["output_fields", "names"]
+  OP_PARAMS = [
+    _POutputFields,
+    ("names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Empty list to query all groups, group names otherwise"),
+    ]
+  OP_RESULT = _TOldQueryResult
+
+
+class OpGroupSetParams(OpCode):
+  """Change the parameters of a node group."""
+  OP_DSC_FIELD = "group_name"
+  OP_PARAMS = [
+    _PGroupName,
+    _PNodeGroupAllocPolicy,
+    _PGroupNodeParams,
+    _PDiskParams,
+    _PHvState,
+    _PDiskState,
+    ("ipolicy", None, ht.TMaybeDict, "Group-wide instance policy specs"),
+    ]
+  OP_RESULT = _TSetParamsResult
+
+
+class OpGroupRemove(OpCode):
+  """Remove a node group from the cluster."""
+  OP_DSC_FIELD = "group_name"
+  OP_PARAMS = [
+    _PGroupName,
+    ]
+  OP_RESULT = ht.TNone
+
+
+class OpGroupRename(OpCode):
+  """Rename a node group in the cluster."""
+  OP_PARAMS = [
+    _PGroupName,
+    ("new_name", ht.NoDefault, ht.TNonEmptyString, "New group name"),
+    ]
+  OP_RESULT = ht.Comment("New group name")(ht.TNonEmptyString)
+
+
+class OpGroupEvacuate(OpCode):
+  """Evacuate a node group in the cluster."""
+  OP_DSC_FIELD = "group_name"
+  OP_PARAMS = [
+    _PGroupName,
+    _PEarlyRelease,
+    ("iallocator", None, ht.TMaybeString, "Iallocator for computing solution"),
+    ("target_groups", None, ht.TMaybeListOf(ht.TNonEmptyString),
+     "Destination group names or UUIDs"),
+    ]
+  OP_RESULT = TJobIdListOnly
 
 
 # OS opcodes
 
 
 # OS opcodes
-class OpDiagnoseOS(OpCode):
+class OpOsDiagnose(OpCode):
   """Compute the list of guest operating systems."""
   """Compute the list of guest operating systems."""
-  OP_ID = "OP_OS_DIAGNOSE"
-  __slots__ = ["output_fields", "names"]
+  OP_PARAMS = [
+    _POutputFields,
+    ("names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Which operating systems to diagnose"),
+    ]
+  OP_RESULT = _TOldQueryResult
 
 
 # Exports opcodes
 
 
 # Exports opcodes
-class OpQueryExports(OpCode):
+class OpBackupQuery(OpCode):
   """Compute the list of exported images."""
   """Compute the list of exported images."""
-  OP_ID = "OP_BACKUP_QUERY"
-  __slots__ = ["nodes", "use_locking"]
+  OP_PARAMS = [
+    _PUseLocking,
+    ("nodes", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
+     "Empty list to query all nodes, node names otherwise"),
+    ]
+  OP_RESULT = ht.TDictOf(ht.TNonEmptyString,
+                         ht.TOr(ht.Comment("False on error")(ht.TBool),
+                                ht.TListOf(ht.TNonEmptyString)))
 
 
 
 
-class OpPrepareExport(OpCode):
+class OpBackupPrepare(OpCode):
   """Prepares an instance export.
 
   @ivar instance_name: Instance name
   @ivar mode: Export mode (one of L{constants.EXPORT_MODES})
 
   """
   """Prepares an instance export.
 
   @ivar instance_name: Instance name
   @ivar mode: Export mode (one of L{constants.EXPORT_MODES})
 
   """
-  OP_ID = "OP_BACKUP_PREPARE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
-    "instance_name", "mode",
+  OP_PARAMS = [
+    _PInstanceName,
+    ("mode", ht.NoDefault, ht.TElemOf(constants.EXPORT_MODES),
+     "Export mode"),
     ]
     ]
+  OP_RESULT = ht.TOr(ht.TNone, ht.TDict)
 
 
 
 
-class OpExportInstance(OpCode):
+class OpBackupExport(OpCode):
   """Export an instance.
 
   For local exports, the export destination is the node name. For remote
   """Export an instance.
 
   For local exports, the export destination is the node name. For remote
@@ -777,52 +1696,79 @@ class OpExportInstance(OpCode):
                              only)
 
   """
                              only)
 
   """
-  OP_ID = "OP_BACKUP_EXPORT"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = [
+  OP_PARAMS = [
+    _PInstanceName,
+    _PShutdownTimeout,
     # TODO: Rename target_node as it changes meaning for different export modes
     # (e.g. "destination")
     # TODO: Rename target_node as it changes meaning for different export modes
     # (e.g. "destination")
-    "instance_name", "target_node", "shutdown", "shutdown_timeout",
-    "remove_instance",
-    "ignore_remove_failures",
-    "mode",
-    "x509_key_name",
-    "destination_x509_ca",
+    ("target_node", ht.NoDefault, ht.TOr(ht.TNonEmptyString, ht.TList),
+     "Destination information, depends on export mode"),
+    ("shutdown", True, ht.TBool, "Whether to shutdown instance before export"),
+    ("remove_instance", False, ht.TBool,
+     "Whether to remove instance after export"),
+    ("ignore_remove_failures", False, ht.TBool,
+     "Whether to ignore failures while removing instances"),
+    ("mode", constants.EXPORT_MODE_LOCAL, ht.TElemOf(constants.EXPORT_MODES),
+     "Export mode"),
+    ("x509_key_name", None, ht.TOr(ht.TList, ht.TNone),
+     "Name of X509 key (remote export only)"),
+    ("destination_x509_ca", None, ht.TMaybeString,
+     "Destination X509 CA (remote export only)"),
     ]
     ]
+  OP_RESULT = \
+    ht.TAnd(ht.TIsLength(2), ht.TItems([
+      ht.Comment("Finalizing status")(ht.TBool),
+      ht.Comment("Status for every exported disk")(ht.TListOf(ht.TBool)),
+      ]))
 
 
 
 
-class OpRemoveExport(OpCode):
+class OpBackupRemove(OpCode):
   """Remove an instance's export."""
   """Remove an instance's export."""
-  OP_ID = "OP_BACKUP_REMOVE"
   OP_DSC_FIELD = "instance_name"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name"]
+  OP_PARAMS = [
+    _PInstanceName,
+    ]
+  OP_RESULT = ht.TNone
 
 
 # Tags opcodes
 
 
 # Tags opcodes
-class OpGetTags(OpCode):
+class OpTagsGet(OpCode):
   """Returns the tags of the given object."""
   """Returns the tags of the given object."""
-  OP_ID = "OP_TAGS_GET"
   OP_DSC_FIELD = "name"
   OP_DSC_FIELD = "name"
-  __slots__ = ["kind", "name"]
+  OP_PARAMS = [
+    _PTagKind,
+    # Name is only meaningful for nodes and instances
+    ("name", ht.NoDefault, ht.TMaybeString, None),
+    ]
 
 
 
 
-class OpSearchTags(OpCode):
+class OpTagsSearch(OpCode):
   """Searches the tags in the cluster for a given pattern."""
   """Searches the tags in the cluster for a given pattern."""
-  OP_ID = "OP_TAGS_SEARCH"
   OP_DSC_FIELD = "pattern"
   OP_DSC_FIELD = "pattern"
-  __slots__ = ["pattern"]
+  OP_PARAMS = [
+    ("pattern", ht.NoDefault, ht.TNonEmptyString, None),
+    ]
 
 
 
 
-class OpAddTags(OpCode):
+class OpTagsSet(OpCode):
   """Add a list of tags on a given object."""
   """Add a list of tags on a given object."""
-  OP_ID = "OP_TAGS_SET"
-  __slots__ = ["kind", "name", "tags"]
+  OP_PARAMS = [
+    _PTagKind,
+    _PTags,
+    # Name is only meaningful for nodes and instances
+    ("name", ht.NoDefault, ht.TMaybeString, None),
+    ]
 
 
 
 
-class OpDelTags(OpCode):
+class OpTagsDel(OpCode):
   """Remove a list of tags from a given object."""
   """Remove a list of tags from a given object."""
-  OP_ID = "OP_TAGS_DEL"
-  __slots__ = ["kind", "name", "tags"]
+  OP_PARAMS = [
+    _PTagKind,
+    _PTags,
+    # Name is only meaningful for nodes and instances
+    ("name", ht.NoDefault, ht.TMaybeString, None),
+    ]
 
 
 # Test opcodes
 
 
 # Test opcodes
@@ -847,9 +1793,13 @@ class OpTestDelay(OpCode):
   generator. The case of duration == 0 will not be treated specially.
 
   """
   generator. The case of duration == 0 will not be treated specially.
 
   """
-  OP_ID = "OP_TEST_DELAY"
   OP_DSC_FIELD = "duration"
   OP_DSC_FIELD = "duration"
-  __slots__ = ["duration", "on_master", "on_nodes", "repeat"]
+  OP_PARAMS = [
+    ("duration", ht.NoDefault, ht.TNumber, None),
+    ("on_master", True, ht.TBool, None),
+    ("on_nodes", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), None),
+    ("repeat", 0, ht.TPositiveInt, None),
+    ]
 
 
 class OpTestAllocator(OpCode):
 
 
 class OpTestAllocator(OpCode):
@@ -863,26 +1813,42 @@ class OpTestAllocator(OpCode):
       return the allocator output (direction 'out')
 
   """
       return the allocator output (direction 'out')
 
   """
-  OP_ID = "OP_TEST_ALLOCATOR"
   OP_DSC_FIELD = "allocator"
   OP_DSC_FIELD = "allocator"
-  __slots__ = [
-    "direction", "mode", "allocator", "name",
-    "mem_size", "disks", "disk_template",
-    "os", "tags", "nics", "vcpus", "hypervisor",
-    "evac_nodes",
+  OP_PARAMS = [
+    ("direction", ht.NoDefault,
+     ht.TElemOf(constants.VALID_IALLOCATOR_DIRECTIONS), None),
+    ("mode", ht.NoDefault, ht.TElemOf(constants.VALID_IALLOCATOR_MODES), None),
+    ("name", ht.NoDefault, ht.TNonEmptyString, None),
+    ("nics", ht.NoDefault,
+     ht.TMaybeListOf(ht.TDictOf(ht.TElemOf([constants.INIC_MAC,
+                                            constants.INIC_IP,
+                                            "bridge"]),
+                                ht.TOr(ht.TNone, ht.TNonEmptyString))),
+     None),
+    ("disks", ht.NoDefault, ht.TOr(ht.TNone, ht.TList), None),
+    ("hypervisor", None, ht.TMaybeString, None),
+    ("allocator", None, ht.TMaybeString, None),
+    ("tags", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), None),
+    ("memory", None, ht.TOr(ht.TNone, ht.TPositiveInt), None),
+    ("vcpus", None, ht.TOr(ht.TNone, ht.TPositiveInt), None),
+    ("os", None, ht.TMaybeString, None),
+    ("disk_template", None, ht.TMaybeString, None),
+    ("instances", None, ht.TMaybeListOf(ht.TNonEmptyString), None),
+    ("evac_mode", None,
+     ht.TOr(ht.TNone, ht.TElemOf(constants.IALLOCATOR_NEVAC_MODES)), None),
+    ("target_groups", None, ht.TMaybeListOf(ht.TNonEmptyString), None),
     ]
 
 
     ]
 
 
-class OpTestJobqueue(OpCode):
+class OpTestJqueue(OpCode):
   """Utility opcode to test some aspects of the job queue.
 
   """
   """Utility opcode to test some aspects of the job queue.
 
   """
-  OP_ID = "OP_TEST_JQUEUE"
-  __slots__ = [
-    "notify_waitlock",
-    "notify_exec",
-    "log_messages",
-    "fail",
+  OP_PARAMS = [
+    ("notify_waitlock", False, ht.TBool, None),
+    ("notify_exec", False, ht.TBool, None),
+    ("log_messages", ht.EmptyList, ht.TListOf(ht.TString), None),
+    ("fail", False, ht.TBool, None),
     ]
 
 
     ]
 
 
@@ -890,14 +1856,24 @@ class OpTestDummy(OpCode):
   """Utility opcode used by unittests.
 
   """
   """Utility opcode used by unittests.
 
   """
-  OP_ID = "OP_TEST_DUMMY"
-  __slots__ = [
-    "result",
-    "messages",
-    "fail",
+  OP_PARAMS = [
+    ("result", ht.NoDefault, ht.NoType, None),
+    ("messages", ht.NoDefault, ht.NoType, None),
+    ("fail", ht.NoDefault, ht.NoType, None),
+    ("submit_jobs", None, ht.NoType, None),
     ]
     ]
+  WITH_LU = False
+
+
+def _GetOpList():
+  """Returns list of all defined opcodes.
+
+  Does not eliminate duplicates by C{OP_ID}.
+
+  """
+  return [v for v in globals().values()
+          if (isinstance(v, type) and issubclass(v, OpCode) and
+              hasattr(v, "OP_ID") and v is not OpCode)]
 
 
 
 
-OP_MAPPING = dict([(v.OP_ID, v) for v in globals().values()
-                   if (isinstance(v, type) and issubclass(v, OpCode) and
-                       hasattr(v, "OP_ID"))])
+OP_MAPPING = dict((v.OP_ID, v) for v in _GetOpList())