diff --git a/brick_cinderclient_ext/client.py b/brick_cinderclient_ext/client.py index 7e6d3d7..efa6f6b 100644 --- a/brick_cinderclient_ext/client.py +++ b/brick_cinderclient_ext/client.py @@ -70,7 +70,7 @@ class Client(object): with actions.ConnectVolume(self.volumes_client, volume_id) as cmd: brick_connector = self._brick_get_connector( - connection['driver_volume_type'], is_local=True) + connection['driver_volume_type'], do_local_attach=True) device_info = cmd.connect(brick_connector, connection['data'], mountpoint, mode, hostname) @@ -87,7 +87,7 @@ class Client(object): connection = cmd.initialize(self, multipath, enforce_multipath) brick_connector = self._brick_get_connector( - connection['driver_volume_type'], is_local=True) + connection['driver_volume_type'], do_local_attach=True) with actions.DisconnectVolume(self.volumes_client, volume_id) as cmd: cmd.disconnect(brick_connector, connection['data'], device_info) diff --git a/brick_cinderclient_ext/tests/unit/test_volume_actions.py b/brick_cinderclient_ext/tests/unit/test_volume_actions.py index 6b84f7a..a453ebc 100644 --- a/brick_cinderclient_ext/tests/unit/test_volume_actions.py +++ b/brick_cinderclient_ext/tests/unit/test_volume_actions.py @@ -56,7 +56,7 @@ class TestVolumeActions(base.BaseTestCase): self.v_client.volumes.initialize_connection.assert_called_once_with( self.volume_id, None) - @ddt.data('iscsi', 'iSCSI', 'ISCSI') + @ddt.data('iscsi', 'iSCSI', 'ISCSI', 'rbd', 'RBD') def test_verify_protocol(self, protocol): with volume_actions.VerifyProtocol(*self.command_args) as cmd: # NOTE(e0ne): veryfy that no exception is rased diff --git a/brick_cinderclient_ext/volume_actions.py b/brick_cinderclient_ext/volume_actions.py index 546e1c4..5d5e312 100644 --- a/brick_cinderclient_ext/volume_actions.py +++ b/brick_cinderclient_ext/volume_actions.py @@ -42,9 +42,9 @@ class InitializeConnection(VolumeAction): class VerifyProtocol(VolumeAction): - # NOTE(e0ne): iSCSI drivers works without issues, RBD and NFS don't + # NOTE(e0ne): Only iSCSI and RBD based drivers are supported. NFS doesn't # work. Drivers with other protocols are not tested yet. - SUPPORTED_PROCOTOLS = [connector.ISCSI] + SUPPORTED_PROCOTOLS = [connector.ISCSI, connector.RBD] def verify(self, protocol): protocol = protocol.upper()