summaryrefslogtreecommitdiffstats
path: root/openstack/common/utils.py
diff options
context:
space:
mode:
authorEugene Kirpichov <ekirpichov@gmail.com>2012-09-26 18:23:40 +0000
committerEugene Kirpichov <ekirpichov@gmail.com>2012-09-26 18:25:59 +0000
commit8a0c03c9e57926f4bc6c1a0ad9a87b9d59953e6e (patch)
tree248af9e99c2da85a2593ba360e090b036fa8feee /openstack/common/utils.py
parentac5067fb957556fbb2359e0bb8b99b6f733c6a04 (diff)
downloadoslo-8a0c03c9e57926f4bc6c1a0ad9a87b9d59953e6e.tar.gz
oslo-8a0c03c9e57926f4bc6c1a0ad9a87b9d59953e6e.tar.xz
oslo-8a0c03c9e57926f4bc6c1a0ad9a87b9d59953e6e.zip
Extracted parse_host_port into network_utils.
Change-Id: I77bcbf03a18659cfa62e99da9ba2136f8348022b
Diffstat (limited to 'openstack/common/utils.py')
-rw-r--r--openstack/common/utils.py44
1 files changed, 0 insertions, 44 deletions
diff --git a/openstack/common/utils.py b/openstack/common/utils.py
index 7df3dbc..74c571d 100644
--- a/openstack/common/utils.py
+++ b/openstack/common/utils.py
@@ -64,50 +64,6 @@ def bool_from_string(subject):
return False
-def parse_host_port(address, default_port=None):
- """
- Interpret a string as a host:port pair.
- An IPv6 address MUST be escaped if accompanied by a port,
- because otherwise ambiguity ensues: 2001:db8:85a3::8a2e:370:7334
- means both [2001:db8:85a3::8a2e:370:7334] and
- [2001:db8:85a3::8a2e:370]:7334.
-
- >>> parse_host_port('server01:80')
- ('server01', 80)
- >>> parse_host_port('server01')
- ('server01', None)
- >>> parse_host_port('server01', default_port=1234)
- ('server01', 1234)
- >>> parse_host_port('[::1]:80')
- ('::1', 80)
- >>> parse_host_port('[::1]')
- ('::1', None)
- >>> parse_host_port('[::1]', default_port=1234)
- ('::1', 1234)
- >>> parse_host_port('2001:db8:85a3::8a2e:370:7334', default_port=1234)
- ('2001:db8:85a3::8a2e:370:7334', 1234)
-
- """
- if address[0] == '[':
- # Escaped ipv6
- _host, _port = address[1:].split(']')
- host = _host
- if ':' in _port:
- port = _port.split(':')[1]
- else:
- port = default_port
- else:
- if address.count(':') == 1:
- host, port = address.split(':')
- else:
- # 0 means ipv4, >1 means ipv6.
- # We prohibit unescaped ipv6 addresses with port.
- host = address
- port = default_port
-
- return (host, None if port is None else int(port))
-
-
def execute(*cmd, **kwargs):
"""
Helper method to execute command with optional retry.