Improve import/export timeout settings
[ganeti-local] / lib / opcodes.py
index 06ce78d..d53cea6 100644 (file)
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2006, 2007 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 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
@@ -117,10 +117,11 @@ class OpCode(BaseOpCode):
                children of this class.
   @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"]
+  __slots__ = ["dry_run", "debug_level", "priority"]
 
   def __getstate__(self):
     """Specialized getstate for opcodes.
@@ -175,6 +176,8 @@ class OpCode(BaseOpCode):
     field_name = getattr(self, "OP_DSC_FIELD", None)
     if field_name:
       field_value = getattr(self, field_name, None)
+      if isinstance(field_value, (list, tuple)):
+        field_value = ",".join(str(i) for i in field_value)
       txt = "%s(%s)" % (txt, field_value)
     return txt
 
@@ -299,16 +302,23 @@ class OpSetClusterParams(OpCode):
   OP_ID = "OP_CLUSTER_SET_PARAMS"
   __slots__ = [
     "vg_name",
+    "drbd_helper",
     "enabled_hypervisors",
     "hvparams",
     "os_hvp",
     "beparams",
+    "osparams",
     "nicparams",
     "candidate_pool_size",
     "maintain_node_health",
     "uid_pool",
     "add_uids",
     "remove_uids",
+    "default_iallocator",
+    "reserved_lvs",
+    "hidden_os",
+    "blacklisted_os",
+    "prealloc_wipe_disks",
     ]
 
 
@@ -354,11 +364,18 @@ class OpAddNode(OpCode):
                name is already in the cluster; use this parameter to 'repair'
                a node that had its configuration broken, or was reinstalled
                without removal from the cluster.
+  @type group: C{str}
+  @ivar group: The node group to which this node will belong.
+  @type vm_capable: C{bool}
+  @ivar vm_capable: The vm_capable node attribute
+  @type master_capable: C{bool}
+  @ivar master_capable: The master_capable node attribute
 
   """
   OP_ID = "OP_NODE_ADD"
   OP_DSC_FIELD = "node_name"
-  __slots__ = ["node_name", "primary_ip", "secondary_ip", "readd"]
+  __slots__ = ["node_name", "primary_ip", "secondary_ip", "readd", "group",
+               "vm_capable", "master_capable"]
 
 
 class OpQueryNodes(OpCode):
@@ -418,6 +435,9 @@ class OpSetNodeParams(OpCode):
     "offline",
     "drained",
     "auto_promote",
+    "master_capable",
+    "vm_capable",
+    "secondary_ip",
     ]
 
 
@@ -431,21 +451,13 @@ class OpPowercycleNode(OpCode):
     ]
 
 
-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",
+    "mode",
     "live",
     ]
 
@@ -460,7 +472,17 @@ class OpNodeEvacuationStrategy(OpCode):
 # instance opcodes
 
 class OpCreateInstance(OpCode):
-  """Create an instance."""
+  """Create an instance.
+
+  @ivar instance_name: Instance name
+  @ivar mode: Instance creation mode (one of L{constants.INSTANCE_CREATE_MODES})
+  @ivar source_handshake: Signed handshake from source (remote import only)
+  @ivar source_x509_ca: Source X509 CA in PEM format (remote import only)
+  @ivar source_instance_name: Previous name of instance (remote import only)
+  @ivar source_shutdown_timeout: Shutdown timeout used for source instance
+    (remote import only)
+
+  """
   OP_ID = "OP_INSTANCE_CREATE"
   OP_DSC_FIELD = "instance_name"
   __slots__ = [
@@ -472,8 +494,11 @@ class OpCreateInstance(OpCode):
     "wait_for_sync", "ip_check", "name_check",
     "file_storage_dir", "file_driver",
     "iallocator",
-    "hypervisor", "hvparams", "beparams",
-    "dry_run",
+    "hypervisor", "hvparams", "beparams", "osparams",
+    "source_handshake",
+    "source_x509_ca",
+    "source_instance_name",
+    "source_shutdown_timeout",
     ]
 
 
@@ -481,7 +506,7 @@ class OpReinstallInstance(OpCode):
   """Reinstall an instance's OS."""
   OP_ID = "OP_INSTANCE_REINSTALL"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "os_type", "force_variant"]
+  __slots__ = ["instance_name", "os_type", "force_variant", "osparams"]
 
 
 class OpRemoveInstance(OpCode):
@@ -499,7 +524,7 @@ class OpRenameInstance(OpCode):
   """Rename an instance."""
   OP_ID = "OP_INSTANCE_RENAME"
   __slots__ = [
-    "instance_name", "ignore_ip", "new_name",
+    "instance_name", "ip_check", "new_name", "name_check",
     ]
 
 
@@ -508,7 +533,7 @@ class OpStartupInstance(OpCode):
   OP_ID = "OP_INSTANCE_STARTUP"
   OP_DSC_FIELD = "instance_name"
   __slots__ = [
-    "instance_name", "force", "hvparams", "beparams",
+    "instance_name", "force", "hvparams", "beparams", "ignore_offline_nodes",
     ]
 
 
@@ -516,7 +541,9 @@ class OpShutdownInstance(OpCode):
   """Shutdown an instance."""
   OP_ID = "OP_INSTANCE_SHUTDOWN"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "timeout"]
+  __slots__ = [
+    "instance_name", "timeout", "ignore_offline_nodes",
+    ]
 
 
 class OpRebootInstance(OpCode):
@@ -554,11 +581,12 @@ class OpMigrateInstance(OpCode):
   node.
 
   @ivar instance_name: the name of the instance
+  @ivar mode: the migration mode (live, non-live or None for auto)
 
   """
   OP_ID = "OP_INSTANCE_MIGRATE"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "live", "cleanup"]
+  __slots__ = ["instance_name", "mode", "cleanup", "live"]
 
 
 class OpMoveInstance(OpCode):
@@ -624,7 +652,7 @@ class OpSetInstanceParams(OpCode):
   OP_DSC_FIELD = "instance_name"
   __slots__ = [
     "instance_name",
-    "hvparams", "beparams", "force",
+    "hvparams", "beparams", "osparams", "force",
     "nics", "disks", "disk_template",
     "remote_node", "os_name", "force_variant",
     ]
@@ -755,7 +783,7 @@ class OpTestDelay(OpCode):
   """
   OP_ID = "OP_TEST_DELAY"
   OP_DSC_FIELD = "duration"
-  __slots__ = ["duration", "on_master", "on_nodes"]
+  __slots__ = ["duration", "on_master", "on_nodes", "repeat"]
 
 
 class OpTestAllocator(OpCode):
@@ -779,6 +807,31 @@ class OpTestAllocator(OpCode):
     ]
 
 
+class OpTestJobqueue(OpCode):
+  """Utility opcode to test some aspects of the job queue.
+
+  """
+  OP_ID = "OP_TEST_JQUEUE"
+  __slots__ = [
+    "notify_waitlock",
+    "notify_exec",
+    "log_messages",
+    "fail",
+    ]
+
+
+class OpTestDummy(OpCode):
+  """Utility opcode used by unittests.
+
+  """
+  OP_ID = "OP_TEST_DUMMY"
+  __slots__ = [
+    "result",
+    "messages",
+    "fail",
+    ]
+
+
 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"))])