Merge branch 'devel-2.2'

[ganeti-local] / lib / opcodes.py

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 05c0ef4..d314fc8 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -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
 
@@ -312,6 +315,9 @@ class OpSetClusterParams(OpCode):
     "add_uids",
     "remove_uids",
     "default_iallocator",
+    "reserved_lvs",
+    "hidden_oss",
+    "blacklisted_oss",
     ]
 
 
@@ -361,7 +367,7 @@ class OpAddNode(OpCode):
   """
   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", "nodegroup"]
 
 
 class OpQueryNodes(OpCode):
@@ -441,6 +447,7 @@ class OpMigrateNode(OpCode):
   __slots__ = [
     "node_name",
     "mode",
+    "live",
     ]
 
 
@@ -478,7 +485,6 @@ class OpCreateInstance(OpCode):
     "source_handshake",
     "source_x509_ca",
     "source_instance_name",
-    "dry_run",
     ]
 
 
@@ -504,7 +510,7 @@ class OpRenameInstance(OpCode):
   """Rename an instance."""
   OP_ID = "OP_INSTANCE_RENAME"
   __slots__ = [
-    "instance_name", "ignore_ip", "new_name", "check_name",
+    "instance_name", "ip_check", "new_name", "name_check",
     ]
 
 
@@ -564,7 +570,7 @@ class OpMigrateInstance(OpCode):
   """
   OP_ID = "OP_INSTANCE_MIGRATE"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = ["instance_name", "mode", "cleanup"]
+  __slots__ = ["instance_name", "mode", "cleanup", "live"]
 
 
 class OpMoveInstance(OpCode):
@@ -798,6 +804,18 @@ class OpTestJobqueue(OpCode):
     ]
 
 
+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"))])