<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: make the ranap interface optional<br><br>Allows to use the test cases without STP<br><br>Change-Id: I43df456c2d5aa3ba3ea9e34da3f0f96b55f7c9a1<br>---<br>M sgsn/SGSN_Tests.ttcn<br>M sgsn/SGSN_Tests_Iu.ttcn<br>2 files changed, 24 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index adbcf19..501bec8 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -130,6 +130,7 @@</span><br><span> type component test_CT {</span><br><span> var GbInstances g_gb;</span><br><span> var RAN_Adapter g_ranap[NUM_RNC];</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean g_ranap_enable := false;</span><br><span> </span><br><span> var GSUP_Emulation_CT vc_GSUP;</span><br><span> var IPA_Emulation_CT vc_GSUP_IPA;</span><br><span>@@ -177,8 +178,8 @@</span><br><span> SGSN_ConnHdlrNetworkPars net,</span><br><span> float t_guard,</span><br><span> /* only in IuPS / RANAP case */</span><br><span style="color: hsl(0, 100%, 40%);">- SCCP_PAR_Address sccp_addr_local,</span><br><span style="color: hsl(0, 100%, 40%);">- SCCP_PAR_Address sccp_addr_peer</span><br><span style="color: hsl(120, 100%, 40%);">+ SCCP_PAR_Address sccp_addr_local optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ SCCP_PAR_Address sccp_addr_peer optional</span><br><span> };</span><br><span> </span><br><span> private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV {</span><br><span>@@ -327,9 +328,11 @@</span><br><span> f_init_gb(g_gb[1], "SGSN_Test-Gb1", 1);</span><br><span> f_init_gb(g_gb[2], "SGSN_Test-Gb2", 2);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i := 0; i < NUM_RNC; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ran_adapter_start(g_ranap[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_ranap_enable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NUM_RNC; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_start(g_ranap[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> f_init_gsup("SGSN_Test");</span><br><span> f_init_gtp("SGSN_Test");</span><br><span>@@ -338,8 +341,10 @@</span><br><span> </span><br><span> function f_cleanup() runs on test_CT {</span><br><span> var integer i;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i := 0; i < NUM_RNC; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ran_adapter_cleanup(g_ranap[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_ranap_enable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NUM_RNC; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_cleanup(g_ranap[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> self.stop;</span><br><span> }</span><br><span>@@ -398,10 +403,15 @@</span><br><span> vec := omit,</span><br><span> net := net_pars,</span><br><span> t_guard := t_guard,</span><br><span style="color: hsl(0, 100%, 40%);">- sccp_addr_local := g_ranap[0].sccp_addr_own,</span><br><span style="color: hsl(0, 100%, 40%);">- sccp_addr_peer := g_ranap[0].sccp_addr_peer</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp_addr_local := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp_addr_peer := omit</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_ranap_enable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_local := g_ranap[0].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_peer := g_ranap[0].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vc_conn := BSSGP_ConnHdlr.create(id);</span><br><span> connect(vc_conn:BSSGP[0], gb[0].vc_BSSGP:BSSGP_SP);</span><br><span> connect(vc_conn:BSSGP_PROC[0], gb[0].vc_BSSGP:BSSGP_PROC);</span><br><span>@@ -411,8 +421,10 @@</span><br><span> connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP:BSSGP_PROC);</span><br><span> </span><br><span> /* FIXME: support multiple RNCs */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:BSSAP, g_ranap[0].vc_RAN:CLIENT);</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:BSSAP_PROC, g_ranap[0].vc_RAN:PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_ranap_enable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSAP, g_ranap[0].vc_RAN:CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSAP_PROC, g_ranap[0].vc_RAN:PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);</span><br><span> connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);</span><br><span>diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn</span><br><span>index ace295c..2f077d8 100644</span><br><span>--- a/sgsn/SGSN_Tests_Iu.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests_Iu.ttcn</span><br><span>@@ -28,6 +28,7 @@</span><br><span> * MS -> SGSN: Attach Complete</span><br><span> */</span><br><span> var BSSGP_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_ranap_enable := true;</span><br><span> f_init();</span><br><span> f_sleep(1.0);</span><br><span> vc_conn := f_start_handler(refers(f_TC_iu_attach), testcasename(), g_gb, 1001);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15162">change 15162</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/+/15162"/><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: I43df456c2d5aa3ba3ea9e34da3f0f96b55f7c9a1 </div>
<div style="display:none"> Gerrit-Change-Number: 15162 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>