<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: add tests for SMS and voice call while Paging<br><br>Start a second<br>- MT SMS<br>- MT call<br>while a Paging is already ongoing.<br><br>The second trans being an SMS works.<br><br>The second trans being a call fails with current osmo-msc master; a fix is in<br>the related patch (s.b.).<br><br>Related: Idd4537b5f4817d17e5c87d9a93775a32aee0e7be<br>Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>M msc/MSC_Tests_Iu.ttcn<br>3 files changed, 139 insertions(+), 8 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 623dae9..007e541 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -1766,22 +1766,25 @@</span><br><span> f_mo_sms_wait_rp_ack(spars);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_mt_sms_deliver_pdu(in SmsParameters spars)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr</span><br><span style="color: hsl(120, 100%, 40%);">+return template PDU_DTAP_MT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template TPDU_RP_DATA_SGSN_MS tp_mt := tr_SMS_DELIVER(?, spars.tp.ud, spars.tp.pid, spars.tp.dcs, ?);</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RPDU_SGSN_MS rp_mt := tr_RP_DATA_MT(?, spars.rp.smsc_addr, omit, tp_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PDU_ML3_NW_MS l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt));</span><br><span style="color: hsl(120, 100%, 40%);">+ return tr_PDU_DTAP_MT(l3_mt, spars.dlci);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Wait for MT SMS on an already existing DTAP connection */</span><br><span> function f_mt_sms_expect(inout SmsParameters spars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span> var template (value) PDU_ML3_MS_NW l3_mo;</span><br><span style="color: hsl(0, 100%, 40%);">- var template TPDU_RP_DATA_SGSN_MS tp_mt;</span><br><span style="color: hsl(0, 100%, 40%);">- var template RPDU_SGSN_MS rp_mt;</span><br><span style="color: hsl(0, 100%, 40%);">- var template PDU_ML3_NW_MS l3_mt;</span><br><span> var PDU_DTAP_MT dtap_mt;</span><br><span> </span><br><span> var default d := activate(as_other_sms());</span><br><span> </span><br><span> /* Expect CP-DATA(RP-DATA(SMS-DELIVER)) */</span><br><span style="color: hsl(0, 100%, 40%);">- tp_mt := tr_SMS_DELIVER(?, spars.tp.ud, spars.tp.pid, spars.tp.dcs, ?);</span><br><span style="color: hsl(0, 100%, 40%);">- rp_mt := tr_RP_DATA_MT(?, spars.rp.smsc_addr, omit, tp_mt);</span><br><span style="color: hsl(0, 100%, 40%);">- l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt));</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)) -> value dtap_mt;</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(f_mt_sms_deliver_pdu(spars)) -> value dtap_mt;</span><br><span> </span><br><span> /* Extract relevant identifiers */</span><br><span> spars.tid := bit2int(dtap_mt.dtap.tiOrSkip.transactionId.tio);</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index cf91b1e..084ae85 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -1778,6 +1778,68 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* MT call while already Paging */</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_tc_lu_and_mt_call_already_paging(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var CallParameters cpars := valueof(t_CallParams('123456'H, 0));</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 OCT4 tmsi;</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%);">+ /* 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%);">+ tmsi := g_pars.tmsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ tmsi := 'FFFFFFFF'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_register_imsi(g_pars.imsi, tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log("start Paging by an SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MSC->BSC: expect PAGING from MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log("MNCC signals MT call, before Paging Response");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_call_initate(cpars);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(0.5);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("phone answers Paging, expecting both SMS and MT call to be established");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span style="color: hsl(120, 100%, 40%);">+ spars.tp.ud := 'C8329BFD064D9B53'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ interleave {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSAP.receive(f_mt_sms_deliver_pdu(spars)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Got SMS-DELIVER");</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_SETUP(cpars.transaction_id, *, cpars.called_party))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Got CC Setup");</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%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("success, tear down");</span><br><span style="color: hsl(120, 100%, 40%);">+ var default ccrel := activate(as_optional_cc_rel(cpars));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.ran_is_geran) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSMAP_ClearRequest(0));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_RANAP_IuReleaseRequest(ts_RanapCause_om_intervention));</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%);">+ deactivate(ccrel);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_sms_clear(hex2str(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lu_and_mt_call_already_paging() 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(391);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_call_already_paging), pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Test MO Call SETUP with DTMF */</span><br><span> private function f_tc_mo_setup_dtmf_dup(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> f_init_handler(pars);</span><br><span>@@ -1985,6 +2047,53 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* SMS added while already Paging */</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_tc_lu_and_mt_sms_already_paging(charstring id, BSC_ConnHdlrPars pars) 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 OCT4 tmsi;</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%);">+ 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%);">+ tmsi := g_pars.tmsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ tmsi := 'FFFFFFFF'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_register_imsi(g_pars.imsi, tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log("first SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MSC->BSC: expect PAGING from MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log("second SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now osmo-msc is in state "Paging pending", make sure that another SMS to be sent at this time just joins in</span><br><span style="color: hsl(120, 100%, 40%);">+ * with the pending paging. Another SMS: */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_sms_send(hex2str(pars.imsi), "2342", "Another SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Establish DTAP / BSSAP / SCCP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ spars.tp.ud := 'C8329BFD064D9B53'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_sms(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ spars.tp.ud := '41F79B8E2ECB41D3E614'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_sms(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_lu_and_mt_sms_already_paging() 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(44);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_already_paging), pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /* Paging for MT SMS but no response */</span><br><span> friend function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span>@@ -5089,7 +5198,6 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Perform a SGSAP LU and then make a CSFB call */</span><br><span> private function f_tc_sgsap_lu_and_mt_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> f_mt_lu_and_csfb_call(id, pars, false);</span><br><span>@@ -5984,9 +6092,11 @@</span><br><span> execute( TC_reset_two() );</span><br><span> </span><br><span> execute( TC_lu_and_mt_call() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lu_and_mt_call_already_paging() );</span><br><span> </span><br><span> execute( TC_lu_and_mo_sms() );</span><br><span> execute( TC_lu_and_mt_sms() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lu_and_mt_sms_already_paging() );</span><br><span> execute( TC_lu_and_mt_sms_paging_and_nothing() );</span><br><span> execute( TC_lu_and_mt_sms_paging_repeated() );</span><br><span> execute( TC_smpp_mo_sms() );</span><br><span>diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn</span><br><span>index febae09..361dd83 100644</span><br><span>--- a/msc/MSC_Tests_Iu.ttcn</span><br><span>+++ b/msc/MSC_Tests_Iu.ttcn</span><br><span>@@ -280,6 +280,13 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_iu_lu_and_mt_call_already_paging() 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(3);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_lu_and_mt_call_already_paging), 1142, ran_idx := 2, ran_is_geran := false);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> testcase TC_iu_lu_and_mo_sms() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(3);</span><br><span>@@ -296,6 +303,15 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_iu_lu_and_mt_sms_already_paging() 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(3);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars := f_init_pars(101045, ran_idx := 2, ran_is_geran := false);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_already_paging), pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> testcase TC_iu_lu_and_mt_sms_paging_and_nothing() runs on MTC_CT {</span><br><span> var BSC_ConnHdlrPars pars;</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span>@@ -559,9 +575,11 @@</span><br><span> execute( TC_reset_two_1iu() );</span><br><span> </span><br><span> execute( TC_iu_lu_and_mt_call() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_iu_lu_and_mt_call_already_paging() );</span><br><span> </span><br><span> execute( TC_iu_lu_and_mo_sms() );</span><br><span> execute( TC_iu_lu_and_mt_sms() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_iu_lu_and_mt_sms_already_paging() );</span><br><span> execute( TC_iu_lu_and_mt_sms_paging_and_nothing() );</span><br><span> execute( TC_iu_lu_and_mt_sms_paging_repeated() );</span><br><span> execute( TC_iu_smpp_mo_sms() );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297">change 16297</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/c/osmo-ttcn3-hacks/+/16297"/><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-Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 </div>
<div style="display:none"> Gerrit-Change-Number: 16297 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>