<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12689">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_Tests.ttcn: introduce TC_gsup_mo_mt_sms_rp_mr<br><br>The idea of this test case is to verify SM-RP-MR assignment for<br>a few concurrent MO/MT SMS being sent over GSUP.<br><br>Basically, the algorythm is the following:<br><br>1.0 establish a RAN connection,<br>1.1 send CM Service Request for MO SMMA indication,<br>1.2 submit MO SMMA indication on DTAP,<br>1.3 expect MO-ForwardSM-Req on GSUP,<br><br>2.0 send MT SMS using MT-ForwardSM-Req on GSUP,<br>2.1 expect CP-DATA/RP-DATA for MT SMS on DTAP,<br><br>3.0 compare both SM-RP-MR values (for MT, assigned by the MSC),<br>3.1 send MO-ForwardSM-Res for MO SMMA on GSUP,<br>3.1.1 expect CP-DATA/RP-ACK for MO SMMA on DTAP,<br>3.2 send CP-DATA/RP-ACK for MT SMS on DTAP,<br>3.2.1 expect MT-ForwardSM-Res for MT SMS on GSUP.<br><br>Change-Id: I17cbbaa64d9bce770f985588e93cd3eecd732120<br>---<br>M msc/MSC_Tests.ttcn<br>M msc/expected-results.xml<br>2 files changed, 106 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index fb0798c..8d29e7a 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -2521,6 +2521,110 @@</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 SM-RP-MR assignment for MT-SMS over GSUP */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_gsup_mo_mt_sms_rp_mr(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_mo := valueof(t_SmsPars); /* MO SMMA */</span><br><span style="color: hsl(120, 100%, 40%);">+ var SmsParameters spars_mt := valueof(t_SmsPars); /* MT SMS */</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%);">+ /* Register an 'expect' for given IMSI (+TMSI) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isvalue(g_pars.tmsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O);</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%);">+ /* Send CM Service Request for MO SMMA */</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%);">+ /* Submit MO SMMA on DTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Submit MO SMMA on DTAP, SM-RP-MR is '00'O");</span><br><span style="color: hsl(120, 100%, 40%);">+ spars_mo.rp.msg_ref := '00'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mo_smma(spars_mo);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect MO-forwardSM-Req for MO SMMA on GSUP */</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GSUP.receive(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_mo.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%);">+ log("RX MO-ReadyForSM-Req, SM-RP-MR is '00'O");</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%);">+ /* Submit MT SMS on GSUP */</span><br><span style="color: hsl(120, 100%, 40%);">+ log("TX MT-forwardSM-Req for the MT SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_gsup_forwardSM_req(spars_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait for MT SMS on DTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_sms_expect(spars_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("RX MT SMS on DTAP, DTAP TID is ", spars_mt.tid,</span><br><span style="color: hsl(120, 100%, 40%);">+ ", SM-RP-MR is ", spars_mt.rp.msg_ref);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Both SM-RP-MR values shall be different */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (spars_mo.rp.msg_ref == spars_mt.rp.msg_ref) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Both SM-RP-MR values shall be different");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</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%);">+ /* SM-RP-MR value for MT SMS shall be assigned */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (spars_mt.rp.msg_ref == 'FF'O) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Unassigned SM-RP-MR value for the MT SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</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 for MO SMMA 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_mo.rp.msg_ref)));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect RP-ACK for MO SMMA on DTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mo_sms_wait_rp_ack(spars_mo);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send RP-ACK for MT SMS and expect MT-forwardSM-Res on GSUP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_sms_send_rp_ack(spars_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GSUP.receive(tr_GSUP_MT_FORWARD_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_mt.rp.msg_ref</span><br><span style="color: hsl(120, 100%, 40%);">+ )) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("RX MT-forwardSM-Res (RP-ACK)");</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%);">+ 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_mt_sms_rp_mr() runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSC_ConnHdlrPars pars;</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%);">+ pars := f_init_pars(93);</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_with_pars(refers(f_tc_gsup_mo_mt_sms_rp_mr), pars);</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> /* Test multi-part MT-SMS over GSUP */</span><br><span> private function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span>@@ -4457,6 +4561,7 @@</span><br><span> execute( TC_gsup_mt_sms_ack() );</span><br><span> execute( TC_gsup_mt_sms_err() );</span><br><span> execute( TC_gsup_mt_sms_rp_mr() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_gsup_mo_mt_sms_rp_mr() );</span><br><span> execute( TC_gsup_mt_multi_part_sms() );</span><br><span> </span><br><span> execute( TC_lu_and_mo_ussd_single_request() );</span><br><span>diff --git a/msc/expected-results.xml b/msc/expected-results.xml</span><br><span>index 84df264..efe7219 100644</span><br><span>--- a/msc/expected-results.xml</span><br><span>+++ b/msc/expected-results.xml</span><br><span>@@ -59,6 +59,7 @@</span><br><span> <testcase classname='MSC_Tests' name='TC_gsup_mt_sms_ack' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_gsup_mt_sms_err' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_gsup_mt_sms_rp_mr' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MSC_Tests' name='TC_gsup_mo_mt_sms_rp_mr' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_gsup_mt_multi_part_sms' time='MASKED'></span><br><span> <failure type='fail-verdict'>Tguard timeout</span><br><span> MSC_Tests.ttcn:MASKED MSC_Tests control part</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12689">change 12689</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/12689"/><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: I17cbbaa64d9bce770f985588e93cd3eecd732120 </div>
<div style="display:none"> Gerrit-Change-Number: 12689 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: Vadim Yanitskiy <axilirator@gmail.com> </div>