From 0091b480c6bc50d0ef37b8dbc3c78bc7d0b8ef73 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Sat, 15 Jan 2011 12:57:04 +0100 Subject: [PATCH] Rename OpMoveInstance and LUMoveInstance MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Iustin Pop Reviewed-by: René Nussbaumer --- lib/client/gnt_instance.py | 2 +- lib/cmdlib.py | 2 +- lib/opcodes.py | 2 +- tools/burnin | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py index 7f16cc4..aab49df 100644 --- a/lib/client/gnt_instance.py +++ b/lib/client/gnt_instance.py @@ -870,7 +870,7 @@ def MoveInstance(opts, args): if not AskUser(usertext): return 1 - op = opcodes.OpMoveInstance(instance_name=instance_name, + op = opcodes.OpInstanceMove(instance_name=instance_name, target_node=opts.node, shutdown_timeout=opts.shutdown_timeout) SubmitOrSend(op, opts, cl=cl) diff --git a/lib/cmdlib.py b/lib/cmdlib.py index dc2e6e4..6317b4a 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -5737,7 +5737,7 @@ class LUInstanceMigrate(LogicalUnit): return env, nl, nl_post -class LUMoveInstance(LogicalUnit): +class LUInstanceMove(LogicalUnit): """Move an instance by data-copying. """ diff --git a/lib/opcodes.py b/lib/opcodes.py index 3052b20..c965b85 100644 --- a/lib/opcodes.py +++ b/lib/opcodes.py @@ -906,7 +906,7 @@ class OpInstanceMigrate(OpCode): ] -class OpMoveInstance(OpCode): +class OpInstanceMove(OpCode): """Move an instance. This move (with shutting down an instance and data copying) to an diff --git a/tools/burnin b/tools/burnin index a5c31ab..de726b2 100755 --- a/tools/burnin +++ b/tools/burnin @@ -661,7 +661,7 @@ class Burner(object): self.instances) for tnode, instance in mytor: Log("instance %s", instance, indent=1) - op = opcodes.OpMoveInstance(instance_name=instance, + op = opcodes.OpInstanceMove(instance_name=instance, target_node=tnode) self.ExecOrQueue(instance, [op]) -- 1.7.10.4