X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest-connman;h=81dca916c2881a0ec62caf7d4fb133469d2449da;hb=d320f846f5b6bfc94ec697c0b60f2200ea45a9cb;hp=c59a064c5a3c70d18429c8937f4c415b2658fbd0;hpb=7054e93685c8c18838cc78500566ba4277a5cb26;p=connman

diff --git a/test/test-connman b/test/test-connman
index c59a064..81dca91 100755
--- a/test/test-connman
+++ b/test/test-connman
@@ -12,6 +12,12 @@ if len(sys.argv) < 2:
 	print "Usage: %s <command>" % (sys.argv[0])
 	print ""
 	print "  state"
+	print "  services"
+	print "  passphrase <service> [passphrase]"
+	print "  connect <service>"
+	print "  disconnect <service>"
+	print "  remove <service>"
+	print ""
 	print "  scan [ <interface> ]"
 	print "  dev <interface>"
 	print "  dev <interface> scan"
@@ -62,7 +68,11 @@ def print_networks(networks):
 		else:
 			connected = " "
 
-		name = properties["Name"]
+		if "Name" in properties.keys():
+			name = properties["Name"]
+		else:
+			name = ""
+
 		strength = int(properties["Strength"])
 
 		details = ""
@@ -78,7 +88,7 @@ def print_networks(networks):
 			if properties["WiFi.Passphrase"] != "":
 				details += "{passphrase present}"
 
-		print "%s %-20s %3d%%  %s" % (connected,
+		print "%s %-26s %3d%%  %s" % (connected,
 						name, strength, details)
 
 def select_network(networks, name):
@@ -132,11 +142,119 @@ def disconnect_network(networks, name):
 			print "Disconnecting from network %s" % (name)
 			network.Disconnect()
 
+def print_services(services):
+	for path in services:
+		service = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.connman.Service")
+
+		properties = service.GetProperties()
+
+		identifier = path[path.rfind("/") + 1:]
+
+		if properties["Favorite"] == dbus.Boolean(1):
+			favorite = "*"
+		else:
+			favorite = " "
+
+		if "Name" in properties.keys():
+			name = properties["Name"]
+		else:
+			name = "{" + properties["Type"] + "}"
+
+		print "%s %-26s { %s }" % (favorite, name, identifier)
+
 if sys.argv[1] == "state":
 	properties = manager.GetProperties()
 
 	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 = "/profile/default/" + sys.argv[2]
+
+	service = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.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)
+
+elif sys.argv[1] in ["connect", "conn"]:
+	if (len(sys.argv) < 3):
+		print "Need at least service parameter"
+		sys.exit(1)
+
+	path = "/profile/default/" + sys.argv[2]
+
+	service = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.connman.Service")
+
+	try:
+		service.Connect(timeout=60000)
+	except dbus.DBusException, error:
+		print "%s: %s" % (error._dbus_error_name, error.message)
+
+elif sys.argv[1] in ["disconnect", "disc"]:
+	if (len(sys.argv) < 3):
+		print "Need at least service parameter"
+		sys.exit(1)
+
+	path = "/profile/default/" + sys.argv[2]
+
+	service = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.connman.Service")
+
+	try:
+		service.Disconnect()
+	except dbus.DBusException, error:
+		print "%s: %s" % (error._dbus_error_name, error.message)
+
+elif sys.argv[1] in ["remove"]:
+	if (len(sys.argv) < 3):
+		print "Need at least service parameter"
+		sys.exit(1)
+
+	path = "/profile/default/" + sys.argv[2]
+
+	service = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.connman.Service")
+
+	properties = service.GetProperties()
+
+	if properties["Favorite"] == dbus.Boolean(0):
+		print "Only favorite services can be removed"
+		sys.exit(1)
+
+	try:
+		service.Remove()
+	except dbus.DBusException, error:
+		print "%s: %s" % (error._dbus_error_name, error.message)
+
 elif sys.argv[1] == "scan":
 	properties = manager.GetProperties()