Imported Upstream version 1.38

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

diff --git a/test/get-services b/test/get-services
index 1afebc5..2fa8b5b 100755 (executable)
--- a/test/get-services
+++ b/test/get-services
@@ -4,9 +4,12 @@ import dbus
 
 def extract_values(values):
        val = "{"
-       for key in values.keys():
+       for key in list(values.keys()):
                val += " " + key + "="
-               val += str(values[key])
+               if key in ["Servers", "Excludes"]:
+                       val += extract_list(values[key])
+               else:
+                       val += str(values[key])
        val += " }"
        return val
 
@@ -19,8 +22,8 @@ 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')
 
 services = manager.GetServices()
 
@@ -28,16 +31,20 @@ for entry in services:
        path = entry[0]
        properties = entry[1]
 
-       print "[ %s ]" % (path)
+       print("[ %s ]" % (path))
 
-       for key in properties.keys():
-               if key in ["IPv4", "IPv4.Configuration", "Proxy", "Ethernet"]:
+       for key in list(properties.keys()):
+               if key in ["IPv4", "IPv4.Configuration",
+                                       "IPv6", "IPv6.Configuration",
+                                       "Proxy", "Proxy.Configuration",
+                                               "Ethernet", "Provider"]:
                        val = extract_values(properties[key])
                elif key in ["Nameservers", "Nameservers.Configuration",
-                                       "Domains", "Domains.Configuration"]:
+                                       "Domains", "Domains.Configuration",
+                                               "Security"]:
                        val = extract_list(properties[key])
                elif key in ["Favorite", "Immutable", "AutoConnect",
-                               "SetupRequired", "PassphraseRequired"]:
+                               "PassphraseRequired"]:
                        if properties[key] == dbus.Boolean(1):
                                val = "true"
                        else:
@@ -46,6 +53,6 @@ for entry in services:
                        val = int(properties[key])
                else:
                        val = str(properties[key])
-               print "    %s = %s" % (key, val)
+               print("    %s = %s" % (key, val))
 
-       print
+       print()