Fix an issue where the log option is applied incorrectly

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

diff --git a/test/list-services b/test/list-services
index 3ae6a4d..a2610d7 100755 (executable)
--- a/test/list-services
+++ b/test/list-services
@@ -11,6 +11,8 @@ def extract_values(values):
                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 += " }"
@@ -28,29 +30,26 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object("net.connman", "/"),
                                        "net.connman.Manager")
 
-properties = manager.GetProperties()
-
-for path in properties["Services"]:
+for path, properties in manager.GetServices():
        service = dbus.Interface(bus.get_object("net.connman", path),
                                                "net.connman.Service")
-
-       properties = service.GetProperties()
-
-       print "[ %s ]" % (path)
+       identifier = path[path.rfind("/") + 1:]
+       print "[ %s ]" % (identifier)
 
        for key in 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",
-                                               "Security"]:
+                            "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: