openstack
/
os-brick
Code Issues Proposed changes

Merge "Windows: fix connectors 'disconnect_volume' signature"

This commit is contained in:
Zuul 2018-02-13 10:29:51 +00:00 committed by Gerrit Code Review
parent 1b6d30e112 603d036ff9
commit e3b969dfd1
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_brick/initiator/windows/fibre_channel.py
View File

@ -126,6 +126,6 @@ class WindowsFCConnector(win_conn_base.BaseWindowsConnector):
return mappings
@utils.trace
def disconnect_volume(self, connection_properties,
def disconnect_volume(self, connection_properties, device_info=None,
force=False, ignore_errors=False):
pass

2
os_brick/initiator/windows/iscsi.py
View File

@ -134,7 +134,7 @@ class WindowsISCSIConnector(win_conn_base.BaseWindowsConnector,
return device_info
@utils.trace
def disconnect_volume(self, connection_properties,
def disconnect_volume(self, connection_properties, device_info=None,
force=False, ignore_errors=False):
# We want to refresh the cached information first.
self._diskutils.rescan_disks()

2
os_brick/initiator/windows/smbfs.py
View File

@ -49,7 +49,7 @@ class WindowsSMBFSConnector(win_conn_base.BaseWindowsConnector):
return device_info
@utils.trace
def disconnect_volume(self, connection_properties,
def disconnect_volume(self, connection_properties, device_info=None,
force=False, ignore_errors=False):
export_path = self._get_export_path(connection_properties)
self._remotefsclient.unmount(export_path)

3
os_brick/tests/windows/test_iscsi.py
View File

@ -168,7 +168,8 @@ class WindowsISCSIConnectorTestCase(test_base.WindowsConnectorTestBase):
mock_get_all_targets.return_value = targets
self._iscsi_utils.get_target_luns.return_value = [mock.sentinel.lun_0]
self._connector.disconnect_volume(mock.sentinel.conn_props)
self._connector.disconnect_volume(mock.sentinel.conn_props,
mock.sentinel.dev_info)
self._diskutils.rescan_disks.assert_called_once_with()
mock_get_all_targets.assert_called_once_with(mock.sentinel.conn_props)

3
os_brick/tests/windows/test_smbfs.py
View File

@ -46,7 +46,8 @@ class WindowsSMBFSConnectorTestCase(test_base.WindowsConnectorTestBase):
@mock.patch.object(smbfs.WindowsSMBFSConnector, '_get_export_path')
def test_disconnect_volume(self, mock_get_export_path):
self._connector.disconnect_volume(mock.sentinel.conn_props)
self._connector.disconnect_volume(mock.sentinel.conn_props,
mock.sentinel.dev_info)
self._remotefs.unmount.assert_called_once_with(
mock_get_export_path.return_value)