From 968fe145e6f250bc49dc0688fbc04b15e2fca946 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Tue, 13 Aug 2019 13:50:11 +0100
Subject: [PATCH] consoleconf: Fixup write_login_details_standalone

Port to use prober API, stop using removed APIs.
---
 console_conf/controllers/identity.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/console_conf/controllers/identity.py b/console_conf/controllers/identity.py
index b1373ac0..f2d82c86 100644
--- a/console_conf/controllers/identity.py
+++ b/console_conf/controllers/identity.py
@@ -170,21 +170,18 @@ def write_login_details_standalone():
     if owner is None:
         print("No device owner details found.")
         return 0
-    from probert import network
-    from subiquitycore.models.network import (NETDEV_IGNORED_IFACE_NAMES,
-                                              NETDEV_IGNORED_IFACE_TYPES)
-    import operator
-    observer = network.UdevObserver()
-    observer.start()
+    from probert.prober import Prober
+    from subiquitycore.models.network import NETDEV_IGNORED_IFACE_TYPES
+    prober = Prober()
+    prober.probe_network()
+    links = prober.get_results()['network']['links']
     ips = []
-    for l in sorted(observer.links.values(), key=operator.attrgetter('name')):
-        if l.type in NETDEV_IGNORED_IFACE_TYPES:
+    for l in sorted(links, key=lambda l: l['netlink_data']['name']):
+        if l['type'] in NETDEV_IGNORED_IFACE_TYPES:
             continue
-        if l.name in NETDEV_IGNORED_IFACE_NAMES:
-            continue
-        for _, addr in sorted(l.addresses.items()):
-            if addr.scope == "global":
-                ips.append(addr.ip)
+        for addr in l['addresses']:
+            if addr['scope'] == "global":
+                ips.append(addr['address'].split('/')[0])
     if len(ips) == 0:
         tty_name = os.ttyname(0)[5:]
         version = get_core_version() or "16"