openstack
/
cinder
Code Issues Proposed changes

Remove invalid NetApp QoS keys 

The NetApp driver code contains two QoS keys that don't work.
They aren't documented anywhere, and they are redundant,
so the simplest fix is to remove them.

Closes-Bug: #1532965
Change-Id: I21a638dc56cb779fbad54c4fe62ec9711a6b8098
This commit is contained in:
Clinton Knight 2016-01-11 16:21:47 -05:00
parent 7c789079a3
commit 1a45a8d852
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/volume/drivers/netapp/utils.py
View File

@ -50,8 +50,7 @@ DEPRECATED_SSC_SPECS = {'netapp_unmirrored': 'netapp_mirrored',
'netapp_nodedup': 'netapp_dedup',
'netapp_nocompression': 'netapp_compression',
'netapp_thick_provisioned': 'netapp_thin_provisioned'}
QOS_KEYS = frozenset(
['maxIOPS', 'total_iops_sec', 'maxBPS', 'total_bytes_sec'])
QOS_KEYS = frozenset(['maxIOPS', 'maxBPS'])
BACKEND_QOS_CONSUMERS = frozenset(['back-end', 'both'])
@ -204,9 +203,9 @@ def map_qos_spec(qos_spec, volume):
spec = dict(policy_name=get_qos_policy_group_name(volume),
max_throughput=None)
# IOPS and BPS specifications are exclusive of one another.
if 'maxiops' in qos_spec or 'total_iops_sec' in qos_spec:
if 'maxiops' in qos_spec:
spec['max_throughput'] = '%siops' % qos_spec['maxiops']
elif 'maxbps' in qos_spec or 'total_bytes_sec' in qos_spec:
elif 'maxbps' in qos_spec:
spec['max_throughput'] = '%sB/s' % qos_spec['maxbps']
return spec