<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13557">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 disabeling GSUP<br><br>The GSUP link between testsuit and osmo-msc is currently on by default<br>and can not be disabled. However, there may be situations where a<br>missing GSUP connection must be simulated. Lets add add a parameter to<br>disable GSUP if necessary.<br><br>Change-Id: I7c86aa0a906a0d7e8be765f9109a65b4b4387bc6<br>Related: OS#3859<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 21 insertions(+), 8 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 c7a4a71..8e5c5f2 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -73,7 +73,8 @@</span><br><span> integer ipa_ctrl_port,</span><br><span> boolean ipa_ctrl_enable,</span><br><span> boolean mm_info,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean sgsap_enable</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean sgsap_enable,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean gsup_enable</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 c7c61eb..1a6e8f7 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -210,11 +210,17 @@</span><br><span> vc_MGCP.start(MGCP_Emulation.main(ops, pars, id));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function ForwardUnitdataCallback(PDU_SGsAP msg)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on SGsAP_Emulation_CT return template PDU_SGsAP {</span><br><span style="color: hsl(120, 100%, 40%);">+ SGsAP_CLIENT.send(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return omit;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_init_sgsap(charstring id) runs on MTC_CT {</span><br><span> id := id & "-SGsAP";</span><br><span> var SGsAPOps ops := {</span><br><span> create_cb := refers(SGsAP_Emulation.ExpectedCreateCallback),</span><br><span style="color: hsl(0, 100%, 40%);">- unitdata_cb := refers(SGsAP_Emulation.DummyUnitdataCallback)</span><br><span style="color: hsl(120, 100%, 40%);">+ unitdata_cb := refers(ForwardUnitdataCallback)</span><br><span> }</span><br><span> var SGsAP_conn_parameters pars := {</span><br><span> remote_ip := mp_msc_ip,</span><br><span>@@ -258,7 +264,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init(integer num_bsc := 1, boolean sgsap := false) runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := true) runs on MTC_CT {</span><br><span> </span><br><span> if (g_initialized == true) {</span><br><span> return;</span><br><span>@@ -281,7 +287,10 @@</span><br><span> f_ipa_ctrl_start(mp_msc_ip, mp_msc_ctrl_port);</span><br><span> f_init_mncc("MSC_Test");</span><br><span> f_init_mgcp("MSC_Test");</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_gsup("MSC_Test");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsup == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_gsup("MSC_Test");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> f_init_smpp("MSC_Test");</span><br><span> </span><br><span> if (sgsap == true) {</span><br><span>@@ -476,7 +485,7 @@</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) 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) 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>@@ -501,7 +510,8 @@</span><br><span> ipa_ctrl_port := mp_msc_ctrl_port,</span><br><span> ipa_ctrl_enable := true,</span><br><span> mm_info := mp_mm_info,</span><br><span style="color: hsl(0, 100%, 40%);">- sgsap_enable := sgsap</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsap_enable := sgsap,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_enable := gsup</span><br><span> };</span><br><span> return pars;</span><br><span> }</span><br><span>@@ -521,8 +531,10 @@</span><br><span> connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);</span><br><span> connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC);</span><br><span> /* GSUP part */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pars.gsup_enable == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* SMPP part */</span><br><span> connect(vc_conn:SMPP, vc_SMPP:SMPP_CLIENT);</span><br><span> connect(vc_conn:SMPP_PROC, vc_SMPP:SMPP_PROC);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13557">change 13557</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/13557"/><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: I7c86aa0a906a0d7e8be765f9109a65b4b4387bc6 </div>
<div style="display:none"> Gerrit-Change-Number: 13557 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>