openstack/nova
Code Issues Proposed changes

Merge "Fix pre_live_migration result processing from legacy computes"

Browse Source
This commit is contained in:
Jenkins
2016-03-11 17:46:00 +00:00
committed by Gerrit Code Review
parent 4022d578cc fb6f37f7f9
commit 859ff4893f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/compute/rpcapi.py
View File

@@ -693,7 +693,8 @@ class ComputeAPI(object):
if isinstance(result, migrate_data_obj.LiveMigrateData):
return result
elif migrate_data_orig and result:
migrate_data_orig.from_legacy_dict(result)
migrate_data_orig.from_legacy_dict(
{'pre_live_migration_result': result})
return migrate_data_orig
else:
return result

6
nova/tests/unit/compute/test_rpcapi.py
View File

@@ -626,7 +626,8 @@ class ComputeRpcAPITestCase(test.NoDBTestCase):
callret=None,
calltype='cast')
def test_pre_live_migration_converts_objects(self):
@mock.patch('nova.objects.migrate_data.LiveMigrateData.from_legacy_dict')
def test_pre_live_migration_converts_objects(self, mock_fld):
obj = migrate_data_obj.LiveMigrateData()
result = self._test_simple_call('pre_live_migration',
inargs={'instance': 'foo',
@@ -639,6 +640,7 @@ class ComputeRpcAPITestCase(test.NoDBTestCase):
'disk': None,
'migrate_data': {}},
callret=obj)
self.assertFalse(mock_fld.called)
self.assertEqual(obj, result)
result = self._test_simple_call('pre_live_migration',
inargs={'instance': 'foo',
@@ -651,6 +653,8 @@ class ComputeRpcAPITestCase(test.NoDBTestCase):
'disk': None,
'migrate_data': {}},
callret={'foo': 'bar'})
mock_fld.assert_called_once_with(
{'pre_live_migration_result': {'foo': 'bar'}})
self.assertIsInstance(result, migrate_data_obj.LiveMigrateData)
def test_rollback_live_migration_at_destination_converts_objects(self):