<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11661">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: handle Deact SACCH messages<br><br>Allow osmo-bsc sending a Deact SACCH messages in most cases. Prepare the<br>ttcn3-bsc-tests to not break just because of those messages that will soon be<br>sent.<br><br>When releasing an lchan, it makes sense to Deactivate SACCH on it, if it was<br>ever active. So far osmo-bsc was fairly reluctant to send Deactivate SACCH, but<br>osmo-bsc Id3301df059582da2377ef82feae554e94fa42035 is about to change that.<br><br>In most test cases, Deact SACCH are still optional, but in one case, the<br>current missing Deact SACCH will introduce a test failure: in the 'interleave'<br>of BSC_Tests.TC_ho_out_fail_no_ho_detect.<br><br>As soon as abovementioned osmo-bsc patch is merged, the test will pass again.<br><br>Also, as soon as Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 is merged here, the<br>bsc tests will properly ensure whether Deact SACCH is sent or not in all tests.<br><br>Change-Id: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 10 insertions(+), 0 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 fcccad0..b1f3a31 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -2182,6 +2182,7 @@</span><br><span> /* Check the amount of MGCP transactions is still consistant with the</span><br><span> * test expectation */</span><br><span> f_check_mgcp_expectations()</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(0.5);</span><br><span> }</span><br><span> </span><br><span> testcase TC_ho_int() runs on test_CT {</span><br><span>@@ -2447,6 +2448,9 @@</span><br><span> var MgcpCommand mgcp;</span><br><span> var octetstring l3_rr_chan_rel := '060D00'O;</span><br><span> interleave {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Got Deact SACCH");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, l3_rr_chan_rel)) {</span><br><span> log("Got RR Release");</span><br><span> }</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 003813a..07eafc7 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -682,6 +682,9 @@</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3));</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) {</span><br><span> RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0))));</span><br><span> repeat;</span><br><span>@@ -1043,6 +1046,9 @@</span><br><span> }</span><br><span> [st.rr_ho_cmpl_seen] as_Media_ipacc();</span><br><span> [st.rr_ho_cmpl_seen] as_Media_mgw(true); </span><br><span style="color: hsl(120, 100%, 40%);">+ [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) {</span><br><span> RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0))));</span><br><span> repeat;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11661">change 11661</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/11661"/><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: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2 </div>
<div style="display:none"> Gerrit-Change-Number: 11661 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>