openstack
/
compute-hyperv
Code Issues Proposed changes

Address driver API changes (finish_migration) 

As part of a bug fix, Nova is now passing resource allocations to
"finish_migration".

Change-Id: I8323ee22c1c71a9fee04701f62759c57d5182fe3
Depends-On: Ifd76289964d513e9544544e5787f5f8999589475
This commit is contained in:
Lucian Petrut 2020-03-24 09:56:33 +02:00
parent f327d0549c
commit 8d7384a030
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compute_hyperv/nova/cluster/driver.py
View File

@ -65,10 +65,11 @@ class HyperVClusterDriver(driver.HyperVDriver):
def finish_migration(self, context, migration, instance, disk_info,
network_info, image_meta, resize_instance,
block_device_info=None, power_on=True):
allocations, block_device_info=None, power_on=True):
super(HyperVClusterDriver, self).finish_migration(
context, migration, instance, disk_info, network_info,
image_meta, resize_instance, block_device_info, power_on)
image_meta, resize_instance, allocations,
block_device_info, power_on)
self._clops.add_to_cluster(instance)
def finish_revert_migration(self, context, instance, network_info,

2
compute_hyperv/nova/driver.py
View File

@ -383,7 +383,7 @@ class HyperVDriver(driver.ComputeDriver):
def finish_migration(self, context, migration, instance, disk_info,
network_info, image_meta, resize_instance,
block_device_info=None, power_on=True):
allocations, block_device_info=None, power_on=True):
image_meta = self._recreate_image_meta(context, instance, image_meta)
self._migrationops.finish_migration(context, migration, instance,
disk_info, network_info,

4
compute_hyperv/tests/unit/cluster/test_driver.py
View File

@ -129,13 +129,15 @@ class HyperVClusterTestCase(test_base.HyperVBaseTestCase):
mock.sentinel.network_info,
mock.sentinel.image_meta,
mock.sentinel.resize_instance,
mock.sentinel.allocations,
mock.sentinel.block_dev_info,
mock.sentinel.power_on)
mock_superclass_finish_migration.assert_called_once_with(
self.context, mock.sentinel.migration, mock.sentinel.fake_instance,
mock.sentinel.disk_info, mock.sentinel.network_info,
mock.sentinel.image_meta, mock.sentinel.resize_instance,
mock.sentinel.block_dev_info, mock.sentinel.power_on)
mock.sentinel.allocations, mock.sentinel.block_dev_info,
mock.sentinel.power_on)
self.driver._clops.add_to_cluster.assert_called_once_with(
mock.sentinel.fake_instance)

4
compute_hyperv/tests/unit/test_driver.py
View File

@ -493,8 +493,8 @@ class HyperVDriverTestCase(test_base.HyperVBaseTestCase):
mock.sentinel.context, mock.sentinel.migration,
mock.sentinel.instance, mock.sentinel.disk_info,
mock.sentinel.network_info, mock.sentinel.image_meta,
mock.sentinel.resize_instance, mock.sentinel.block_device_info,
mock.sentinel.power_on)
mock.sentinel.resize_instance, mock.sentinel.allocations,
mock.sentinel.block_device_info, mock.sentinel.power_on)
mock_recreate_img_meta.assert_called_once_with(
mock.sentinel.context, mock.sentinel.instance,