Commit 2237687b authored by Iustin Pop's avatar Iustin Pop
Browse files

Rename OpQueryNodes and LUQueryNodes


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 e0d4735f
......@@ -780,7 +780,7 @@ We will change Ganeti to use UUIDs for entity tracking, but in a
staggered way. In 2.1, we will simply add an “uuid” attribute to each
of the instances, nodes and cluster itself. This will be reported on
instance creation for nodes, and on node adds for the nodes. It will
be of course avaiblable for querying via the OpQueryNodes/Instance and
be of course avaiblable for querying via the OpNodeQuery/Instance and
cluster information, and via RAPI as well.
Note that Ganeti will not provide any way to change this attribute.
......
......@@ -3598,7 +3598,7 @@ class _NodeQuery(_QueryBase):
oob_support, lu.cfg.GetClusterInfo())
class LUQueryNodes(NoHooksLU):
class LUNodeQuery(NoHooksLU):
"""Logical unit for querying nodes.
"""
......
......@@ -638,7 +638,7 @@ class OpNodeAdd(OpCode):
]
class OpQueryNodes(OpCode):
class OpNodeQuery(OpCode):
"""Compute the list of nodes."""
OP_ID = "OP_NODE_QUERY"
OP_PARAMS = [
......
......@@ -288,8 +288,8 @@ class ClientOps:
if use_locking:
raise errors.OpPrereqError("Sync queries are not allowed",
errors.ECODE_INVAL)
op = opcodes.OpQueryNodes(names=names, output_fields=fields,
use_locking=use_locking)
op = opcodes.OpNodeQuery(names=names, output_fields=fields,
use_locking=use_locking)
return self._Query(op)
elif method == luxi.REQ_QUERY_GROUPS:
......
......@@ -418,8 +418,8 @@ def GetClusterData():
op1 = opcodes.OpInstanceQuery(output_fields=op1_fields, names=[],
use_locking=True)
op2_fields = ["name", "bootid", "offline"]
op2 = opcodes.OpQueryNodes(output_fields=op2_fields, names=[],
use_locking=True)
op2 = opcodes.OpNodeQuery(output_fields=op2_fields, names=[],
use_locking=True)
job_id = client.SubmitJob([op1, op2])
......
......@@ -502,8 +502,8 @@ class Burner(object):
else:
names = []
try:
op = opcodes.OpQueryNodes(output_fields=["name", "offline", "drained"],
names=names, use_locking=True)
op = opcodes.OpNodeQuery(output_fields=["name", "offline", "drained"],
names=names, use_locking=True)
result = self.ExecOp(True, op)
except errors.GenericError, err:
err_code, msg = cli.FormatError(err)
......
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