diff --git a/Makefile.am b/Makefile.am index fa0a0d99..368284c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -321,6 +321,8 @@ test_scripts = test/activate-context \ test/list-contexts \ test/list-modems \ test/list-operators \ + test/scan-for-operators \ + test/get-operators\ test/monitor-ofono \ test/process-context-settings \ test/receive-sms \ diff --git a/test/get-operators b/test/get-operators new file mode 100755 index 00000000..2351db05 --- /dev/null +++ b/test/get-operators @@ -0,0 +1,37 @@ +#!/usr/bin/python + +import dbus +import sys + +bus = dbus.SystemBus() + +if len(sys.argv) == 2: + path = sys.argv[1] +else: + manager = dbus.Interface(bus.get_object('org.ofono', '/'), + 'org.ofono.Manager') + properties = manager.GetProperties() + path = properties["Modems"][0] + +netreg = dbus.Interface(bus.get_object('org.ofono', path), + 'org.ofono.NetworkRegistration') + +operators = netreg.GetOperators() + +for entry in operators: + path = entry[0] + properties = entry[1] + + print "[ %s ]" % (path) + + for key in properties.keys(): + if key in ["Technologies"]: + val = "" + for i in properties[key]: + val += i + " " + else: + val = str(properties[key]) + print " %s = %s" % (key, val) + + print + diff --git a/test/propose-scan b/test/scan-for-operators similarity index 76% rename from test/propose-scan rename to test/scan-for-operators index c35618d3..3206f8f0 100755 --- a/test/propose-scan +++ b/test/scan-for-operators @@ -17,13 +17,11 @@ print "Propose scanning for modem %s..." % path netreg = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.NetworkRegistration') -operators = netreg.ProposeScan(timeout=100); +operators = netreg.Scan(timeout=100); -for path in operators: - operator = dbus.Interface(bus.get_object('org.ofono', path), - 'org.ofono.NetworkOperator') - - properties = operator.GetProperties() +for entry in operators: + path = entry[0] + properties = entry[1] print "[ %s ]" % (path)