else:
fdefs = query.Query(cls.FIELDS, fields).GetFields()
- return {
- "fields": [fdef.ToDict() for fdef in fdefs],
- }
+ return objects.QueryFieldsResponse(fields=fdefs).ToDict()
def ExpandNames(self, lu):
"""Expand names for this query.
"""
data = self._GetQueryData(lu)
- return {
- "data": self.query.Query(data),
- "fields": [fdef.ToDict()
- for fdef in self.query.GetFields()],
- }
+ return objects.QueryResponse(data=self.query.Query(data),
+ fields=self.query.GetFields()).ToDict()
def OldStyleQuery(self, lu):
"""Collect data and execute query.
]
+class _QueryResponseBase(ConfigObject):
+ __slots__ = [
+ "fields",
+ ]
+
+ def ToDict(self):
+ """Custom function for serializing.
+
+ """
+ mydict = super(_QueryResponseBase, self).ToDict()
+ mydict["fields"] = self._ContainerToDicts(mydict["fields"])
+ return mydict
+
+ @classmethod
+ def FromDict(cls, val):
+ """Custom function for de-serializing.
+
+ """
+ obj = super(_QueryResponseBase, cls).FromDict(val)
+ obj.fields = cls._ContainerFromDicts(obj.fields, list, QueryFieldDefinition)
+ return obj
+
+
class QueryRequest(ConfigObject):
"""Object holding a query request.
]
-class QueryResponse(ConfigObject):
+class QueryResponse(_QueryResponseBase):
"""Object holding the response to a query.
@ivar fields: List of L{QueryFieldDefinition} objects
"""
__slots__ = [
- "fields",
"data",
]
]
-class QueryFieldsResponse(ConfigObject):
+class QueryFieldsResponse(_QueryResponseBase):
"""Object holding the response to a query for fields.
@ivar fields: List of L{QueryFieldDefinition} objects
"""
__slots__ = [
- "fields",
]