openstack/nova
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2021-02-02 02:26:28 +00:00 committed by Gerrit Code Review
commit 726e2fd03b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/compute/manager.py
View File

@ -8105,7 +8105,7 @@ class ComputeManager(manager.Manager):
LOG.error(msg, msg_args) LOG.error(msg, msg_args)
@staticmethod @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 # We don't generate events if CONF.vif_plugging_timeout=0
# meaning that the operator disabled using them. # meaning that the operator disabled using them.
if CONF.vif_plugging_timeout: if CONF.vif_plugging_timeout:
@ -8181,8 +8181,7 @@ class ComputeManager(manager.Manager):
""" """
pass pass
events = self._get_neutron_events_for_live_migration( events = self._get_neutron_events_for_live_migration(instance)
instance, migration)
try: try:
if ('block_migration' in migrate_data and if ('block_migration' in migrate_data and
migrate_data.block_migration): migrate_data.block_migration):

6
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -9280,7 +9280,7 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase,
self.assertTrue(nw_info.return_value[0].is_hybrid_plug_enabled()) self.assertTrue(nw_info.return_value[0].is_hybrid_plug_enabled())
self.assertEqual( self.assertEqual(
[], self.compute._get_neutron_events_for_live_migration( [], self.compute._get_neutron_events_for_live_migration(
self.instance, migration)) self.instance))
# 2. no VIFs # 2. no VIFs
self.flags(vif_plugging_timeout=300) self.flags(vif_plugging_timeout=300)
@ -9289,7 +9289,7 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase,
nw_info.return_value = network_model.NetworkInfo([]) nw_info.return_value = network_model.NetworkInfo([])
self.assertEqual( self.assertEqual(
[], self.compute._get_neutron_events_for_live_migration( [], self.compute._get_neutron_events_for_live_migration(
self.instance, migration)) self.instance))
# 3. no plug time events # 3. no plug time events
with mock.patch.object(self.instance, 'get_network_info') as nw_info: with mock.patch.object(self.instance, 'get_network_info') as nw_info:
@ -9300,7 +9300,7 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase,
self.assertFalse(nw_info.return_value[0].is_hybrid_plug_enabled()) self.assertFalse(nw_info.return_value[0].is_hybrid_plug_enabled())
self.assertEqual( self.assertEqual(
[], self.compute._get_neutron_events_for_live_migration( [], 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.rpcapi.ComputeAPI.pre_live_migration')
@mock.patch('nova.compute.manager.ComputeManager._post_live_migration') @mock.patch('nova.compute.manager.ComputeManager._post_live_migration')