openstack/ironic
Code Issues Proposed changes

Merge "Allow periods (".") in hostnames"

Browse Source
This commit is contained in:
Jenkins 2015-03-18 20:58:12 +00:00 committed by Gerrit Code Review
commit b3602906b9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/common/utils.py
View File

@ -185,11 +185,13 @@ def is_hostname_safe(hostname):
* http://tools.ietf.org/html/rfc952
* http://tools.ietf.org/html/rfc1123
Also allow "." because what kind of hostname doesn't allow that.
:param hostname: The hostname to be validated.
:returns: True if valid. False if not.
"""
m = '^[a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?$'
m = '^[a-z0-9]([a-z0-9\-\.]{0,61}[a-z0-9])?$'
return (isinstance(hostname, six.string_types) and
(re.match(m, hostname) is not None))

1
ironic/tests/test_utils.py
View File

@ -343,6 +343,7 @@ class GenericUtilsTestCase(base.TestCase):
self.assertFalse(utils.is_hostname_safe('spam-'))
self.assertTrue(utils.is_hostname_safe('spam-eggs'))
self.assertFalse(utils.is_hostname_safe('spam eggs'))
self.assertTrue(utils.is_hostname_safe('spam.eggs'))
self.assertTrue(utils.is_hostname_safe('9spam'))
self.assertTrue(utils.is_hostname_safe('spam7'))
self.assertTrue(utils.is_hostname_safe('br34kf4st'))