Added support to get country-code.

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

diff --git a/test/enable-tethering b/test/enable-tethering
index 4464b26..13e5a18 100755 (executable)
--- a/test/enable-tethering
+++ b/test/enable-tethering
@@ -3,13 +3,12 @@
 import sys
 import dbus
 
-if (len(sys.argv) < 4 and sys.argv[1] == "wifi"):
-       print "Usage: %s wifi [SSID] [passphrase]" % (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 "Enabling %s tethering" % (sys.argv[1])
+       print("Usage: %s type" % (sys.argv[0]))
+       sys.exit(1)
 
 bus = dbus.SystemBus()
 
@@ -22,7 +21,7 @@ def technology_enable_tethering(path, tech_type, ssid, psk):
 
        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:
@@ -31,16 +30,25 @@ def technology_enable_tethering(path, tech_type, ssid, psk):
                                if len(psk) > 0:
                                        tech.SetProperty("TetheringPassphrase",
                                                                psk)
+                               print("Enabling %s tethering" % tech_type)
                                tech.SetProperty("Tethering", dbus.Boolean(1))
 
-properties = manager.GetProperties()
-
-for key in properties.keys():
-       if key in ["Technologies"]:
-               for path in properties[key]:
-                       if (len(sys.argv) == 4):
-                               technology_enable_tethering(path, sys.argv[1],
-                                               sys.argv[2], sys.argv[3])
+                               return tech_type
                        else:
-                               technology_enable_tethering(path, sys.argv[1],
-                                                                       "", "")
+                               return None
+
+technologies = manager.GetTechnologies()
+tech = None
+
+for path,_ in technologies:
+       if (len(sys.argv) == 4):
+               tech = technology_enable_tethering(path,
+                                       sys.argv[1], sys.argv[2], sys.argv[3])
+       else:
+               tech = technology_enable_tethering(path, sys.argv[1], "", "")
+
+       if tech != None:
+               break;
+
+if tech == None:
+       print("Failed to enable %s tethering" % (sys.argv[1]))