Revision e571ee44
b/lib/query.py | ||
---|---|---|
1072 | 1072 |
|
1073 | 1073 |
#: Fields available for lock queries |
1074 | 1074 |
LOCK_FIELDS = _BuildLockFields() |
1075 |
|
|
1076 |
#: All available field lists |
|
1077 |
ALL_FIELD_LISTS = [NODE_FIELDS, INSTANCE_FIELDS, LOCK_FIELDS] |
b/test/ganeti.query_unittest.py | ||
---|---|---|
763 | 763 |
|
764 | 764 |
class TestQueryFields(unittest.TestCase): |
765 | 765 |
def testAllFields(self): |
766 |
for fielddefs in [query.NODE_FIELDS, query.INSTANCE_FIELDS]:
|
|
766 |
for fielddefs in query.ALL_FIELD_LISTS:
|
|
767 | 767 |
result = query.QueryFields(fielddefs, None) |
768 | 768 |
self.assert_(isinstance(result, dict)) |
769 | 769 |
response = objects.QueryFieldsResponse.FromDict(result) |
... | ... | |
776 | 776 |
rnd = random.Random(5357) |
777 | 777 |
|
778 | 778 |
for _ in range(10): |
779 |
for fielddefs in [query.NODE_FIELDS, query.INSTANCE_FIELDS]: |
|
780 |
fields = [fdef |
|
781 |
for (fdef, _, _) in rnd.sample(fielddefs.values(), |
|
782 |
rnd.randint(5, 20))] |
|
779 |
for fielddefs in query.ALL_FIELD_LISTS: |
|
780 |
if len(fielddefs) > 20: |
|
781 |
sample_size = rnd.randint(5, 20) |
|
782 |
else: |
|
783 |
sample_size = rnd.randint(1, max(1, len(fielddefs) - 1)) |
|
784 |
fields = [fdef for (fdef, _, _) in rnd.sample(fielddefs.values(), |
|
785 |
sample_size)] |
|
783 | 786 |
result = query.QueryFields(fielddefs, [fdef.name for fdef in fields]) |
784 | 787 |
self.assert_(isinstance(result, dict)) |
785 | 788 |
response = objects.QueryFieldsResponse.FromDict(result) |
Also available in: Unified diff