<p>neels <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix TC_ho_int; make neighbor config more robust<br><br>Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs"<br>(I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those<br>cells as neighbors that are explicitly listed, or all local cells if none are<br>listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one<br>remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now<br>regarded as invalid.<br><br>The remote-cell neighbor is needed for inter-BSC handover tests; also consider<br>that the TC_ho_neighbor_config_* tests each place individual neighbor<br>configuration by live VTY interaction.<br><br>Hence make all of these tests more robust: remove the neighbor config from the<br>osmo-bsc.cfg file, and instead include VTY interaction for each test case that<br>sets the particularly needed neighbor configuration at runtime.<br><br>An analogous osmo-bsc.cfg change in docker-playground is in change<br>If44dd6b578cdc55076c8180707d1c2d69fe5f2a8.<br><br>(It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but<br>remove that since it is also not needed anymore.)<br><br>Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/osmo-bsc.cfg<br>2 files changed, 5 insertions(+), 2 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 4497a2e..09c5e5c 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -2863,6 +2863,7 @@</span><br><span> ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));</span><br><span> </span><br><span> f_establish_fully(ass_cmd, exp_compl);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_bts_0_cfg({"neighbor bts 1"});</span><br><span> </span><br><span> var HandoverState hs := {</span><br><span> rr_ho_cmpl_seen := false,</span><br><span>@@ -2944,6 +2945,7 @@</span><br><span> var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span> f_establish_fully(ass_req, exp_compl);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});</span><br><span> f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");</span><br><span> </span><br><span> BSSAP.receive(tr_BSSMAP_HandoverRequired);</span><br><span>@@ -3010,6 +3012,7 @@</span><br><span> var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span> f_establish_fully(ass_req, exp_compl);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});</span><br><span> f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");</span><br><span> </span><br><span> BSSAP.receive(tr_BSSMAP_HandoverRequired);</span><br><span>@@ -3056,6 +3059,7 @@</span><br><span> var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span> f_establish_fully(ass_req, exp_compl);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});</span><br><span> f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");</span><br><span> </span><br><span> BSSAP.receive(tr_BSSMAP_HandoverRequired);</span><br><span>@@ -3140,6 +3144,7 @@</span><br><span> var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span> f_establish_fully(ass_req, exp_compl);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});</span><br><span> f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");</span><br><span> </span><br><span> BSSAP.receive(tr_BSSMAP_HandoverRequired);</span><br><span>diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg</span><br><span>index 9384491..74fe255 100644</span><br><span>--- a/bsc/osmo-bsc.cfg</span><br><span>+++ b/bsc/osmo-bsc.cfg</span><br><span>@@ -88,8 +88,6 @@</span><br><span> early-classmark-sending forbidden</span><br><span> ip.access unit_id 1234 0</span><br><span> oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(0, 100%, 40%);">- # remote-BSS neighbor:</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac 99 arfcn 123 bsic any</span><br><span> neighbor-list mode manual-si5</span><br><span> neighbor-list add arfcn 100</span><br><span> neighbor-list add arfcn 200</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216">change 15216</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/+/15216"/><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: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 </div>
<div style="display:none"> Gerrit-Change-Number: 15216 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>