diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py
index 0f8950cf6513..ac3cc643d545 100644
--- a/nova/compute/rpcapi.py
+++ b/nova/compute/rpcapi.py
@@ -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
diff --git a/nova/tests/unit/compute/test_rpcapi.py b/nova/tests/unit/compute/test_rpcapi.py
index a3b3f369d0df..58ec05c6e652 100644
--- a/nova/tests/unit/compute/test_rpcapi.py
+++ b/nova/tests/unit/compute/test_rpcapi.py
@@ -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):
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/nova/commit/859ff4893f699b680fec4db7dedd3bec8c8d0a1c.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/nova/commit/859ff4893f699b680fec4db7dedd3bec8c8d0a1c.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>