diff options
| author | Dmitry Tantsur <divius.inside@gmail.com> | 2018-02-21 17:21:59 +0000 |
|---|---|---|
| committer | Dmitry Tantsur <divius.inside@gmail.com> | 2018-02-21 18:33:35 +0100 |
| commit | 08ed859ce2c2388e903fb42f7efad9f9b265b7c9 (patch) | |
| tree | 8ee6c89ba945f61414c811862f7578007d18a230 /ironic/tests/unit/drivers/modules/network/test_common.py | |
| parent | a97fa8e3ced56fc12ecb1045a13f171a020fddb1 (diff) | |
| download | ironic-08ed859ce2c2388e903fb42f7efad9f9b265b7c9.tar.gz | |
Revert "Don't try to lock for vif detach"
This is causing more serious issues, as there is a race
between tenant VIF removal and cleaning VIF adding.
This reverts commit 4f79cb3932f2518ab3f06b86ceea065cbb399e8c.
The release note is not deleted from it, because the change has
already been released. A new one is added instead.
Change-Id: I922f24293645ff6bb79ad753f49dc9548b9f2485
Closes-Bug: #1750785
Diffstat (limited to 'ironic/tests/unit/drivers/modules/network/test_common.py')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/network/test_common.py | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/ironic/tests/unit/drivers/modules/network/test_common.py b/ironic/tests/unit/drivers/modules/network/test_common.py index cccb2c016..a64fc348f 100644 --- a/ironic/tests/unit/drivers/modules/network/test_common.py +++ b/ironic/tests/unit/drivers/modules/network/test_common.py @@ -941,28 +941,12 @@ class TestNeutronVifPortIDMixin(db_base.DbTestCase): self.node.save() mock_get.return_value = self.port mock_unp.side_effect = exception.NetworkError - with task_manager.acquire(self.context, self.node.id, - shared=True) as task: + with task_manager.acquire(self.context, self.node.id) as task: self.assertRaises(exception.NetworkError, self.interface.vif_detach, task, 'fake_vif_id') mock_unp.assert_called_once_with('fake_vif_id', context=task.context) mock_get.assert_called_once_with(task, 'fake_vif_id') - mock_clear.assert_not_called() - - @mock.patch.object(common.VIFPortIDMixin, '_clear_vif_from_port_like_obj') - @mock.patch.object(neutron_common, 'unbind_neutron_port', autospec=True) - @mock.patch.object(common.VIFPortIDMixin, '_get_port_like_obj_by_vif_id') - def test_vif_detach_deleting_node_success(self, mock_get, mock_unp, - mock_clear): - self.node.provision_state = states.DELETING - self.node.save() - mock_get.return_value = self.port - with task_manager.acquire(self.context, self.node.id, - shared=True) as task: - self.interface.vif_detach(task, 'fake_vif_id') - self.assertFalse(mock_unp.called) - mock_get.assert_called_once_with(task, 'fake_vif_id') mock_clear.assert_called_once_with(self.port) @mock.patch.object(common_utils, 'warn_about_deprecated_extra_vif_port_id', |