Commit ad8d0595 authored by Iustin Pop's avatar Iustin Pop
Browse files

Rename OpQueryNodeStorage and LUQueryNodeStorage


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 8ed55bfd
...@@ -571,7 +571,7 @@ def ListStorage(opts, args): ...@@ -571,7 +571,7 @@ def ListStorage(opts, args):
selected_fields = ParseFields(opts.output, _LIST_STOR_DEF_FIELDS) selected_fields = ParseFields(opts.output, _LIST_STOR_DEF_FIELDS)
op = opcodes.OpQueryNodeStorage(nodes=args, op = opcodes.OpNodeQueryStorage(nodes=args,
storage_type=storage_type, storage_type=storage_type,
output_fields=selected_fields) output_fields=selected_fields)
output = SubmitOpCode(op, opts=opts) output = SubmitOpCode(op, opts=opts)
......
...@@ -3694,7 +3694,7 @@ class LUNodeQueryvols(NoHooksLU): ...@@ -3694,7 +3694,7 @@ class LUNodeQueryvols(NoHooksLU):
return output return output
class LUQueryNodeStorage(NoHooksLU): class LUNodeQueryStorage(NoHooksLU):
"""Logical unit for getting information on storage units on node(s). """Logical unit for getting information on storage units on node(s).
""" """
......
...@@ -657,7 +657,7 @@ class OpNodeQueryvols(OpCode): ...@@ -657,7 +657,7 @@ class OpNodeQueryvols(OpCode):
] ]
class OpQueryNodeStorage(OpCode): class OpNodeQueryStorage(OpCode):
"""Get information on storage for node(s).""" """Get information on storage for node(s)."""
OP_ID = "OP_NODE_QUERY_STORAGE" OP_ID = "OP_NODE_QUERY_STORAGE"
OP_PARAMS = [ OP_PARAMS = [
......
...@@ -473,7 +473,7 @@ class R_2_nodes_name_storage(baserlib.R_Generic): ...@@ -473,7 +473,7 @@ class R_2_nodes_name_storage(baserlib.R_Generic):
"""/2/nodes/[node_name]/storage resource. """/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] GET_ACCESS = [rapi.RAPI_ACCESS_WRITE]
def GET(self): def GET(self):
...@@ -489,7 +489,7 @@ class R_2_nodes_name_storage(baserlib.R_Generic): ...@@ -489,7 +489,7 @@ class R_2_nodes_name_storage(baserlib.R_Generic):
raise http.HttpBadRequest("Missing the required 'output_fields'" raise http.HttpBadRequest("Missing the required 'output_fields'"
" parameter") " parameter")
op = opcodes.OpQueryNodeStorage(nodes=[node_name], op = opcodes.OpNodeQueryStorage(nodes=[node_name],
storage_type=storage_type, storage_type=storage_type,
output_fields=output_fields.split(",")) output_fields=output_fields.split(","))
return baserlib.SubmitJob([op]) return baserlib.SubmitJob([op])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment