<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12380">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;">msc: Add a test for LU with invalid MCC/MNC in BSSAP/RANAP<br><br>Verify that the MSC rejects a location update from a Cell/BSC that<br>contains a PLMN which does not match the core network's PLMN.<br><br>Related: OS#3162<br>Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1<br>---<br>M msc/MSC_Tests.ttcn<br>M msc/MSC_Tests_Iu.ttcn<br>2 files changed, 43 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 e1e5088..9524afb 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -3614,6 +3614,40 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Location Update with invalid (non-matching) MCC/MNC reported on BSSMAP level from BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_tc_lu_with_invalid_mcc_mnc(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</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%);">+ /* tell GSUP dispatcher to send this IMSI to us */</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%);">+ /* modify the cell ID which will be used to construct the COMPLELTE L3 or InitialUE */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.cell_id := valueof(ts_CellId_CGI('333'H, '22'H, 23, 42));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ f_cl3_or_initial_ue(l3_lu);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect LU reject from MSC. */</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</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%);">+ [] BSSAP.receive {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unknown/unexpected BSSAP received");</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%);">+ f_expect_clear();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lu_with_invalid_mcc_mnc() 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%);">+ vc_conn := f_start_handler(refers(f_tc_lu_with_invalid_mcc_mnc), 54);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* TODO (SMS):</span><br><span> * different user data lengths</span><br><span> * SMPP transaction mode with unsuccessful delivery</span><br><span>@@ -5282,6 +5316,7 @@</span><br><span> execute( TC_lu_and_ss_session_timeout() );</span><br><span> </span><br><span> execute( TC_cipher_complete_with_invalid_cipher() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lu_with_invalid_mcc_mnc() );</span><br><span> </span><br><span> execute( TC_sgsap_reset() );</span><br><span> execute( TC_sgsap_lu() );</span><br><span>diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn</span><br><span>index 991c9b8..5798821 100644</span><br><span>--- a/msc/MSC_Tests_Iu.ttcn</span><br><span>+++ b/msc/MSC_Tests_Iu.ttcn</span><br><span>@@ -387,6 +387,13 @@</span><br><span> f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_iu_lu_with_invalid_mcc_mnc() 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_with_invalid_mcc_mnc), 1054, 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> control {</span><br><span> execute( TC_iu_lu_imsi_reject() );</span><br><span> execute( TC_iu_lu_imsi_timeout_gsup() );</span><br><span>@@ -430,6 +437,7 @@</span><br><span> execute( TC_iu_lu_and_mt_ussd_during_mt_call() );</span><br><span> execute( TC_iu_lu_and_mo_ussd_mo_release() );</span><br><span> execute( TC_iu_lu_and_ss_session_timeout() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_iu_lu_with_invalid_mcc_mnc() );</span><br><span> </span><br><span> /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12380">change 12380</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/12380"/><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: I676894358259b9cc0f973769ce552ba58a2a58a1 </div>
<div style="display:none"> Gerrit-Change-Number: 12380 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <stsp@stsp.name> </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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-CC: Vadim Yanitskiy <axilirator@gmail.com> </div>