openstack/oslo.utils
Code Issues Proposed changes

Merge "Add method to escape ipv6 ip addresses"

Browse Source
This commit is contained in:
Zuul 2018-01-05 19:34:03 +00:00 committed by Gerrit Code Review
commit f009808e34
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oslo_utils/netutils.py
View File

@ -217,6 +217,20 @@ def is_ipv6_enabled():
return _IS_IPV6_ENABLED
def escape_ipv6(address):
"""Escape an IP address in square brackets if IPv6
:param address: address to optionaly escape
:type address: string
:returns: string
.. versionadded:: 3.29.0
"""
if is_valid_ipv6(address):
return "[%s]" % address
return address
def is_valid_ip(address):
"""Verify that address represents a valid IP address.

4
oslo_utils/tests/test_netutils.py
View File

@ -172,6 +172,10 @@ class NetworkUtilsTest(test_base.BaseTestCase):
self.assertFalse(netutils.is_valid_ipv6(''))
def test_escape_ipv6(self):
self.assertEqual('[1234::1234]', netutils.escape_ipv6('1234::1234'))
self.assertEqual('127.0.0.1', netutils.escape_ipv6('127.0.0.1'))
def test_is_valid_ip(self):
self.assertTrue(netutils.is_valid_ip('127.0.0.1'))