Merge "Join migration_context and flavor in Migration.instance" into stable/train
This commit is contained in:
commit
6e59fd670e
|
@ -194,7 +194,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
|
||||||
|
|
|
@ -3233,7 +3233,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.'
|
||||||
|
|
|
@ -200,10 +200,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)
|
||||||
|
|
Loading…
Reference in New Issue