<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12818">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSC_Tests: Don't make invalid assumptions about RR RELEASE<br><br>The RR RELEASE message does not always have to be '060D00'O,<br>which constrains it to:<br>* not having any optional IEs<br>* not having a cause value != 00<br><br>Let's relax the matching to accept any RR RELEASE message, whatever<br>the cause may be, and whether or not there are any optional IEs at the<br>end.<br><br>At the same time, also remove some copy+pasting but rather have one<br>template that gets used everywhere.<br><br>Change-Id: I4b9d078c9b66f040fe673b5d957cf8e2c6d5892c<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/BSC_Tests_LCLS.ttcn<br>2 files changed, 4 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index af32b8c..5ac8191 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -62,6 +62,7 @@</span><br><span> const integer NUM_TCHH_PER_BTS := 2;</span><br><span> const integer NUM_TCHF_PER_BTS := 4;</span><br><span> const integer NUM_SDCCH_PER_BTS := 4;</span><br><span style="color: hsl(120, 100%, 40%);">+template octetstring t_l3_rr_chan_rel := '060D??*'O;</span><br><span> </span><br><span> </span><br><span> /* per-BTS state which we keep */</span><br><span>@@ -860,7 +861,6 @@</span><br><span> ) runs on test_CT {</span><br><span> </span><br><span> var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0));</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring l3_rr_chan_rel := '060D00'O;</span><br><span> var boolean got_deact_sacch := false;</span><br><span> var boolean got_rr_chan_rel := false;</span><br><span> var boolean got_rll_rel_req := false;</span><br><span>@@ -872,7 +872,7 @@</span><br><span> got_deact_sacch := true;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, l3_rr_chan_rel))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, t_l3_rr_chan_rel))) {</span><br><span> got_rr_chan_rel := true;</span><br><span> repeat;</span><br><span> }</span><br><span>@@ -2812,12 +2812,11 @@</span><br><span> * RR should be released and Clear Request should go to the MSC. */</span><br><span> </span><br><span> var MgcpCommand mgcp;</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring l3_rr_chan_rel := '060D00'O;</span><br><span> interleave {</span><br><span> [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {</span><br><span> log("Got Deact SACCH");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, l3_rr_chan_rel)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, t_l3_rr_chan_rel)) {</span><br><span> log("Got RR Release");</span><br><span> }</span><br><span> [] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {</span><br><span>diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>index c401206..0fada93 100644</span><br><span>--- a/bsc/BSC_Tests_LCLS.ttcn</span><br><span>+++ b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>@@ -700,10 +700,9 @@</span><br><span> </span><br><span> /* Perform hard BSSMAP Clear on "A" side, expect no LS on "B" side */</span><br><span> var myBSSMAP_Cause cause_val := GSM0808_CAUSE_CALL_CONTROL;</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring l3_rr_chan_rel := '060D00'O;</span><br><span> CONN_A.send(ts_BSSMAP_ClearCommand(enum2int(cause_val)));</span><br><span> interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_RSL_DATA_REQ(?, tr_RslLinkID_DCCH(0), l3_rr_chan_rel));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_RSL_DATA_REQ(?, tr_RslLinkID_DCCH(0), t_l3_rr_chan_rel));</span><br><span> [] CONN_A.receive(tr_RSL_DEACT_SACCH(?));</span><br><span> [] CONN_A.receive(tr_RSL_RF_CHAN_REL(?)) -> value rsl {</span><br><span> var RSL_IE_Body ieb;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12818">change 12818</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/12818"/><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: I4b9d078c9b66f040fe673b5d957cf8e2c6d5892c </div>
<div style="display:none"> Gerrit-Change-Number: 12818 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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: daniel <dwillmann@sysmocom.de> </div>