openstack
/
cinder
Code Issues Proposed changes

Merge "[SVF] Fix Retype issue of mirror volume"

This commit is contained in:
Zuul 2021-12-13 16:18:47 +00:00 committed by Gerrit Code Review
parent e5ef39604c 50e1731011
commit 5c23c9fbe4
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
View File

@ -7306,6 +7306,38 @@ class StorwizeSVCCommonDriverTestCase(test.TestCase):
self.driver.delete_volume(vol1)
@ddt.data(({'mirror_pool': 'openstack1'}, {'mirror_pool': 'openstack2'}))
@ddt.unpack
def test_storwize_retype_from_mirror_to_different_mirror(self,
old_opts,
new_opts):
self.driver.do_setup(self.ctxt)
host = {'host': 'openstack@svc#openstack'}
ctxt = context.get_admin_context()
vol_type1 = self._create_volume_type(old_opts, 'old')
vol_type2 = self._create_volume_type(new_opts, 'new')
diff, _equal = volume_types.volume_types_diff(ctxt, vol_type1.id,
vol_type2.id)
vol1 = self._generate_vol_info(vol_type1)
self.driver.create_volume(vol1)
self._assert_vol_exists(vol1.name, True)
copies = self.driver._helpers.lsvdiskcopy(vol1.name)
self.assertEqual(len(copies), 2)
copies = self.driver._helpers.get_vdisk_copies(vol1.name)
self.assertEqual(copies['primary']['mdisk_grp_name'], 'openstack')
self.assertEqual(copies['secondary']['mdisk_grp_name'], 'openstack1')
self.driver.retype(self.ctxt, vol1, vol_type2, diff, host)
copies = self.driver._helpers.lsvdiskcopy(vol1.name)
self.assertEqual(len(copies), 2)
copies = self.driver._helpers.get_vdisk_copies(vol1.name)
self.assertEqual(copies['primary']['mdisk_grp_name'], 'openstack')
self.assertEqual(copies['secondary']['mdisk_grp_name'], 'openstack2')
self.driver.delete_volume(vol1)
@ddt.data(({}, {'mirror_pool': 'openstack1'}),
({'mirror_pool': ''}, {'mirror_pool': 'openstack1'}),
({'mirror_pool': 'openstack1'}, {}),

2
cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
View File

@ -5190,7 +5190,7 @@ class StorwizeSVCCommonDriver(san.SanDriver,
msg = _('Unable to retype: the thin-provisioned or '
'compressed vol can not be migrated from a dr pool'
' or to a dr pool.')
raise exception.VolumeDriverException(message=msg)
raise exception.VolumeDriverException(message=msg)
if not old_opts['mirror_pool'] and new_opts['mirror_pool']:
need_check_dr_pool_param = True

7
releasenotes/notes/bug-1949061-ibm-svf-fix_retype_issue_of_mirror_volume-5f37c265bee89d97.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
IBM Spectrum Virtualize Family driver
`Bug #1949061 <https://bugs.launchpad.net/cinder/+bug/1949061>`_:
Fixed retype issue of mirror-volume to mirror-volume-type
with different mirror pool