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

diff --git a/test/test-manager b/test/test-manager
index dfd9594..2bc53ac 100755
--- a/test/test-manager
+++ b/test/test-manager
@@ -4,7 +4,7 @@ import dbus
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["PrefixLength"]:
 			val += "%s" % (int(values[key]))
@@ -30,88 +30,57 @@ manager = dbus.Interface(bus.get_object("net.connman", "/"),
 
 properties = manager.GetProperties()
 
-def print_properties(key, value):
-	if key == "Profiles":
-		interface = "net.connman.Profile"
-	elif key == "Services":
-		interface = "net.connman.Service"
-	else:
-		return
-
-	print "%s" % (key)
-	for path in value:
-		print "    %s" % (path)
-		obj = dbus.Interface(bus.get_object("net.connman", path),
-								interface)
-
-		properties = obj.GetProperties()
-
-		for key in properties.keys():
-			if key in ["Services"]:
-				continue
-
-			elif 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)
-
-		if "Services" in properties.keys():
-			list = ""
-			for path in properties["Services"]:
-				val = str(path)
-				list = list + val[val.rfind("/") + 1:] + " "
-			print "        Services = [ %s]" % (list)
-
-
-for key in properties.keys():
-	if key in ["Profiles", "Services"]:
-		print_properties(key, properties[key])
-	elif key in ["AvailableDebugs", "EnabledDebugs"]:
-		print "%s" % (key)
-		list = ""
-		for val in properties[key]:
-			list = list + val + " "
-		print "    [ %s]" % (list)
-	elif key in ["OfflineMode", "SessionMode"]:
-		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 properties.keys():
+	print("    %s" % (path))
+	for key in list(properties.keys()):
 
 		if key in ["Connected", "Powered", "Tethering"]:
 			if properties[key] == dbus.Boolean(1):
@@ -121,4 +90,4 @@ for (path, properties) in technologies:
 		else:
 			val = properties[key]
 
-		print "        %s = %s" % (key, val)
+		print("        %s = %s" % (key, val))