hv_chroot: remove hard-coded path constructs

[ganeti-local] / lib / opcodes.py

diff --git a/lib/opcodes.py b/lib/opcodes.py
index c0b88a9..66698f5 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -52,8 +52,9 @@ class BaseOpCode(object):
     __slots__ attribute for this class.
 
     """
     __slots__ attribute for this class.
 
     """

+    slots = self._all_slots()

     for key in kwargs:
     for key in kwargs:

-      if key not in self.__slots__:
+      if key not in slots:

         raise TypeError("Object %s doesn't support the parameter '%s'" %
                         (self.__class__.__name__, key))
       setattr(self, key, kwargs[key])
         raise TypeError("Object %s doesn't support the parameter '%s'" %
                         (self.__class__.__name__, key))
       setattr(self, key, kwargs[key])

@@ -69,7 +70,7 @@ class BaseOpCode(object):
 
     """
     state = {}
 
     """
     state = {}

-    for name in self.__slots__:
+    for name in self._all_slots():

       if hasattr(self, name):
         state[name] = getattr(self, name)
     return state
       if hasattr(self, name):
         state[name] = getattr(self, name)
     return state

@@ -88,13 +89,23 @@ class BaseOpCode(object):
       raise ValueError("Invalid data to __setstate__: expected dict, got %s" %
                        type(state))
 
       raise ValueError("Invalid data to __setstate__: expected dict, got %s" %
                        type(state))
 

-    for name in self.__slots__:
+    for name in self._all_slots():

       if name not in state:
         delattr(self, name)
 
     for name in state:
       setattr(self, name, state[name])
 
       if name not in state:
         delattr(self, name)
 
     for name in state:
       setattr(self, name, state[name])
 

+  @classmethod
+  def _all_slots(cls):
+    """Compute the list of all declared slots for a class.
+
+    """
+    slots = []
+    for parent in cls.__mro__:
+      slots.extend(getattr(parent, "__slots__", []))
+    return slots
+

 
 class OpCode(BaseOpCode):
   """Abstract OpCode.
 
 class OpCode(BaseOpCode):
   """Abstract OpCode.

@@ -103,11 +114,13 @@ class OpCode(BaseOpCode):
   from this class should override OP_ID.
 
   @cvar OP_ID: The ID of this opcode. This should be unique amongst all
   from this class should override OP_ID.
 
   @cvar OP_ID: The ID of this opcode. This should be unique amongst all

-               childre of this class.
+               children of this class.
+  @ivar dry_run: Whether the LU should be run in dry-run mode, i.e. just
+                 the check steps

 
   """
   OP_ID = "OP_ABSTRACT"
 
   """
   OP_ID = "OP_ABSTRACT"

-  __slots__ = []
+  __slots__ = ["dry_run", "debug_level"]

 
   def __getstate__(self):
     """Specialized getstate for opcodes.
 
   def __getstate__(self):
     """Specialized getstate for opcodes.

@@ -142,14 +155,9 @@ class OpCode(BaseOpCode):
       raise ValueError("Invalid data to LoadOpcode, missing OP_ID")
     op_id = data["OP_ID"]
     op_class = None
       raise ValueError("Invalid data to LoadOpcode, missing OP_ID")
     op_id = data["OP_ID"]
     op_class = None

-    for item in globals().values():
-      if (isinstance(item, type) and
-          issubclass(item, cls) and
-          hasattr(item, "OP_ID") and
-          getattr(item, "OP_ID") == op_id):
-        op_class = item
-        break
-    if op_class is None:
+    if op_id in OP_MAPPING:
+      op_class = OP_MAPPING[op_id]
+    else:

       raise ValueError("Invalid data to LoadOpCode: OP_ID %s unsupported" %
                        op_id)
     op = op_class()
       raise ValueError("Invalid data to LoadOpCode: OP_ID %s unsupported" %
                        op_id)
     op = op_class()

@@ -171,6 +179,19 @@ class OpCode(BaseOpCode):
     return txt
 
 
     return txt
 
 

+# cluster opcodes
+
+class OpPostInitCluster(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.
+
+  """
+  OP_ID = "OP_CLUSTER_POST_INIT"
+  __slots__ = []
+
+

 class OpDestroyCluster(OpCode):
   """Destroy the cluster.
 
 class OpDestroyCluster(OpCode):
   """Destroy the cluster.
 

@@ -199,7 +220,8 @@ class OpVerifyCluster(OpCode):
 
   """
   OP_ID = "OP_CLUSTER_VERIFY"
 
   """
   OP_ID = "OP_CLUSTER_VERIFY"

-  __slots__ = ["skip_checks"]
+  __slots__ = ["skip_checks", "verbose", "error_codes",
+               "debug_simulate_errors"]

 
 
 class OpVerifyDisks(OpCode):
 
 
 class OpVerifyDisks(OpCode):

@@ -227,6 +249,26 @@ class OpVerifyDisks(OpCode):
   __slots__ = []
 
 
   __slots__ = []
 
 

+class OpRepairDiskSizes(OpCode):
+  """Verify the disk sizes of the instances and fixes configuration
+  mimatches.
+
+  Parameters: optional instances list, in case we want to restrict the
+  checks to only a subset of the instances.
+
+  Result: a list of tuples, (instance, disk, new-size) for changed
+  configurations.
+
+  In normal operation, the list should be empty.
+
+  @type instances: list
+  @ivar instances: the list of instances to check, or empty for all instances
+
+  """
+  OP_ID = "OP_CLUSTER_REPAIR_DISK_SIZES"
+  __slots__ = ["instances"]
+
+

 class OpQueryConfigValues(OpCode):
   """Query cluster configuration values."""
   OP_ID = "OP_CLUSTER_CONFIG_QUERY"
 class OpQueryConfigValues(OpCode):
   """Query cluster configuration values."""
   OP_ID = "OP_CLUSTER_CONFIG_QUERY"

@@ -255,8 +297,22 @@ class OpSetClusterParams(OpCode):
 
   """
   OP_ID = "OP_CLUSTER_SET_PARAMS"
 
   """
   OP_ID = "OP_CLUSTER_SET_PARAMS"

-  __slots__ = ["vg_name", "enabled_hypervisors", "hvparams", "beparams"]
+  __slots__ = [
+    "vg_name",
+    "enabled_hypervisors",
+    "hvparams",
+    "beparams",
+    "nicparams",
+    "candidate_pool_size",
+    ]
+
+
+class OpRedistributeConfig(OpCode):
+  """Force a full push of the cluster configuration.

 
 

+  """
+  OP_ID = "OP_CLUSTER_REDIST_CONF"
+  __slots__ = []

 
 # node opcodes
 
 
 # node opcodes
 

@@ -303,7 +359,7 @@ class OpAddNode(OpCode):
 class OpQueryNodes(OpCode):
   """Compute the list of nodes."""
   OP_ID = "OP_NODE_QUERY"
 class OpQueryNodes(OpCode):
   """Compute the list of nodes."""
   OP_ID = "OP_NODE_QUERY"

-  __slots__ = ["output_fields", "names"]
+  __slots__ = ["output_fields", "names", "use_locking"]

 
 
 class OpQueryNodeVolumes(OpCode):
 
 
 class OpQueryNodeVolumes(OpCode):

@@ -312,6 +368,40 @@ class OpQueryNodeVolumes(OpCode):
   __slots__ = ["nodes", "output_fields"]
 
 
   __slots__ = ["nodes", "output_fields"]
 
 

+class OpQueryNodeStorage(OpCode):
+  """Get information on storage for node(s)."""
+  OP_ID = "OP_NODE_QUERY_STORAGE"
+  __slots__ = [
+    "nodes",
+    "storage_type",
+    "name",
+    "output_fields",
+    ]
+
+
+class OpModifyNodeStorage(OpCode):
+  """Modifies the properies of a storage unit"""
+  OP_ID = "OP_NODE_MODIFY_STORAGE"
+  __slots__ = [
+    "node_name",
+    "storage_type",
+    "name",
+    "changes",
+    ]
+
+
+class OpRepairNodeStorage(OpCode):
+  """Repairs the volume group on a node."""
+  OP_ID = "OP_REPAIR_NODE_STORAGE"
+  OP_DSC_FIELD = "node_name"
+  __slots__ = [
+    "node_name",
+    "storage_type",
+    "name",
+    "ignore_consistency",
+    ]
+
+

 class OpSetNodeParams(OpCode):
   """Change the parameters of a node."""
   OP_ID = "OP_NODE_SET_PARAMS"
 class OpSetNodeParams(OpCode):
   """Change the parameters of a node."""
   OP_ID = "OP_NODE_SET_PARAMS"

@@ -320,8 +410,47 @@ class OpSetNodeParams(OpCode):
     "node_name",
     "force",
     "master_candidate",
     "node_name",
     "force",
     "master_candidate",

+    "offline",
+    "drained",

     ]
 
     ]
 

+
+class OpPowercycleNode(OpCode):
+  """Tries to powercycle a node."""
+  OP_ID = "OP_NODE_POWERCYCLE"
+  OP_DSC_FIELD = "node_name"
+  __slots__ = [
+    "node_name",
+    "force",
+    ]
+
+
+class OpEvacuateNode(OpCode):
+  """Relocate secondary instances from a node."""
+  OP_ID = "OP_NODE_EVACUATE"
+  OP_DSC_FIELD = "node_name"
+  __slots__ = [
+    "node_name", "remote_node", "iallocator", "early_release",
+    ]
+
+
+class OpMigrateNode(OpCode):
+  """Migrate all instances from a node."""
+  OP_ID = "OP_NODE_MIGRATE"
+  OP_DSC_FIELD = "node_name"
+  __slots__ = [
+    "node_name",
+    "live",
+    ]
+
+
+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"]
+
+

 # instance opcodes
 
 class OpCreateInstance(OpCode):
 # instance opcodes
 
 class OpCreateInstance(OpCode):

@@ -329,14 +458,15 @@ class OpCreateInstance(OpCode):
   OP_ID = "OP_INSTANCE_CREATE"
   OP_DSC_FIELD = "instance_name"
   __slots__ = [
   OP_ID = "OP_INSTANCE_CREATE"
   OP_DSC_FIELD = "instance_name"
   __slots__ = [

-    "instance_name", "os_type", "pnode",
-    "disk_template", "snode", "mode",
+    "instance_name", "os_type", "force_variant",
+    "pnode", "disk_template", "snode", "mode",

     "disks", "nics",
     "src_node", "src_path", "start",
     "disks", "nics",
     "src_node", "src_path", "start",

-    "wait_for_sync", "ip_check",
+    "wait_for_sync", "ip_check", "name_check",

     "file_storage_dir", "file_driver",
     "iallocator",
     "hypervisor", "hvparams", "beparams",
     "file_storage_dir", "file_driver",
     "iallocator",
     "hypervisor", "hvparams", "beparams",

+    "dry_run",

     ]
 
 
     ]
 
 

@@ -344,56 +474,101 @@ class OpReinstallInstance(OpCode):
   """Reinstall an instance's OS."""
   OP_ID = "OP_INSTANCE_REINSTALL"
   OP_DSC_FIELD = "instance_name"
   """Reinstall an instance's OS."""
   OP_ID = "OP_INSTANCE_REINSTALL"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "os_type"]
+  __slots__ = ["instance_name", "os_type", "force_variant"]

 
 
 class OpRemoveInstance(OpCode):
   """Remove an instance."""
   OP_ID = "OP_INSTANCE_REMOVE"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpRemoveInstance(OpCode):
   """Remove an instance."""
   OP_ID = "OP_INSTANCE_REMOVE"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "ignore_failures"]
+  __slots__ = [
+    "instance_name",
+    "ignore_failures",
+    "shutdown_timeout",
+    ]

 
 
 class OpRenameInstance(OpCode):
   """Rename an instance."""
   OP_ID = "OP_INSTANCE_RENAME"
 
 
 class OpRenameInstance(OpCode):
   """Rename an instance."""
   OP_ID = "OP_INSTANCE_RENAME"

-  __slots__ = ["instance_name", "ignore_ip", "new_name"]
+  __slots__ = [
+    "instance_name", "ignore_ip", "new_name",
+    ]

 
 
 class OpStartupInstance(OpCode):
   """Startup an instance."""
   OP_ID = "OP_INSTANCE_STARTUP"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpStartupInstance(OpCode):
   """Startup an instance."""
   OP_ID = "OP_INSTANCE_STARTUP"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "force", "extra_args"]
+  __slots__ = [
+    "instance_name", "force", "hvparams", "beparams",
+    ]

 
 
 class OpShutdownInstance(OpCode):
   """Shutdown an instance."""
   OP_ID = "OP_INSTANCE_SHUTDOWN"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpShutdownInstance(OpCode):
   """Shutdown an instance."""
   OP_ID = "OP_INSTANCE_SHUTDOWN"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name"]
+  __slots__ = ["instance_name", "timeout"]

 
 
 class OpRebootInstance(OpCode):
   """Reboot an instance."""
   OP_ID = "OP_INSTANCE_REBOOT"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpRebootInstance(OpCode):
   """Reboot an instance."""
   OP_ID = "OP_INSTANCE_REBOOT"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "reboot_type", "extra_args",
-               "ignore_secondaries" ]
+  __slots__ = [
+    "instance_name", "reboot_type", "ignore_secondaries", "shutdown_timeout",
+    ]

 
 
 class OpReplaceDisks(OpCode):
   """Replace the disks of an instance."""
   OP_ID = "OP_INSTANCE_REPLACE_DISKS"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpReplaceDisks(OpCode):
   """Replace the disks of an instance."""
   OP_ID = "OP_INSTANCE_REPLACE_DISKS"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "remote_node", "mode", "disks", "iallocator"]
+  __slots__ = [
+    "instance_name", "remote_node", "mode", "disks", "iallocator",
+    "early_release",
+    ]

 
 
 class OpFailoverInstance(OpCode):
   """Failover an instance."""
   OP_ID = "OP_INSTANCE_FAILOVER"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpFailoverInstance(OpCode):
   """Failover an instance."""
   OP_ID = "OP_INSTANCE_FAILOVER"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "ignore_consistency"]
+  __slots__ = [
+    "instance_name", "ignore_consistency", "shutdown_timeout",
+    ]
+
+
+class OpMigrateInstance(OpCode):
+  """Migrate an instance.
+
+  This migrates (without shutting down an instance) to its secondary
+  node.
+
+  @ivar instance_name: the name of the instance
+
+  """
+  OP_ID = "OP_INSTANCE_MIGRATE"
+  OP_DSC_FIELD = "instance_name"
+  __slots__ = ["instance_name", "live", "cleanup"]
+
+
+class OpMoveInstance(OpCode):
+  """Move an instance.
+
+  This move (with shutting down an instance and data copying) to an
+  arbitrary node.
+
+  @ivar instance_name: the name of the instance
+  @ivar target_node: the destination node
+
+  """
+  OP_ID = "OP_INSTANCE_MOVE"
+  OP_DSC_FIELD = "instance_name"
+  __slots__ = [
+    "instance_name", "target_node", "shutdown_timeout",
+    ]

 
 
 class OpConnectConsole(OpCode):
 
 
 class OpConnectConsole(OpCode):

@@ -407,7 +582,7 @@ class OpActivateInstanceDisks(OpCode):
   """Activate an instance's disks."""
   OP_ID = "OP_INSTANCE_ACTIVATE_DISKS"
   OP_DSC_FIELD = "instance_name"
   """Activate an instance's disks."""
   OP_ID = "OP_INSTANCE_ACTIVATE_DISKS"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name"]
+  __slots__ = ["instance_name", "ignore_size"]

 
 
 class OpDeactivateInstanceDisks(OpCode):
 
 
 class OpDeactivateInstanceDisks(OpCode):

@@ -417,10 +592,17 @@ class OpDeactivateInstanceDisks(OpCode):
   __slots__ = ["instance_name"]
 
 
   __slots__ = ["instance_name"]
 
 

+class OpRecreateInstanceDisks(OpCode):
+  """Deactivate an instance's disks."""
+  OP_ID = "OP_INSTANCE_RECREATE_DISKS"
+  OP_DSC_FIELD = "instance_name"
+  __slots__ = ["instance_name", "disks"]
+
+

 class OpQueryInstances(OpCode):
   """Compute the list of instances."""
   OP_ID = "OP_INSTANCE_QUERY"
 class OpQueryInstances(OpCode):
   """Compute the list of instances."""
   OP_ID = "OP_INSTANCE_QUERY"

-  __slots__ = ["output_fields", "names"]
+  __slots__ = ["output_fields", "names", "use_locking"]

 
 
 class OpQueryInstanceData(OpCode):
 
 
 class OpQueryInstanceData(OpCode):

@@ -444,7 +626,9 @@ class OpGrowDisk(OpCode):
   """Grow a disk of an instance."""
   OP_ID = "OP_INSTANCE_GROW_DISK"
   OP_DSC_FIELD = "instance_name"
   """Grow a disk of an instance."""
   OP_ID = "OP_INSTANCE_GROW_DISK"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "disk", "amount", "wait_for_sync"]
+  __slots__ = [
+    "instance_name", "disk", "amount", "wait_for_sync",
+    ]

 
 
 # OS opcodes
 
 
 # OS opcodes

@@ -458,14 +642,16 @@ class OpDiagnoseOS(OpCode):
 class OpQueryExports(OpCode):
   """Compute the list of exported images."""
   OP_ID = "OP_BACKUP_QUERY"
 class OpQueryExports(OpCode):
   """Compute the list of exported images."""
   OP_ID = "OP_BACKUP_QUERY"

-  __slots__ = ["nodes"]
+  __slots__ = ["nodes", "use_locking"]

 
 
 class OpExportInstance(OpCode):
   """Export an instance."""
   OP_ID = "OP_BACKUP_EXPORT"
   OP_DSC_FIELD = "instance_name"
 
 
 class OpExportInstance(OpCode):
   """Export an instance."""
   OP_ID = "OP_BACKUP_EXPORT"
   OP_DSC_FIELD = "instance_name"

-  __slots__ = ["instance_name", "target_node", "shutdown"]
+  __slots__ = [
+    "instance_name", "target_node", "shutdown", "shutdown_timeout",
+    ]

 
 
 class OpRemoveExport(OpCode):
 
 
 class OpRemoveExport(OpCode):

@@ -546,4 +732,10 @@ class OpTestAllocator(OpCode):
     "direction", "mode", "allocator", "name",
     "mem_size", "disks", "disk_template",
     "os", "tags", "nics", "vcpus", "hypervisor",
     "direction", "mode", "allocator", "name",
     "mem_size", "disks", "disk_template",
     "os", "tags", "nics", "vcpus", "hypervisor",

+    "evac_nodes",

     ]
     ]

+
+
+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"))])