mcpu: Use new timeout class for timeout

[ganeti-local] / lib / opcodes.py

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 9fea1a1..7e01595 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -442,8 +442,8 @@ class OpCreateInstance(OpCode):
   OP_ID = "OP_INSTANCE_CREATE"
   OP_DSC_FIELD = "instance_name"
   __slots__ = OpCode.__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",
     "wait_for_sync", "ip_check",
@@ -458,14 +458,18 @@ class OpReinstallInstance(OpCode):
   """Reinstall an instance's OS."""
   OP_ID = "OP_INSTANCE_REINSTALL"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = OpCode.__slots__ + ["instance_name", "os_type"]
+  __slots__ = OpCode.__slots__ + ["instance_name", "os_type", "force_variant"]
 
 
 class OpRemoveInstance(OpCode):
   """Remove an instance."""
   OP_ID = "OP_INSTANCE_REMOVE"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = OpCode.__slots__ + ["instance_name", "ignore_failures"]
+  __slots__ = OpCode.__slots__ + [
+    "instance_name",
+    "ignore_failures",
+    "shutdown_timeout",
+    ]
 
 
 class OpRenameInstance(OpCode):
@@ -489,7 +493,7 @@ class OpShutdownInstance(OpCode):
   """Shutdown an instance."""
   OP_ID = "OP_INSTANCE_SHUTDOWN"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = OpCode.__slots__ + ["instance_name"]
+  __slots__ = OpCode.__slots__ + ["instance_name", "timeout"]
 
 
 class OpRebootInstance(OpCode):
@@ -497,7 +501,7 @@ class OpRebootInstance(OpCode):
   OP_ID = "OP_INSTANCE_REBOOT"
   OP_DSC_FIELD = "instance_name"
   __slots__ = OpCode.__slots__ + [
-    "instance_name", "reboot_type", "ignore_secondaries",
+    "instance_name", "reboot_type", "ignore_secondaries", "shutdown_timeout",
     ]
 
 
@@ -514,7 +518,9 @@ class OpFailoverInstance(OpCode):
   """Failover an instance."""
   OP_ID = "OP_INSTANCE_FAILOVER"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = OpCode.__slots__ + ["instance_name", "ignore_consistency"]
+  __slots__ = OpCode.__slots__ + [
+    "instance_name", "ignore_consistency", "shutdown_timeout",
+    ]
 
 
 class OpMigrateInstance(OpCode):
@@ -543,7 +549,9 @@ class OpMoveInstance(OpCode):
   """
   OP_ID = "OP_INSTANCE_MOVE"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = OpCode.__slots__ + ["instance_name", "target_node"]
+  __slots__ = OpCode.__slots__ + [
+    "instance_name", "target_node", "shutdown_timeout",
+  ]
 
 
 class OpConnectConsole(OpCode):
@@ -624,7 +632,9 @@ class OpExportInstance(OpCode):
   """Export an instance."""
   OP_ID = "OP_BACKUP_EXPORT"
   OP_DSC_FIELD = "instance_name"
-  __slots__ = OpCode.__slots__ + ["instance_name", "target_node", "shutdown"]
+  __slots__ = OpCode.__slots__ + [
+    "instance_name", "target_node", "shutdown", "shutdown_timeout",
+    ]
 
 
 class OpRemoveExport(OpCode):