Rename OpDeactivateInstanceDisks and LUDeactivateInstanceDisks

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 12fa709..e9f324a 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -611,7 +611,7 @@ def DeactivateDisks(opts, args):
 
   """
   instance_name = args[0]
-  op = opcodes.OpDeactivateInstanceDisks(instance_name=instance_name)
+  op = opcodes.OpInstanceDeactivateDisks(instance_name=instance_name)
   SubmitOrSend(op, opts)
   return 0
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d60b490..a43c14d 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4763,7 +4763,7 @@ def _StartInstanceDisks(lu, instance, force):
     raise errors.OpExecError("Disk consistency error")
 
 
-class LUDeactivateInstanceDisks(NoHooksLU):
+class LUInstanceDeactivateDisks(NoHooksLU):
   """Shutdown an instance's disks.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 181d2a7..36ba2af 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -944,7 +944,7 @@ class OpInstanceActivateDisks(OpCode):
     ]
 
 
-class OpDeactivateInstanceDisks(OpCode):
+class OpInstanceDeactivateDisks(OpCode):
   """Deactivate an instance's disks."""
   OP_ID = "OP_INSTANCE_DEACTIVATE_DISKS"
   OP_DSC_FIELD = "instance_name"

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 275ab1e..6b215d3 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1136,7 +1136,7 @@ class R_2_instances_name_deactivate_disks(baserlib.R_Generic):
     """
     instance_name = self.items[0]
 
-    op = opcodes.OpDeactivateInstanceDisks(instance_name=instance_name)
+    op = opcodes.OpInstanceDeactivateDisks(instance_name=instance_name)
 
     return baserlib.SubmitJob([op])
 

diff --git a/tools/burnin b/tools/burnin
index d6ab042..52b0a9f 100755 (executable)
--- a/tools/burnin
+++ b/tools/burnin
@@ -848,7 +848,7 @@ class Burner(object):
       Log("instance %s", instance, indent=1)
       op_start = self.StartInstanceOp(instance)
       op_act = opcodes.OpInstanceActivateDisks(instance_name=instance)
-      op_deact = opcodes.OpDeactivateInstanceDisks(instance_name=instance)
+      op_deact = opcodes.OpInstanceDeactivateDisks(instance_name=instance)
       op_stop = self.StopInstanceOp(instance)
       Log("activate disks when online", indent=2)
       Log("activate disks when offline", indent=2)