From 75c866c2a631c45a8abf0f804e0a8f5105dcd333 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:57:04 +0100
Subject: [PATCH] Rename OpMigrateInstance and LUMigrateInstance
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 | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 0e38e64b4..7f16cc4cd 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -843,7 +843,7 @@ def MigrateInstance(opts, args):
else:
mode = opts.migration_mode
- op = opcodes.OpMigrateInstance(instance_name=instance_name, mode=mode,
+ op = opcodes.OpInstanceMigrate(instance_name=instance_name, mode=mode,
cleanup=opts.cleanup)
SubmitOpCode(op, cl=cl, opts=opts)
return 0
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2cb3374fc..dc2e6e4dc 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5688,7 +5688,7 @@ class LUInstanceFailover(LogicalUnit):
(instance.name, target_node, msg))
-class LUMigrateInstance(LogicalUnit):
+class LUInstanceMigrate(LogicalUnit):
"""Migrate an instance.
This is migration without shutting down, compared to the failover,
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 1a1c01f57..3052b203e 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -886,7 +886,7 @@ class OpInstanceFailover(OpCode):
]
-class OpMigrateInstance(OpCode):
+class OpInstanceMigrate(OpCode):
"""Migrate an instance.
This migrates (without shutting down an instance) to its secondary
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 26c31f42e..a2f278208 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1207,7 +1207,7 @@ class R_2_instances_name_export(baserlib.R_Generic):
def _ParseMigrateInstanceRequest(name, data):
"""Parses a request for an instance migration.
- @rtype: L{opcodes.OpMigrateInstance}
+ @rtype: L{opcodes.OpInstanceMigrate}
@return: Instance migration opcode
"""
@@ -1215,7 +1215,7 @@ def _ParseMigrateInstanceRequest(name, data):
cleanup = baserlib.CheckParameter(data, "cleanup", exptype=bool,
default=False)
- return opcodes.OpMigrateInstance(instance_name=name, mode=mode,
+ return opcodes.OpInstanceMigrate(instance_name=name, mode=mode,
cleanup=cleanup)
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index f7d51d8ac..2c3d9e46c 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -239,7 +239,7 @@ class TestParseMigrateInstanceRequest(testutils.GanetiTestCase):
"mode": mode,
}
op = self.Parse(name, data)
- self.assert_(isinstance(op, opcodes.OpMigrateInstance))
+ self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
self.assertEqual(op.instance_name, name)
self.assertEqual(op.mode, mode)
self.assertEqual(op.cleanup, cleanup)
@@ -248,7 +248,7 @@ class TestParseMigrateInstanceRequest(testutils.GanetiTestCase):
name = "instnohZeex0"
op = self.Parse(name, {})
- self.assert_(isinstance(op, opcodes.OpMigrateInstance))
+ self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
self.assertEqual(op.instance_name, name)
self.assertEqual(op.mode, None)
self.assertFalse(op.cleanup)
diff --git a/tools/burnin b/tools/burnin
index 60f758d49..a5c31ab33 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -671,10 +671,10 @@ class Burner(object):
Log("Migrating instances")
for instance in self.instances:
Log("instance %s", instance, indent=1)
- op1 = opcodes.OpMigrateInstance(instance_name=instance, mode=None,
+ op1 = opcodes.OpInstanceMigrate(instance_name=instance, mode=None,
cleanup=False)
- op2 = opcodes.OpMigrateInstance(instance_name=instance, mode=None,
+ op2 = opcodes.OpInstanceMigrate(instance_name=instance, mode=None,
cleanup=True)
Log("migration and migration cleanup", indent=2)
self.ExecOrQueue(instance, [op1, op2])
--
GitLab