From 8d7384a0300dd008ab99831f4789492c6df845da Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Tue, 24 Mar 2020 09:56:33 +0200 Subject: [PATCH] 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 --- compute_hyperv/nova/cluster/driver.py | 5 +++-- compute_hyperv/nova/driver.py | 2 +- compute_hyperv/tests/unit/cluster/test_driver.py | 4 +++- compute_hyperv/tests/unit/test_driver.py | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/compute_hyperv/nova/cluster/driver.py b/compute_hyperv/nova/cluster/driver.py index be597290..70c32905 100644 --- a/compute_hyperv/nova/cluster/driver.py +++ b/compute_hyperv/nova/cluster/driver.py @@ -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, diff --git a/compute_hyperv/nova/driver.py b/compute_hyperv/nova/driver.py index 1d2d2d1e..0e00c7a6 100644 --- a/compute_hyperv/nova/driver.py +++ b/compute_hyperv/nova/driver.py @@ -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, diff --git a/compute_hyperv/tests/unit/cluster/test_driver.py b/compute_hyperv/tests/unit/cluster/test_driver.py index e7b456f8..4a8981b4 100644 --- a/compute_hyperv/tests/unit/cluster/test_driver.py +++ b/compute_hyperv/tests/unit/cluster/test_driver.py @@ -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) diff --git a/compute_hyperv/tests/unit/test_driver.py b/compute_hyperv/tests/unit/test_driver.py index f04da26e..d753248d 100644 --- a/compute_hyperv/tests/unit/test_driver.py +++ b/compute_hyperv/tests/unit/test_driver.py @@ -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,