Revision 1635eec0 test/py/ganeti.query_unittest.py
b/test/py/ganeti.query_unittest.py | ||
---|---|---|
617 | 617 |
] |
618 | 618 |
|
619 | 619 |
iqd = query.InstanceQueryData(instances, cluster, None, [], [], {}, |
620 |
set(), {}, None, None) |
|
620 |
set(), {}, None, None, None)
|
|
621 | 621 |
self.assertEqual(q.Query(iqd), |
622 | 622 |
[[(constants.RS_NORMAL, "inst1"), |
623 | 623 |
(constants.RS_NORMAL, 128), |
... | ... | |
646 | 646 |
q = self._Create(selected) |
647 | 647 |
self.assertEqual(q.RequestedData(), |
648 | 648 |
set([query.IQ_CONFIG, query.IQ_LIVE, query.IQ_DISKUSAGE, |
649 |
query.IQ_CONSOLE, query.IQ_NODES])) |
|
649 |
query.IQ_CONSOLE, query.IQ_NODES, query.IQ_NETWORKS]))
|
|
650 | 650 |
|
651 | 651 |
cluster = objects.Cluster(cluster_name="testcluster", |
652 | 652 |
hvparams=constants.HVC_DEFAULTS, |
... | ... | |
823 | 823 |
|
824 | 824 |
iqd = query.InstanceQueryData(instances, cluster, disk_usage, |
825 | 825 |
offline_nodes, bad_nodes, live_data, |
826 |
wrongnode_inst, consinfo, {}, {}) |
|
826 |
wrongnode_inst, consinfo, {}, {}, {})
|
|
827 | 827 |
result = q.Query(iqd) |
828 | 828 |
self.assertEqual(len(result), len(instances)) |
829 | 829 |
self.assert_(compat.all(len(row) == len(selected) |
Also available in: Unified diff