Revision 2c758845 test/ganeti.query_unittest.py
b/test/ganeti.query_unittest.py | ||
---|---|---|
961 | 961 |
alloc_policy=constants.ALLOC_POLICY_PREFERRED, |
962 | 962 |
ipolicy=objects.MakeEmptyIPolicy(), |
963 | 963 |
ndparams={}, |
964 |
diskparams={}, |
|
964 | 965 |
), |
965 | 966 |
objects.NodeGroup(name="restricted", |
966 | 967 |
uuid="d2a40a74-18e7-11e0-9143-001d0904baeb", |
967 | 968 |
alloc_policy=constants.ALLOC_POLICY_LAST_RESORT, |
968 | 969 |
ipolicy=objects.MakeEmptyIPolicy(), |
969 |
ndparams={} |
|
970 |
ndparams={}, |
|
971 |
diskparams={}, |
|
970 | 972 |
), |
971 | 973 |
] |
972 | 974 |
self.cluster = objects.Cluster(cluster_name="testcluster", |
... | ... | |
979 | 981 |
}, |
980 | 982 |
ndparams=constants.NDC_DEFAULTS, |
981 | 983 |
ipolicy=constants.IPOLICY_DEFAULTS, |
984 |
diskparams=constants.DISK_DT_DEFAULTS, |
|
982 | 985 |
) |
983 | 986 |
|
984 | 987 |
def _Create(self, selected): |
... | ... | |
986 | 989 |
|
987 | 990 |
def testSimple(self): |
988 | 991 |
q = self._Create(["name", "uuid", "alloc_policy"]) |
989 |
gqd = query.GroupQueryData(self.cluster, self.groups, None, None) |
|
992 |
gqd = query.GroupQueryData(self.cluster, self.groups, None, None, False)
|
|
990 | 993 |
|
991 | 994 |
self.assertEqual(q.RequestedData(), set([query.GQ_CONFIG])) |
992 | 995 |
|
... | ... | |
1008 | 1011 |
} |
1009 | 1012 |
|
1010 | 1013 |
q = self._Create(["name", "node_cnt", "node_list"]) |
1011 |
gqd = query.GroupQueryData(self.cluster, self.groups, groups_to_nodes, None) |
|
1014 |
gqd = query.GroupQueryData(self.cluster, self.groups, groups_to_nodes, None, |
|
1015 |
False) |
|
1012 | 1016 |
|
1013 | 1017 |
self.assertEqual(q.RequestedData(), set([query.GQ_CONFIG, query.GQ_NODE])) |
1014 | 1018 |
|
... | ... | |
1031 | 1035 |
|
1032 | 1036 |
q = self._Create(["pinst_cnt", "pinst_list"]) |
1033 | 1037 |
gqd = query.GroupQueryData(self.cluster, self.groups, None, |
1034 |
groups_to_instances) |
|
1038 |
groups_to_instances, False)
|
|
1035 | 1039 |
|
1036 | 1040 |
self.assertEqual(q.RequestedData(), set([query.GQ_INST])) |
1037 | 1041 |
|
Also available in: Unified diff