test: Handle new tethering properties

diff --git a/test/disable-tethering b/test/disable-tethering
index 01cc96c..2dabd83 100755 (executable)
--- a/test/disable-tethering
+++ b/test/disable-tethering
@@ -1,10 +1,32 @@
 #!/usr/bin/python
 
+import sys
 import dbus
 
+if (len(sys.argv) < 2):
+       print "Usage: %s type" % (sys.argv[0])
+
+print "Disabling %s tethering" % (sys.argv[1])
+
 bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object('net.connman', "/"),
                                        'net.connman.Manager')
 
-manager.SetProperty("Tethering", dbus.Boolean(0));
+def technology_disable_tethering(path, tech_type):
+       tech = dbus.Interface(bus.get_object("net.connman", path),
+                                               "net.connman.Technology")
+
+       properties = tech.GetProperties()
+
+       for key in properties.keys():
+               if key in ["Type"]:
+                       if properties[key] == tech_type:
+                               tech.SetProperty("Tethering", dbus.Boolean(0))
+
+properties = manager.GetProperties()
+
+for key in properties.keys():
+       if key in ["Technologies"]:
+               for path in properties[key]:
+                       technology_disable_tethering(path, sys.argv[1])

diff --git a/test/enable-tethering b/test/enable-tethering
index 51a9cca..4464b26 100755 (executable)
--- a/test/enable-tethering
+++ b/test/enable-tethering
@@ -1,10 +1,46 @@
 #!/usr/bin/python
 
+import sys
 import dbus
 
+if (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])
+
 bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object('net.connman', "/"),
                                        'net.connman.Manager')
 
-manager.SetProperty("Tethering", dbus.Boolean(1));
+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():
+               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)
+                               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])
+                       else:
+                               technology_enable_tethering(path, sys.argv[1],
+                                                                       "", "")

diff --git a/test/test-manager b/test/test-manager
index 7c51b8f..87b0e16 100755 (executable)
--- a/test/test-manager
+++ b/test/test-manager
@@ -74,6 +74,12 @@ def print_properties(key, value):
 
                        elif key in ["Strength", "Priority"]:
                                val = int(properties[key])
+
+                       elif key in ["Tethering"]:
+                               if properties[key] == dbus.Boolean(1):
+                                       val = "true"
+                               else:
+                                       val = "false"
                        else:
                                val = str(properties[key])