From 019dbee1d17540f3f884409894bd22f921d3271a Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Sat, 15 Jan 2011 12:56:18 +0100 Subject: [PATCH] Rename OpFailoverInstance and LUFailoverInstance 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/client/gnt_node.py | 2 +- lib/cmdlib.py | 2 +- lib/opcodes.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 e9f324a..cf6c8a3 100644 --- a/lib/client/gnt_instance.py +++ b/lib/client/gnt_instance.py @@ -794,7 +794,7 @@ def FailoverInstance(opts, args): if not AskUser(usertext): return 1 - op = opcodes.OpFailoverInstance(instance_name=instance_name, + op = opcodes.OpInstanceFailover(instance_name=instance_name, ignore_consistency=opts.ignore_consistency, shutdown_timeout=opts.shutdown_timeout) SubmitOrSend(op, opts, cl=cl) diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py index 1ac4f5a..74dfe60 100644 --- a/lib/client/gnt_node.py +++ b/lib/client/gnt_node.py @@ -326,7 +326,7 @@ def FailoverNode(opts, args): jex = JobExecutor(cl=cl, opts=opts) for iname in pinst: - op = opcodes.OpFailoverInstance(instance_name=iname, + op = opcodes.OpInstanceFailover(instance_name=iname, ignore_consistency=opts.ignore_consistency) jex.QueueJob(iname, op) results = jex.GetResults() diff --git a/lib/cmdlib.py b/lib/cmdlib.py index a43c14d..116261f 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -5541,7 +5541,7 @@ class LUQueryInstances(NoHooksLU): return self.iq.OldStyleQuery(self) -class LUFailoverInstance(LogicalUnit): +class LUInstanceFailover(LogicalUnit): """Failover an instance. """ diff --git a/lib/opcodes.py b/lib/opcodes.py index 36ba2af..45f9e2a 100644 --- a/lib/opcodes.py +++ b/lib/opcodes.py @@ -875,7 +875,7 @@ class OpReplaceDisks(OpCode): ] -class OpFailoverInstance(OpCode): +class OpInstanceFailover(OpCode): """Failover an instance.""" OP_ID = "OP_INSTANCE_FAILOVER" OP_DSC_FIELD = "instance_name" diff --git a/tools/burnin b/tools/burnin index 52b0a9f..7899de5 100755 --- a/tools/burnin +++ b/tools/burnin @@ -648,7 +648,7 @@ class Burner(object): Log("Failing over instances") for instance in self.instances: Log("instance %s", instance, indent=1) - op = opcodes.OpFailoverInstance(instance_name=instance, + op = opcodes.OpInstanceFailover(instance_name=instance, ignore_consistency=False) self.ExecOrQueue(instance, [op]) -- 1.7.10.4