<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11960">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;">HLR_Tests.ttcn: introduce TC_mo_sss_reject<br><br>As at the moment, OsmoHLR doesn't support "structured" SS, such<br>requests are being rejected. This test case aims to verify that.<br><br>Change-Id: I147b919d0242b3b44e39a4587bf1b4660fa58bd2<br>Related: OS#3651<br>---<br>M hlr/HLR_Tests.ttcn<br>M hlr/expected-results.xml<br>2 files changed, 51 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn</span><br><span>index 29af522..f7902be 100644</span><br><span>--- a/hlr/HLR_Tests.ttcn</span><br><span>+++ b/hlr/HLR_Tests.ttcn</span><br><span>@@ -995,6 +995,53 @@</span><br><span> vc_EUSE.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ * Test "Structured" Supplementary Services</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * NOTE: at the moment, OsmoHLR doesn't support "structured" SS,</span><br><span style="color: hsl(120, 100%, 40%);">+ * so such requests are being rejected (actually ReturnError</span><br><span style="color: hsl(120, 100%, 40%);">+ * with GSM0480_ERR_CODE_FACILITY_NOT_SUPPORTED).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_mo_sss_reject() runs on HLR_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var SS_FacilityInformation ss_req;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prepare '*#21#' SS request */</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_req := valueof(ts_SS_FACILITY_INVOKE(</span><br><span style="color: hsl(120, 100%, 40%);">+ invoke_id := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ op_code := SS_OP_CODE_INTERROGATE_SS,</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_code := '21'O));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send it towards HLR */</span><br><span style="color: hsl(120, 100%, 40%);">+ GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.sub.imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_BEGIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ enc_SS_FacilityInformation(ss_req))));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect ReturnError with FACILITY_NOT_SUPPORTED */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_SS_expect(g_pars.sub.imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_FACILITY_RETURN_ERROR(0, 21));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_mo_sss_reject() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var HLR_ConnHdlrPars pars;</span><br><span style="color: hsl(120, 100%, 40%);">+ var HLR_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ var HlrSubscriber sub;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Create a random subscriber */</span><br><span style="color: hsl(120, 100%, 40%);">+ sub := valueof(t_Sub2G(f_rnd_imsi('26242'H),</span><br><span style="color: hsl(120, 100%, 40%);">+ '49161'H & f_rnd_hexstring(7, 9), "comp128v1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars := valueof(t_Pars_sub(sub));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.ussd.sid := f_rnd_octstring(4);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_subscr_create(VTY, sub);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_TC_mo_sss_reject), pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_subscr_delete(VTY, sub);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* TODO USSD:</span><br><span> * MO USSD for IMSI of non-existant subscriber</span><br><span>@@ -1035,6 +1082,9 @@</span><br><span> execute( TC_mo_ussd_euse() );</span><br><span> execute( TC_mo_ussd_euse_continue() );</span><br><span> execute( TC_mo_ussd_euse_defaultroute() );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* "Structured" Supplementary Services */</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_mo_sss_reject() );</span><br><span> };</span><br><span> </span><br><span> };</span><br><span>diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml</span><br><span>index 5431b78..8a1ed26 100644</span><br><span>--- a/hlr/expected-results.xml</span><br><span>+++ b/hlr/expected-results.xml</span><br><span>@@ -17,4 +17,5 @@</span><br><span> <testcase classname='HLR_Tests' name='TC_mo_ussd_euse' time='MASKED'/></span><br><span> <testcase classname='HLR_Tests' name='TC_mo_ussd_euse_continue' time='MASKED'/></span><br><span> <testcase classname='HLR_Tests' name='TC_mo_ussd_euse_defaultroute' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='HLR_Tests' name='TC_mo_sss_reject' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11960">change 11960</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/11960"/><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: I147b919d0242b3b44e39a4587bf1b4660fa58bd2 </div>
<div style="display:none"> Gerrit-Change-Number: 11960 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>