summaryrefslogtreecommitdiff
path: root/ironic_python_agent/netutils.py
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2016-12-16 12:59:55 +0000
committerDerek Higgins <derekh@redhat.com>2017-01-11 11:00:56 +0000
commit9f5f6640804e255b05adfa34de9dd4d900fcdcbf (patch)
tree5cb14d0265a214f352893fa669f50051d4b3970d /ironic_python_agent/netutils.py
parenta6b09f2fa85f397cfda6a43ce19c995c8a3be76d (diff)
downloadironic-python-agent-9f5f6640804e255b05adfa34de9dd4d900fcdcbf.tar.gz
Advertise the correct address when using IPv6
Parse the output of "ip route get $IP" taking IPv6 into consideration. Also wrap the IP address in square brackets if it is IPv6. Change-Id: Ifc44e5aa3c5b814b6ceba04461bb68fe1d75c22b Closes-Bug: #1650533
Diffstat (limited to 'ironic_python_agent/netutils.py')
-rw-r--r--ironic_python_agent/netutils.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/ironic_python_agent/netutils.py b/ironic_python_agent/netutils.py
index 55c7a3eb..4d482b69 100644
--- a/ironic_python_agent/netutils.py
+++ b/ironic_python_agent/netutils.py
@@ -22,6 +22,7 @@ import sys
import netifaces
from oslo_config import cfg
from oslo_log import log as logging
+from oslo_utils import netutils
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
@@ -213,3 +214,9 @@ def interface_has_carrier(interface_name):
LOG.debug('No carrier information for interface %s',
interface_name)
return False
+
+
+def wrap_ipv6(ip):
+ if netutils.is_valid_ipv6(ip):
+ return "[%s]" % ip
+ return ip