Rename OpModifyNodeStorage and LUModifyNodeStorage

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

diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index e2ede0a..8910f34 100644 (file)
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -633,7 +633,7 @@ def ModifyStorage(opts, args):
     changes[constants.SF_ALLOCATABLE] = opts.allocatable
 
   if changes:
-    op = opcodes.OpModifyNodeStorage(node_name=node_name,
+    op = opcodes.OpNodeModifyStorage(node_name=node_name,
                                      storage_type=storage_type,
                                      name=volume_name,
                                      changes=changes)

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 75fb712..d5c4252 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3887,7 +3887,7 @@ class LUQueryFields(NoHooksLU):
     return self.qcls.FieldsQuery(self.op.fields)
 
 
-class LUModifyNodeStorage(NoHooksLU):
+class LUNodeModifyStorage(NoHooksLU):
   """Logical unit for modifying a storage volume on a node.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 7a2356b..32731db 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -668,7 +668,7 @@ class OpQueryNodeStorage(OpCode):
     ]
 
 
-class OpModifyNodeStorage(OpCode):
+class OpNodeModifyStorage(OpCode):
   """Modifies the properies of a storage unit"""
   OP_ID = "OP_NODE_MODIFY_STORAGE"
   OP_PARAMS = [

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 0e52d30..a267c9a 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -518,7 +518,7 @@ class R_2_nodes_name_storage_modify(baserlib.R_Generic):
       changes[constants.SF_ALLOCATABLE] = \
         bool(self._checkIntVariable("allocatable", default=1))
 
-    op = opcodes.OpModifyNodeStorage(node_name=node_name,
+    op = opcodes.OpNodeModifyStorage(node_name=node_name,
                                      storage_type=storage_type,
                                      name=name,
                                      changes=changes)