openstack/placement
Code Issues Proposed changes

Merge "Fix and optimize external_events for multiple cells"

Browse Source
This commit is contained in:
Jenkins 2017-07-21 00:13:14 +00:00 committed by Gerrit Code Review
commit 7078c87386
1 changed files with 8 additions and 1 deletions

9
nova/tests/fixtures.py

@ -288,6 +288,9 @@ class SingleCellSimple(fixtures.Fixture):
self.useFixture(fixtures.MonkeyPatch( self.useFixture(fixtures.MonkeyPatch(
'nova.objects.InstanceMapping._get_by_instance_uuid_from_db', 'nova.objects.InstanceMapping._get_by_instance_uuid_from_db',
self._fake_instancemapping_get)) self._fake_instancemapping_get))
self.useFixture(fixtures.MonkeyPatch(
'nova.objects.InstanceMappingList._get_by_instance_uuids_from_db',
self._fake_instancemapping_get_uuids))
self.useFixture(fixtures.MonkeyPatch( self.useFixture(fixtures.MonkeyPatch(
'nova.objects.InstanceMapping._save_in_db', 'nova.objects.InstanceMapping._save_in_db',
self._fake_instancemapping_get)) self._fake_instancemapping_get))
@ -310,13 +313,17 @@ class SingleCellSimple(fixtures.Fixture):
'id': 1, 'id': 1,
'updated_at': None, 'updated_at': None,
'created_at': None, 'created_at': None,
'instance_uuid': uuidsentinel.instance, 'instance_uuid': args[-1],
'cell_id': (self.instances_created and 1 or None), 'cell_id': (self.instances_created and 1 or None),
'project_id': 'project', 'project_id': 'project',
'cell_mapping': ( 'cell_mapping': (
self.instances_created and self._fake_cell_get() or None), self.instances_created and self._fake_cell_get() or None),
} }
def _fake_instancemapping_get_uuids(self, *args):
return [self._fake_instancemapping_get(uuid)
for uuid in args[-1]]
def _fake_cell_get(self, *args): def _fake_cell_get(self, *args):
return self._fake_cell_list()[0] return self._fake_cell_list()[0]