openstack/nova
Code Issues Proposed changes

Merge "Move _validate_int_value controller func to utils"

Browse Source
This commit is contained in:
Jenkins 2013-07-22 21:51:49 +00:00 committed by Gerrit Code Review
commit 9e2d4ac460
3 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
nova/api/openstack/compute/servers.py
View File

@ -580,29 +580,6 @@ class Controller(wsgi.Controller):
def _validate_server_name(self, value):
self._check_string_length(value, 'Server name', max_length=255)
def _validate_int_value(self, str_value, str_name,
min_value=None, max_value=None):
try:
value = int(str(str_value))
except ValueError:
msg = _('%(value_name)s must be an integer')
raise exc.HTTPBadRequest(explanation=msg % (
{'value_name': str_name}))
if min_value is not None:
if value < min_value:
msg = _('%(value_name)s must be >= %(min_value)d')
raise exc.HTTPBadRequest(explanation=msg % (
{'value_name': str_name,
'min_value': min_value}))
if max_value is not None:
if value > max_value:
msg = _('%{value_name}s must be <= %(max_value)d')
raise exc.HTTPBadRequest(explanation=msg % (
{'value_name': str_name,
'max_value': max_value}))
return value
def _validate_block_device(self, bd):
self._check_string_length(bd['device_name'],
'Device name', max_length=255)
@ -612,8 +589,11 @@ class Controller(wsgi.Controller):
raise exc.HTTPBadRequest(explanation=msg)
if 'volume_size' in bd:
self._validate_int_value(bd['volume_size'], 'volume_size',
min_value=0)
try:
bd['volume_size'] = utils.validate_integer(
bd['volume_size'], 'volume_size', min_value=0)
except exception.InvalidInput as e:
raise exc.HTTPBadRequest(explanation=e.format_message())
def _get_injected_files(self, personality):
"""Create a list of injected files from the personality attribute.
@ -874,10 +854,13 @@ class Controller(wsgi.Controller):
min_count = server_dict.get('min_count', 1)
max_count = server_dict.get('max_count', min_count)
min_count = self._validate_int_value(min_count, "min_count",
min_value=1)
max_count = self._validate_int_value(max_count, "max_count",
min_value=1)
try:
min_count = utils.validate_integer(
min_count, "min_count", min_value=1)
max_count = utils.validate_integer(
max_count, "max_count", min_value=1)
except exception.InvalidInput as e:
raise exc.HTTPBadRequest(explanation=e.format_message())
if min_count > max_count:
msg = _('min_count must be <= max_count')

36
nova/tests/test_utils.py
View File

@ -892,3 +892,39 @@ class StringLengthTestCase(test.TestCase):
self.assertRaises(exception.InvalidInput,
utils.check_string_length,
'a' * 256, 'name', max_length=255)
class ValidateIntegerTestCase(test.TestCase):
def test_valid_inputs(self):
self.assertEquals(
utils.validate_integer(42, "answer"), 42)
self.assertEquals(
utils.validate_integer("42", "answer"), 42)
self.assertEquals(
utils.validate_integer(
"7", "lucky", min_value=7, max_value=8), 7)
self.assertEquals(
utils.validate_integer(
7, "lucky", min_value=6, max_value=7), 7)
self.assertEquals(
utils.validate_integer(
300, "Spartaaa!!!", min_value=300), 300)
self.assertEquals(
utils.validate_integer(
"300", "Spartaaa!!!", max_value=300), 300)
def test_invalid_inputs(self):
self.assertRaises(exception.InvalidInput,
utils.validate_integer,
"im-not-an-int", "not-an-int")
self.assertRaises(exception.InvalidInput,
utils.validate_integer,
3.14, "Pie")
self.assertRaises(exception.InvalidInput,
utils.validate_integer,
"299", "Sparta no-show",
min_value=300, max_value=300)
self.assertRaises(exception.InvalidInput,
utils.validate_integer,
55, "doing 55 in a 54",
max_value=54)

26
nova/utils.py
View File

@ -1114,6 +1114,32 @@ def check_string_length(value, name, min_length=0, max_length=None):
raise exception.InvalidInput(message=msg)
def validate_integer(value, name, min_value=None, max_value=None):
"""Make sure that value is a valid integer, potentially within range."""
try:
value = int(str(value))
except ValueError:
msg = _('%(value_name)s must be an integer')
raise exception.InvalidInput(reason=(
msg % {'value_name': name}))
if min_value is not None:
if value < min_value:
msg = _('%(value_name)s must be >= %(min_value)d')
raise exception.InvalidInput(
reason=(msg % {'value_name': name,
'min_value': min_value}))
if max_value is not None:
if value > max_value:
msg = _('%(value_name)s must be <= %(max_value)d')
raise exception.InvalidInput(
reason=(
msg % {'value_name': name,
'max_value': max_value})
)
return value
def spawn_n(func, *args, **kwargs):
"""Passthrough method for eventlet.spawn_n.