<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20659">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms: Fix and use ms msisdn() getter<br><br>The getter method was named the same as the itnernal field, and hence<br>when used it would fail since the intenral field would be sleect and<br>fail to be called.<br><br>Change-Id: I2f631eb6256eb0e065f41d5b7531395c4a054cd8<br>---<br>M src/osmo_gsm_tester/obj/hlr_osmo.py<br>M src/osmo_gsm_tester/obj/ms.py<br>M src/osmo_gsm_tester/obj/ms_ofono.py<br>M sysmocom/suites/debug/interactive.py<br>M sysmocom/suites/encryption/lib/testlib.py<br>M sysmocom/suites/nitb_debug/interactive.py<br>M sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py<br>M sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py<br>M sysmocom/suites/nitb_ussd/assert_extension.py<br>M sysmocom/suites/smpp/esme_ms_sms_storeforward.py<br>M sysmocom/suites/smpp/esme_ms_sms_transaction.py<br>M sysmocom/suites/ussd/assert_extension.py<br>12 files changed, 35 insertions(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/hlr_osmo.py b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>index 9b911d6..ecff75e 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>@@ -125,7 +125,7 @@</span><br><span> try:</span><br><span> c = conn.cursor()</span><br><span> c.execute('insert into subscriber (id, imsi, msisdn) values (?, ?, ?)',</span><br><span style="color: hsl(0, 100%, 40%);">- (subscriber_id, modem.imsi(), modem.msisdn,))</span><br><span style="color: hsl(120, 100%, 40%);">+ (subscriber_id, modem.imsi(), modem.msisdn(),))</span><br><span> c.execute('insert into auc_2g (subscriber_id, algo_id_2g, ki) values (?, ?, ?)',</span><br><span> (subscriber_id, algo, modem.ki(),))</span><br><span> conn.commit()</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py</span><br><span>index 3e75719..417ad52 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms.py</span><br><span>@@ -45,7 +45,7 @@</span><br><span> def __init__(self, name, conf):</span><br><span> super().__init__(log.C_TST, name)</span><br><span> self._conf = conf</span><br><span style="color: hsl(0, 100%, 40%);">- self.msisdn = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self._msisdn = None</span><br><span> </span><br><span> ########################</span><br><span> # PUBLIC - INTERNAL API</span><br><span>@@ -111,10 +111,10 @@</span><br><span> return self._conf.get('auth_algo', None)</span><br><span> </span><br><span> def set_msisdn(self, msisdn):</span><br><span style="color: hsl(0, 100%, 40%);">- self.msisdn = msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ self._msisdn = msisdn</span><br><span> </span><br><span> def msisdn(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return self.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._msisdn</span><br><span> </span><br><span> def get_counter(self, counter_name):</span><br><span> raise log.Error('get_counter() not implemented!')</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_ofono.py b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>index b604325..0c67e0a 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>@@ -706,12 +706,12 @@</span><br><span> </span><br><span> def sms_send(self, to_msisdn_or_modem, *tokens):</span><br><span> if isinstance(to_msisdn_or_modem, Modem):</span><br><span style="color: hsl(0, 100%, 40%);">- to_msisdn = to_msisdn_or_modem.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ to_msisdn = to_msisdn_or_modem.msisdn()</span><br><span> tokens = list(tokens)</span><br><span> tokens.append('to ' + to_msisdn_or_modem.name())</span><br><span> else:</span><br><span> to_msisdn = str(to_msisdn_or_modem)</span><br><span style="color: hsl(0, 100%, 40%);">- msg = sms.Sms(self.msisdn, to_msisdn, 'from ' + self.name(), *tokens)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = sms.Sms(self.msisdn(), to_msisdn, 'from ' + self.name(), *tokens)</span><br><span> self.log('sending sms to MSISDN', to_msisdn, sms=msg)</span><br><span> mm = self.dbus.interface(I_SMS)</span><br><span> mm.SendMessage(to_msisdn, str(msg))</span><br><span>@@ -743,7 +743,7 @@</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 style="color: hsl(0, 100%, 40%);">- to_msisdn = to_msisdn_or_modem.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ to_msisdn = to_msisdn_or_modem.msisdn()</span><br><span> else:</span><br><span> to_msisdn = str(to_msisdn_or_modem)</span><br><span> self.dbg('Dialing:', to_msisdn)</span><br><span>@@ -766,7 +766,7 @@</span><br><span> </span><br><span> def call_wait_incoming(self, caller_msisdn_or_modem, timeout=60):</span><br><span> if isinstance(caller_msisdn_or_modem, Modem):</span><br><span style="color: hsl(0, 100%, 40%);">- caller_msisdn = caller_msisdn_or_modem.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ caller_msisdn = caller_msisdn_or_modem.msisdn()</span><br><span> else:</span><br><span> caller_msisdn = str(caller_msisdn_or_modem)</span><br><span> self.dbg('Waiting for incoming call from:', caller_msisdn)</span><br><span>diff --git a/sysmocom/suites/debug/interactive.py b/sysmocom/suites/debug/interactive.py</span><br><span>index 3b6a338..18b49d1 100755</span><br><span>--- a/sysmocom/suites/debug/interactive.py</span><br><span>+++ b/sysmocom/suites/debug/interactive.py</span><br><span>@@ -68,14 +68,14 @@</span><br><span> elif 'sms'.startswith(cmd):</span><br><span> for mo in modems:</span><br><span> for mt in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- mo.sms_send(mt.msisdn, 'to ' + mt.name())</span><br><span style="color: hsl(120, 100%, 40%);">+ mo.sms_send(mt.msisdn(), 'to ' + mt.name())</span><br><span> </span><br><span> elif cmd.startswith('call-list'):</span><br><span> if len(params) != 1 and len(params) != 2:</span><br><span> print('wrong format')</span><br><span> continue</span><br><span> for ms in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if len(params) == 1 or str(ms.msisdn) == params[1]:</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(params) == 1 or str(ms.msisdn()) == params[1]:</span><br><span> print('call-list: %r %r' % (ms.name(), ms.call_id_list()))</span><br><span> </span><br><span> elif cmd.startswith('call-dial'):</span><br><span>@@ -84,7 +84,7 @@</span><br><span> continue</span><br><span> src_msisdn, dst_msisdn = params[1:]</span><br><span> for mo in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(mo.msisdn) == src_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(mo.msisdn()) == src_msisdn:</span><br><span> print('dialing %s->%s' % (src_msisdn, dst_msisdn))</span><br><span> call_id = mo.call_dial(dst_msisdn)</span><br><span> print('dial success: call_id=%r' % call_id)</span><br><span>@@ -95,7 +95,7 @@</span><br><span> continue</span><br><span> src_msisdn, dst_msisdn = params[1:]</span><br><span> for mt in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(mt.msisdn) == dst_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(mt.msisdn()) == dst_msisdn:</span><br><span> print('waiting for incoming %s->%s' % (src_msisdn, dst_msisdn))</span><br><span> call_id = mt.call_wait_incoming(src_msisdn)</span><br><span> print('incoming call success: call_id=%r' % call_id)</span><br><span>@@ -106,7 +106,7 @@</span><br><span> continue</span><br><span> mt_msisdn, call_id = params[1:]</span><br><span> for mt in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(mt.msisdn) == mt_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(mt.msisdn()) == mt_msisdn:</span><br><span> print('answering %s %r' % (mt.name(), call_id))</span><br><span> mt.call_answer(call_id)</span><br><span> </span><br><span>@@ -116,7 +116,7 @@</span><br><span> continue</span><br><span> ms_msisdn, call_id = params[1:]</span><br><span> for ms in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(ms.msisdn) == ms_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(ms.msisdn()) == ms_msisdn:</span><br><span> print('hanging up %s %r' % (ms.name(), call_id))</span><br><span> ms.call_hangup(call_id)</span><br><span> </span><br><span>diff --git a/sysmocom/suites/encryption/lib/testlib.py b/sysmocom/suites/encryption/lib/testlib.py</span><br><span>index 87581c6..e85e1c9 100644</span><br><span>--- a/sysmocom/suites/encryption/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/encryption/lib/testlib.py</span><br><span>@@ -45,7 +45,7 @@</span><br><span> hlr.subscriber_delete(ms)</span><br><span> print('KI changed: ' + bad_ki + " => " + good_ki)</span><br><span> ms.set_ki(good_ki)</span><br><span style="color: hsl(0, 100%, 40%);">- hlr.subscriber_add(ms, ms.msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr.subscriber_add(ms, ms.msisdn())</span><br><span> print('Attempt connection with correct KI...')</span><br><span> else:</span><br><span> print('Attempt connection with wrong KI, should work as it is not used...')</span><br><span>diff --git a/sysmocom/suites/nitb_debug/interactive.py b/sysmocom/suites/nitb_debug/interactive.py</span><br><span>index 21f4175..eb196bf 100755</span><br><span>--- a/sysmocom/suites/nitb_debug/interactive.py</span><br><span>+++ b/sysmocom/suites/nitb_debug/interactive.py</span><br><span>@@ -45,14 +45,14 @@</span><br><span> elif 'sms'.startswith(cmd):</span><br><span> for mo in modems:</span><br><span> for mt in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- mo.sms_send(mt.msisdn, 'to ' + mt.name())</span><br><span style="color: hsl(120, 100%, 40%);">+ mo.sms_send(mt.msisdn(), 'to ' + mt.name())</span><br><span> </span><br><span> elif cmd.startswith('call-list'):</span><br><span> if len(params) != 1 and len(params) != 2:</span><br><span> print('wrong format')</span><br><span> continue</span><br><span> for ms in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if len(params) == 1 or str(ms.msisdn) == params[1]:</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(params) == 1 or str(ms.msisdn()) == params[1]:</span><br><span> print('call-list: %r %r' % (ms.name(), ms.call_id_list()))</span><br><span> </span><br><span> elif cmd.startswith('call-dial'):</span><br><span>@@ -61,7 +61,7 @@</span><br><span> continue</span><br><span> src_msisdn, dst_msisdn = params[1:]</span><br><span> for mo in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(mo.msisdn) == src_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(mo.msisdn()) == src_msisdn:</span><br><span> print('dialing %s->%s' % (src_msisdn, dst_msisdn))</span><br><span> call_id = mo.call_dial(dst_msisdn)</span><br><span> print('dial success: call_id=%r' % call_id)</span><br><span>@@ -72,7 +72,7 @@</span><br><span> continue</span><br><span> src_msisdn, dst_msisdn = params[1:]</span><br><span> for mt in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(mt.msisdn) == dst_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(mt.msisdn()) == dst_msisdn:</span><br><span> print('waiting for incoming %s->%s' % (src_msisdn, dst_msisdn))</span><br><span> call_id = mt.call_wait_incoming(src_msisdn)</span><br><span> print('incoming call success: call_id=%r' % call_id)</span><br><span>@@ -83,7 +83,7 @@</span><br><span> continue</span><br><span> mt_msisdn, call_id = params[1:]</span><br><span> for mt in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(mt.msisdn) == mt_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(mt.msisdn()) == mt_msisdn:</span><br><span> print('answering %s %r' % (mt.name(), call_id))</span><br><span> mt.call_answer(call_id)</span><br><span> </span><br><span>@@ -93,7 +93,7 @@</span><br><span> continue</span><br><span> ms_msisdn, call_id = params[1:]</span><br><span> for ms in modems:</span><br><span style="color: hsl(0, 100%, 40%);">- if str(ms.msisdn) == ms_msisdn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str(ms.msisdn()) == ms_msisdn:</span><br><span> print('hanging up %s %r' % (ms.name(), call_id))</span><br><span> ms.call_hangup(call_id)</span><br><span> </span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>index f9617e2..f4d379c 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>@@ -27,13 +27,13 @@</span><br><span> esme.connect()</span><br><span> nitb.subscriber_add(ms)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-wrong_msisdn = ms.msisdn + esme.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+wrong_msisdn = ms.msisdn() + esme.msisdn</span><br><span> print('sending sms with wrong msisdn %s, it will fail' % wrong_msisdn)</span><br><span> msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')</span><br><span> esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD)</span><br><span> </span><br><span> print('sending sms, it will be stored...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send not-yet-registered message')</span><br><span> umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)</span><br><span> </span><br><span> print('MS registers and will receive the SMS...')</span><br><span>@@ -45,7 +45,7 @@</span><br><span> wait(esme.receipt_was_received, umref)</span><br><span> </span><br><span> print('checking MS can receive SMS while registered...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send already-registered message')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send already-registered message')</span><br><span> umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> print('Waiting to receive and consume sms receipt with reference', umref)</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>index ade8054..171fd2c 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>@@ -32,16 +32,16 @@</span><br><span> wait(nitb.subscriber_attached, ms)</span><br><span> </span><br><span> print('sending first sms...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send message')</span><br><span> esme.sms_send(msg, esme.MSGMODE_TRANSACTION)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> </span><br><span> print('sending second sms (unicode chars not in gsm aplhabet)...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'chars:[кизаçйж]')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'chars:[кизаçйж]')</span><br><span> esme.sms_send(msg, esme.MSGMODE_TRANSACTION)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-wrong_msisdn = ms.msisdn + esme.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+wrong_msisdn = ms.msisdn() + esme.msisdn</span><br><span> print('sending third sms (with wrong msisdn %s)' % wrong_msisdn)</span><br><span> msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')</span><br><span> esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_TRANSACTION)</span><br><span>diff --git a/sysmocom/suites/nitb_ussd/assert_extension.py b/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>index e547131..c0c32be 100755</span><br><span>--- a/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>+++ b/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>@@ -34,4 +34,4 @@</span><br><span> </span><br><span> print('Sending ussd code %s' % USSD_COMMAND_GET_EXTENSION)</span><br><span> response = ms.ussd_send(USSD_COMMAND_GET_EXTENSION)</span><br><span style="color: hsl(0, 100%, 40%);">-assert ' ' + ms.msisdn + '\r' in response</span><br><span style="color: hsl(120, 100%, 40%);">+assert ' ' + ms.msisdn() + '\r' in response</span><br><span>diff --git a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>index 6ec414b..c26f168 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>@@ -37,7 +37,7 @@</span><br><span> esme.connect()</span><br><span> hlr.subscriber_add(ms)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-wrong_msisdn = ms.msisdn + esme.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+wrong_msisdn = ms.msisdn() + esme.msisdn</span><br><span> print('sending sms with wrong msisdn %s, it will be stored but not delivered' % wrong_msisdn)</span><br><span> msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')</span><br><span> # Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR</span><br><span>@@ -45,7 +45,7 @@</span><br><span> umref_wrong = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)</span><br><span> </span><br><span> print('sending sms, it will be stored...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send not-yet-registered message')</span><br><span> umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)</span><br><span> </span><br><span> print('MS registers and will receive the SMS...')</span><br><span>@@ -57,7 +57,7 @@</span><br><span> wait(esme.receipt_was_received, umref)</span><br><span> </span><br><span> print('checking MS can receive SMS while registered...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send already-registered message')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send already-registered message')</span><br><span> umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> print('Waiting to receive and consume sms receipt with reference', umref)</span><br><span>diff --git a/sysmocom/suites/smpp/esme_ms_sms_transaction.py b/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>index 5a5a470..5efaf66 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>@@ -42,16 +42,16 @@</span><br><span> wait(msc.subscriber_attached, ms)</span><br><span> </span><br><span> print('sending first sms...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send message')</span><br><span> esme.sms_send(msg, esme.MSGMODE_TRANSACTION)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> </span><br><span> print('sending second sms (unicode chars not in gsm aplhabet)...')</span><br><span style="color: hsl(0, 100%, 40%);">-msg = Sms(esme.msisdn, ms.msisdn, 'chars:[кизаçйж]')</span><br><span style="color: hsl(120, 100%, 40%);">+msg = Sms(esme.msisdn, ms.msisdn(), 'chars:[кизаçйж]')</span><br><span> esme.sms_send(msg, esme.MSGMODE_TRANSACTION)</span><br><span> wait(ms.sms_was_received, msg)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-wrong_msisdn = ms.msisdn + esme.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+wrong_msisdn = ms.msisdn() + esme.msisdn</span><br><span> print('sending third sms (with wrong msisdn %s)' % wrong_msisdn)</span><br><span> msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')</span><br><span> esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_TRANSACTION)</span><br><span>diff --git a/sysmocom/suites/ussd/assert_extension.py b/sysmocom/suites/ussd/assert_extension.py</span><br><span>index 87f2ee5..11a5c5b 100755</span><br><span>--- a/sysmocom/suites/ussd/assert_extension.py</span><br><span>+++ b/sysmocom/suites/ussd/assert_extension.py</span><br><span>@@ -47,4 +47,4 @@</span><br><span> print('Sending ussd code %s' % USSD_COMMAND_GET_EXTENSION)</span><br><span> response = ms.ussd_send(USSD_COMMAND_GET_EXTENSION)</span><br><span> log('got ussd response: %r' % repr(response))</span><br><span style="color: hsl(0, 100%, 40%);">-assert response.endswith(' ' + ms.msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+assert response.endswith(' ' + ms.msisdn())</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20659">change 20659</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/c/osmo-gsm-tester/+/20659"/><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-Change-Id: I2f631eb6256eb0e065f41d5b7531395c4a054cd8 </div>
<div style="display:none"> Gerrit-Change-Number: 20659 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>