diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-11 00:24:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-11 00:24:10 +0000 |
| commit | ad0e2afbb1dd209b1efb3db6a0b770e6005effad (patch) | |
| tree | f18df6488064e02e78aa45d6eea63cbf47513ec8 /nova/tests | |
| parent | ac206c5a5eb067541d619ff3a1ccc5aeebdc19f6 (diff) | |
| parent | 8de35027ea4a1c0d58915ff0c67fb7f65700cd07 (diff) | |
Merge "Optimize some of compute/manager's periodic tasks' DB queries"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 612bc5969..8ef7f9311 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3613,14 +3613,18 @@ class ComputeTestCase(BaseTestCase): def test_get_instance_nw_info(self): fake_network.unset_stub_network_methods(self.stubs) - fake_instance = 'fake-instance' + fake_instance = {'uuid': 'fake-instance'} fake_nw_info = network_model.NetworkInfo() self.mox.StubOutWithMock(self.compute.network_api, 'get_instance_nw_info') self.mox.StubOutWithMock(self.compute.conductor_api, 'instance_info_cache_update') + self.mox.StubOutWithMock(self.compute.conductor_api, + 'instance_get_by_uuid') + self.compute.conductor_api.instance_get_by_uuid( + self.context, fake_instance['uuid']).AndReturn(fake_instance) self.compute.network_api.get_instance_nw_info(self.context, fake_instance, conductor_api=self.compute.conductor_api ).AndReturn(fake_nw_info) @@ -3646,8 +3650,9 @@ class ComputeTestCase(BaseTestCase): call_info = {'get_all_by_host': 0, 'get_by_uuid': 0, 'get_nw_info': 0, 'expected_instance': None} - def fake_instance_get_all_by_host(context, host): + def fake_instance_get_all_by_host(context, host, columns_to_join): call_info['get_all_by_host'] += 1 + self.assertEqual(columns_to_join, []) return instances[:] def fake_instance_get_by_uuid(context, instance_uuid): @@ -3723,7 +3728,8 @@ class ComputeTestCase(BaseTestCase): 'launched_at': not_timed_out_time}] unrescued_instances = {'fake_uuid1': False, 'fake_uuid4': False} - def fake_instance_get_all_by_host(context, host): + def fake_instance_get_all_by_host(context, host, columns_to_join): + self.assertEqual(columns_to_join, []) return instances def fake_unrescue(self, context, instance): @@ -4342,8 +4348,10 @@ class ComputeTestCase(BaseTestCase): self.compute.driver.list_instance_uuids().AndReturn( [inst['uuid'] for inst in driver_instances]) self.compute.conductor_api.instance_get_all_by_filters( - fake_context, {'uuid': [inst['uuid'] for - inst in driver_instances]}).AndReturn( + fake_context, + {'uuid': [inst['uuid'] for + inst in driver_instances]}, + columns_to_join=[]).AndReturn( driver_instances) self.mox.ReplayAll() @@ -4377,7 +4385,8 @@ class ComputeTestCase(BaseTestCase): self.compute.driver.list_instances().AndReturn( [inst['name'] for inst in driver_instances]) self.compute.conductor_api.instance_get_all_by_host( - fake_context, self.compute.host).AndReturn(all_instances) + fake_context, self.compute.host, + columns_to_join=[]).AndReturn(all_instances) self.mox.ReplayAll() |