X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2Fenable-tethering;h=13e5a18c4d345350c5972044ecf90035fa2ea744;hb=132afd1b759135225e1582fce0125759b8580d9e;hp=674b3c91350f589f5f1b077c835a42f339459251;hpb=9c99015013fcf0abde65abaf2203dde64c07a962;p=platform%2Fupstream%2Fconnman.git

diff --git a/test/enable-tethering b/test/enable-tethering
index 674b3c9..13e5a18 100755
--- a/test/enable-tethering
+++ b/test/enable-tethering
@@ -3,20 +3,11 @@
 import sys
 import dbus
 
-if (len(sys.argv) >= 2 and len(sys.argv) < 4 and sys.argv[1] == "wifi"):
-	print "Usage: %s wifi [SSID] [passphrase] [hidden]" % (sys.argv[0])
-	print "Example:"
-	print "Create the open system access point:"
-	print "%s wifi abcd \"\"" % (sys.argv[0])
-	print "Create the security access point:"
-	print "%s wifi abcd 123456789" % (sys.argv[0])
-	print "Create the hidden access point:"
-	print "%s wifi abcd 123456789 hidden" % (sys.argv[0])
-	print "Create the open and hidden access point:"
-	print "%s wifi abcd \"\" hidden" % (sys.argv[0])
+if (len(sys.argv) >= 3 and len(sys.argv) != 4 and sys.argv[1] == "wifi"):
+	print("Usage: %s wifi [SSID] [passphrase]" % (sys.argv[0]))
 	sys.exit(1)
 elif (len(sys.argv) < 2):
-	print "Usage: %s type" % (sys.argv[0])
+	print("Usage: %s type" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -24,30 +15,22 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('net.connman', "/"),
 					'net.connman.Manager')
 
-def technology_enable_tethering(path, tech_type, ssid, psk, hidden):
+def technology_enable_tethering(path, tech_type, ssid, psk):
 	tech = dbus.Interface(bus.get_object("net.connman", path),
 						"net.connman.Technology")
 
 	properties = tech.GetProperties()
 
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["Type"]:
 			if properties[key] == tech_type:
 				if len(ssid) > 0:
 					tech.SetProperty("TetheringIdentifier",
 								ssid)
+				if len(psk) > 0:
 					tech.SetProperty("TetheringPassphrase",
 								psk)
-				if tech_type == "wifi":
-					if len(hidden) > 0:
-						if hidden == "hidden":
-							tech.SetProperty("Hidden",dbus.Boolean(1))
-						else:
-							tech.SetProperty("Hidden",dbus.Boolean(0))
-					else:
-						tech.SetProperty("Hidden",dbus.Boolean(0))
-
-				print "Enabling %s tethering" % tech_type
+				print("Enabling %s tethering" % tech_type)
 				tech.SetProperty("Tethering", dbus.Boolean(1))
 
 				return tech_type
@@ -58,17 +41,14 @@ technologies = manager.GetTechnologies()
 tech = None
 
 for path,_ in technologies:
-	if (len(sys.argv) == 5):
-		tech = technology_enable_tethering(path,
-					sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
-	elif (len(sys.argv) == 4):
+	if (len(sys.argv) == 4):
 		tech = technology_enable_tethering(path,
-					sys.argv[1], sys.argv[2], sys.argv[3], "")
+					sys.argv[1], sys.argv[2], sys.argv[3])
 	else:
-		tech = technology_enable_tethering(path, sys.argv[1], "", "", "")
+		tech = technology_enable_tethering(path, sys.argv[1], "", "")
 
 	if tech != None:
 		break;
 
 if tech == None:
-	print "Failed to enable %s tethering" % (sys.argv[1])
+	print("Failed to enable %s tethering" % (sys.argv[1]))