openstack/cinder
Code Issues Proposed changes

Merge "PowerMax Driver - Manage volume emulation check"

Browse Source
This commit is contained in:
Zuul 2020-04-16 17:11:57 +00:00 committed by Gerrit Code Review
commit eab4ea8320
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_common.py
View File

@ -1659,12 +1659,15 @@ class PowerMaxCommonTest(test.TestCase):
model_update = self.common.manage_existing(volume, external_ref)
self.assertEqual(ref_update, model_update)
@mock.patch.object(rest.PowerMaxRest, 'get_volume_list',
return_value=[tpd.PowerMaxData.device_id3])
@mock.patch.object(
rest.PowerMaxRest, 'get_masking_views_from_storage_group',
return_value=None)
@mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
return_value=(False, False, None))
def test_check_lun_valid_for_cinder_management(self, mock_rep, mock_mv):
def test_check_lun_valid_for_cinder_management(
self, mock_rep, mock_mv, mock_list):
external_ref = {u'source-name': u'00003'}
vol, source_sg = self.common._check_lun_valid_for_cinder_management(
self.data.array, self.data.device_id3,
@ -1672,13 +1675,15 @@ class PowerMaxCommonTest(test.TestCase):
self.assertEqual(vol, '123')
self.assertIsNone(source_sg)
@mock.patch.object(rest.PowerMaxRest, 'get_volume_list',
return_value=[tpd.PowerMaxData.device_id4])
@mock.patch.object(
rest.PowerMaxRest, 'get_masking_views_from_storage_group',
return_value=None)
@mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
return_value=(False, False, None))
def test_check_lun_valid_for_cinder_management_multiple_sg_exception(
self, mock_rep, mock_mv):
self, mock_rep, mock_mv, mock_list):
external_ref = {u'source-name': u'00004'}
self.assertRaises(
exception.ManageExistingInvalidReference,
@ -1686,6 +1691,8 @@ class PowerMaxCommonTest(test.TestCase):
self.data.array, self.data.device_id4,
self.data.test_volume.id, external_ref)
@mock.patch.object(rest.PowerMaxRest, 'get_volume_list',
return_value=[tpd.PowerMaxData.device_id3])
@mock.patch.object(rest.PowerMaxRest, 'get_volume',
side_effect=[None,
tpd.PowerMaxData.volume_details[2],
@ -1701,7 +1708,7 @@ class PowerMaxCommonTest(test.TestCase):
@mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
side_effect=[(True, False, []), (False, False, None)])
def test_check_lun_valid_for_cinder_management_exception(
self, mock_rep, mock_sg, mock_mvs, mock_get_vol):
self, mock_rep, mock_sg, mock_mvs, mock_get_vol, mock_list):
external_ref = {u'source-name': u'00003'}
for x in range(0, 3):
self.assertRaises(
@ -1714,6 +1721,22 @@ class PowerMaxCommonTest(test.TestCase):
self.data.array, self.data.device_id3,
self.data.test_volume.id, external_ref)
@mock.patch.object(rest.PowerMaxRest, 'get_volume_list',
return_value=[tpd.PowerMaxData.device_id])
@mock.patch.object(
rest.PowerMaxRest, 'get_masking_views_from_storage_group',
return_value=None)
@mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
return_value=(False, False, None))
def test_check_lun_valid_for_cinder_management_non_FBA(
self, mock_rep, mock_mv, mock_list):
external_ref = {u'source-name': u'00004'}
self.assertRaises(
exception.ManageExistingVolumeTypeMismatch,
self.common._check_lun_valid_for_cinder_management,
self.data.array, self.data.device_id4,
self.data.test_volume.id, external_ref)
def test_manage_existing_get_size(self):
external_ref = {u'source-name': u'00001'}
size = self.common.manage_existing_get_size(

8
cinder/volume/drivers/dell_emc/powermax/common.py
View File

@ -2983,6 +2983,14 @@ class PowerMaxCommon(object):
'device %(device_id)s') % {'device_id': device_id})
raise exception.ManageExistingInvalidReference(
existing_ref=external_ref, reason=msg)
# Check if volume is FBA emulation
fba_devices = self.rest.get_volume_list(array, "emulation=FBA")
if device_id not in fba_devices:
msg = (_("Unable to import volume %(device_id)s to cinder as it "
"is not an FBA volume. Only volumes with an emulation "
"type of FBA are supported.")
% {'device_id': device_id})
raise exception.ManageExistingVolumeTypeMismatch(reason=msg)
volume_identifier = None
# Check if volume is already cinder managed
if volume_details.get('volume_identifier'):