Merge "[FUP] this change removes an unused paramater"

Author: Zuul

nova/compute/manager.py

@@ -8105,7 +8105,7 @@ def _neutron_failed_migration_callback(event_name, instance):
         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:
@@ -8181,8 +8181,7 @@ class _BreakWaitForInstanceEvent(Exception):
             """
             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):

nova/tests/unit/compute/test_compute_mgr.py

@@ -9280,7 +9280,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
             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)
@@ -9289,7 +9289,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
             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:
@@ -9300,7 +9300,7 @@ def test_get_neutron_events_for_live_migration_empty(self):
             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')