blob: da8be404ea887c590e9e24158c4c243d6b8fde0b [file] [log] [blame]
Peter Pentchev6ef0f072022-09-26 16:20:30 +03001From d93a652c373a95e8ebcadd6ee002f725deebbdbd Mon Sep 17 00:00:00 2001
2From: Peter Penchev <openstack-dev@storpool.com>
3Date: Mon, 26 Sep 2022 16:04:36 +0300
4Subject: [PATCH 6/7] StorPool: drop copy_image_to_volume() and
5 copy_volume_to_image()
6
7These methods seem to be leftovers from a bygone era when the parent
8driver could not or would not attach volumes safely.
9
10Change-Id: I6e1a9026e677aee6c7ccad908fe6f92dc253762a
11---
12 cinder/volume/drivers/storpool.py | 43 -------------------------------
13 1 file changed, 43 deletions(-)
14
15diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
16index cccda8ecb..cdaf0043d 100644
17--- a/cinder/volume/drivers/storpool.py
18+++ b/cinder/volume/drivers/storpool.py
19@@ -315,49 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
20 'pools': pools
21 }
22
23- def copy_volume_to_image(self, context, volume, image_service, image_meta):
24- req_id = context.request_id
25- volname = self._attach.volumeName(volume['id'])
26- name = self._attach.volsnapName(volume['id'], req_id)
27- try:
28- self._attach.api().snapshotCreate(volname, {'name': name})
29- except spapi.ApiError as e:
30- raise self._backendException(e)
31- self._attach.add(req_id, {
32- 'volume': name,
33- 'type': 'copy-from',
34- 'id': req_id,
35- 'rights': 1,
36- 'volsnap': True
37- })
38- try:
39- return super(StorPoolDriver, self).copy_volume_to_image(
40- context, volume, image_service, image_meta)
41- finally:
42- self._attach.remove(req_id)
43- try:
44- self._attach.api().snapshotDelete(name)
45- except spapi.ApiError as e:
46- LOG.error(
47- 'Could not remove the temp snapshot %(name)s for '
48- '%(vol)s: %(err)s',
49- {'name': name, 'vol': volname, 'err': e})
50-
51- def copy_image_to_volume(self, context, volume, image_service, image_id):
52- req_id = context.request_id
53- name = self._attach.volumeName(volume['id'])
54- self._attach.add(req_id, {
55- 'volume': name,
56- 'type': 'copy-to',
57- 'id': req_id,
58- 'rights': 2
59- })
60- try:
61- return super(StorPoolDriver, self).copy_image_to_volume(
62- context, volume, image_service, image_id)
63- finally:
64- self._attach.remove(req_id)
65-
66 def extend_volume(self, volume, new_size):
67 size = int(new_size) * units.Gi
68 name = self._attach.volumeName(volume['id'])
69--
702.35.1
71