Neels Hofmeyr has submitted this change and it was merged. (
https://gerrit.osmocom.org/13192 )
Change subject: msc: expect only one Paging on failed MT SMS
......................................................................
msc: expect only one Paging on failed MT SMS
An MSC might decide to repeatedly retry Paging if it failed the first time, but
osmo-msc currently has no such mechanism. Instead, it so far had a bug that
retriggered a failed Paging from a start in a situation where there are SMS
pending for only one subscriber, and sending the SMS fails. osmo-msc patch
I24bf9f1c1167efe1080ae4cf47ed2ef0bd981e49 changes this behavior to accept a
Paging failure and not launch the same SMS again numerous times.
Adjust the tests to this new behavior.
Depends: I24bf9f1c1167efe1080ae4cf47ed2ef0bd981e49 (osmo-msc)
Change-Id: I7dce12942a65eaaf97f78ca69401c7f93faacb9e
---
M msc/MSC_Tests.ttcn
1 file changed, 4 insertions(+), 31 deletions(-)
Approvals:
Jenkins Builder: Verified
Neels Hofmeyr: Looks good to me, approved
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 8aa6199..df088bc 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2044,7 +2044,6 @@
private function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id,
BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
var SmsParameters spars := valueof(t_SmsPars);
var OCT4 tmsi;
- var integer page_count := 0;
f_init_handler(pars, 150.0);
/* Perform location update */
@@ -2060,21 +2059,8 @@
f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");
- /* Expect the MSC to page exactly 10 times before giving up */
- alt {
- [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi))
- {
- page_count := page_count + 1;
-
- if (page_count < 10) {
- repeat;
- }
- }
- [] BSSAP.receive {
- setverdict(fail, "unexpected BSSAP message received");
- self.stop;
- }
- }
+ /* Expect the MSC to page exactly once */
+ BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) { };
/* Wait some time to make sure the MSC is not delivering any further
* paging messages or anything else that could be unexpected. */
@@ -4423,21 +4409,8 @@
/* Trigger SMS via VTY */
f_vty_sms_send_conn_hdlr(hex2str(pars.imsi), "2342", "Hello SMS");
- /* Expect the MSC/VLR to page exactly 10 times before giving up */
- alt {
- [] SGsAP.receive(exp_pag_req)
- {
- page_count := page_count + 1;
-
- if (page_count < 10) {
- repeat;
- }
- }
- [] SGsAP.receive {
- setverdict(fail, "unexpected SGsAP message received");
- self.stop;
- }
- }
+ /* Expect the MSC/VLR to page exactly once */
+ SGsAP.receive(exp_pag_req);
/* Wait some time to make sure the MSC is not delivering any further
* paging messages or anything else that could be unexpected. */
--
To view, visit https://gerrit.osmocom.org/13192
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7dce12942a65eaaf97f78ca69401c7f93faacb9e
Gerrit-Change-Number: 13192
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <[email protected]>
