From e176281f7c0f8fc9ec9c9c854fc7c123220e65ff Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:56:18 +0100
Subject: [PATCH] Rename OpDeactivateInstanceDisks and
LUDeactivateInstanceDisks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/client/gnt_instance.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
tools/burnin | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 12fa70957..e9f324a73 100644
--- 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 d60b4902e..a43c14df4 100644
--- 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 181d2a765..36ba2af55 100644
--- 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 275ab1e61..6b215d317 100644
--- 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 d6ab042e7..52b0a9ffb 100755
--- 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)
--
GitLab