Revision b02c6bdf
b/lib/opcodes.py | ||
---|---|---|
40 | 40 |
from ganeti import errors |
41 | 41 |
from ganeti import ht |
42 | 42 |
from ganeti import objects |
43 |
from ganeti import query |
|
44 | 43 |
|
45 | 44 |
|
46 | 45 |
# Common opcode attributes |
... | ... | |
255 | 254 |
return ht.TStrictDict(True, True, fields_types) |
256 | 255 |
|
257 | 256 |
|
258 |
_TObjFdefs = \
|
|
259 |
_GenerateObjectTypeCheck(objects.QueryFieldDefinition, {
|
|
260 |
"name": ht.TRegex(query.FIELD_NAME_RE),
|
|
261 |
"title": ht.TRegex(query.TITLE_RE),
|
|
262 |
"kind": ht.TElemOf(constants.QFT_ALL),
|
|
263 |
"doc": ht.TRegex(query.DOC_RE),
|
|
264 |
})
|
|
257 |
_TQueryFieldDef = \
|
|
258 |
_GenerateObjectTypeCheck(objects.QueryFieldDefinition, { |
|
259 |
"name": ht.TNonEmptyString,
|
|
260 |
"title": ht.TNonEmptyString,
|
|
261 |
"kind": ht.TElemOf(constants.QFT_ALL), |
|
262 |
"doc": ht.TNonEmptyString,
|
|
263 |
}) |
|
265 | 264 |
|
266 | 265 |
|
267 | 266 |
def RequireFileStorage(): |
... | ... | |
920 | 919 |
"Query filter"), |
921 | 920 |
] |
922 | 921 |
OP_RESULT = \ |
923 |
_GenerateObjectTypeCheck(objects.QueryResponse, {
|
|
924 |
"fields": ht.TListOf(_TObjFdefs),
|
|
925 |
"data": _TQueryResult,
|
|
926 |
})
|
|
922 |
_GenerateObjectTypeCheck(objects.QueryResponse, { |
|
923 |
"fields": ht.TListOf(_TQueryFieldDef),
|
|
924 |
"data": _TQueryResult, |
|
925 |
}) |
|
927 | 926 |
|
928 | 927 |
|
929 | 928 |
class OpQueryFields(OpCode): |
... | ... | |
940 | 939 |
"Requested fields; if not given, all are returned"), |
941 | 940 |
] |
942 | 941 |
OP_RESULT = \ |
943 |
_GenerateObjectTypeCheck(objects.QueryFieldsResponse, {
|
|
944 |
"fields": ht.TListOf(_TObjFdefs),
|
|
945 |
})
|
|
942 |
_GenerateObjectTypeCheck(objects.QueryFieldsResponse, { |
|
943 |
"fields": ht.TListOf(_TQueryFieldDef),
|
|
944 |
}) |
|
946 | 945 |
|
947 | 946 |
|
948 | 947 |
class OpOobCommand(OpCode): |
Also available in: Unified diff