openstack/cinder
Code Issues Proposed changes

Merge "PowerMax Driver - Array capabilities extend fix"

Browse Source
This commit is contained in:
Zuul 2020-06-12 16:54:53 +00:00 committed by Gerrit Code Review
commit a6119fe738
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -729,6 +729,8 @@ class PowerMaxCommonTest(test.TestCase):
self.common.extend_volume(volume, new_size) self.common.extend_volume(volume, new_size)
mck_extend.assert_called_once_with( mck_extend.assert_called_once_with(
array, device_id, new_size, ref_extra_specs, '1') array, device_id, new_size, ref_extra_specs, '1')
mck_ode.assert_called_once_with(
array, ref_extra_specs[utils.REP_CONFIG], True)
@mock.patch.object(provision.PowerMaxProvision, 'extend_volume') @mock.patch.object(provision.PowerMaxProvision, 'extend_volume')
@mock.patch.object(common.PowerMaxCommon, '_extend_legacy_replicated_vol') @mock.patch.object(common.PowerMaxCommon, '_extend_legacy_replicated_vol')
@ -755,6 +757,8 @@ class PowerMaxCommonTest(test.TestCase):
mck_leg_extend.assert_called_once_with( mck_leg_extend.assert_called_once_with(
array, volume, device_id, volume.name, new_size, array, volume, device_id, volume.name, new_size,
ref_extra_specs, '1') ref_extra_specs, '1')
mck_ode.assert_called_once_with(
array, ref_extra_specs[utils.REP_CONFIG], True)
mck_extend.assert_not_called() mck_extend.assert_not_called()
@mock.patch.object(provision.PowerMaxProvision, 'extend_volume') @mock.patch.object(provision.PowerMaxProvision, 'extend_volume')
@ -782,6 +786,8 @@ class PowerMaxCommonTest(test.TestCase):
mck_leg_extend.assert_called_once_with( mck_leg_extend.assert_called_once_with(
array, volume, device_id, volume.name, new_size, array, volume, device_id, volume.name, new_size,
ref_extra_specs, '1') ref_extra_specs, '1')
mck_ode.assert_called_once_with(
array, ref_extra_specs[utils.REP_CONFIG], True)
mck_extend.assert_not_called() mck_extend.assert_not_called()
@mock.patch.object(common.PowerMaxCommon, '_array_ode_capabilities_check', @mock.patch.object(common.PowerMaxCommon, '_array_ode_capabilities_check',

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

@ -1092,7 +1092,7 @@ class PowerMaxCommon(object):
rep_config = ex_specs[utils.REP_CONFIG] rep_config = ex_specs[utils.REP_CONFIG]
rdf_grp_no, __ = self.get_rdf_details(array, rep_config) rdf_grp_no, __ = self.get_rdf_details(array, rep_config)
r1_ode, r1_ode_metro, r2_ode, r2_ode_metro = ( r1_ode, r1_ode_metro, r2_ode, r2_ode_metro = (
self._array_ode_capabilities_check(array, True)) self._array_ode_capabilities_check(array, rep_config, True))
if self.next_gen: if self.next_gen:
if self.utils.is_metro_device(rep_config, ex_specs): if self.utils.is_metro_device(rep_config, ex_specs):