ms: Fix and use ms msisdn() getter
The getter method was named the same as the itnernal field, and hence
when used it would fail since the intenral field would be sleect and
fail to be called.
Change-Id: I2f631eb6256eb0e065f41d5b7531395c4a054cd8
diff --git a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py
index 6ec414b..c26f168 100755
--- a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py
+++ b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py
@@ -37,7 +37,7 @@
esme.connect()
hlr.subscriber_add(ms)
-wrong_msisdn = ms.msisdn + esme.msisdn
+wrong_msisdn = ms.msisdn() + esme.msisdn
print('sending sms with wrong msisdn %s, it will be stored but not delivered' % wrong_msisdn)
msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')
# Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR
@@ -45,7 +45,7 @@
umref_wrong = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
print('sending sms, it will be stored...')
-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message')
+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send not-yet-registered message')
umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
print('MS registers and will receive the SMS...')
@@ -57,7 +57,7 @@
wait(esme.receipt_was_received, umref)
print('checking MS can receive SMS while registered...')
-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send already-registered message')
+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send already-registered message')
umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
wait(ms.sms_was_received, msg)
print('Waiting to receive and consume sms receipt with reference', umref)
diff --git a/sysmocom/suites/smpp/esme_ms_sms_transaction.py b/sysmocom/suites/smpp/esme_ms_sms_transaction.py
index 5a5a470..5efaf66 100755
--- a/sysmocom/suites/smpp/esme_ms_sms_transaction.py
+++ b/sysmocom/suites/smpp/esme_ms_sms_transaction.py
@@ -42,16 +42,16 @@
wait(msc.subscriber_attached, ms)
print('sending first sms...')
-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message')
+msg = Sms(esme.msisdn, ms.msisdn(), 'smpp send message')
esme.sms_send(msg, esme.MSGMODE_TRANSACTION)
wait(ms.sms_was_received, msg)
print('sending second sms (unicode chars not in gsm aplhabet)...')
-msg = Sms(esme.msisdn, ms.msisdn, 'chars:[кизаçйж]')
+msg = Sms(esme.msisdn, ms.msisdn(), 'chars:[кизаçйж]')
esme.sms_send(msg, esme.MSGMODE_TRANSACTION)
wait(ms.sms_was_received, msg)
-wrong_msisdn = ms.msisdn + esme.msisdn
+wrong_msisdn = ms.msisdn() + esme.msisdn
print('sending third sms (with wrong msisdn %s)' % wrong_msisdn)
msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')
esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_TRANSACTION)