diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py index 4c0241ecaf6..0eac3d9570b 100644 --- a/cinder/tests/unit/volume/drivers/test_storpool.py +++ b/cinder/tests/unit/volume/drivers/test_storpool.py @@ -224,7 +224,9 @@ class StorPoolTestCase(test.TestCase): def test_initialize_connection_good(self, cid, hid, name): c = self.driver.initialize_connection({'id': hid}, {'host': name}) self.assertEqual('storpool', c['driver_volume_type']) - self.assertDictEqual({'client_id': cid, 'volume': hid}, c['data']) + self.assertDictEqual({'client_id': cid, 'volume': hid, + 'access_mode': 'rw'}, + c['data']) def test_noop_functions(self): self.driver.terminate_connection(None, None) diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py index abfdad16024..d21fb52f667 100644 --- a/cinder/volume/drivers/storpool.py +++ b/cinder/volume/drivers/storpool.py @@ -167,6 +167,7 @@ class StorPoolDriver(driver.VolumeDriver): 'data': { 'client_id': self._storpool_client_id(connector), 'volume': volume['id'], + 'access_mode': 'rw', }} def terminate_connection(self, volume, connector, **kwargs): @@ -313,45 +314,6 @@ class StorPoolDriver(driver.VolumeDriver): 'pools': pools } - def _attach_volume(self, context, volume, properties, remote=False): - if remote: - return super(StorPoolDriver, self)._attach_volume( - context, volume, properties, remote=remote) - req_id = context.request_id - req = self._attach.get().get(req_id, None) - if req is None: - req = { - 'volume': self._attach.volumeName(volume['id']), - 'type': 'cinder-attach', - 'id': context.request_id, - 'rights': 2, - 'volsnap': False, - 'remove_on_detach': True - } - self._attach.add(req_id, req) - name = req['volume'] - self._attach.sync(req_id, None) - return {'device': {'path': '/dev/storpool/' + name, - 'storpool_attach_req': req_id}}, volume - - def _detach_volume(self, context, attach_info, volume, properties, - force=False, remote=False, ignore_errors=False): - if remote: - return super(StorPoolDriver, self)._detach_volume( - context, attach_info, volume, properties, - force=force, remote=remote, ignore_errors=ignore_errors) - try: - req_id = attach_info.get('device', {}).get( - 'storpool_attach_req', context.request_id) - req = self._attach.get()[req_id] - name = req['volume'] - self._attach.sync(req_id, name) - if req.get('remove_on_detach', False): - self._attach.remove(req_id) - except BaseException: - if not ignore_errors: - raise - def backup_volume(self, context, backup, backup_service): volume = self.db.volume_get(context, backup['volume_id']) req_id = context.request_id diff --git a/releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml b/releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml new file mode 100644 index 00000000000..b199040417c --- /dev/null +++ b/releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + StorPool driver `bug #1939241 + `_: Fixed the creation of + encrypted StorPool volumes by dropping the needlessly and incompletely + overridden `_attach_volume()` and `_detach_volume()` methods.