From 6f55a4ffe002932a9857e512d8dfb9b9e401b98d Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 2 Sep 2020 12:12:10 -0400
Subject: [PATCH] Python 3.7 fix for ipv6 lla handling

Python 3.7 changes behavior of recfrom (because.. why not apparently...)
Use getnameinfo to normalize the printable version.
---
 confluent_server/confluent/discovery/core.py             | 6 +++++-
 confluent_server/confluent/discovery/handlers/generic.py | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index 4641ee08..0ad06141 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -81,6 +81,7 @@ import confluent.noderange as noderange
 import confluent.util as util
 import eventlet
 import traceback
+import socket as nsocket
 webclient = eventlet.import_patched('pyghmi.util.webclient')
 
 
@@ -206,13 +207,16 @@ def uuid_is_valid(uuid):
                                 '00112233-4455-6677-8899-aabbccddeeff',
                                 '20202020-2020-2020-2020-202020202020')
 
+def _printable_ip(sa):
+    return nsocket.getnameinfo(
+        sa, nsocket.NI_NUMERICHOST|nsocket.NI_NUMERICSERV)[0]
 
 def send_discovery_datum(info):
     addresses = info.get('addresses', [])
     if info['handler'] == pxeh:
         enrich_pxe_info(info)
     yield msg.KeyValueData({'nodename': info.get('nodename', '')})
-    yield msg.KeyValueData({'ipaddrs': [x[0] for x in addresses]})
+    yield msg.KeyValueData({'ipaddrs': [_printable_ip(x) for x in addresses]})
     sn = info.get('serialnumber', '')
     mn = info.get('modelnumber', '')
     uuid = info.get('uuid', '')
diff --git a/confluent_server/confluent/discovery/handlers/generic.py b/confluent_server/confluent/discovery/handlers/generic.py
index 51c52a1e..abc0929b 100644
--- a/confluent_server/confluent/discovery/handlers/generic.py
+++ b/confluent_server/confluent/discovery/handlers/generic.py
@@ -14,6 +14,7 @@
 
 import errno
 import eventlet
+import socket
 webclient = eventlet.import_patched('pyghmi.util.webclient')
 
 class NodeHandler(object):
@@ -38,7 +39,8 @@ class NodeHandler(object):
         else:
             if info.get('addresses', False):
                 targsa = info['addresses'][0]
-        self.ipaddr = targsa[0]
+        self.ipaddr = socket.getnameinfo(
+            targsa, socket.NI_NUMERICHOST|socket.NI_NUMERICSERV)[0]
 
     @classmethod
     def adequate(cls, info):