From b595890f980ae28ff1c6d18baf3c6febf5f11c48 Mon Sep 17 00:00:00 2001 From: Graham Hayes Date: Wed, 18 Jan 2017 15:22:38 +0000 Subject: [PATCH] Use the oslo_utils address parser Ours did not understand IPv6 Change-Id: I4c15909ed22c64fde4a64eb612d52ddcca247f43 Fixes-Bug: #1653839 (cherry picked from commit 184544ec6c155578192f69edcb02d74799e6cbe0) --- designate/service.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/designate/service.py b/designate/service.py index 1515d4f59..e5431f1ab 100644 --- a/designate/service.py +++ b/designate/service.py @@ -30,6 +30,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_service import service from oslo_service import sslutils +from oslo_utils import netutils from designate.i18n import _ from designate.i18n import _LE @@ -123,17 +124,11 @@ class Service(service.Service): return [(host, port)] else: - def _split_host_port(l): - try: - host, port = l.split(':', 1) - return host, int(port) - except ValueError: - LOG.exception(_LE('Invalid ip:port pair: %s'), l) - raise - # Convert listen pair list to a set, to remove accidental - # duplicates. - return map(_split_host_port, set(self._service_config.listen)) + return map( + netutils.parse_host_port, + set(self._service_config.listen) + ) class RPCService(object):