From 3cd2d4b1290629c9d95dce28c2911c0f8c1590f2 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:57:46 +0100
Subject: [PATCH] Rename OpRemoveInstance and LURemoveInstance
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>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/client/gnt_instance.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
tools/burnin | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 7fe1d28f6..3ab78b416 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -538,7 +538,7 @@ def RemoveInstance(opts, args):
if not AskUser(usertext):
return 1
- op = opcodes.OpRemoveInstance(instance_name=instance_name,
+ op = opcodes.OpInstanceRemove(instance_name=instance_name,
ignore_failures=opts.ignore_failures,
shutdown_timeout=opts.shutdown_timeout)
SubmitOrSend(op, opts, cl=cl)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e1b0fe445..88e7b6a8f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5437,7 +5437,7 @@ class LURenameInstance(LogicalUnit):
return inst.name
-class LURemoveInstance(LogicalUnit):
+class LUInstanceRemove(LogicalUnit):
"""Remove an instance.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index f7fad1a73..fb760609b 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -803,7 +803,7 @@ class OpInstanceReinstall(OpCode):
]
-class OpRemoveInstance(OpCode):
+class OpInstanceRemove(OpCode):
"""Remove an instance."""
OP_ID = "OP_INSTANCE_REMOVE"
OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 3c2338b18..7e8edf282 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -933,7 +933,7 @@ class R_2_instances_name(baserlib.R_Generic):
"""Delete an instance.
"""
- op = opcodes.OpRemoveInstance(instance_name=self.items[0],
+ op = opcodes.OpInstanceRemove(instance_name=self.items[0],
ignore_failures=False,
dry_run=bool(self.dryRun()))
return baserlib.SubmitJob([op])
diff --git a/tools/burnin b/tools/burnin
index f839e399c..7722c0279 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -715,7 +715,7 @@ class Burner(object):
target_node=enode,
mode=constants.EXPORT_MODE_LOCAL,
shutdown=True)
- rem_op = opcodes.OpRemoveInstance(instance_name=instance,
+ rem_op = opcodes.OpInstanceRemove(instance_name=instance,
ignore_failures=True)
imp_dir = utils.PathJoin(constants.EXPORT_DIR, full_name)
imp_op = opcodes.OpInstanceCreate(instance_name=instance,
@@ -781,7 +781,7 @@ class Burner(object):
Log("Removing instances")
for instance in self.to_rem:
Log("instance %s", instance, indent=1)
- op = opcodes.OpRemoveInstance(instance_name=instance,
+ op = opcodes.OpInstanceRemove(instance_name=instance,
ignore_failures=True)
self.ExecOrQueue(instance, [op])
--
GitLab