test: Fixes enable/disable tethering script according to new API

Fixes BMC#24644

diff --git a/test/disable-tethering b/test/disable-tethering
index 8743523..d9c56a0 100755 (executable)
--- a/test/disable-tethering
+++ b/test/disable-tethering
@@ -5,6 +5,7 @@ import dbus
 
 if (len(sys.argv) < 2):
        print "Usage: %s type" % (sys.argv[0])
+       sys.exit(1)
 
 bus = dbus.SystemBus()
 
@@ -27,14 +28,13 @@ def technology_disable_tethering(path, tech_type):
                        else:
                                return None
 
-properties = manager.GetProperties()
+technologies = manager.GetTechnologies()
+tech = None
 
-for key in properties.keys():
-       if key in ["Technologies"]:
-               for path in properties[key]:
-                       tech = technology_disable_tethering(path, sys.argv[1])
-                       if tech != None:
-                               break;
+for path,_ in technologies:
+       tech = technology_disable_tethering(path, sys.argv[1])
+       if tech != None:
+               break;
 
 if tech == None:
        print "Failed to disable %s tethering" % (sys.argv[1])

diff --git a/test/enable-tethering b/test/enable-tethering
index cdb037f..c9668a1 100755 (executable)
--- a/test/enable-tethering
+++ b/test/enable-tethering
@@ -3,11 +3,12 @@
 import sys
 import dbus
 
-if (len(sys.argv) < 4 and sys.argv[1] == "wifi"):
+if (len(sys.argv) >= 2 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])
+       sys.exit(1)
 
 bus = dbus.SystemBus()
 
@@ -36,20 +37,18 @@ def technology_enable_tethering(path, tech_type, ssid, psk):
                        else:
                                return None
 
-properties = manager.GetProperties()
+technologies = manager.GetTechnologies()
+tech = None
 
-for key in properties.keys():
-       if key in ["Technologies"]:
-               for path in properties[key]:
-                       if (len(sys.argv) == 4):
-                               tech = technology_enable_tethering(path,
+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], "", "")
+       else:
+               tech = technology_enable_tethering(path, sys.argv[1], "", "")
 
-                       if tech != None:
-                               break;
+       if tech != None:
+               break;
 
 if tech == None:
        print "Failed to enable %s tethering" % (sys.argv[1])