From b4b3266bfb6e7967ac58ab56218df8be14317331 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 17 Apr 2012 20:48:30 +0200
Subject: [PATCH] Drop objects.QueryRequest
It was only used in one place and wasn't really necessary.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/objects.py | 11 -----------
lib/server/masterd.py | 21 ++++++++++-----------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/lib/objects.py b/lib/objects.py
index b8d67eae4..e70945d1e 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -1894,17 +1894,6 @@ class _QueryResponseBase(ConfigObject):
return obj
-class QueryRequest(ConfigObject):
- """Object holding a query request.
-
- """
- __slots__ = [
- "what",
- "fields",
- "qfilter",
- ]
-
-
class QueryResponse(_QueryResponseBase):
"""Object holding the response to a query.
diff --git a/lib/server/masterd.py b/lib/server/masterd.py
index e7c1247d9..4284e718e 100644
--- a/lib/server/masterd.py
+++ b/lib/server/masterd.py
@@ -302,21 +302,20 @@ class ClientOps:
elif method == luxi.REQ_QUERY:
(what, fields, qfilter) = args
- req = objects.QueryRequest(what=what, fields=fields, qfilter=qfilter)
- if req.what in constants.QR_VIA_OP:
- result = self._Query(opcodes.OpQuery(what=req.what, fields=req.fields,
- qfilter=req.qfilter))
- elif req.what == constants.QR_LOCK:
- if req.qfilter is not None:
+ if what in constants.QR_VIA_OP:
+ result = self._Query(opcodes.OpQuery(what=what, fields=fields,
+ qfilter=qfilter))
+ elif what == constants.QR_LOCK:
+ if qfilter is not None:
raise errors.OpPrereqError("Lock queries can't be filtered")
- return context.glm.QueryLocks(req.fields)
- elif req.what == constants.QR_JOB:
- return queue.QueryJobs(req.fields, req.qfilter)
- elif req.what in constants.QR_VIA_LUXI:
+ return context.glm.QueryLocks(fields)
+ elif what == constants.QR_JOB:
+ return queue.QueryJobs(fields, qfilter)
+ elif what in constants.QR_VIA_LUXI:
raise NotImplementedError
else:
- raise errors.OpPrereqError("Resource type '%s' unknown" % req.what,
+ raise errors.OpPrereqError("Resource type '%s' unknown" % what,
errors.ECODE_INVAL)
return result
--
GitLab