<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
neels: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: TC_ho_int: verify TSC in HandoverCommand<br><br>For intra-BSC handovers, also verify the correct Training Sequence Code<br>in the RR Handover Command (not only in the Channel Activation as added<br>in previous patch).<br><br>Related: SYS#4895 OS#5244<br>Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc)<br>Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 21 insertions(+), 4 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 e8bb99c..04e895a 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -5079,7 +5079,8 @@</span><br><span> var HandoverState hs := {</span><br><span> rr_ho_cmpl_seen := false,</span><br><span> handover_done := false,</span><br><span style="color: hsl(0, 100%, 40%);">- old_chan_nr := -</span><br><span style="color: hsl(120, 100%, 40%);">+ old_chan_nr := -,</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_target_tsc := BTS_TSC[1]</span><br><span> };</span><br><span> /* issue hand-over command on VTY, from BTS 0 to BTS 1 */</span><br><span> f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1);</span><br><span>@@ -5197,7 +5198,8 @@</span><br><span> var HandoverState hs := {</span><br><span> rr_ho_cmpl_seen := false,</span><br><span> handover_done := false,</span><br><span style="color: hsl(0, 100%, 40%);">- old_chan_nr := -</span><br><span style="color: hsl(120, 100%, 40%);">+ old_chan_nr := -,</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_target_tsc := BTS_TSC[1]</span><br><span> };</span><br><span> /* issue hand-over command on VTY */</span><br><span> f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1);</span><br><span>@@ -9347,7 +9349,8 @@</span><br><span> var HandoverState hs := {</span><br><span> rr_ho_cmpl_seen := false,</span><br><span> handover_done := false,</span><br><span style="color: hsl(0, 100%, 40%);">- old_chan_nr := -</span><br><span style="color: hsl(120, 100%, 40%);">+ old_chan_nr := -,</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_target_tsc := BTS_TSC[1]</span><br><span> };</span><br><span> /* issue hand-over command on VTY */</span><br><span> f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1);</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 5f77764..2b1f711 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -1467,7 +1467,8 @@</span><br><span> boolean rr_ho_cmpl_seen,</span><br><span> integer mdcx_seen_before_ho,</span><br><span> boolean handover_done,</span><br><span style="color: hsl(0, 100%, 40%);">- RslChannelNr old_chan_nr</span><br><span style="color: hsl(120, 100%, 40%);">+ RslChannelNr old_chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint3_t expect_target_tsc optional</span><br><span> };</span><br><span> </span><br><span> altstep as_handover(inout HandoverState st) runs on MSC_ConnHdlr {</span><br><span>@@ -1482,6 +1483,19 @@</span><br><span> new_chan_nr, arfcn);</span><br><span> /* FIXME: Determine TRX NR by ARFCN, instead of hard-coded TRX0! */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Verify correct TSC in handoverCommand */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(st.expect_target_tsc)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint3_t got_tsc := rr_chan_desc_tsc(l3.msgs.rrm.handoverCommand.channelDescription2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(got_tsc, st.expect_target_tsc)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ",</span><br><span style="color: hsl(120, 100%, 40%);">+ st.expect_target_tsc, " got ", got_tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("handoverCommand: verified TSC = ", got_tsc, " (matches ",</span><br><span style="color: hsl(120, 100%, 40%);">+ st.expect_target_tsc, ")");</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> /* register our component for this channel number at the RSL Emulation */</span><br><span> f_rslem_register(0, new_chan_nr, RSL1_PROC);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663">change 25663</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/c/osmo-ttcn3-hacks/+/25663"/><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-Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 </div>
<div style="display:none"> Gerrit-Change-Number: 25663 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>