openstack/cinder
Code Issues Proposed changes

fix: typo in pure driver

Browse Source 
Closes-Bug: #2083532
Change-Id: Ib4788d13aa724d86d662442dae344ac0b365374e
This commit is contained in:
Pablo Colson 2024-10-02 20:18:58 +02:00 committed by Keerthivasan S
parent b07e4147f9
commit dfb233b06e
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cinder/tests/unit/volume/drivers/test_pure.py
View File

@ -4064,34 +4064,56 @@ class PureBaseVolumeDriverTestCase(PureBaseSharedDriverTestCase):
self.driver._get_qos_settings, self.driver._get_qos_settings,
voltype) voltype)
@mock.patch(BASE_DRIVER_OBJ + ".create_with_qos") @ddt.data(
{
"qos_name": "qos-iops-bws",
"qos_spec": dict(QOS_IOPS_BWS),
"qos_data": {"iops_limit": '100', "bandwidth_limit": '1048576'}
},
{
"qos_name": "qos-iops",
"qos_spec": dict(QOS_IOPS),
"qos_data": {"iops_limit": '100'}
},
{
"qos_name": "qos-bws",
"qos_spec": dict(QOS_BWS),
"qos_data": {"bandwidth_limit": '1048576'}
},
)
@mock.patch(DRIVER_PATH + ".flasharray.VolumePost")
@mock.patch(BASE_DRIVER_OBJ + "._add_to_group_if_needed") @mock.patch(BASE_DRIVER_OBJ + "._add_to_group_if_needed")
@mock.patch(BASE_DRIVER_OBJ + "._get_replication_type_from_vol_type") @mock.patch(BASE_DRIVER_OBJ + "._get_replication_type_from_vol_type")
@mock.patch.object(qos_specs, "get_qos_specs") @mock.patch.object(qos_specs, "get_qos_specs")
@mock.patch.object(volume_types, 'get_volume_type') @mock.patch.object(volume_types, 'get_volume_type')
def test_create_volume_with_qos(self, mock_get_volume_type, def test_create_volume_with_qos(self, qos_info,
mock_get_volume_type,
mock_get_qos_specs, mock_get_qos_specs,
mock_get_repl_type, mock_get_repl_type,
mock_add_to_group, mock_add_to_group,
mock_create_qos): mock_create_favol):
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
qos = qos_specs.create(ctxt, "qos-iops-bws", dict(QOS_IOPS_BWS)) qos = qos_specs.create(ctxt,
qos_info["qos_name"],
qos_info["qos_spec"])
qos_data = self.flasharray.Qos(**qos_info["qos_data"])
vol, vol_name = self.new_fake_vol(spec={"size": 1}, vol, vol_name = self.new_fake_vol(spec={"size": 1},
type_qos_specs_id=qos.id) type_qos_specs_id=qos.id)
mock_data = self.flasharray.VolumePost(names=[vol_name],
provisioned=vol["size"],
qos=qos_data)
mock_get_volume_type.return_value = vol.volume_type mock_get_volume_type.return_value = vol.volume_type
mock_get_qos_specs.return_value = qos mock_get_qos_specs.return_value = qos
mock_get_repl_type.return_value = None mock_get_repl_type.return_value = None
self.driver.create_volume(vol) self.driver.create_volume(vol)
self.driver.create_with_qos.assert_called_with(self.array, vol_name, self.array.post_volumes.\
vol["size"] * 1024 assert_called_with(names=[vol_name],
* 1024 * 1024, with_default_protection=False,
{'maxIOPS': 100, volume=mock_data)
'maxBWS': 1048576}) mock_add_to_group.assert_called_with(vol,
mock_add_to_group.assert_called_once_with(vol, vol_name)
vol_name) self.assert_error_propagates([mock_create_favol],
self.assert_error_propagates([mock_create_qos],
self.driver.create_volume, vol) self.driver.create_volume, vol)
@mock.patch(BASE_DRIVER_OBJ + ".set_qos") @mock.patch(BASE_DRIVER_OBJ + ".set_qos")

4
cinder/volume/drivers/pure.py
View File

@ -386,7 +386,7 @@ class PureBaseVolumeDriver(san.SanDriver):
array.post_volumes(names=[vol_name], array.post_volumes(names=[vol_name],
with_default_protection=False, with_default_protection=False,
volume=flasharray.VolumePost( volume=flasharray.VolumePost(
provisoned=vol_size, provisioned=vol_size,
qos=flasharray.Qos( qos=flasharray.Qos(
iops_limit=qos['maxIOPS']))) iops_limit=qos['maxIOPS'])))
else: else:
@ -411,7 +411,7 @@ class PureBaseVolumeDriver(san.SanDriver):
elif qos['maxBWS'] == 0: elif qos['maxBWS'] == 0:
array.post_volumes(names=[vol_name], array.post_volumes(names=[vol_name],
volume=flasharray.VolumePost( volume=flasharray.VolumePost(
provisoned=vol_size, provisioned=vol_size,
qos=flasharray.Qos( qos=flasharray.Qos(
iops_limit=qos['maxIOPS']))) iops_limit=qos['maxIOPS'])))
else: else:

5
releasenotes/notes/pure-storage-driver-typo-a24d19021f25a4f8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
`Bug #2083532 <https://bugs.launchpad.net/cinder/+bug/2083532>`_:
[Pure Storage] Fixed creation of volumes with only IOPS qos.