diff options
| -rwxr-xr-x | nova/compute/manager.py | 7 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a242a121d..741f3a545 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -409,7 +409,8 @@ class ComputeManager(manager.SchedulerDependentManager): 'trying to set it to ERROR'), instance_uuid=instance_uuid) - def _get_instances_on_driver(self, context, filters=None): + def _get_instances_on_driver(self, context, filters=None, + columns_to_join=None): """Return a list of instance records for the instances found on the hypervisor which satisfy the specified filters. If filters=None return a list of instance records for all the instances found on the @@ -421,7 +422,7 @@ class ComputeManager(manager.SchedulerDependentManager): driver_uuids = self.driver.list_instance_uuids() filters['uuid'] = driver_uuids local_instances = self.conductor_api.instance_get_all_by_filters( - context, filters, columns_to_join=[]) + context, filters, columns_to_join=columns_to_join) return local_instances except NotImplementedError: pass @@ -430,7 +431,7 @@ class ComputeManager(manager.SchedulerDependentManager): # to brute force. driver_instances = self.driver.list_instances() instances = self.conductor_api.instance_get_all_by_filters( - context, filters, columns_to_join=[]) + context, filters, columns_to_join=columns_to_join) name_map = dict((instance['name'], instance) for instance in instances) local_instances = [] for driver_instance in driver_instances: diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index e2783641c..2a6651cd1 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -5119,7 +5119,8 @@ class ComputeTestCase(BaseTestCase): self.mox.ReplayAll() - result = self.compute._get_instances_on_driver(fake_context) + result = self.compute._get_instances_on_driver(fake_context, + columns_to_join=[]) self.assertEqual(driver_instances, result) def test_get_instances_on_driver_fallback(self): @@ -5150,7 +5151,7 @@ class ComputeTestCase(BaseTestCase): [inst['name'] for inst in driver_instances]) self.compute.conductor_api.instance_get_all_by_filters( fake_context, filters, - columns_to_join=[]).AndReturn(all_instances) + columns_to_join=None).AndReturn(all_instances) self.mox.ReplayAll() |