openstack/placement
Code Issues Proposed changes

Merge "Remove pre-cellsv2 short circuit in instance get"

Browse Source
This commit is contained in:
Jenkins 2017-02-02 01:34:22 +00:00 committed by Gerrit Code Review
commit efc363954a
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nova/tests/fixtures.py
View File

@ -264,8 +264,14 @@ class SingleCellSimple(fixtures.Fixture):
If you need to distinguish between cell0 and cellN, then you If you need to distinguish between cell0 and cellN, then you
should use the CellDatabases fixture. should use the CellDatabases fixture.
If instances should appear to still be in scheduling state, pass
instances_created=False to init.
""" """
def __init__(self, instances_created=True):
self.instances_created = instances_created
def setUp(self): def setUp(self):
super(SingleCellSimple, self).setUp() super(SingleCellSimple, self).setUp()
self.useFixture(fixtures.MonkeyPatch( self.useFixture(fixtures.MonkeyPatch(
@ -277,6 +283,12 @@ class SingleCellSimple(fixtures.Fixture):
self.useFixture(fixtures.MonkeyPatch( self.useFixture(fixtures.MonkeyPatch(
'nova.objects.HostMapping._get_by_host_from_db', 'nova.objects.HostMapping._get_by_host_from_db',
self._fake_hostmapping_get)) self._fake_hostmapping_get))
self.useFixture(fixtures.MonkeyPatch(
'nova.objects.InstanceMapping._get_by_instance_uuid_from_db',
self._fake_instancemapping_get))
self.useFixture(fixtures.MonkeyPatch(
'nova.objects.InstanceMapping._save_in_db',
self._fake_instancemapping_get))
self.useFixture(fixtures.MonkeyPatch( self.useFixture(fixtures.MonkeyPatch(
'nova.context.target_cell', 'nova.context.target_cell',
self._fake_target_cell)) self._fake_target_cell))
@ -288,6 +300,18 @@ class SingleCellSimple(fixtures.Fixture):
'host': 'host1', 'host': 'host1',
'cell_mapping': self._fake_cell_list()[0]} 'cell_mapping': self._fake_cell_list()[0]}
def _fake_instancemapping_get(self, *args):
return {
'id': 1,
'updated_at': None,
'created_at': None,
'instance_uuid': uuidsentinel.instance,
'cell_id': (self.instances_created and 1 or None),
'project_id': 'project',
'cell_mapping': (
self.instances_created and self._fake_cell_get() or None),
}
def _fake_cell_get(self, *args): def _fake_cell_get(self, *args):
return self._fake_cell_list()[0] return self._fake_cell_list()[0]