From 5659e2e29bff75adf3608597147f88d6d6e49b90 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 OpRenameInstance and LURenameInstance
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 | 4 ++--
test/ganeti.rapi.rlib2_unittest.py | 4 ++--
tools/burnin | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 3ab78b416..ec6b5ea6f 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -561,7 +561,7 @@ def RenameInstance(opts, args):
" that '%s' is a FQDN. Continue?" % args[1]):
return 1
- op = opcodes.OpRenameInstance(instance_name=args[0],
+ op = opcodes.OpInstanceRename(instance_name=args[0],
new_name=args[1],
ip_check=opts.ip_check,
name_check=opts.name_check)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 88e7b6a8f..38729e637 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5332,7 +5332,7 @@ class LUInstanceRecreateDisks(LogicalUnit):
_CreateDisks(self, self.instance, to_skip=to_skip)
-class LURenameInstance(LogicalUnit):
+class LUInstanceRename(LogicalUnit):
"""Rename an instance.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index fb760609b..f97a66acb 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -814,7 +814,7 @@ class OpInstanceRemove(OpCode):
]
-class OpRenameInstance(OpCode):
+class OpInstanceRename(OpCode):
"""Rename an instance."""
OP_ID = "OP_INSTANCE_RENAME"
OP_PARAMS = [
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 7e8edf282..cfbbc86c7 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1239,7 +1239,7 @@ class R_2_instances_name_migrate(baserlib.R_Generic):
def _ParseRenameInstanceRequest(name, data):
"""Parses a request for renaming an instance.
- @rtype: L{opcodes.OpRenameInstance}
+ @rtype: L{opcodes.OpInstanceRename}
@return: Instance rename opcode
"""
@@ -1247,7 +1247,7 @@ def _ParseRenameInstanceRequest(name, data):
ip_check = baserlib.CheckParameter(data, "ip_check", default=True)
name_check = baserlib.CheckParameter(data, "name_check", default=True)
- return opcodes.OpRenameInstance(instance_name=name, new_name=new_name,
+ return opcodes.OpInstanceRename(instance_name=name, new_name=new_name,
name_check=name_check, ip_check=ip_check)
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index ece7b03a8..24ff85177 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -273,7 +273,7 @@ class TestParseRenameInstanceRequest(testutils.GanetiTestCase):
}
op = self.Parse(name, data)
- self.assert_(isinstance(op, opcodes.OpRenameInstance))
+ self.assert_(isinstance(op, opcodes.OpInstanceRename))
self.assertEqual(op.instance_name, name)
self.assertEqual(op.new_name, new_name)
self.assertEqual(op.ip_check, ip_check)
@@ -288,7 +288,7 @@ class TestParseRenameInstanceRequest(testutils.GanetiTestCase):
}
op = self.Parse(name, data)
- self.assert_(isinstance(op, opcodes.OpRenameInstance))
+ self.assert_(isinstance(op, opcodes.OpInstanceRename))
self.assertEqual(op.instance_name, name)
self.assertEqual(op.new_name, new_name)
self.assert_(op.ip_check)
diff --git a/tools/burnin b/tools/burnin
index 7722c0279..2f9aab703 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -761,7 +761,7 @@ class Burner(object):
@staticmethod
def RenameInstanceOp(instance, instance_new):
"""Rename instance."""
- return opcodes.OpRenameInstance(instance_name=instance,
+ return opcodes.OpInstanceRename(instance_name=instance,
new_name=instance_new)
@_DoCheckInstances
--
GitLab