openstack
/
nova
Code Issues Proposed changes

Remove conversion from dict to object from xenapi live_migration 

Since mitaka checks before live-migration operates migrate_data objects
not dicts. This patch removes check and conversion from
check_can_live_migrate_source.

Change-Id: Ic1959c5e733014f2e9c16c3c5d270142ac8a966d
This commit is contained in:
Timofey Durakov 2016-08-24 13:13:12 +03:00
parent c6a188aaf4
commit ee9f631f69
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/tests/unit/virt/xenapi/test_xenapi.py
View File

@ -3492,16 +3492,13 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
self._add_default_live_migrate_stubs(self.conn)
dest_check_data = {'block_migration': True,
'is_volume_backed': False,
'migrate_data': {
'destination_sr_ref': None,
'migrate_send_data': {'key': 'value'}
}}
dest_check_data = objects.XenapiLiveMigrateData(
block_migration=True, is_volume_backed=False,
destination_sr_ref=None, migrate_send_data={'key': 'value'})
result = self.conn.check_can_live_migrate_source(self.context,
{'host': 'host'},
dest_check_data)
self.assertEqual(dest_check_data, result.to_legacy_dict())
self.assertEqual(dest_check_data, result)
def test_check_can_live_migrate_source_with_block_migrate_iscsi(self):
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
@ -3558,12 +3555,9 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
self._add_default_live_migrate_stubs(self.conn)
dest_check_data = {'block_migration': True,
'is_volume_backed': True,
'migrate_data': {
'destination_sr_ref': None,
'migrate_send_data': {'key': 'value'}
}}
dest_check_data = objects.XenapiLiveMigrateData(
block_migration=True, is_volume_backed=True,
migrate_send_data={'key': 'value'}, destination_sr_ref=None)
self.assertRaises(exception.MigrationError,
self.conn.check_can_live_migrate_source,
self.context,

6
nova/virt/xenapi/vmops.py
View File

@ -47,7 +47,6 @@ from nova import context as nova_context
from nova import exception
from nova.i18n import _, _LE, _LI, _LW
from nova import objects
from nova.objects import migrate_data as migrate_data_obj
from nova.pci import manager as pci_manager
from nova import utils
from nova.virt import configdrive
@ -2246,11 +2245,6 @@ class VMOps(object):
raise exception.MigrationError(reason=_('XAPI supporting '
'relax-xsm-sr-check=true required'))
if not isinstance(dest_check_data, migrate_data_obj.LiveMigrateData):
obj = objects.XenapiLiveMigrateData()
obj.from_legacy_dict(dest_check_data)
dest_check_data = obj
if ('block_migration' in dest_check_data and
dest_check_data.block_migration):
vm_ref = self._get_vm_opaque_ref(instance_ref)