test: Also monitor technology changes

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

diff --git a/test/test-connman b/test/test-connman
index 2d9223d..473af62 100755 (executable)
--- a/test/test-connman
+++ b/test/test-connman
@@ -13,25 +13,19 @@ if len(sys.argv) < 2:
        print ""
        print "  state"
        print "  services"
-       print "  passphrase <service> [passphrase]"
        print "  autoconnect <service> [autoconnect]"
        print "  connect <service>"
        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:]
 
                if properties["Favorite"] == dbus.Boolean(1):
@@ -52,40 +46,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"])
-
-elif sys.argv[1] in ["passphrase", "pass"]:
-       if (len(sys.argv) < 3):
-               print "Need at least service parameter"
-               sys.exit(1)
-
-       path = "/net/connman/service/" + sys.argv[2]
-
-       service = dbus.Interface(bus.get_object("net.connman", path),
-                                               "net.connman.Service")
-
-       if (len(sys.argv) > 3):
-               passphrase = sys.argv[3]
-
-               service.SetProperty("Passphrase", passphrase);
-
-               print "Passphrase %s set for %s" % (passphrase, sys.argv[2])
-       else:
-               properties = service.GetProperties()
-
-               if "Name" in properties.keys():
-                       name = properties["Name"]
-               else:
-                       name = "{" + properties["Type"] + "}"
-
-               if "Passphrase" in properties.keys():
-                       passphrase = properties["Passphrase"]
-               else:
-                       passphrase = "not set"
-
-               print "Passphrase for %s is %s" % (name, passphrase)
+       print_services(manager.GetServices())
 
 elif sys.argv[1] in ["autoconnect", "autoconn"]:
        if (len(sys.argv) < 3):
@@ -172,21 +133,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: