X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2Ftest-manager;h=2bc53acc3c77b7ba607ca1e2aa4ac2b67ba88a64;hb=a57098c65678aa6f708215133099520fcb2ef815;hp=ea976caecd4ac064e413b6335e66f1485e676e8d;hpb=64af510378fbd97f37553dc47db96d55e281afae;p=platform%2Fupstream%2Fconnman.git

diff --git a/test/test-manager b/test/test-manager
index ea976ca..2bc53ac 100755
--- a/test/test-manager
+++ b/test/test-manager
@@ -2,64 +2,92 @@
 
 import dbus
 
+def extract_values(values):
+	val = "{"
+	for key in list(values.keys()):
+		val += " " + key + "="
+		if key in ["PrefixLength"]:
+			val += "%s" % (int(values[key]))
+		else:
+			if key in ["Servers", "Excludes"]:
+				val += extract_list(values[key])
+			else:
+				val += str(values[key])
+	val += " }"
+	return val
+
+def extract_list(list):
+	val = "["
+	for i in list:
+		val += " " + str(i)
+	val += " ]"
+	return val
+
 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")
 
 properties = manager.GetProperties()
 
-def print_properties(key, value):
-	if key == "Profiles":
-		interface = "org.moblin.connman.Profile"
-	elif key == "Devices":
-		interface = "org.moblin.connman.Device"
-	elif key == "Connections":
-		interface = "org.moblin.connman.Connection"
-	else:
-		return
-
-	print "%s" % (key)
-	for path in value:
-		print "    %s" % (path)
-		obj = dbus.Interface(bus.get_object("org.moblin.connman", path),
-								interface)
-
-		properties = obj.GetProperties()
-
-		for key in properties.keys():
-			if key == "Networks":
-				continue
-
-			if key in ["Powered", "Scanning", "Connected",
-					"Available", "Remember", "Default"]:
-				if properties[key] == dbus.Boolean(1):
-					val = "true"
-				else:
-					val = "false"
-			elif key == "Strength":
-				val = int(properties[key])
-			else:
-				val = str(properties[key])
-
-			print "        %s = %s" % (key, val)
-
-		if "Networks" in properties.keys():
-			list = ""
-			for path in properties["Networks"]:
-				val = str(path)
-				list = list + val[val.rfind("/") + 1:] + " "
-			print "        Networks = [ %s]" % (list)
-
-for key in properties.keys():
-	if key in ["Profiles", "Devices", "Connections"]:
-		print_properties(key, properties[key])
-	elif key in ["FlightMode"]:
-		print "%s" % (key)
+for key in list(properties.keys()):
+	if key in ["OfflineMode", "SessionMode"]:
+		print("%s" % (key))
 		if properties[key] == dbus.Boolean(1):
-			print "    true"
+			print("    true")
 		else:
-			print "    false"
+			print("    false")
 	else:
-		print "%s" % (key)
-		print "    %s" % (properties[key])
+		print("%s" % (key))
+		print("    %s" % (properties[key]))
+
+print ("Services")
+services = manager.GetServices()
+
+for (path, properties) in services:
+	print("    %s" % (path))
+	for key in list(properties.keys()):
+		if key in ["Available", "Remember", "Default",
+				"Favorite", "Immutable", "AutoConnect",
+					"LoginRequired",
+					"PassphraseRequired"]:
+			if properties[key] == dbus.Boolean(1):
+				val = "true"
+			else:
+				val = "false"
+
+		elif 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",
+					"Security"]:
+			val = extract_list(properties[key])
+
+		elif key in ["Strength", "Priority"]:
+			val = int(properties[key])
+
+		else:
+			val = str(properties[key])
+
+		print("        %s = %s" % (key, val))
+
+print ("Technologies")
+technologies = manager.GetTechnologies()
+
+for (path, properties) in technologies:
+	print("    %s" % (path))
+	for key in list(properties.keys()):
+
+		if key in ["Connected", "Powered", "Tethering"]:
+			if properties[key] == dbus.Boolean(1):
+				val = "true"
+			else:
+				val = "false"
+		else:
+			val = properties[key]
+
+		print("        %s = %s" % (key, val))