<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13730">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_Tests: Allow test cases to specify RAN index<br><br>This allows to start ConnHdlr on specific RAN connections, i.e.<br>on different emulated BSCs (and soon RNCs).<br><br>Change-Id: I3d7ec567a7b69d8c6f79d26971bf1c94e077d5f5<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 12 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index db0e683..4534a9b 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -74,7 +74,8 @@</span><br><span> boolean ipa_ctrl_enable,</span><br><span> boolean mm_info,</span><br><span> boolean sgsap_enable,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean gsup_enable</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean gsup_enable,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer ran_idx</span><br><span> };</span><br><span> </span><br><span> /* get a one-octet bitmaks of supported algorithms based on Classmark information */</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 6ad8860..8c221dc 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -485,7 +485,8 @@</span><br><span> type function void_fn(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr;</span><br><span> </span><br><span> /* FIXME: move into BSC_ConnectionHandler? */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup := true) runs on MTC_CT return BSC_ConnHdlrPars {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup := true, integer ran_idx := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MTC_CT return BSC_ConnHdlrPars {</span><br><span> var BSC_ConnHdlrNetworkPars net_pars := {</span><br><span> kc_support := '0A'O, /* A5/1 and A5/3 enabled */</span><br><span> expect_tmsi := true,</span><br><span>@@ -493,8 +494,8 @@</span><br><span> expect_ciph := false</span><br><span> };</span><br><span> var BSC_ConnHdlrPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">- sccp_addr_own := g_bssap[0].sccp_addr_own,</span><br><span style="color: hsl(0, 100%, 40%);">- sccp_addr_peer := g_bssap[0].sccp_addr_peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp_addr_own := g_bssap[ran_idx].sccp_addr_own,</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp_addr_peer := g_bssap[ran_idx].sccp_addr_peer,</span><br><span> cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)),</span><br><span> imei := f_gen_imei(imsi_suffix),</span><br><span> imsi := f_gen_imsi(imsi_suffix),</span><br><span>@@ -511,7 +512,8 @@</span><br><span> ipa_ctrl_enable := true,</span><br><span> mm_info := mp_mm_info,</span><br><span> sgsap_enable := sgsap,</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_enable := gsup</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_enable := gsup,</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_idx := ran_idx</span><br><span> };</span><br><span> return pars;</span><br><span> }</span><br><span>@@ -522,8 +524,8 @@</span><br><span> </span><br><span> vc_conn := BSC_ConnHdlr.create(id);</span><br><span> /* BSSMAP part / A interface */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:BSSAP, g_bssap[0].vc_RAN:CLIENT);</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:BSSAP_PROC, g_bssap[0].vc_RAN:PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSAP, g_bssap[pars.ran_idx].vc_RAN:CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSAP_PROC, g_bssap[pars.ran_idx].vc_RAN:PROC);</span><br><span> /* MNCC part */</span><br><span> connect(vc_conn:MNCC, vc_MNCC:MNCC_CLIENT);</span><br><span> connect(vc_conn:MNCC_PROC, vc_MNCC:MNCC_PROC);</span><br><span>@@ -550,8 +552,8 @@</span><br><span> return vc_conn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_start_handler(void_fn fn, integer imsi_suffix) runs on MTC_CT return BSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- return f_start_handler_with_pars(fn, f_init_pars(imsi_suffix));</span><br><span style="color: hsl(120, 100%, 40%);">+function f_start_handler(void_fn fn, integer imsi_suffix, integer ran_idx := 0) runs on MTC_CT return BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ return f_start_handler_with_pars(fn, f_init_pars(imsi_suffix, ran_idx := ran_idx));</span><br><span> }</span><br><span> </span><br><span> private function f_tc_lu_imsi_noauth_tmsi(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13730">change 13730</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/13730"/><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: I3d7ec567a7b69d8c6f79d26971bf1c94e077d5f5 </div>
<div style="display:none"> Gerrit-Change-Number: 13730 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>