Rename OpMigrateNode and LUMigrateNode

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 42256d8..e2ede0a 100644 (file)
--- 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 a1507cf..75fb712 100644 (file)
--- 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 7fbb443..7a2356b 100644 (file)
--- 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 5dba35d..0e52d30 100644 (file)
--- 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])