Rename OpRemoveNode and LURemoveNode

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

diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 598aafd..ec33caa 100644 (file)
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -438,7 +438,7 @@ def RemoveNode(opts, args):
   @return: the desired exit code
 
   """
-  op = opcodes.OpRemoveNode(node_name=args[0])
+  op = opcodes.OpNodeRemove(node_name=args[0])
   SubmitOpCode(op, opts=opts)
   return 0
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index dd9626f..ae6c5cb 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3429,7 +3429,7 @@ class LUDiagnoseOS(NoHooksLU):
     return output
 
 
-class LURemoveNode(LogicalUnit):
+class LUNodeRemove(LogicalUnit):
   """Logical unit for removing a node.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 8b46534..0257be4 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -581,7 +581,7 @@ class OpOobCommand(OpCode):
 
 # node opcodes
 
-class OpRemoveNode(OpCode):
+class OpNodeRemove(OpCode):
   """Remove a node.
 
   @type node_name: C{str}