From 0ae89533d56e5652811f97b5d7a4c3b8f6e5c7ef Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Sat, 15 Jan 2011 13:06:17 +0100 Subject: [PATCH] Rename OpNodeEvacuationStrategy and LUNodeEvacuationStrategy 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_node.py | 6 +++--- lib/cmdlib.py | 2 +- lib/opcodes.py | 2 +- lib/rapi/rlib2.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py index 9bcbf4096..42256d8f6 100644 --- a/lib/client/gnt_node.py +++ b/lib/client/gnt_node.py @@ -254,9 +254,9 @@ def EvacuateNode(opts, args): dst_node = opts.dst_node iallocator = opts.iallocator - op = opcodes.OpNodeEvacuationStrategy(nodes=args, - iallocator=iallocator, - remote_node=dst_node) + op = opcodes.OpNodeEvacStrategy(nodes=args, + iallocator=iallocator, + remote_node=dst_node) result = SubmitOpCode(op, cl=cl, opts=opts) if not result: diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 1b0e03655..a1507cfe7 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -8545,7 +8545,7 @@ class LURepairNodeStorage(NoHooksLU): (self.op.name, self.op.node_name)) -class LUNodeEvacuationStrategy(NoHooksLU): +class LUNodeEvacStrategy(NoHooksLU): """Computes the node evacuation strategy. """ diff --git a/lib/opcodes.py b/lib/opcodes.py index e7b05f18c..7fbb443e9 100644 --- a/lib/opcodes.py +++ b/lib/opcodes.py @@ -731,7 +731,7 @@ class OpMigrateNode(OpCode): ] -class OpNodeEvacuationStrategy(OpCode): +class OpNodeEvacStrategy(OpCode): """Compute the evacuation strategy for a list of nodes.""" OP_ID = "OP_NODE_EVAC_STRATEGY" OP_DSC_FIELD = "nodes" diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py index 6b7bb93bf..5dba35d04 100644 --- a/lib/rapi/rlib2.py +++ b/lib/rapi/rlib2.py @@ -420,9 +420,9 @@ class R_2_nodes_name_evacuate(baserlib.R_Generic): cl = baserlib.GetClient() - op = opcodes.OpNodeEvacuationStrategy(nodes=[node_name], - iallocator=iallocator, - remote_node=remote_node) + op = opcodes.OpNodeEvacStrategy(nodes=[node_name], + iallocator=iallocator, + remote_node=remote_node) job_id = baserlib.SubmitJob([op], cl) # we use custom feedback function, instead of print we log the status -- GitLab