openstack/cinder
Code Issues Proposed changes

Merge "Use method validate_integer from oslo.utils"

Browse Source
This commit is contained in:
Zuul 2018-01-07 07:13:48 +00:00 committed by Gerrit Code Review
commit 6dd3776723
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/api/contrib/test_volume_type_encryption.py
View File

@ -558,7 +558,7 @@ class VolumeTypeEncryptionTest(test.TestCase):
def test_update_key_size_non_integer(self):
update_body = {"encryption": {'key_size': 'abc'}}
msg = 'key_size must be an integer.'
msg = 'key_size must be an integer'
self._encryption_update_bad_body(update_body, msg)
def test_update_item_invalid_body(self):

20
cinder/utils.py
View File

@ -1038,21 +1038,11 @@ def validate_integer(value, name, min_value=None, max_value=None):
:param max_length: the max_length of the integer
:returns: integer
"""
if not strutils.is_int_like(value):
raise webob.exc.HTTPBadRequest(explanation=(
_('%s must be an integer.') % name))
value = int(value)
if min_value is not None and value < min_value:
raise webob.exc.HTTPBadRequest(
explanation=(_('%(value_name)s must be >= %(min_value)d') %
{'value_name': name, 'min_value': min_value}))
if max_value is not None and value > max_value:
raise webob.exc.HTTPBadRequest(
explanation=(_('%(value_name)s must be <= %(max_value)d') %
{'value_name': name, 'max_value': max_value}))
return value
try:
value = strutils.validate_integer(value, name, min_value, max_value)
return value
except ValueError as e:
raise webob.exc.HTTPBadRequest(explanation=six.text_type(e))
def validate_dictionary_string_length(specs):