diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2012-01-13 10:37:20 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-01-13 18:07:09 +0100 |
| commit | 0b7cb9b50caca9d3c0022fc33705b1b097c45909 (patch) | |
| tree | aa116d4c4a1748fdadf1e074c7196963119f4cf8 /test | |
| parent | c9dbae14bfcfa140077fbdaa9eb5b4059483fdf5 (diff) | |
| download | connman-0b7cb9b50caca9d3c0022fc33705b1b097c45909.tar.gz connman-0b7cb9b50caca9d3c0022fc33705b1b097c45909.tar.bz2 connman-0b7cb9b50caca9d3c0022fc33705b1b097c45909.zip | |
test: Fixes enable/disable tethering script according to new API
Fixes BMC#24644
Diffstat (limited to 'test')
| -rwxr-xr-x | test/disable-tethering | 14 | ||||
| -rwxr-xr-x | test/enable-tethering | 23 |
2 files changed, 18 insertions, 19 deletions
diff --git a/test/disable-tethering b/test/disable-tethering index 87435232..d9c56a0b 100755 --- 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 cdb037fb..c9668a10 100755 --- 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]) |