Skip to content

Commit 936039d

Browse files
committed
[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
1 parent 67c76de commit 936039d

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

nova/compute/manager.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8085,7 +8085,7 @@ def _neutron_failed_migration_callback(event_name, instance):
80858085
LOG.error(msg, msg_args)
80868086

80878087
@staticmethod
8088-
def _get_neutron_events_for_live_migration(instance, migration):
8088+
def _get_neutron_events_for_live_migration(instance):
80898089
# We don't generate events if CONF.vif_plugging_timeout=0
80908090
# meaning that the operator disabled using them.
80918091
if CONF.vif_plugging_timeout:
@@ -8161,8 +8161,7 @@ class _BreakWaitForInstanceEvent(Exception):
81618161
"""
81628162
pass
81638163

8164-
events = self._get_neutron_events_for_live_migration(
8165-
instance, migration)
8164+
events = self._get_neutron_events_for_live_migration(instance)
81668165
try:
81678166
if ('block_migration' in migrate_data and
81688167
migrate_data.block_migration):

nova/tests/unit/compute/test_compute_mgr.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9268,7 +9268,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
92689268
self.assertTrue(nw_info.return_value[0].is_hybrid_plug_enabled())
92699269
self.assertEqual(
92709270
[], self.compute._get_neutron_events_for_live_migration(
9271-
self.instance, migration))
9271+
self.instance))
92729272

92739273
# 2. no VIFs
92749274
self.flags(vif_plugging_timeout=300)
@@ -9277,7 +9277,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
92779277
nw_info.return_value = network_model.NetworkInfo([])
92789278
self.assertEqual(
92799279
[], self.compute._get_neutron_events_for_live_migration(
9280-
self.instance, migration))
9280+
self.instance))
92819281

92829282
# 3. no plug time events
92839283
with mock.patch.object(self.instance, 'get_network_info') as nw_info:
@@ -9288,7 +9288,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
92889288
self.assertFalse(nw_info.return_value[0].is_hybrid_plug_enabled())
92899289
self.assertEqual(
92909290
[], self.compute._get_neutron_events_for_live_migration(
9291-
self.instance, migration))
9291+
self.instance))
92929292

92939293
@mock.patch('nova.compute.rpcapi.ComputeAPI.pre_live_migration')
92949294
@mock.patch('nova.compute.manager.ComputeManager._post_live_migration')

0 commit comments

Comments
 (0)