openstack
/
os-brick
Code Issues Proposed changes

Merge "Fix iopsLimit parameter in ScaleIO connector"

This commit is contained in:
Jenkins 2015-12-02 20:07:12 +00:00 committed by Gerrit Code Review
parent 4ca9840f91 665ffea730
commit d16aca5c27
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_brick/initiator/connector.py
View File

@ -2311,7 +2311,7 @@ class ScaleIOConnector(InitiatorConnector):
if self.bandwidth_limit is not None:
params['bandwidthLimitInKbps'] = self.bandwidth_limit
if self.iops_limit is not None:
params['iops_limit'] = self.iops_limit
params['iopsLimit'] = self.iops_limit
request = (
"https://%(server_ip)s:%(server_port)s/api/instances/"

12
os_brick/tests/initiator/test_connector.py
View File

@ -2143,6 +2143,18 @@ class ScaleIOConnectorTestCase(ConnectorTestCase):
"""Fake REST server"""
api_call = url.split(':', 2)[2].split('/', 1)[1].replace('api/', '')
if 'setMappedSdcLimits' in api_call:
self.assertNotIn("iops_limit", kwargs['data'])
if "iopsLimit" not in kwargs['data']:
self.assertIn("bandwidthLimitInKbps",
kwargs['data'])
elif "bandwidthLimitInKbps" not in kwargs['data']:
self.assertIn("iopsLimit", kwargs['data'])
else:
self.assertIn("bandwidthLimitInKbps",
kwargs['data'])
self.assertIn("iopsLimit", kwargs['data'])
try:
return self.mock_calls[api_call]
except KeyError: