openstack/cinder
Code Issues Proposed changes

Merge "Fix _per_gb_min usage with _per_gb"

Browse Source
This commit is contained in:
Zuul 2018-12-18 19:32:14 +00:00 committed by Gerrit Code Review
commit 3b7265cc70
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cinder/tests/unit/volume/test_connection.py
View File

@ -192,7 +192,7 @@ class VolumeConnectionTestCase(base.BaseVolumeTestCase):
connector = {'ip': 'IP', 'initiator': 'INITIATOR'}
qos_values = {'consumer': 'front-end',
'specs': {
'write_iops_sec_per_gb': 5,
'write_iops_sec_per_gb': 30,
'read_iops_sec_per_gb': 7700,
'total_iops_sec_per_gb': 300000,
'read_bytes_sec_per_gb': 10,
@ -207,7 +207,7 @@ class VolumeConnectionTestCase(base.BaseVolumeTestCase):
type_qos.return_value = dict(qos_specs=qos_values)
driver_init.return_value = {'data': {}}
mock_get_target.return_value = None
qos_specs_expected = {'write_iops_sec': 15,
qos_specs_expected = {'write_iops_sec': 90,
'read_iops_sec': 23100,
'total_iops_sec': 900000,
'read_bytes_sec': 30,
@ -253,8 +253,8 @@ class VolumeConnectionTestCase(base.BaseVolumeTestCase):
connector = {'ip': 'IP', 'initiator': 'INITIATOR'}
qos_values = {'consumer': 'front-end',
'specs': {
'write_iops_sec_per_gb_min': 15,
'write_iops_sec_per_gb': 5,
'write_iops_sec_per_gb_min': 800,
'write_iops_sec_per_gb': 30,
'read_iops_sec_per_gb_min': 23100,
'read_iops_sec_per_gb': 7700,
'total_iops_sec_per_gb_min': 900000,
@ -274,7 +274,7 @@ class VolumeConnectionTestCase(base.BaseVolumeTestCase):
type_qos.return_value = dict(qos_specs=qos_values)
driver_init.return_value = {'data': {}}
mock_get_target.return_value = None
qos_specs_expected = {'write_iops_sec': 15,
qos_specs_expected = {'write_iops_sec': 800,
'read_iops_sec': 23100,
'total_iops_sec': 900000,
'read_bytes_sec': 30,
@ -320,8 +320,8 @@ class VolumeConnectionTestCase(base.BaseVolumeTestCase):
connector = {'ip': 'IP', 'initiator': 'INITIATOR'}
qos_values = {'consumer': 'front-end',
'specs': {
'write_iops_sec_per_gb_min': 15,
'write_iops_sec_per_gb': 5,
'write_iops_sec_per_gb_min': 800,
'write_iops_sec_per_gb': 30,
'read_iops_sec_per_gb_min': 23100,
'read_iops_sec_per_gb': 7700,
'total_iops_sec_per_gb_min': 900000,
@ -341,7 +341,7 @@ class VolumeConnectionTestCase(base.BaseVolumeTestCase):
type_qos.return_value = dict(qos_specs=qos_values)
driver_init.return_value = {'data': {}}
mock_get_target.return_value = None
qos_specs_expected = {'write_iops_sec': 500,
qos_specs_expected = {'write_iops_sec': 3000,
'read_iops_sec': 770000,
'total_iops_sec': 30000000,
'read_bytes_sec': 1000,

2
cinder/volume/manager.py
View File

@ -1620,7 +1620,7 @@ class VolumeManager(manager.CleanableManager,
option_per_gb = '%s_per_gb' % option
option_per_gb_min = '%s_per_gb_min' % option
if option_per_gb in specs:
minimum_value = specs.pop(option_per_gb_min, 0)
minimum_value = int(specs.pop(option_per_gb_min, 0))
value = int(specs[option_per_gb]) * volume_size
specs[option] = max(minimum_value, value)
specs.pop(option_per_gb)