test: refactor
This commit is contained in:
@@ -11,7 +11,11 @@ MM_DBUS_INTERFACE_MODEM='org.freedesktop.ModemManager.Modem'
|
|||||||
MM_DBUS_INTERFACE_MODEM_GSM_CARD='org.freedesktop.ModemManager.Modem.Gsm.Card'
|
MM_DBUS_INTERFACE_MODEM_GSM_CARD='org.freedesktop.ModemManager.Modem.Gsm.Card'
|
||||||
MM_DBUS_INTERFACE_MODEM_GSM_NETWORK='org.freedesktop.ModemManager.Modem.Gsm.Network'
|
MM_DBUS_INTERFACE_MODEM_GSM_NETWORK='org.freedesktop.ModemManager.Modem.Gsm.Network'
|
||||||
|
|
||||||
def get_network_mode(modem):
|
def inspect_cdma(proxy):
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def get_gsm_network_mode(modem):
|
||||||
mode = modem.GetNetworkMode()
|
mode = modem.GetNetworkMode()
|
||||||
if mode == 1:
|
if mode == 1:
|
||||||
mode = "GPRS"
|
mode = "GPRS"
|
||||||
@@ -26,7 +30,7 @@ def get_network_mode(modem):
|
|||||||
|
|
||||||
print "Mode: %s" % mode
|
print "Mode: %s" % mode
|
||||||
|
|
||||||
def get_band(modem):
|
def get_gsm_band(modem):
|
||||||
band = modem.GetBand()
|
band = modem.GetBand()
|
||||||
if band == 0:
|
if band == 0:
|
||||||
band = "Any"
|
band = "Any"
|
||||||
@@ -58,41 +62,7 @@ def get_band(modem):
|
|||||||
print "Band: %s" % band
|
print "Band: %s" % band
|
||||||
|
|
||||||
|
|
||||||
bus = dbus.SystemBus()
|
def inspect_gsm(proxy):
|
||||||
|
|
||||||
# Get available modems:
|
|
||||||
manager_proxy = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
|
|
||||||
manager_iface = dbus.Interface(manager_proxy, dbus_interface='org.freedesktop.ModemManager')
|
|
||||||
modems = manager_iface.EnumerateDevices()
|
|
||||||
|
|
||||||
if not modems:
|
|
||||||
print "No modems found"
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
for m in modems:
|
|
||||||
proxy = bus.get_object(MM_DBUS_SERVICE, m)
|
|
||||||
|
|
||||||
# Properties
|
|
||||||
props_iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.DBus.Properties')
|
|
||||||
|
|
||||||
type = props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'Type')
|
|
||||||
if type == 1:
|
|
||||||
print "GSM modem"
|
|
||||||
elif type == 2:
|
|
||||||
print "CDMA modem"
|
|
||||||
else:
|
|
||||||
print "Invalid modem type: %d" % type
|
|
||||||
|
|
||||||
print "Driver: '%s'" % (props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'Driver'))
|
|
||||||
print "Data device: '%s'" % (props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'Device'))
|
|
||||||
|
|
||||||
# Modem interface
|
|
||||||
modem = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM)
|
|
||||||
modem.Enable(True)
|
|
||||||
|
|
||||||
if type != 1:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Gsm.Card interface
|
# Gsm.Card interface
|
||||||
card = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM_GSM_CARD)
|
card = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM_GSM_CARD)
|
||||||
try:
|
try:
|
||||||
@@ -126,6 +96,44 @@ for m in modems:
|
|||||||
else:
|
else:
|
||||||
print "%s: %s" % (r['operator-short'], status)
|
print "%s: %s" % (r['operator-short'], status)
|
||||||
|
|
||||||
|
|
||||||
|
bus = dbus.SystemBus()
|
||||||
|
|
||||||
|
# Get available modems:
|
||||||
|
manager_proxy = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
|
||||||
|
manager_iface = dbus.Interface(manager_proxy, dbus_interface='org.freedesktop.ModemManager')
|
||||||
|
modems = manager_iface.EnumerateDevices()
|
||||||
|
|
||||||
|
if not modems:
|
||||||
|
print "No modems found"
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
for m in modems:
|
||||||
|
proxy = bus.get_object(MM_DBUS_SERVICE, m)
|
||||||
|
|
||||||
|
# Properties
|
||||||
|
props_iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.DBus.Properties')
|
||||||
|
|
||||||
|
type = props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'Type')
|
||||||
|
if type == 1:
|
||||||
|
print "GSM modem"
|
||||||
|
elif type == 2:
|
||||||
|
print "CDMA modem"
|
||||||
|
else:
|
||||||
|
print "Invalid modem type: %d" % type
|
||||||
|
|
||||||
|
print "Driver: '%s'" % (props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'Driver'))
|
||||||
|
print "Modem device: '%s'" % (props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'MasterDevice'))
|
||||||
|
print "Data device: '%s'" % (props_iface.Get(MM_DBUS_INTERFACE_MODEM, 'Device'))
|
||||||
|
|
||||||
|
# Modem interface
|
||||||
|
modem = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM)
|
||||||
|
modem.Enable(True)
|
||||||
|
|
||||||
|
if type == 1:
|
||||||
|
inspect_gsm(proxy)
|
||||||
|
elif type == 2:
|
||||||
|
inspect_cdma(proxy)
|
||||||
print
|
print
|
||||||
|
|
||||||
modem.Enable(False)
|
modem.Enable(False)
|
||||||
|
Reference in New Issue
Block a user