blob: c15c4a57071a600be2459e29d53de9ffbb9d82d7 [file] [log] [blame]
Peter Pentchevacaaa382023-02-28 11:26:13 +02001From 18a0deedf635f1aa88afa8a3b3dc108e92df286e Mon Sep 17 00:00:00 2001
Peter Pentchev6ef0f072022-09-26 16:20:30 +03002From: Peter Penchev <openstack-dev@storpool.com>
3Date: Mon, 26 Sep 2022 16:04:36 +0300
Peter Pentchevacaaa382023-02-28 11:26:13 +02004Subject: [PATCH 06/10] StorPool: drop copy_image_to_volume() and
Peter Pentchev6ef0f072022-09-26 16:20:30 +03005 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
Peter Pentchevacaaa382023-02-28 11:26:13 +020011Closes-Bug: #2002996
Peter Pentchev6ef0f072022-09-26 16:20:30 +030012---
13 cinder/volume/drivers/storpool.py | 43 -------------------------------
14 1 file changed, 43 deletions(-)
15
16diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
Peter Pentchevacaaa382023-02-28 11:26:13 +020017index c183a506d..956f7ae5a 100644
Peter Pentchev6ef0f072022-09-26 16:20:30 +030018--- a/cinder/volume/drivers/storpool.py
19+++ b/cinder/volume/drivers/storpool.py
Peter Pentchevacaaa382023-02-28 11:26:13 +020020@@ -316,49 +316,6 @@ class StorPoolDriver(driver.VolumeDriver):
Peter Pentchev6ef0f072022-09-26 16:20:30 +030021 'pools': pools
22 }
23
24- def copy_volume_to_image(self, context, volume, image_service, image_meta):
25- req_id = context.request_id
26- volname = self._attach.volumeName(volume['id'])
27- name = self._attach.volsnapName(volume['id'], req_id)
28- try:
29- self._attach.api().snapshotCreate(volname, {'name': name})
30- except spapi.ApiError as e:
31- raise self._backendException(e)
32- self._attach.add(req_id, {
33- 'volume': name,
34- 'type': 'copy-from',
35- 'id': req_id,
36- 'rights': 1,
37- 'volsnap': True
38- })
39- try:
40- return super(StorPoolDriver, self).copy_volume_to_image(
41- context, volume, image_service, image_meta)
42- finally:
43- self._attach.remove(req_id)
44- try:
45- self._attach.api().snapshotDelete(name)
46- except spapi.ApiError as e:
47- LOG.error(
48- 'Could not remove the temp snapshot %(name)s for '
49- '%(vol)s: %(err)s',
50- {'name': name, 'vol': volname, 'err': e})
51-
52- def copy_image_to_volume(self, context, volume, image_service, image_id):
53- req_id = context.request_id
54- name = self._attach.volumeName(volume['id'])
55- self._attach.add(req_id, {
56- 'volume': name,
57- 'type': 'copy-to',
58- 'id': req_id,
59- 'rights': 2
60- })
61- try:
62- return super(StorPoolDriver, self).copy_image_to_volume(
63- context, volume, image_service, image_id)
64- finally:
65- self._attach.remove(req_id)
66-
67 def extend_volume(self, volume, new_size):
68 size = int(new_size) * units.Gi
69 name = self._attach.volumeName(volume['id'])
70--
Peter Pentchevacaaa382023-02-28 11:26:13 +0200712.39.2
Peter Pentchev6ef0f072022-09-26 16:20:30 +030072