<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12899">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Log signals from VoiceCall dbus objects<br><br>Change-Id: I0def02b9063f75ec32c8b9382bdb12d65e1fb9eb<br>---<br>M src/osmo_gsm_tester/modem.py<br>1 file changed, 54 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py</span><br><span>index e7ce68a..28f7f04 100644</span><br><span>--- a/src/osmo_gsm_tester/modem.py</span><br><span>+++ b/src/osmo_gsm_tester/modem.py</span><br><span>@@ -40,6 +40,7 @@</span><br><span> I_CALL = 'org.ofono.VoiceCall'</span><br><span> I_SS = 'org.ofono.SupplementaryServices'</span><br><span> I_SIMMGR = 'org.ofono.SimManager'</span><br><span style="color: hsl(120, 100%, 40%);">+I_VOICECALL = 'org.ofono.VoiceCall'</span><br><span> </span><br><span> # See https://github.com/intgr/ofono/blob/master/doc/network-api.txt#L78</span><br><span> NETREG_ST_REGISTERED = 'registered'</span><br><span>@@ -318,6 +319,39 @@</span><br><span> def is_online(self):</span><br><span> return self.property_is('Online', True)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class ModemCall(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ofono Modem voicecall dbus object'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, modem, dbuspath):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_TST, dbuspath)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.modem = modem</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbuspath = dbuspath</span><br><span style="color: hsl(120, 100%, 40%);">+ self.signal_list = []</span><br><span style="color: hsl(120, 100%, 40%);">+ self.register_signals()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def register_signals(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ call_dbus_obj = systembus_get(self.dbuspath)</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr = dbus_connect(call_dbus_obj.PropertyChanged, lambda name, value: self.on_voicecall_property_change(self.dbuspath, name, value))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.signal_list.append(subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr = dbus_connect(call_dbus_obj.DisconnectReason, lambda reason: self.on_voicecall_disconnect_reason(self.dbuspath, reason))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.signal_list.append(subscr)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def unregister_signals(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ for subscr in self.signal_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr.disconnect()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.signal_list = []</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def cleanup(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.unregister_signals()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __del__(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.cleanup()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def on_voicecall_property_change(self, obj_path, name, value):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('%r:%r.PropertyChanged() -> %s=%s' % (obj_path, I_VOICECALL, name, value))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def on_voicecall_disconnect_reason(self, obj_path, reason):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('%r:%r.DisconnectReason() -> %s' % (obj_path, I_VOICECALL, reason))</span><br><span> </span><br><span> class Modem(MS):</span><br><span> 'convenience for ofono Modem interaction'</span><br><span>@@ -357,6 +391,9 @@</span><br><span> self.cancellable = None</span><br><span> if self.is_powered():</span><br><span> self.power_off()</span><br><span style="color: hsl(120, 100%, 40%);">+ for call_obj in self.call_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ call_obj.cleanup()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.call_list = []</span><br><span> self.dbus.cleanup()</span><br><span> self.dbus = None</span><br><span> </span><br><span>@@ -670,8 +707,15 @@</span><br><span> return False</span><br><span> </span><br><span> def call_id_list(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.dbg('call_id_list: %r' % self.call_list)</span><br><span style="color: hsl(0, 100%, 40%);">- return self.call_list</span><br><span style="color: hsl(120, 100%, 40%);">+ li = [call.dbuspath for call in self.call_list]</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('call_id_list: %r' % li)</span><br><span style="color: hsl(120, 100%, 40%);">+ return li</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def call_find_by_id(self, id):</span><br><span style="color: hsl(120, 100%, 40%);">+ for call in self.call_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ if call.dbuspath == id:</span><br><span style="color: hsl(120, 100%, 40%);">+ return call</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span> </span><br><span> def call_dial(self, to_msisdn_or_modem):</span><br><span> if isinstance(to_msisdn_or_modem, Modem):</span><br><span>@@ -681,9 +725,9 @@</span><br><span> self.dbg('Dialing:', to_msisdn)</span><br><span> cmgr = self.dbus.interface(I_CALLMGR)</span><br><span> call_obj_path = cmgr.Dial(to_msisdn, 'default')</span><br><span style="color: hsl(0, 100%, 40%);">- if call_obj_path not in self.call_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.call_find_by_id(call_obj_path) is None:</span><br><span> self.dbg('Adding %s to call list' % call_obj_path)</span><br><span style="color: hsl(0, 100%, 40%);">- self.call_list.append(call_obj_path)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.call_list.append(ModemCall(self, call_obj_path))</span><br><span> else:</span><br><span> self.dbg('Dial returned already existing call')</span><br><span> return call_obj_path</span><br><span>@@ -734,15 +778,17 @@</span><br><span> </span><br><span> def _on_callmgr_call_added(self, obj_path, properties):</span><br><span> self.dbg('%r.CallAdded() -> %s=%r' % (I_CALLMGR, obj_path, repr(properties)))</span><br><span style="color: hsl(0, 100%, 40%);">- if obj_path not in self.call_list:</span><br><span style="color: hsl(0, 100%, 40%);">- self.call_list.append(obj_path)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.call_find_by_id(obj_path) is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.call_list.append(ModemCall(self, obj_path))</span><br><span> else:</span><br><span> self.dbg('Call already exists %r' % obj_path)</span><br><span> </span><br><span> def _on_callmgr_call_removed(self, obj_path):</span><br><span> self.dbg('%r.CallRemoved() -> %s' % (I_CALLMGR, obj_path))</span><br><span style="color: hsl(0, 100%, 40%);">- if obj_path in self.call_list:</span><br><span style="color: hsl(0, 100%, 40%);">- self.call_list.remove(obj_path)</span><br><span style="color: hsl(120, 100%, 40%);">+ call_obj = self.call_find_by_id(obj_path)</span><br><span style="color: hsl(120, 100%, 40%);">+ if call_obj is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.call_list.remove(call_obj)</span><br><span style="color: hsl(120, 100%, 40%);">+ call_obj.cleanup()</span><br><span> else:</span><br><span> self.dbg('Trying to remove non-existing call %r' % obj_path)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12899">change 12899</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12899"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0def02b9063f75ec32c8b9382bdb12d65e1fb9eb </div>
<div style="display:none"> Gerrit-Change-Number: 12899 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>