dnsproxy: Only one copy of the relevant buffers will be made to a TCP request

[framework/connectivity/connman.git] / test / test-connman

diff --git a/test/test-connman b/test/test-connman
index 8ce1ac1..67b0c85 100755 (executable)
--- a/test/test-connman
+++ b/test/test-connman
@@ -18,23 +18,30 @@ if len(sys.argv) < 2:
        print "  disconnect <service>"
        print "  remove <service>"
        print ""
-       print "  scan [type]"
+       print "  scan <type>"
        print "  enable <type>"
        print "  disable <type>"
        print "  offlinemode [on|off]"
        sys.exit(1)
 
 def print_services(services):
-       for path in services:
-               service = dbus.Interface(bus.get_object("net.connman", path),
-                                               "net.connman.Service")
-
-               properties = service.GetProperties()
-
+       for path, properties in services:
                identifier = path[path.rfind("/") + 1:]
+               state = " "
+               autoconnect = "  "
 
                if properties["Favorite"] == dbus.Boolean(1):
                        favorite = "*"
+
+                       if properties["AutoConnect"] == dbus.Boolean(1):
+                               autoconnect = " A"
+                       else:
+                               autoconnect = "  "
+
+                       if properties["State"] == "ready":
+                               state = "R"
+                       elif properties["State"] == "online":
+                               state = "O"
                else:
                        favorite = " "
 
@@ -43,7 +50,8 @@ def print_services(services):
                else:
                        name = "{" + properties["Type"] + "}"
 
-               print "%s %-26s { %s }" % (favorite, name, identifier)
+               print "%s%s%s %-26s { %s }" % (favorite, autoconnect, state,
+                                              name, identifier)
 
 if sys.argv[1] == "state":
        properties = manager.GetProperties()
@@ -51,9 +59,7 @@ if sys.argv[1] == "state":
        print "System is %s" % (properties["State"])
 
 elif sys.argv[1] in ["services", "list", "show"]:
-       properties = manager.GetProperties()
-
-       print_services(properties["Services"])
+       print_services(manager.GetServices())
 
 elif sys.argv[1] in ["autoconnect", "autoconn"]:
        if (len(sys.argv) < 3):
@@ -140,21 +146,24 @@ elif sys.argv[1] in ["remove"]:
 
 elif sys.argv[1] == "scan":
        if len(sys.argv) > 2:
-               manager.RequestScan(sys.argv[2])
-       else:
-               manager.RequestScan("")
+               path = "/net/connman/technology/" + sys.argv[2]
+               technology = dbus.Interface(bus.get_object("net.connman", path),
+                                               "net.connman.Technology")
+               technology.Scan()
 
 elif sys.argv[1] == "enable":
        if len(sys.argv) > 2:
-               manager.EnableTechnology(sys.argv[2])
-       else:
-               manager.EnableTechnology("")
+               path = "/net/connman/technology/" + sys.argv[2]
+               technology = dbus.Interface(bus.get_object("net.connman", path),
+                                           "net.connman.Technology")
+               technology.SetProperty("Powered", True)
 
 elif sys.argv[1] == "disable":
        if len(sys.argv) > 2:
-               manager.DisableTechnology(sys.argv[2])
-       else:
-               manager.DisableTechnology("")
+               path = "/net/connman/technology/" + sys.argv[2]
+               technology = dbus.Interface(bus.get_object("net.connman", path),
+                                           "net.connman.Technology")
+               technology.SetProperty("Powered", False)
 
 elif sys.argv[1] in ["offlinemode", "flightmode"]:
        if len(sys.argv) > 2: