<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664">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, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_*<br><br>Related: SYS#4895 OS#5244<br>Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc)<br>Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 19 insertions(+), 7 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 04e895a..cc387f6 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -6267,7 +6267,8 @@</span><br><span> charstring log_descr,</span><br><span> charstring handover_vty_cmd,</span><br><span> boolean expect_handover,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean is_inter_bsc_handover := false)</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean is_inter_bsc_handover := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint3_t expect_target_tsc := ?)</span><br><span> runs on MSC_ConnHdlr</span><br><span> {</span><br><span> /* We're going to thwart any and all handover attempts, just be ready to handle (and ignore) handover target</span><br><span>@@ -6299,6 +6300,17 @@</span><br><span> log("Handover to new chan ", new_chan_nr, " on ARFCN ", arfcn);</span><br><span> log(l3.msgs.rrm.handoverCommand);</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%);">+ 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, 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%);">+ 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%);">+ expect_target_tsc, ")");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Need to register for new lchan on new BTS -- it's either bts 1 or bts 2. It doesn't really</span><br><span> * matter on which BTS it really is, we're not going to follow through an entire handover</span><br><span> * anyway. */</span><br><span>@@ -6407,7 +6419,7 @@</span><br><span> f_bts_0_cfg(BSCVTY, {"no neighbors"});</span><br><span> f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)",</span><br><span> "handover any to arfcn 871 bsic 11",</span><br><span style="color: hsl(0, 100%, 40%);">- true);</span><br><span style="color: hsl(120, 100%, 40%);">+ true, expect_target_tsc := BTS_TSC[1]);</span><br><span> </span><br><span> f_probe_for_handover("1.b", "HO to unknown cell does not start",</span><br><span> "handover any to arfcn 13 bsic 39",</span><br><span>@@ -6419,7 +6431,7 @@</span><br><span> </span><br><span> f_probe_for_handover("1.d", "HO to 871-11 still works (verify that this test properly cleans up)",</span><br><span> "handover any to arfcn 871 bsic 11",</span><br><span style="color: hsl(0, 100%, 40%);">- true);</span><br><span style="color: hsl(120, 100%, 40%);">+ true, expect_target_tsc := BTS_TSC[1]);</span><br><span> }</span><br><span> testcase TC_ho_neighbor_config_1() runs on test_CT {</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span>@@ -6475,7 +6487,7 @@</span><br><span> </span><br><span> f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor",</span><br><span> "handover any to arfcn 871 bsic 11",</span><br><span style="color: hsl(0, 100%, 40%);">- true);</span><br><span style="color: hsl(120, 100%, 40%);">+ true, expect_target_tsc := BTS_TSC[1]);</span><br><span> </span><br><span> f_probe_for_handover("2.b", "HO to bts 2 doesn't work, not listed as neighbor",</span><br><span> "handover any to arfcn 871 bsic 12",</span><br><span>@@ -6528,7 +6540,7 @@</span><br><span> false);</span><br><span> f_probe_for_handover("3.b", "HO to bts 2 works, explicitly listed as neighbor; no ambiguity because bts 3 is not listed as neighbor",</span><br><span> "handover any to arfcn 871 bsic 12",</span><br><span style="color: hsl(0, 100%, 40%);">- true);</span><br><span style="color: hsl(120, 100%, 40%);">+ true, expect_target_tsc := BTS_TSC[2]);</span><br><span> }</span><br><span> testcase TC_ho_neighbor_config_3() runs on test_CT {</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span>@@ -6714,7 +6726,7 @@</span><br><span> </span><br><span> f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2",</span><br><span> "handover any to arfcn 871 bsic 12",</span><br><span style="color: hsl(0, 100%, 40%);">- true);</span><br><span style="color: hsl(120, 100%, 40%);">+ true, expect_target_tsc := BTS_TSC[2]);</span><br><span> f_probe_for_handover("7.b", "HO to 123-45 triggers inter-BSC HO",</span><br><span> "handover any to arfcn 123 bsic 45",</span><br><span> true, true);</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 2b1f711..cb93bfe 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -955,7 +955,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function rr_chan_desc_tsc(ChannelDescription2_V cd2)</span><br><span style="color: hsl(120, 100%, 40%);">+function rr_chan_desc_tsc(ChannelDescription2_V cd2)</span><br><span> return uint3_t</span><br><span> {</span><br><span> var uint3_t tsc := oct2int(cd2.octet3);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664">change 25664</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/+/25664"/><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: I09cb07561a57527880b87147495619a3bbbceb3f </div>
<div style="display:none"> Gerrit-Change-Number: 25664 </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>