diff --git a/nova/compute/manager.py b/nova/compute/manager.py index aa67bb55cdf1..f2589c1a6e59 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3481,7 +3481,7 @@ class ComputeManager(manager.Manager): network_info = self.network_api.get_instance_nw_info(context, instance) - self.driver.confirm_migration(migration, instance, + self.driver.confirm_migration(context, migration, instance, network_info) migration.status = 'confirmed' diff --git a/nova/tests/unit/virt/hyperv/test_driver.py b/nova/tests/unit/virt/hyperv/test_driver.py index 1d108789355f..30a112fc99f2 100644 --- a/nova/tests/unit/virt/hyperv/test_driver.py +++ b/nova/tests/unit/virt/hyperv/test_driver.py @@ -388,10 +388,12 @@ class HyperVDriverTestCase(test_base.HyperVBaseTestCase): def test_confirm_migration(self): self.driver.confirm_migration( + mock.sentinel.context, mock.sentinel.migration, mock.sentinel.instance, mock.sentinel.network_info) self.driver._migrationops.confirm_migration.assert_called_once_with( + mock.sentinel.context, mock.sentinel.migration, mock.sentinel.instance, mock.sentinel.network_info) diff --git a/nova/tests/unit/virt/hyperv/test_migrationops.py b/nova/tests/unit/virt/hyperv/test_migrationops.py index 0973e509c990..c1200453e6b5 100644 --- a/nova/tests/unit/virt/hyperv/test_migrationops.py +++ b/nova/tests/unit/virt/hyperv/test_migrationops.py @@ -215,6 +215,7 @@ class MigrationOpsTestCase(test_base.HyperVBaseTestCase): def test_confirm_migration(self): mock_instance = fake_instance.fake_instance_obj(self.context) self._migrationops.confirm_migration( + context=self.context, migration=mock.sentinel.migration, instance=mock_instance, network_info=mock.sentinel.network_info) get_instance_migr_revert_dir = ( diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 0e6081891329..424037169b49 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -16070,8 +16070,8 @@ class LibvirtDriverTestCase(test.NoDBTestCase): _fake_network_info(self, 1)) self.mox.ReplayAll() - self.drvr.confirm_migration("migration_ref", ins_ref, - _fake_network_info(self, 1)) + self.drvr.confirm_migration(self.context, "migration_ref", ins_ref, + _fake_network_info(self, 1)) def test_cleanup_resize_same_host(self): CONF.set_override('policy_dirs', [], group='oslo_policy') diff --git a/nova/virt/driver.py b/nova/virt/driver.py index dd3c304d134e..0eb6a17298e4 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -585,12 +585,11 @@ class ComputeDriver(object): """ raise NotImplementedError() - def confirm_migration(self, migration, instance, network_info): + def confirm_migration(self, context, migration, instance, network_info): """Confirms a resize/migration, destroying the source VM. :param instance: nova.objects.instance.Instance """ - # TODO(Vek): Need to pass context in for access to auth_token raise NotImplementedError() def finish_revert_migration(self, context, instance, network_info, diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 3533abcffa59..32894e04c1fd 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -498,7 +498,7 @@ class FakeDriver(driver.ComputeDriver): block_device_info=None, power_on=True): return - def confirm_migration(self, migration, instance, network_info): + def confirm_migration(self, context, migration, instance, network_info): return def pre_live_migration(self, context, instance, block_device_info, diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py index 94637c584e65..9ac8f16ffa85 100644 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -309,8 +309,9 @@ class HyperVDriver(driver.ComputeDriver): timeout, retry_interval) - def confirm_migration(self, migration, instance, network_info): - self._migrationops.confirm_migration(migration, instance, network_info) + def confirm_migration(self, context, migration, instance, network_info): + self._migrationops.confirm_migration(context, migration, + instance, network_info) def finish_revert_migration(self, context, instance, network_info, block_device_info=None, power_on=True): diff --git a/nova/virt/hyperv/migrationops.py b/nova/virt/hyperv/migrationops.py index 3445b712e0be..66280d6ee9b0 100644 --- a/nova/virt/hyperv/migrationops.py +++ b/nova/virt/hyperv/migrationops.py @@ -134,7 +134,7 @@ class MigrationOps(object): # disk_info is not used return "" - def confirm_migration(self, migration, instance, network_info): + def confirm_migration(self, context, migration, instance, network_info): LOG.debug("confirm_migration called", instance=instance) self._pathutils.get_instance_migr_revert_dir(instance.name, diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index d731859cd197..d796b6535f24 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -7385,7 +7385,7 @@ class LibvirtDriver(driver.ComputeDriver): LOG.debug("finish_revert_migration finished successfully.", instance=instance) - def confirm_migration(self, migration, instance, network_info): + def confirm_migration(self, context, migration, instance, network_info): """Confirms a resize, destroying the source VM.""" self._cleanup_resize(instance, network_info) diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 2afc55ae1d2b..4ddcbc3d2738 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -229,7 +229,7 @@ class VMwareVCDriver(driver.ComputeDriver): return self._vmops.migrate_disk_and_power_off(context, instance, dest, flavor) - def confirm_migration(self, migration, instance, network_info): + def confirm_migration(self, context, migration, instance, network_info): """Confirms a resize, destroying the source VM.""" self._vmops.confirm_migration(migration, instance, network_info) diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index c39a092a4ad0..5db72a0f7348 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -165,9 +165,8 @@ class XenAPIDriver(driver.ComputeDriver): self._vmops.spawn(context, instance, image_meta, injected_files, admin_password, network_info, block_device_info) - def confirm_migration(self, migration, instance, network_info): + def confirm_migration(self, context, migration, instance, network_info): """Confirms a resize, destroying the source VM.""" - # TODO(Vek): Need to pass context in for access to auth_token self._vmops.confirm_migration(migration, instance, network_info) def finish_revert_migration(self, context, instance, network_info,