openstack
/
nova
Code Issues Proposed changes

Merge "Use check_string_length from oslo_utils"

This commit is contained in:
Zuul 2018-09-12 21:01:14 +00:00 committed by Gerrit Code Review
parent 06e533bc96 ad0510c2e8
commit 976efd4493
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/api/openstack/compute/test_security_groups.py
View File

@ -192,8 +192,8 @@ class TestSecurityGroupsV21(test.TestCase):
self.controller.create(self.req, {'security_group': sg})
self.fail('Should have raised BadRequest exception')
except webob.exc.HTTPBadRequest as exc:
self.assertEqual('description has a minimum character requirement'
' of 1.', exc.explanation)
self.assertEqual('description has 0 characters, '
'less than 1.', exc.explanation)
except exception.InvalidInput:
self.fail('Should have raised BadRequest exception instead of')

25
nova/utils.py
View File

@ -735,25 +735,12 @@ def check_string_length(value, name=None, min_length=0, max_length=None):
:param min_length: the min_length of the string
:param max_length: the max_length of the string
"""
if not isinstance(value, six.string_types):
if name is None:
msg = _("The input is not a string or unicode")
else:
msg = _("%s is not a string or unicode") % name
raise exception.InvalidInput(message=msg)
if name is None:
name = value
if len(value) < min_length:
msg = _("%(name)s has a minimum character requirement of "
"%(min_length)s.") % {'name': name, 'min_length': min_length}
raise exception.InvalidInput(message=msg)
if max_length and len(value) > max_length:
msg = _("%(name)s has more than %(max_length)s "
"characters.") % {'name': name, 'max_length': max_length}
raise exception.InvalidInput(message=msg)
try:
strutils.check_string_length(value, name=name,
min_length=min_length,
max_length=max_length)
except (ValueError, TypeError) as exc:
raise exception.InvalidInput(message=exc.args[0])
def validate_integer(value, name, min_value=None, max_value=None):