x/vmware-nsx
Code Issues Proposed changes

Merge "Adds test scripts for _validate_range"

Browse Source
This commit is contained in:
Jenkins 2012-11-12 18:15:05 +00:00 committed by Gerrit Code Review
commit ccca549dd1
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
quantum/api/v2/attributes.py
View File

@ -63,12 +63,9 @@ def _validate_string(data, max_len=None):
def _validate_range(data, valid_values=None):
min_value = valid_values[0]
max_value = valid_values[1]
if data >= min_value and data <= max_value:
return
else:
msg_dict = dict(data=data, min_value=min_value, max_value=max_value)
msg = _("%(data)s is not in range %(min_value)s through "
"%(max_value)s") % msg_dict
if not min_value <= data <= max_value:
msg = _("'%(data)s' is not in range %(min_value)s through "
"%(max_value)s") % locals()
LOG.debug("validate_range: %s", msg)
return msg

25
quantum/tests/unit/test_attributes.py
View File

@ -111,6 +111,31 @@ class TestAttributes(unittest2.TestCase):
msg = attributes._validate_string("123456789", None)
self.assertIsNone(msg)
def test_range(self):
msg = attributes._validate_range(1, [1, 9])
self.assertIsNone(msg)
msg = attributes._validate_range(5, [1, 9])
self.assertIsNone(msg)
msg = attributes._validate_range(9, [1, 9])
self.assertIsNone(msg)
msg = attributes._validate_range(1, (1, 9))
self.assertIsNone(msg)
msg = attributes._validate_range(5, (1, 9))
self.assertIsNone(msg)
msg = attributes._validate_range(9, (1, 9))
self.assertIsNone(msg)
msg = attributes._validate_range(0, [1, 9])
self.assertEquals(msg, "'0' is not in range 1 through 9")
msg = attributes._validate_range(10, (1, 9))
self.assertEquals(msg, "'10' is not in range 1 through 9")
def test_ip_pools(self):
pools = [[{'end': '10.0.0.254'}],
[{'start': '10.0.0.254'}],