diff --git a/os_brick/initiator/windows/fibre_channel.py b/os_brick/initiator/windows/fibre_channel.py index 7995fde96..3efd5130c 100644 --- a/os_brick/initiator/windows/fibre_channel.py +++ b/os_brick/initiator/windows/fibre_channel.py @@ -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 diff --git a/os_brick/initiator/windows/iscsi.py b/os_brick/initiator/windows/iscsi.py index 9a2f9435f..c81291789 100644 --- a/os_brick/initiator/windows/iscsi.py +++ b/os_brick/initiator/windows/iscsi.py @@ -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() diff --git a/os_brick/initiator/windows/smbfs.py b/os_brick/initiator/windows/smbfs.py index 4465bbe9a..fe026f2f8 100644 --- a/os_brick/initiator/windows/smbfs.py +++ b/os_brick/initiator/windows/smbfs.py @@ -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) diff --git a/os_brick/tests/windows/test_iscsi.py b/os_brick/tests/windows/test_iscsi.py index 42d6ca28b..67e3e1b82 100644 --- a/os_brick/tests/windows/test_iscsi.py +++ b/os_brick/tests/windows/test_iscsi.py @@ -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) diff --git a/os_brick/tests/windows/test_smbfs.py b/os_brick/tests/windows/test_smbfs.py index 0775f7b49..a11ee23ce 100644 --- a/os_brick/tests/windows/test_smbfs.py +++ b/os_brick/tests/windows/test_smbfs.py @@ -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)