File tree Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -8085,7 +8085,7 @@ def _neutron_failed_migration_callback(event_name, instance):
8085
8085
LOG.error(msg, msg_args)
8086
8086
8087
8087
@staticmethod
8088
- def _get_neutron_events_for_live_migration(instance, migration ):
8088
+ def _get_neutron_events_for_live_migration(instance):
8089
8089
# We don't generate events if CONF.vif_plugging_timeout=0
8090
8090
# meaning that the operator disabled using them.
8091
8091
if CONF.vif_plugging_timeout:
@@ -8161,8 +8161,7 @@ class _BreakWaitForInstanceEvent(Exception):
8161
8161
"""
8162
8162
pass
8163
8163
8164
- events = self._get_neutron_events_for_live_migration(
8165
- instance, migration)
8164
+ events = self._get_neutron_events_for_live_migration(instance)
8166
8165
try:
8167
8166
if ('block_migration' in migrate_data and
8168
8167
migrate_data.block_migration):
Original file line number Diff line number Diff line change @@ -9268,7 +9268,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
9268
9268
self.assertTrue(nw_info.return_value[0].is_hybrid_plug_enabled())
9269
9269
self.assertEqual(
9270
9270
[], self.compute._get_neutron_events_for_live_migration(
9271
- self.instance, migration ))
9271
+ self.instance))
9272
9272
9273
9273
# 2. no VIFs
9274
9274
self.flags(vif_plugging_timeout=300)
@@ -9277,7 +9277,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
9277
9277
nw_info.return_value = network_model.NetworkInfo([])
9278
9278
self.assertEqual(
9279
9279
[], self.compute._get_neutron_events_for_live_migration(
9280
- self.instance, migration ))
9280
+ self.instance))
9281
9281
9282
9282
# 3. no plug time events
9283
9283
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):
9288
9288
self.assertFalse(nw_info.return_value[0].is_hybrid_plug_enabled())
9289
9289
self.assertEqual(
9290
9290
[], self.compute._get_neutron_events_for_live_migration(
9291
- self.instance, migration ))
9291
+ self.instance))
9292
9292
9293
9293
@mock.patch('nova.compute.rpcapi.ComputeAPI.pre_live_migration')
9294
9294
@mock.patch('nova.compute.manager.ComputeManager._post_live_migration')
You can’t perform that action at this time.
0 commit comments