Fix WPA3 Multi-bssid Issue

[platform/upstream/connman.git] / test / list-services

diff --git a/test/list-services b/test/list-services
index c4ae5d7..4accf77 100755 (executable)
--- a/test/list-services
+++ b/test/list-services
@@ -4,13 +4,15 @@ import dbus
 
 def extract_values(values):
        val = "{"
-       for key in values.keys():
+       for key in list(values.keys()):
                val += " " + key + "="
                if key in ["PrefixLength"]:
                        val += "%s" % (int(values[key]))
                else:
                        if key in ["Servers", "Excludes"]:
                                val += extract_list(values[key])
+                       elif key in ["Ethernet", "IPv4"]:
+                               val += extract_values(values[key])
                        else:
                                val += str(values[key])
        val += " }"
@@ -25,31 +27,29 @@ def extract_list(list):
 
 bus = dbus.SystemBus()
 
-manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"),
-                                       "org.moblin.connman.Manager")
+manager = dbus.Interface(bus.get_object("net.connman", "/"),
+                                       "net.connman.Manager")
 
-properties = manager.GetProperties()
+for path, properties in manager.GetServices():
+       service = dbus.Interface(bus.get_object("net.connman", path),
+                                               "net.connman.Service")
+       identifier = path[path.rfind("/") + 1:]
+       print("[ %s ]" % (identifier))
 
-for path in properties["Services"]:
-       service = dbus.Interface(bus.get_object("org.moblin.connman", path),
-                                               "org.moblin.connman.Service")
-
-       properties = service.GetProperties()
-
-       print "[ %s ]" % (path)
-
-       for key in properties.keys():
+       for key in list(properties.keys()):
                if key in ["IPv4", "IPv4.Configuration",
                                "IPv6", "IPv6.Configuration",
                                        "Proxy", "Proxy.Configuration",
-                                               "Ethernet", "Provider"]:
+                                       "Ethernet", "Provider",
+                                       "LastAddressConflict"]:
                        val = extract_values(properties[key])
                elif key in ["Nameservers", "Nameservers.Configuration",
-                                       "Domains", "Domains.Configuration"]:
+                            "Domains", "Domains.Configuration",
+                            "Timeservers", "Timeservers.Configuration",
+                            "Security"]:
                        val = extract_list(properties[key])
                elif key in ["Favorite", "Immutable", "AutoConnect",
-                                       "LoginRequired", "SetupRequired",
-                                                       "PassphraseRequired"]:
+                                       "LoginRequired", "PassphraseRequired"]:
                        if properties[key] == dbus.Boolean(1):
                                val = "true"
                        else:
@@ -58,6 +58,6 @@ for path in properties["Services"]:
                        val = int(properties[key])
                else:
                        val = properties[key]
-               print "    %s = %s" % (key, val)
+               print("    %s = %s" % (key, val))
 
-       print
+       print()