[MERGED] osmo-gsm-tester[master]: aoip_smpp: Since recent osmo-msc, we accept all sms in store...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: aoip_smpp: Since recent osmo-msc, we accept all sms in store&forward mode
......................................................................


aoip_smpp: Since recent osmo-msc, we accept all sms in store&forward mode

Change-Id: Ieb5656f3ca93f4343441d90e30fbe904382c44e3
---
M suites/aoip_smpp/esme_ms_sms_storeforward.py
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py
index 543170e..74765bc 100755
--- a/suites/aoip_smpp/esme_ms_sms_storeforward.py
+++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py
@@ -38,9 +38,11 @@
 hlr.subscriber_add(ms)
 
 wrong_msisdn = ms.msisdn + esme.msisdn
-print('sending sms with wrong msisdn %s, it will fail' % wrong_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')
-esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD)
+# Since osmo-msc 1e67fea7ba5c6336, we accept all sms in store&forward mode without looking at HLR
+# esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD)
+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')
@@ -60,4 +62,8 @@
 wait(ms.sms_was_received, msg)
 print('Waiting to receive and consume sms receipt with reference', umref)
 wait(esme.receipt_was_received, umref)
+
+print('Asserting the sms with wrong msisdn was not delivered', umref_wrong)
+assert not esme.receipt_was_received(umref_wrong)
+
 esme.disconnect()

-- 
To view, visit https://gerrit.osmocom.org/6194
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb5656f3ca93f4343441d90e30fbe904382c44e3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder