Skip to content
Snippets Groups Projects
Commit b4b3266b authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Drop objects.QueryRequest


It was only used in one place and wasn't really necessary.

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent ed4d8889
No related branches found
No related tags found
No related merge requests found
...@@ -1894,17 +1894,6 @@ class _QueryResponseBase(ConfigObject): ...@@ -1894,17 +1894,6 @@ class _QueryResponseBase(ConfigObject):
return obj return obj
class QueryRequest(ConfigObject):
"""Object holding a query request.
"""
__slots__ = [
"what",
"fields",
"qfilter",
]
class QueryResponse(_QueryResponseBase): class QueryResponse(_QueryResponseBase):
"""Object holding the response to a query. """Object holding the response to a query.
......
...@@ -302,21 +302,20 @@ class ClientOps: ...@@ -302,21 +302,20 @@ class ClientOps:
elif method == luxi.REQ_QUERY: elif method == luxi.REQ_QUERY:
(what, fields, qfilter) = args (what, fields, qfilter) = args
req = objects.QueryRequest(what=what, fields=fields, qfilter=qfilter)
if req.what in constants.QR_VIA_OP: if what in constants.QR_VIA_OP:
result = self._Query(opcodes.OpQuery(what=req.what, fields=req.fields, result = self._Query(opcodes.OpQuery(what=what, fields=fields,
qfilter=req.qfilter)) qfilter=qfilter))
elif req.what == constants.QR_LOCK: elif what == constants.QR_LOCK:
if req.qfilter is not None: if qfilter is not None:
raise errors.OpPrereqError("Lock queries can't be filtered") raise errors.OpPrereqError("Lock queries can't be filtered")
return context.glm.QueryLocks(req.fields) return context.glm.QueryLocks(fields)
elif req.what == constants.QR_JOB: elif what == constants.QR_JOB:
return queue.QueryJobs(req.fields, req.qfilter) return queue.QueryJobs(fields, qfilter)
elif req.what in constants.QR_VIA_LUXI: elif what in constants.QR_VIA_LUXI:
raise NotImplementedError raise NotImplementedError
else: else:
raise errors.OpPrereqError("Resource type '%s' unknown" % req.what, raise errors.OpPrereqError("Resource type '%s' unknown" % what,
errors.ECODE_INVAL) errors.ECODE_INVAL)
return result return result
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment