<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12477">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_Tests: make sgsap interface optional<br><br>At the moment the sgsap always enabled in the testsuite. This means the<br>testsuite will try to connect the SGs interface of osmo-msc on<br>initalization. If the connection fails, the testcase will fail also.<br><br>Unfortunately the related patches that add the SGs interface to osmo-msc<br>are not yet merged to master. This causes almost all testcases to fail,<br>so lets have the SGs interface as an option that we can switch on when<br>the SGs interface patches are merged to master.<br><br>Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93<br>Related: OS#3645<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 18 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/12477/1</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 735cd21..7b88192 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -72,7 +72,8 @@</span><br><span> charstring ipa_ctrl_ip,</span><br><span> integer ipa_ctrl_port,</span><br><span> boolean ipa_ctrl_enable,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean mm_info</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mm_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean sgsap_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>@@ -137,8 +138,11 @@</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> /* Route all SGs message for our IMSI to us */</span><br><span style="color: hsl(0, 100%, 40%);">- f_create_sgsap_expect(pars.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.sgsap_enable == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_create_sgsap_expect(pars.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (g_pars.ipa_ctrl_enable == true) {</span><br><span> f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port);</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index bf703e6..96ddc8d 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -119,6 +119,8 @@</span><br><span> charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org";</span><br><span> charstring mp_vlr_name := "vlr.example.net";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mp_sgsap_enable := false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> BSSAP_Configurations mp_bssap_cfg := {</span><br><span> {</span><br><span> sccp_service_type := "mtp3_itu",</span><br><span>@@ -277,7 +279,10 @@</span><br><span> f_init_mgcp("MSC_Test");</span><br><span> f_init_gsup("MSC_Test");</span><br><span> f_init_smpp("MSC_Test");</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_sgsap("MSC_Test");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_sgsap_enable == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_sgsap("MSC_Test");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> map(self:MSCVTY, system:MSCVTY);</span><br><span> f_vty_set_prompts(MSCVTY);</span><br><span>@@ -491,7 +496,8 @@</span><br><span> ipa_ctrl_ip := mp_msc_ip,</span><br><span> ipa_ctrl_port := mp_msc_ctrl_port,</span><br><span> ipa_ctrl_enable := true,</span><br><span style="color: hsl(0, 100%, 40%);">- mm_info := mp_mm_info</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_info := mp_mm_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsap_enable := mp_sgsap_enable</span><br><span> };</span><br><span> return pars;</span><br><span> }</span><br><span>@@ -517,8 +523,10 @@</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> /* SGs part */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT);</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_sgsap_enable == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have</span><br><span> * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12477">change 12477</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/12477"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I429c0c5250d4b61de8a4d6399f284ce2c87cca93 </div>
<div style="display:none"> Gerrit-Change-Number: 12477 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>