From 5b14a488079fd9ffc9dd37fa7025b85a4e315370 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 OpMigrateNode and LUMigrateNode
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_node.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 42256d8f6..e2ede0abd 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -369,7 +369,7 @@ def MigrateNode(opts, args):
mode = constants.HT_MIGRATION_NONLIVE
else:
mode = opts.migration_mode
- op = opcodes.OpMigrateNode(node_name=args[0], mode=mode)
+ op = opcodes.OpNodeMigrate(node_name=args[0], mode=mode)
SubmitOpCode(op, cl=cl, opts=opts)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a1507cfe7..75fb71235 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5912,7 +5912,7 @@ class LUInstanceMove(LogicalUnit):
(instance.name, target_node, msg))
-class LUMigrateNode(LogicalUnit):
+class LUNodeMigrate(LogicalUnit):
"""Migrate all instances from a node.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 7fbb443e9..7a2356b19 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -720,7 +720,7 @@ class OpPowercycleNode(OpCode):
]
-class OpMigrateNode(OpCode):
+class OpNodeMigrate(OpCode):
"""Migrate all instances from a node."""
OP_ID = "OP_NODE_MIGRATE"
OP_DSC_FIELD = "node_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 5dba35d04..0e52d3076 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -464,7 +464,7 @@ class R_2_nodes_name_migrate(baserlib.R_Generic):
else:
mode = self._checkStringVariable("mode", default=None)
- op = opcodes.OpMigrateNode(node_name=node_name, mode=mode)
+ op = opcodes.OpNodeMigrate(node_name=node_name, mode=mode)
return baserlib.SubmitJob([op])
--
GitLab