Revision fab9573b test/ganeti.query_unittest.py
b/test/ganeti.query_unittest.py | ||
---|---|---|
581 | 581 |
] |
582 | 582 |
|
583 | 583 |
iqd = query.InstanceQueryData(instances, cluster, None, [], [], {}, |
584 |
set(), {}) |
|
584 |
set(), {}, None, None)
|
|
585 | 585 |
self.assertEqual(q.Query(iqd), |
586 | 586 |
[[(constants.RS_NORMAL, "inst1"), |
587 | 587 |
(constants.RS_NORMAL, 128), |
... | ... | |
610 | 610 |
q = self._Create(selected) |
611 | 611 |
self.assertEqual(q.RequestedData(), |
612 | 612 |
set([query.IQ_CONFIG, query.IQ_LIVE, query.IQ_DISKUSAGE, |
613 |
query.IQ_CONSOLE])) |
|
613 |
query.IQ_CONSOLE, query.IQ_NODES]))
|
|
614 | 614 |
|
615 | 615 |
cluster = objects.Cluster(cluster_name="testcluster", |
616 | 616 |
hvparams=constants.HVC_DEFAULTS, |
... | ... | |
767 | 767 |
|
768 | 768 |
iqd = query.InstanceQueryData(instances, cluster, disk_usage, |
769 | 769 |
offline_nodes, bad_nodes, live_data, |
770 |
wrongnode_inst, consinfo) |
|
770 |
wrongnode_inst, consinfo, {}, {})
|
|
771 | 771 |
result = q.Query(iqd) |
772 | 772 |
self.assertEqual(len(result), len(instances)) |
773 | 773 |
self.assert_(compat.all(len(row) == len(selected) |
Also available in: Unified diff