openstack/deb-python-neutron-lib
Code Issues Proposed changes

Merge "Make port_range validator accept an integer"

Browse Source
This commit is contained in:
Jenkins
2017-06-19 11:53:50 +00:00
committed by Gerrit Code Review
parent 4ce39e5b9f 29a31c152c
commit e68ec1fbf2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
neutron_lib/api/validators/__init__.py
View File

@@ -925,10 +925,7 @@ def validate_port_range_or_none(data, valid_values=None):
""" """
if data is None: if data is None:
return return
if validate_string_or_none(data): data = str(data)
msg = _("Port range must be a string.")
LOG.debug(msg)
return msg
ports = data.split(':') ports = data.split(':')
if len(ports) > 2: if len(ports) > 2:
msg = _("Port range must be two integers separated by a colon.") msg = _("Port range must be two integers separated by a colon.")

6
neutron_lib/tests/unit/api/validators/test_validators.py
View File

@@ -1102,6 +1102,10 @@ class TestPortRangeValidation(base.BaseTestCase):
result = validators.validate_port_range_or_none("80") result = validators.validate_port_range_or_none("80")
self.assertIsNone(result) self.assertIsNone(result)
def test_valid_port_integer(self):
result = validators.validate_port_range_or_none(80)
self.assertIsNone(result)
def test_valid_range(self): def test_valid_range(self):
result = validators.validate_port_range_or_none("80:8888") result = validators.validate_port_range_or_none("80:8888")
self.assertIsNone(result) self.assertIsNone(result)
@@ -1133,7 +1137,7 @@ class TestPortRangeValidation(base.BaseTestCase):
def test_range_bad_input(self): def test_range_bad_input(self):
result = validators.validate_port_range_or_none(['a', 'b', 'c']) result = validators.validate_port_range_or_none(['a', 'b', 'c'])
self.assertEqual(u"Port range must be a string.", result) self.assertEqual(u"Invalid port: ['a', 'b', 'c'].", result)
def test_range_colon(self): def test_range_colon(self):
result = validators.validate_port_range_or_none(":") result = validators.validate_port_range_or_none(":")