<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13192">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: expect only one Paging on failed MT SMS<br><br>An MSC might decide to repeatedly retry Paging if it failed the first time, but<br>osmo-msc currently has no such mechanism. Instead, it so far had a bug that<br>retriggered a failed Paging from a start in a situation where there are SMS<br>pending for only one subscriber, and sending the SMS fails. osmo-msc patch<br>I24bf9f1c1167efe1080ae4cf47ed2ef0bd981e49 changes this behavior to accept a<br>Paging failure and not launch the same SMS again numerous times.<br><br>Adjust the tests to this new behavior.<br><br>Depends: I24bf9f1c1167efe1080ae4cf47ed2ef0bd981e49 (osmo-msc)<br>Change-Id: I7dce12942a65eaaf97f78ca69401c7f93faacb9e<br>---<br>M msc/MSC_Tests.ttcn<br>1 file changed, 4 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 8aa6199..df088bc 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -2044,7 +2044,6 @@</span><br><span> private function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span>      var SmsParameters spars := valueof(t_SmsPars);</span><br><span>       var OCT4 tmsi;</span><br><span style="color: hsl(0, 100%, 40%);">-  var integer page_count := 0;</span><br><span>         f_init_handler(pars, 150.0);</span><br><span> </span><br><span>     /* Perform location update */</span><br><span>@@ -2060,21 +2059,8 @@</span><br><span> </span><br><span>   f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* Expect the MSC to page exactly 10 times before giving up */</span><br><span style="color: hsl(0, 100%, 40%);">-  alt {</span><br><span style="color: hsl(0, 100%, 40%);">-           [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi))</span><br><span style="color: hsl(0, 100%, 40%);">-         {</span><br><span style="color: hsl(0, 100%, 40%);">-                       page_count := page_count + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-                   if (page_count < 10) {</span><br><span style="color: hsl(0, 100%, 40%);">-                               repeat;</span><br><span style="color: hsl(0, 100%, 40%);">-                 }</span><br><span style="color: hsl(0, 100%, 40%);">-               }</span><br><span style="color: hsl(0, 100%, 40%);">-               [] BSSAP.receive {</span><br><span style="color: hsl(0, 100%, 40%);">-                      setverdict(fail, "unexpected BSSAP message received");</span><br><span style="color: hsl(0, 100%, 40%);">-                        self.stop;</span><br><span style="color: hsl(0, 100%, 40%);">-              }</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Expect the MSC to page exactly once */</span><br><span style="color: hsl(120, 100%, 40%);">+     BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) { };</span><br><span> </span><br><span>        /* Wait some time to make sure the MSC is not delivering any further</span><br><span>          * paging messages or anything else that could be unexpected. */</span><br><span>@@ -4423,21 +4409,8 @@</span><br><span>    /* Trigger SMS via VTY */</span><br><span>    f_vty_sms_send_conn_hdlr(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* Expect the MSC/VLR to page exactly 10 times before giving up */</span><br><span style="color: hsl(0, 100%, 40%);">-      alt {</span><br><span style="color: hsl(0, 100%, 40%);">-           [] SGsAP.receive(exp_pag_req)</span><br><span style="color: hsl(0, 100%, 40%);">-           {</span><br><span style="color: hsl(0, 100%, 40%);">-                       page_count := page_count + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-                   if (page_count < 10) {</span><br><span style="color: hsl(0, 100%, 40%);">-                               repeat;</span><br><span style="color: hsl(0, 100%, 40%);">-                 }</span><br><span style="color: hsl(0, 100%, 40%);">-               }</span><br><span style="color: hsl(0, 100%, 40%);">-               [] SGsAP.receive {</span><br><span style="color: hsl(0, 100%, 40%);">-                      setverdict(fail, "unexpected SGsAP message received");</span><br><span style="color: hsl(0, 100%, 40%);">-                        self.stop;</span><br><span style="color: hsl(0, 100%, 40%);">-              }</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Expect the MSC/VLR to page exactly once */</span><br><span style="color: hsl(120, 100%, 40%);">+ SGsAP.receive(exp_pag_req);</span><br><span> </span><br><span>      /* Wait some time to make sure the MSC is not delivering any further</span><br><span>          * paging messages or anything else that could be unexpected. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13192">change 13192</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/13192"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7dce12942a65eaaf97f78ca69401c7f93faacb9e </div>
<div style="display:none"> Gerrit-Change-Number: 13192 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>