Rename OpQueryNodeStorage and LUQueryNodeStorage

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 749ad14..598aafd 100644 (file)
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -571,7 +571,7 @@ def ListStorage(opts, args):
 
   selected_fields = ParseFields(opts.output, _LIST_STOR_DEF_FIELDS)
 
-  op = opcodes.OpQueryNodeStorage(nodes=args,
+  op = opcodes.OpNodeQueryStorage(nodes=args,
                                   storage_type=storage_type,
                                   output_fields=selected_fields)
   output = SubmitOpCode(op, opts=opts)

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a1a4de7..dd9626f 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3694,7 +3694,7 @@ class LUNodeQueryvols(NoHooksLU):
     return output
 
 
-class LUQueryNodeStorage(NoHooksLU):
+class LUNodeQueryStorage(NoHooksLU):
   """Logical unit for getting information on storage units on node(s).
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 90787aa..8b46534 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -657,7 +657,7 @@ class OpNodeQueryvols(OpCode):
     ]
 
 
-class OpQueryNodeStorage(OpCode):
+class OpNodeQueryStorage(OpCode):
   """Get information on storage for node(s)."""
   OP_ID = "OP_NODE_QUERY_STORAGE"
   OP_PARAMS = [

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index a267c9a..ce72460 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -473,7 +473,7 @@ class R_2_nodes_name_storage(baserlib.R_Generic):
   """/2/nodes/[node_name]/storage resource.
 
   """
-  # LUQueryNodeStorage acquires locks, hence restricting access to GET
+  # LUNodeQueryStorage acquires locks, hence restricting access to GET
   GET_ACCESS = [rapi.RAPI_ACCESS_WRITE]
 
   def GET(self):
@@ -489,7 +489,7 @@ class R_2_nodes_name_storage(baserlib.R_Generic):
       raise http.HttpBadRequest("Missing the required 'output_fields'"
                                 " parameter")
 
-    op = opcodes.OpQueryNodeStorage(nodes=[node_name],
+    op = opcodes.OpNodeQueryStorage(nodes=[node_name],
                                     storage_type=storage_type,
                                     output_fields=output_fields.split(","))
     return baserlib.SubmitJob([op])