test: Update to the new Manager api

Makefile.am

@@ -347,7 +347,6 @@ test_scripts = test/backtrace \
 		test/test-call-barring \
 		test/test-call-forwarding \
 		test/test-call-settings \
-		test/test-manager \
 		test/test-modem \
 		test/test-network-registration \
 		test/test-phonebook \

test/activate-context

@@ -8,14 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
 

test/cancel-ussd

@@ -8,8 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-path = properties["Modems"][0]
+modems = manager.GetModems()
+
+path, properties = modems[0]
 
 ussd = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.SupplementaryServices')

test/create-context

@@ -8,14 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
 

test/create-multiparty

@@ -8,9 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
+modems = manager.GetModems()
 
-path = properties["Modems"][0]
+path, properties = modems[0]
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.VoiceCallManager')

test/deactivate-context

@@ -8,14 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
 

test/dial-number

@@ -8,9 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
+modems = manager.GetModems()
 
-path = properties["Modems"][0]
+path, properties = modems[0]
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.VoiceCallManager')

test/disable-modem

@@ -10,8 +10,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 print "Disconnecting modem %s..." % path
 modem = dbus.Interface(bus.get_object('org.ofono', path),

test/enable-cbs

@@ -10,8 +10,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 print "Enabling cell broadcast on modem %s..." % path
 cbs = dbus.Interface(bus.get_object('org.ofono', path),

test/enable-modem

@@ -10,8 +10,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 print "Connecting modem %s..." % path
 modem = dbus.Interface(bus.get_object('org.ofono', path),

test/enter-pin

@@ -11,9 +11,9 @@ if len(sys.argv) == 4:
 	pin = sys.argv[3]
 elif len(sys.argv) == 3:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-				 'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+					'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
@@ -21,6 +21,6 @@ else:
 
 print "Enter Pin for modem %s..." % path
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
-			    'org.ofono.SimManager')
+				'org.ofono.SimManager')
 
 simmanager.EnterPin(pin_type, pin)

test/get-operators

@@ -10,8 +10,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 netreg = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.NetworkRegistration')
@@ -32,6 +32,6 @@ for entry in operators:
 		else:
 			val = str(properties[key])
 		print "    %s = %s" % (key, val)
-	
+
 	print
 

test/get-tech-preference

@@ -9,8 +9,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.RadioSettings')

test/hangup-all

@@ -8,9 +8,8 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-path = properties["Modems"][0]
+modems = manager.GetModems()
+path = modems[0][0]
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.VoiceCallManager')

test/initiate-ussd

@@ -12,8 +12,8 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-path = properties["Modems"][0]
+modems = manager.GetModems()
+path = modems[0][0]
 
 ussd = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.SupplementaryServices')

test/list-calls

@@ -7,14 +7,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	print "[ %s ]" % (path)
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:

test/list-contexts

@@ -7,14 +7,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	print "[ %s ]" % (path)
 
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:

test/list-modems

@@ -7,14 +7,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	print "[ %s ]" % (path)
 
 	for key in properties.keys():
@@ -64,5 +59,5 @@ for path in properties["Modems"]:
 			else:
 				val = str(properties[key])
 			print "        %s = %s" % (key, val)
-	
+
 	print

test/list-operators

@@ -8,14 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	print "[ %s ]" % (path)
 
 	if "org.ofono.NetworkRegistration" not in properties["Interfaces"]:

test/lock-pin

@@ -11,9 +11,9 @@ if len(sys.argv) == 4:
 	pin = sys.argv[3]
 elif len(sys.argv) == 3:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-				 'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+					'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
@@ -23,5 +23,5 @@ else:
 print "Lock %s %s for modem %s..." % (pin_type, pin, path)
 
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
-			    'org.ofono.SimManager')
+				'org.ofono.SimManager')
 simmanager.LockPin(pin_type, pin)

test/monitor-ofono

@@ -92,6 +92,20 @@ if __name__ == '__main__':
 						path_keyword="path",
 						interface_keyword="interface")
 
+	bus.add_signal_receiver(added,
+					bus_name="org.ofono",
+					signal_name = "ModemAdded",
+						member_keyword="member",
+						path_keyword="path",
+						interface_keyword="interface")
+
+	bus.add_signal_receiver(removed,
+					bus_name="org.ofono",
+					signal_name = "ModemRemoved",
+						member_keyword="member",
+						path_keyword="path",
+						interface_keyword="interface")
+
 	bus.add_signal_receiver(added,
 					bus_name="org.ofono",
 					signal_name = "ContextAdded",

test/offline-modem

@@ -9,8 +9,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 print "Setting modem %s offline..." % path
 modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')

test/online-modem

@@ -9,8 +9,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 print "Setting modem %s online..." % path
 modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')

test/private-chat

@@ -8,9 +8,8 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-path = properties["Modems"][0]
+modems = manager.GetModems()
+path = modems[0][0]
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.VoiceCallManager')

test/process-context-settings

@@ -8,14 +8,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
 

test/remove-contexts

@@ -7,14 +7,9 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-for path in properties["Modems"]:
-	modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-	properties = modem.GetProperties()
+modems = manager.GetModems()
 
+for path, properties in modems:
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
 

test/scan-for-operators

@@ -10,8 +10,8 @@ if len(sys.argv) == 2:
 else:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+	modems = manager.GetModems()
+	path = modems[0][0]
 
 print "Propose scanning for modem %s..." % path
 netreg = dbus.Interface(bus.get_object('org.ofono', path),
@@ -33,6 +33,6 @@ for entry in operators:
 		else:
 			val = str(properties[key])
 		print "    %s = %s" % (key, val)
-	
+
 	print
 

test/send-sms

@@ -8,9 +8,8 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-path = properties["Modems"][0]
+modems = manager.GetModems()
+path = modems[0][0]
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.MessageManager')

test/set-cbs-topics

@@ -10,15 +10,15 @@ if len(sys.argv) == 3:
 	topics = sys.argv[2]
 elif len(sys.argv) == 2:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-						 'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+						'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
 	topics = sys.argv[1]
 else:
 	print "%s [PATH] topics" % (sys.argv[0])
 
 print "Setting cell broadcast topics for modem %s..." % path
 cbs = dbus.Interface(bus.get_object('org.ofono', path),
-				    'org.ofono.CellBroadcast')
+					'org.ofono.CellBroadcast')
 
 cbs.SetProperty("Topics", topics);

test/set-mic-volume

@@ -8,9 +8,8 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-path = properties["Modems"][0]
+modems = manager.GetModems()
+path = modems[0][0]
 
 cv = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.CallVolume')

test/set-speaker-volume

@@ -8,9 +8,8 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 						'org.ofono.Manager')
 
-properties = manager.GetProperties()
-
-path = properties["Modems"][0]
+modems = manager.GetModems()
+path = modems[0][0]
 
 cv = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.CallVolume')

test/set-tech-preference

@@ -10,15 +10,15 @@ if len(sys.argv) == 3:
 	tech = sys.argv[2]
 elif len(sys.argv) == 2:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-						 'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+						'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
 	tech = sys.argv[1]
 else:
 	print "%s [PATH] technology" % (sys.argv[0])
 
 print "Setting technology preference for modem %s..." % path
 radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
-					    'org.ofono.RadioSettings')
+						'org.ofono.RadioSettings')
 
 radiosettings.SetProperty("TechnologyPreference", tech);

test/set-use-sms-reports

@@ -10,9 +10,9 @@ if len(sys.argv) == 3:
 	enabled = sys.argv[2]
 elif len(sys.argv) == 2:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-						 'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+						'org.ofono.Manager')
+	modems = manager.getmodems()
+	path = modems[0][0]
 	enabled = sys.argv[1]
 else:
 	print "%s [PATH] topics" % (sys.argv[0])
@@ -20,6 +20,6 @@ else:
 
 print "Setting delivery report use for modem %s..." % path
 sms = dbus.Interface(bus.get_object('org.ofono', path),
-				    'org.ofono.MessageManager')
+					'org.ofono.MessageManager')
 
 sms.SetProperty("UseDeliveryReports", dbus.Boolean(enabled));

test/test-advice-of-charge

@@ -41,9 +41,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
 
-	modems = manager.GetProperties()['Modems']
+	modems = manager.GetModems()
 
-	cm = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cm = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 			'org.ofono.CallMeter')
 
 	cm.connect_to_signal("PropertyChanged", cm_property_changed)

test/test-call-barring

@@ -38,9 +38,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 			'org.ofono.Manager')
 
-	modems = manager.GetProperties()['Modems']
+	modems = manager.GetModems()
 
-	cb = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cb = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 			'org.ofono.CallBarring')
 
 	cb.connect_to_signal("PropertyChanged", property_changed)

test/test-call-forwarding

@@ -25,12 +25,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	try:
-		modems = manager.GetProperties()['Modems']
-	except dbus.DBusException, e:
-		print "Unable to get the modem list %s" % e
+	modems = manager.GetModems()
 
-	cf = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cf = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 				'org.ofono.CallForwarding')
 
 	cf.connect_to_signal("PropertyChanged", property_changed)

test/test-call-settings

@@ -30,9 +30,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	modems = manager.GetProperties()['Modems']
+	modems = manager.GetModems()
 
-	cs = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cs = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 						'org.ofono.CallSettings')
 
 	cs.connect_to_signal("PropertyChanged", property_changed)

test/test-manager

@@ -1,28 +0,0 @@
-#!/usr/bin/python
-
-import gobject
-
-import dbus
-import dbus.mainloop.glib
-
-def property_changed(property, value):
-	print "Manager property %s changed to %s" % (name, value)
-
-if __name__ == "__main__":
-	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-
-	bus = dbus.SystemBus()
-
-	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-							'org.ofono.Manager')
-
-	manager.connect_to_signal("PropertyChanged", property_changed)
-
-	try:
-		properties = manager.GetProperties()
-		print properties['Modems']
-	except dbus.DBusException, e:
-		print "Unable to call GetProperties %s" % e
-
-	mainloop = gobject.MainLoop()
-	mainloop.run()

test/test-modem

@@ -16,10 +16,8 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	modems = manager.GetProperties()['Modems']
-	print modems
-
-	modem = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	modems = manager.GetModems()
+	modem = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 							'org.ofono.Modem')
 
 	modem.connect_to_signal("PropertyChanged", property_changed)

test/test-network-registration

@@ -31,9 +31,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	modems = manager.GetProperties()['Modems']
+	modems = manager.GetModems()
 
-	netreg = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	netreg = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 				'org.ofono.NetworkRegistration')
 
 	netreg.connect_to_signal("PropertyChanged", network_property_changed)

test/test-phonebook

@@ -8,12 +8,8 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	try:
-		modems = manager.GetProperties()['Modems']
-	except dbus.DBusException, e:
-		print "Unable to get the Modems property %s" % e
-
-	phonebook = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	modems = manager.GetModems()
+	phonebook = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 				'org.ofono.Phonebook')
 
 	print phonebook.Import(timeout=100)

test/test-ss-control-cb

@@ -22,12 +22,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	try:
-		modems = manager.GetProperties()['Modems']
-	except dbus.DBusException, e:
-		print "Unable to get the Modems property %s" % e
+	modems = manager.GetModems()
 
-	cb = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cb = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
                                                         'org.ofono.CallBarring')
 
         cb.connect_to_signal("PropertyChanged", property_changed)

test/test-ss-control-cf

@@ -27,17 +27,14 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	try:
-		modems = manager.GetProperties()['Modems']
-	except dbus.DBusException, e:
-		print "Unable to get the Modems property %s" % e
+	modems = manager.GetModems()
 
-	cf = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cf = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 				'org.ofono.CallForwarding')
 
 	cf.connect_to_signal("PropertyChanged", property_changed)
 
-	ss = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	ss = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 				'org.ofono.SupplementaryServices')
 
 	# Clear everything

test/test-ss-control-cs

@@ -22,12 +22,9 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	try:
-		modems = manager.GetProperties()['Modems']
-	except dbus.DBusException, e:
-		print "Unable to get the Modems property %s" % e
+	modems = manager.GetModems()
 
-	cs = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	cs = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
                                                         'org.ofono.CallSettings')
 
         cs.connect_to_signal("PropertyChanged", property_changed)

test/test-stk-menu

@@ -145,14 +145,9 @@ if __name__ == '__main__':
 	manager = dbus.Interface(bus.get_object("org.ofono", "/"),
 							"org.ofono.Manager")
 
-	properties = manager.GetProperties()
-
-	for path in properties["Modems"]:
-		modem = dbus.Interface(bus.get_object('org.ofono', path),
-							'org.ofono.Modem')
-
-		properties = modem.GetProperties()
+	modems = manager.GetModems()
 
+	for path, properties in modems:
 		if "org.ofono.SimToolkit" not in properties["Interfaces"]:
 			continue
 

test/test-ussd

@@ -30,12 +30,8 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	try:
-		modems = manager.GetProperties()['Modems']
-	except dbus.DBusException, e:
-		print "Unable to get the Modems property %s" % e
-
-	ss = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	modems = manager.GetModems()
+	ss = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 							'org.ofono.SupplementaryServices')
 
 	props = ss.GetProperties()

test/test-voicecall

@@ -54,9 +54,8 @@ if __name__ == "__main__":
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 							'org.ofono.Manager')
 
-	modems = manager.GetProperties()['Modems']
-	modem = modems[0]
-	print modems
+	modems = manager.GetModems()
+	modem = modems[0][0]
 
 	if (len(sys.argv) == 3):
 		modem = sys.argv[1]

test/unlock-pin

@@ -11,9 +11,9 @@ if len(sys.argv) == 4:
 	pin = sys.argv[3]
 elif len(sys.argv) == 3:
 	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-				 'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
+					'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
@@ -23,5 +23,5 @@ else:
 print "Unlock %s %s for modem %s..." % (pin_type, pin, path)
 
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
-			    'org.ofono.SimManager')
+				'org.ofono.SimManager')
 simmanager.UnlockPin(pin_type, pin)