<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11776">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Stefan Sperling: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP<br><br>The idea of this test case is to verify MO SMMA transmission<br>over GSUP towards HLR. The algorythm is equivalent to MO SMS.<br><br>Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5<br>Related: OS#3587<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>M msc/expected-results.xml<br>3 files changed, 79 insertions(+), 0 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 bf83dd3..43a1190 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -837,6 +837,27 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Submit a MO RP-SMMA over an already existing DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mo_smma(inout SmsParameters spars)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) RPDU_MS_SGSN rp_mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) PDU_ML3_MS_NW l3_mo;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var default d := activate(as_other_sms());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* just in case this is routed to SMPP.. */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rp_mo := ts_RP_SMMA_MO(spars.rp.msg_ref);</span><br><span style="color: hsl(120, 100%, 40%);">+ l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* receive CP-ACK for CP-DATA above */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT), spars.dlci));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ deactivate(d);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Submit a MO-SMS over an already existing DTAP connection */</span><br><span> function f_mo_sms_submit(inout SmsParameters spars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 202bce7..ef626bf 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -2098,6 +2098,62 @@</span><br><span> f_vty_config(MSCVTY, "msc", "no sms-over-gsup");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Test MO-SMMA from MS/BTS/BSC towards HLR (via GSUP) */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_gsup_mo_smma(charstring id, BSC_ConnHdlrPars pars)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var SmsParameters spars := valueof(t_SmsPars);</span><br><span style="color: hsl(120, 100%, 40%);">+ var GSUP_PDU gsup_msg_rx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_handler(pars);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We need to inspect GSUP activity */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_create_gsup_expect(hex2str(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Perform location update */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_perform_lu();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send CM Service Request for SMS */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_establish_fully(EST_TYPE_MO_SMS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var template GSUP_PDU mo_ReadyForSM := tr_GSUP_MO_READY_FOR_SM_REQ(</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi := g_pars.imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ sm_rp_mr := spars.rp.msg_ref,</span><br><span style="color: hsl(120, 100%, 40%);">+ sm_alert_rsn := GSUP_SM_ALERT_RSN_TYPE_MEM_AVAIL</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Submit an SMS on DTAP and expect MO-forwardSM-Req on GSUP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mo_smma(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GSUP.receive(mo_ReadyForSM) -> value gsup_msg_rx {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("RX MO-ReadyForSM-Req");</span><br><span style="color: hsl(120, 100%, 40%);">+ log(gsup_msg_rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GSUP.receive {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("RX unexpected GSUP message");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Trigger RP-ACK by sending MO-forwardSM-Res */</span><br><span style="color: hsl(120, 100%, 40%);">+ GSUP.send(valueof(ts_GSUP_MO_READY_FOR_SM_RES(</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi := g_pars.imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ sm_rp_mr := spars.rp.msg_ref)));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect RP-ACK on DTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mo_sms_wait_rp_ack(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_clear();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_gsup_mo_smma() runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config(MSCVTY, "msc", "sms-over-gsup");</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_gsup_mo_smma), 89);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config(MSCVTY, "msc", "no sms-over-gsup");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* convert GSM L3 TON to SMPP_TON enum */</span><br><span> function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON {</span><br><span> select (ton) {</span><br><span>@@ -2984,6 +3040,7 @@</span><br><span> execute( TC_smpp_mt_sms() );</span><br><span> </span><br><span> execute( TC_gsup_mo_sms() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_gsup_mo_smma() );</span><br><span> </span><br><span> execute( TC_lu_and_mo_ussd_single_request() );</span><br><span> execute( TC_lu_and_mt_ussd_notification() );</span><br><span>diff --git a/msc/expected-results.xml b/msc/expected-results.xml</span><br><span>index 49ca1e3..b9c60c0 100644</span><br><span>--- a/msc/expected-results.xml</span><br><span>+++ b/msc/expected-results.xml</span><br><span>@@ -64,6 +64,7 @@</span><br><span> <testcase classname='MSC_Tests' name='TC_smpp_mo_sms' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_smpp_mt_sms' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_gsup_mo_sms' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MSC_Tests' name='TC_gsup_mo_smma' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_and_mo_ussd_single_request' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_and_mt_ussd_notification' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_and_mo_ussd_during_mt_call' time='MASKED'/></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11776">change 11776</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/11776"/><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: I7abc95b8e416f7308d54e11be11c08586d18e6c5 </div>
<div style="display:none"> Gerrit-Change-Number: 11776 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>