diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-03 20:06:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-03 20:06:21 +0000 |
| commit | 587e03962f99300c089a1fe99aef567931a4c8ea (patch) | |
| tree | 080224e53765197edb3370e977f0927efd42f3fd /nova/tests | |
| parent | a9be29baefafd3d7f80a098cce7226c1db2c1834 (diff) | |
| parent | e03a3df8869ad5303aaba0f006c17d0927fa6dab (diff) | |
Merge "Refactor compute manager _get_instances_by_driver"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 088332647..bbe8e0c81 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3697,14 +3697,14 @@ class ComputeTestCase(BaseTestCase): self.mox.StubOutWithMock(self.compute.driver, 'list_instance_uuids') self.mox.StubOutWithMock(self.compute.conductor_api, - 'instance_get_by_uuid') + 'instance_get_all_by_filters') self.compute.driver.list_instance_uuids().AndReturn( [inst['uuid'] for inst in driver_instances]) - for x in xrange(len(driver_instances)): - self.compute.conductor_api.instance_get_by_uuid(fake_context, - driver_instances[x]['uuid']).AndReturn( - driver_instances[x]) + self.compute.conductor_api.instance_get_all_by_filters( + fake_context, {'uuid': [inst['uuid'] for + inst in driver_instances]}).AndReturn( + driver_instances) self.mox.ReplayAll() @@ -3714,6 +3714,7 @@ class ComputeTestCase(BaseTestCase): def test_get_instances_on_driver_fallback(self): # Test getting instances when driver doesn't support # 'list_instance_uuids' + self.compute.host = 'host' fake_context = context.get_admin_context() all_instances = [] @@ -3729,14 +3730,14 @@ class ComputeTestCase(BaseTestCase): self.mox.StubOutWithMock(self.compute.driver, 'list_instances') self.mox.StubOutWithMock(self.compute.conductor_api, - 'instance_get_all') + 'instance_get_all_by_host') self.compute.driver.list_instance_uuids().AndRaise( NotImplementedError()) self.compute.driver.list_instances().AndReturn( [inst['name'] for inst in driver_instances]) - self.compute.conductor_api.instance_get_all( - fake_context).AndReturn(all_instances) + self.compute.conductor_api.instance_get_all_by_host( + fake_context, self.compute.host).AndReturn(all_instances) self.mox.ReplayAll() |