openstack
/
nova
Code Issues Proposed changes

Merge "Join migration_context and flavor in Migration.instance" into stable/rocky

This commit is contained in:
Zuul 2020-01-16 23:52:54 +00:00 committed by Gerrit Code Review
parent 619f1e6a97 e48fb84e12
commit 86067192b0
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/objects/migration.py
View File

@ -169,7 +169,8 @@ class Migration(base.NovaPersistentObject, base.NovaObject,
def instance(self): def instance(self):
if not hasattr(self, '_cached_instance'): if not hasattr(self, '_cached_instance'):
self._cached_instance = objects.Instance.get_by_uuid( self._cached_instance = objects.Instance.get_by_uuid(
self._context, self.instance_uuid) self._context, self.instance_uuid,
expected_attrs=['migration_context', 'flavor'])
return self._cached_instance return self._cached_instance
@instance.setter @instance.setter

5
nova/tests/unit/compute/test_resource_tracker.py
View File

@ -2660,7 +2660,10 @@ class TestUpdateUsageFromMigrations(BaseTestCase):
self.rt._update_usage_from_migrations(mock.sentinel.ctx, [migration], self.rt._update_usage_from_migrations(mock.sentinel.ctx, [migration],
_NODENAME) _NODENAME)
mock_get_instance.assert_called_once_with(mock.sentinel.ctx, mock_get_instance.assert_called_once_with(mock.sentinel.ctx,
'some_uuid') 'some_uuid',
expected_attrs=[
'migration_context',
'flavor'])
self.assertFalse(mock_update_usage.called) self.assertFalse(mock_update_usage.called)
@mock.patch('nova.compute.resource_tracker.ResourceTracker.' @mock.patch('nova.compute.resource_tracker.ResourceTracker.'

9
nova/tests/unit/objects/test_migration.py
View File

@ -161,10 +161,11 @@ class _TestMigrationObject(object):
fake_migration) fake_migration)
mig._context = ctxt mig._context = ctxt
self.assertEqual(mig.instance.host, fake_inst['host']) self.assertEqual(mig.instance.host, fake_inst['host'])
mock_get.assert_called_once_with(ctxt, mock_get.assert_called_once_with(
fake_migration['instance_uuid'], ctxt, fake_migration['instance_uuid'],
columns_to_join=['info_cache', columns_to_join=['extra',
'security_groups']) 'extra.flavor',
'extra.migration_context'])
def test_instance_setter(self): def test_instance_setter(self):
migration = objects.Migration(instance_uuid=uuidsentinel.instance) migration = objects.Migration(instance_uuid=uuidsentinel.instance)