From 936039d38637a704ee836dba6fd0cfb7dbc9283f Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Mon, 1 Feb 2021 14:58:52 +0000 Subject: [PATCH] [FUP] this change removes an unused paramater This change removes the migration paramater from _get_neutron_events_for_live_migration in the compute manager. This was accidentally added in Id2d8d72d30075200d2b07b847c4e5568599b0d3b Change-Id: I37c712ba9a0ab88c44d10f80da3254ab6c463a68 Related-Bug: #1901707 --- nova/compute/manager.py | 5 ++--- nova/tests/unit/compute/test_compute_mgr.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6ed32e4e5955..6d8cbc827f61 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -8085,7 +8085,7 @@ class ComputeManager(manager.Manager): LOG.error(msg, msg_args) @staticmethod - def _get_neutron_events_for_live_migration(instance, migration): + def _get_neutron_events_for_live_migration(instance): # We don't generate events if CONF.vif_plugging_timeout=0 # meaning that the operator disabled using them. if CONF.vif_plugging_timeout: @@ -8161,8 +8161,7 @@ class ComputeManager(manager.Manager): """ pass - events = self._get_neutron_events_for_live_migration( - instance, migration) + events = self._get_neutron_events_for_live_migration(instance) try: if ('block_migration' in migrate_data and migrate_data.block_migration): diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py index 3adb590375cd..bed65813795f 100644 --- a/nova/tests/unit/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -9268,7 +9268,7 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase, self.assertTrue(nw_info.return_value[0].is_hybrid_plug_enabled()) self.assertEqual( [], self.compute._get_neutron_events_for_live_migration( - self.instance, migration)) + self.instance)) # 2. no VIFs self.flags(vif_plugging_timeout=300) @@ -9277,7 +9277,7 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase, nw_info.return_value = network_model.NetworkInfo([]) self.assertEqual( [], self.compute._get_neutron_events_for_live_migration( - self.instance, migration)) + self.instance)) # 3. no plug time events with mock.patch.object(self.instance, 'get_network_info') as nw_info: @@ -9288,7 +9288,7 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase, self.assertFalse(nw_info.return_value[0].is_hybrid_plug_enabled()) self.assertEqual( [], self.compute._get_neutron_events_for_live_migration( - self.instance, migration)) + self.instance)) @mock.patch('nova.compute.rpcapi.ComputeAPI.pre_live_migration') @mock.patch('nova.compute.manager.ComputeManager._post_live_migration')