openstack/nova
Code Issues Proposed changes

Merge "Fix object assumption in remove_deleted_instances()"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 03:51:55 +00:00 committed by Gerrit Code Review
commit d4b35152c0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/scheduler/client/report.py
View File

@ -442,7 +442,7 @@ class SchedulerReportClient(object):
if allocations is None: if allocations is None:
allocations = {} allocations = {}
instance_dict = {instance.uuid: instance instance_dict = {instance['uuid']: instance
for instance in instance_uuids} for instance in instance_uuids}
removed_instances = set(allocations.keys()) - set(instance_dict.keys()) removed_instances = set(allocations.keys()) - set(instance_dict.keys())

7
nova/tests/unit/scheduler/client/test_report.py
View File

@ -769,9 +769,14 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
inst2.uuid: fake_allocations, inst2.uuid: fake_allocations,
} }
} }
# One instance still on the node, dict form as the
# RT tracks it
inst3 = {'uuid': 'foo'}
mock_delete.return_value = True mock_delete.return_value = True
with mock.patch.object(self.client, '_allocations'): with mock.patch.object(self.client, '_allocations'):
self.client.remove_deleted_instances(cn, []) self.client.remove_deleted_instances(cn, [inst3])
mock_get.assert_called_once_with( mock_get.assert_called_once_with(
'/resource_providers/%s/allocations' % cn.uuid) '/resource_providers/%s/allocations' % cn.uuid)
expected_calls = [ expected_calls = [