<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11697">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;">BSC_ConnectionHandler: introduce ctrl interface<br><br>There are some upcomming tests which require to access the control<br>interface of the MSC while the actual test is running. Future test<br>cases (e.g. Paging, see also Change Id:<br>a6a1a6bd6da1bf46d6d703be495795d3610ca431) will use this.<br><br>Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4<br>Related: OS#3615<br>Related: OS#3187<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 18 insertions(+), 3 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 f005e02..e97b97d 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -31,8 +31,13 @@</span><br><span> </span><br><span> import from SMPP_Emulation all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from IPA_Emulation all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_CTRL_Functions all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_CTRL_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_CTRL_Adapter all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* this component represents a single subscriber connection */</span><br><span style="color: hsl(0, 100%, 40%);">-type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT {</span><br><span> var BSC_ConnHdlrPars g_pars;</span><br><span> timer g_Tguard := 60.0;</span><br><span> }</span><br><span>@@ -57,7 +62,10 @@</span><br><span> BSSMAP_IE_ClassmarkInformationType3 cm3 optional,</span><br><span> AuthVector vec optional,</span><br><span> BSC_ConnHdlrNetworkPars net,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean send_early_cm</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean send_early_cm,</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring ipa_ctrl_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer ipa_ctrl_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ipa_ctrl_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>@@ -122,6 +130,10 @@</span><br><span> activate(as_Tguard());</span><br><span> /* Route all SMPP messages for our MSISDN to us */</span><br><span> f_create_smpp_expect(hex2str(pars.msisdn));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.ipa_ctrl_enable == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index adaeea3..1b37329 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -454,7 +454,10 @@</span><br><span> cm3 := omit,</span><br><span> vec := omit,</span><br><span> net := net_pars,</span><br><span style="color: hsl(0, 100%, 40%);">- send_early_cm := true</span><br><span style="color: hsl(120, 100%, 40%);">+ send_early_cm := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_ctrl_ip := mp_msc_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_ctrl_port := mp_msc_ctrl_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_ctrl_enable := true</span><br><span> };</span><br><span> return pars;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11697">change 11697</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/11697"/><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: Ie3caf7a449311e7687670cadfa27818635d25aa4 </div>
<div style="display:none"> Gerrit-Change-Number: 11697 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </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>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>