openstack
/
ironic-python-agent
Code Issues Proposed changes

Merge "Attempt tgtd session detach"

This commit is contained in:
Zuul 2019-09-24 12:00:00 +00:00 committed by Gerrit Code Review
parent 3968ec9d5a 8be4cb689c
commit 74c8cd581b
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ironic_python_agent/extensions/iscsi.py
View File

@ -113,8 +113,19 @@ def clean_up(device):
"""Clean up iSCSI for a given device."""
try:
rts_root = rtslib_fb.RTSRoot()
except (EnvironmentError, rtslib_fb.RTSLibError) as exc:
LOG.info('Linux-IO is not available, not cleaning up. Error: %s.', exc)
except (OSError, EnvironmentError, rtslib_fb.RTSLibError) as exc:
LOG.info('Linux-IO is not available, attemting to stop tgtd mapping. '
'Error: %s.', exc)
cmd = ['tgtadm', '--lld', 'iscsi', '--mode', 'target', '--op',
'unbind', '--tid', '1', '--initiator-address', 'ALL']
_execute(cmd, "Error when cleaning up iscsi binds.")
cmd = ['sync']
_execute(cmd, "Error flushing buffers to disk.")
cmd = ['tgtadm', '--lld', 'iscsi', '--mode', 'target', '--op',
'delete', '--tid', '1']
_execute(cmd, "Error deleting the iscsi target configuration.")
return
storage = None

28
ironic_python_agent/tests/unit/extensions/test_iscsi.py
View File

@ -281,6 +281,30 @@ class TestISCSIExtensionLIO(base.IronicAgentTest):
mock_destroy.assert_called_once_with('/dev/fake', 'my_node_uuid')
@mock.patch.object(utils, 'execute', autospec=True)
class TestISCSIExtensionCleanUpFallback(base.IronicAgentTest):
def setUp(self):
super(TestISCSIExtensionCleanUpFallback, self).setUp()
self.agent_extension = iscsi.ISCSIExtension()
self.fake_dev = '/dev/fake'
self.fake_iqn = 'iqn-fake'
self.rtsmock = mock.patch.object(
iscsi.rtslib_fb, 'RTSRoot',
side_effect=EnvironmentError(), autospec=True)
def test_lio_not_available(self, mock_execute):
mock_execute.return_value = ('', '')
expected = [mock.call('tgtadm', '--lld', 'iscsi', '--mode',
'target', '--op', 'unbind', '--tid', '1',
'--initiator-address', 'ALL'),
mock.call('sync'),
mock.call('tgtadm', '--lld', 'iscsi', '--mode', 'target',
'--op', 'delete', '--tid', '1')]
iscsi.clean_up(self.fake_dev)
mock_execute.assert_has_calls(expected)
@mock.patch.object(iscsi.rtslib_fb, 'RTSRoot', autospec=True)
class TestISCSIExtensionCleanUp(base.IronicAgentTest):
@ -290,10 +314,6 @@ class TestISCSIExtensionCleanUp(base.IronicAgentTest):
self.fake_dev = '/dev/fake'
self.fake_iqn = 'iqn-fake'
def test_lio_not_available(self, mock_rtslib):
mock_rtslib.side_effect = IOError()
iscsi.clean_up(self.fake_dev)
def test_device_not_found(self, mock_rtslib):
mock_rtslib.return_value.storage_objects = []
iscsi.clean_up(self.fake_dev)