openstack
/
cinder
Code Issues Proposed changes

Merge "PowerMax Driver - QoS calculation failure"

This commit is contained in:
Zuul 2019-11-15 23:14:08 +00:00 committed by Gerrit Code Review
parent 3b82de660e 99916612d3
commit 53ab7749a3
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_utils.py
View File

@ -531,6 +531,30 @@ class PowerMaxUtilsTest(test.TestCase):
sg_value, qos_extra_spec, input_prop_dict) sg_value, qos_extra_spec, input_prop_dict)
self.assertEqual(input_prop_dict, ret_prop_dict) self.assertEqual(input_prop_dict, ret_prop_dict)
def test_validate_qos_cast_to_int(self):
qos_extra_spec = {'total_iops_sec': '500',
'total_bytes_sec': '104857600',
'DistributionType': 'Always'}
property_dict = {'host_io_limit_io_sec': 500}
input_prop_dict = {'host_io_limit_io_sec': 500,
'host_io_limit_mb_sec': 100}
input_key = 'total_bytes_sec'
ret_prop_dict = self.utils.validate_qos_input(
input_key, None, qos_extra_spec, property_dict)
self.assertEqual(input_prop_dict, ret_prop_dict)
def test_validate_qos_cast_to_int_drop_fraction(self):
qos_extra_spec = {'total_iops_sec': '500',
'total_bytes_sec': '105000000',
'DistributionType': 'Always'}
property_dict = {'host_io_limit_io_sec': 500}
input_prop_dict = {'host_io_limit_io_sec': 500,
'host_io_limit_mb_sec': 100}
input_key = 'total_bytes_sec'
ret_prop_dict = self.utils.validate_qos_input(
input_key, None, qos_extra_spec, property_dict)
self.assertEqual(input_prop_dict, ret_prop_dict)
def test_compare_cylinders(self): def test_compare_cylinders(self):
source_cylinders = '12345' source_cylinders = '12345'
target_cylinders = '12345' target_cylinders = '12345'

3
cinder/volume/drivers/dell_emc/powermax/utils.py
View File

@ -918,7 +918,8 @@ class PowerMaxUtils(object):
else: else:
qos_unit = "MB/sec" qos_unit = "MB/sec"
min_value = 1 min_value = 1
input_value = int(qos_extra_spec['total_bytes_sec']) / units.Mi input_value = int(
int(qos_extra_spec['total_bytes_sec']) / units.Mi)
sg_key = 'host_io_limit_mb_sec' sg_key = 'host_io_limit_mb_sec'
if min_value <= input_value <= max_value: if min_value <= input_value <= max_value:
if sg_value is None or input_value != int(sg_value): if sg_value is None or input_value != int(sg_value):