openstack
/
cinder
Code Issues Proposed changes

Merge "PowerMax Driver - Migrate extra spec class fix"

This commit is contained in:
Zuul 2020-09-22 01:33:08 +00:00 committed by Gerrit Code Review
parent a7c5d07256 b29a92be64
commit f2a71712dc
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_replication.py
View File

@ -108,6 +108,7 @@ class PowerMaxReplicationTest(test.TestCase):
extra_specs[utils.IS_RE] = True
extra_specs[utils.FORCE_VOL_EDIT] = True
rep_config = self.data.rep_config_sync
rep_config = deepcopy(self.data.rep_config_sync)
rep_config[utils.RDF_CONS_EXEMPT] = False
extra_specs[utils.REP_CONFIG] = rep_config
self.common._unmap_lun(self.data.test_volume, self.data.connector)
@ -134,7 +135,7 @@ class PowerMaxReplicationTest(test.TestCase):
rep_extra_specs = deepcopy(tpd.PowerMaxData.rep_extra_specs)
rep_extra_specs[utils.PORTGROUPNAME] = self.data.port_group_name_f
rep_config = self.data.rep_config_sync
rep_config = deepcopy(self.data.rep_config_sync)
extra_specs[utils.REP_CONFIG] = rep_config
rep_config[utils.RDF_CONS_EXEMPT] = False
@ -1085,7 +1086,7 @@ class PowerMaxReplicationTest(test.TestCase):
target_storage_group = self.data.defaultstoragegroup_name
extra_specs = deepcopy(self.data.extra_specs)
rep_config_sync = deepcopy(self.data.rep_config_sync)
rep_config_sync[utils.RDF_CONS_EXEMPT] = False
rep_config_sync['exempt'] = False
new_type = {'extra_specs': self.data.rep_extra_specs}
target_extra_specs = deepcopy(new_type['extra_specs'])
@ -1107,9 +1108,11 @@ class PowerMaxReplicationTest(test.TestCase):
target_slo, target_workload, target_extra_specs)
mck_protect.assert_called_once_with(
array_id, target_storage_group, device_id, updated_volume_name,
target_extra_specs, volume)
self.data.rep_extra_specs, volume)
self.assertTrue(success)
@mock.patch.object(utils.PowerMaxUtils, 'get_rep_config',
return_value=tpd.PowerMaxData.rep_config_async)
@mock.patch.object(common.PowerMaxCommon, 'get_volume_metadata',
return_value='')
@mock.patch.object(common.PowerMaxCommon, 'update_metadata',
@ -1131,7 +1134,7 @@ class PowerMaxReplicationTest(test.TestCase):
@mock.patch.object(common.PowerMaxCommon, '_validate_rdfg_status')
def test_migrate_volume_success_rep_to_rep(
self, mck_valid, mck_break, mck_sync, mck_rep, mck_retype,
mck_resume, mck_slo, mck_upd_meta, mck_get_meta):
mck_resume, mck_slo, mck_upd_meta, mck_get_meta, mck_rep_conf):
array = self.data.array
volume = self.data.test_volume
device_id = self.data.device_id
@ -1144,17 +1147,20 @@ class PowerMaxReplicationTest(test.TestCase):
extra_specs[utils.REPLICATION_DEVICE_BACKEND_ID] = (
self.data.rep_config_sync[utils.BACKEND_ID])
target_extra_specs = deepcopy(self.data.rep_extra_specs)
target_extra_specs['rep_extra_specs'] = utils.REP_ASYNC
target_extra_specs['array'] = self.data.array
target_extra_specs['slo'] = target_slo
target_extra_specs['rep_mode'] = utils.REP_ASYNC
target_extra_specs['rdf_group_no'] = self.data.rdf_group_name_2
target_extra_specs[utils.REP_CONFIG] = self.data.rep_config_async
target_extra_specs[utils.REPLICATION_DEVICE_BACKEND_ID] = (
self.data.rep_config_async[utils.BACKEND_ID])
target_extra_specs['storagetype:disablecompression'] = False
new_type = {'extra_specs': target_extra_specs}
success, model_update = self.common._migrate_volume(
array, volume, device_id, srp, target_slo, target_workload,
volume_name, new_type, extra_specs)
self.assertEqual(2, mck_valid.call_count)
mck_valid.assert_called_with(array, target_extra_specs)
mck_valid.assert_any_call(array, extra_specs)
mck_break.assert_called_once_with(
array, device_id, volume_name, extra_specs, volume)
mck_sync.assert_called_once_with(array, device_id, extra_specs)

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

@ -3933,7 +3933,7 @@ class PowerMaxCommon(object):
resume_original_sg_dict = dict()
orig_mgmt_sg_name = ''
target_extra_specs = new_type['extra_specs']
target_extra_specs = dict(new_type['extra_specs'])
target_extra_specs.update({
utils.SRP: srp, utils.ARRAY: array, utils.SLO: target_slo,
utils.WORKLOAD: target_workload,