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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: add as_optional_cc_rel to ignore CC REL during call abort tests<br><br>When aborting a call with a Clear Request, it is actually a good idea to<br>release an ongoing call with a CC Release message from the MSC. Allow this.<br><br>Change-Id: I8378f7602fecac8262b31b47ad9327a3782c1bcd<br>---<br>M msc/MSC_Tests.ttcn<br>1 file changed, 23 insertions(+), 9 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 7129f81..1edc7ad 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -152,6 +152,10 @@</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_optional_cc_rel(CallParameters cpars) runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+   [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))) { repeat; };</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_init_smpp(charstring id) runs on MTC_CT {</span><br><span>       id := id & "-SMPP";</span><br><span>    var EsmePars pars := {</span><br><span>@@ -1267,7 +1271,13 @@</span><br><span> </span><br><span>  BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party)));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ var default ccrel := activate(as_optional_cc_rel(cpars));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  f_expect_clear(185.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      deactivate(ccrel);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  f_sleep(1.0);</span><br><span> }</span><br><span> testcase TC_mo_setup_and_nothing() runs on MTC_CT {</span><br><span>    var BSC_ConnHdlr vc_conn;</span><br><span>@@ -1477,7 +1487,6 @@</span><br><span>            setverdict(fail, "Timeout waiting for channel release");</span><br><span>           mtc.stop;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] BSSAP.receive { repeat; }</span><br><span>         [] MNCC.receive { repeat; }</span><br><span>  [] GSUP.receive { repeat; }</span><br><span>  [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd {</span><br><span>@@ -1487,6 +1496,7 @@</span><br><span>           }</span><br><span>    [] MGCP.receive { repeat; }</span><br><span>  [] as_clear_cmd_compl_disc();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_optional_cc_rel(cpars);</span><br><span>        }</span><br><span> }</span><br><span> testcase TC_mt_crcx_ran_reject() runs on MTC_CT {</span><br><span>@@ -1873,13 +1883,11 @@</span><br><span>        /* Drop CRCX */</span><br><span>      MGCP.receive(tr_CRCX) -> value mgcp_cmd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Drop DTAP Release */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id)));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      /* Drop resent DTAP Release */</span><br><span style="color: hsl(0, 100%, 40%);">-  BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id)));</span><br><span style="color: hsl(120, 100%, 40%);">+    var default ccrel := activate(as_optional_cc_rel(cpars));</span><br><span> </span><br><span>        f_expect_clear(60.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       deactivate(ccrel);</span><br><span> }</span><br><span> testcase TC_mo_release_timeout() runs on MTC_CT {</span><br><span>         var BSC_ConnHdlr vc_conn;</span><br><span>@@ -3154,10 +3162,16 @@</span><br><span>  f_sleep(1.0);</span><br><span>        BSSAP.send(ts_BSSMAP_ClearRequest(0));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      MNCC.receive(tr_MNCC_REL_ind(?, ?)) -> value mncc;</span><br><span style="color: hsl(120, 100%, 40%);">+ var default ccrel := activate(as_optional_cc_rel(cpars));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   BSSAP.receive(tr_BSSMAP_ClearCommand);</span><br><span style="color: hsl(0, 100%, 40%);">-  BSSAP.send(ts_BSSMAP_ClearComplete);</span><br><span style="color: hsl(120, 100%, 40%);">+  interleave {</span><br><span style="color: hsl(120, 100%, 40%);">+  [] MNCC.receive(tr_MNCC_REL_ind(?, ?)) { };</span><br><span style="color: hsl(120, 100%, 40%);">+   [] BSSAP.receive(tr_BSSMAP_ClearCommand) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    BSSAP.send(ts_BSSMAP_ClearComplete);</span><br><span style="color: hsl(120, 100%, 40%);">+          };</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   deactivate(ccrel);</span><br><span> </span><br><span>       f_sleep(1.0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13167">change 13167</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/13167"/><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: I8378f7602fecac8262b31b47ad9327a3782c1bcd </div>
<div style="display:none"> Gerrit-Change-Number: 13167 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>