<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23969">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: Verify CommonID contains LastUsedEutranPLMNId when in CSFB<br><br>Validate in test that MSC sends Last Used E-UTRAN PLLMN Id IE when call<br>is started by SGs (CSFB).<br><br>Related: SYS#5337<br>Change-Id: I161529fd9c8cacb7d17ea18660998df06bb0b575<br>---<br>M library/BSSMAP_Templates.ttcn<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>3 files changed, 61 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/23969/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn</span><br><span>index 2b99a5b..c60498e 100644</span><br><span>--- a/library/BSSMAP_Templates.ttcn</span><br><span>+++ b/library/BSSMAP_Templates.ttcn</span><br><span>@@ -1163,7 +1163,10 @@</span><br><span> elementIdentifier := '95'O,</span><br><span> mcc_mnc := mcc_mnc</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+template BSSAMAP_IE_LastUsedEUTRANPLMNId tr_BSSMAP_LastUsedEUTRANPLMNId(template OCT3 mcc_mnc) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ elementIdentifier := '95'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc_mnc := mcc_mnc</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> function f_ts_BSSMAP_LastUsedEUTRANPLMNId(template (omit) OCT3 mcc_mnc)</span><br><span> return template (omit) BSSAMAP_IE_LastUsedEUTRANPLMNId {</span><br><span> if (not istemplatekind(mcc_mnc, "omit")) {</span><br><span>@@ -1172,6 +1175,18 @@</span><br><span> return omit;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+function f_tr_BSSMAP_LastUsedEUTRANPLMNId(template OCT3 mcc_mnc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return template BSSAMAP_IE_LastUsedEUTRANPLMNId {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(mcc_mnc, "*")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return *;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (istemplatekind(mcc_mnc, "?")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (not istemplatekind(mcc_mnc, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return ts_BSSMAP_LastUsedEUTRANPLMNId(valueof(mcc_mnc));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return omit;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> template BSSMAP_FIELD_CellIdentificationList ts_BSSMAP_CIL_noCell := {</span><br><span> cIl_noCell := ''O</span><br><span>@@ -1227,7 +1242,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_enc_mcc_mnc(GsmMcc mcc, GsmMnc mnc) return OCT3 {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_enc_mcc_mnc(GsmMcc mcc, GsmMnc mnc) return OCT3 {</span><br><span> if (lengthof(mnc) == 2) {</span><br><span> return hex2oct(mcc[1] & mcc[0] & 'F'H & mcc[2] & mnc[1] & mnc[0]);</span><br><span> } else {</span><br><span>@@ -1235,6 +1250,15 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_dec_mcc_mnc(in OCT3 mcc_mnc, out GsmMcc mcc, out GsmMnc mnc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var hexstring hs := oct2hex(mcc_mnc);</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc := hs[1] & hs[0] & hs[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc := hs[5] & hs[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hs[2] == 'F'H) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc := mnc & hs[2];</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> template (value) BSSMAP_FIELD_CellIdentification_CGI ts_BSSMAP_CI_CGI(GsmMcc mcc, GsmMnc mnc, GsmLac lac, GsmCellId ci) := {</span><br><span> mcc_mnc := f_enc_mcc_mnc(mcc, mnc),</span><br><span> lac := int2oct(lac, 2),</span><br><span>@@ -1737,14 +1761,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_BSSAP tr_BSSMAP_CommonId(template hexstring imsi_digits)</span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_BSSAP tr_BSSMAP_CommonId(template hexstring imsi_digits,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSAMAP_IE_LastUsedEUTRANPLMNId lastUsedEUTRANPLMNId := *)</span><br><span> modifies tr_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span> commonID := {</span><br><span> messageType := '2F'O,</span><br><span> iMSI := tr_BSSMAP_Imsi(imsi_digits),</span><br><span style="color: hsl(0, 100%, 40%);">- sNAAccessInformation := *</span><br><span style="color: hsl(120, 100%, 40%);">+ sNAAccessInformation := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ selectedPLMNId := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ lastUsedEUTRANPLMNId := lastUsedEUTRANPLMNId</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 30adb03..8ca8264 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -106,7 +106,8 @@</span><br><span> boolean ran_is_geran,</span><br><span> boolean use_osmux,</span><br><span> boolean use_ipv6,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean verify_cell_id</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean verify_cell_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ OCT3 common_id_last_eutran_plmn optional</span><br><span> };</span><br><span> </span><br><span> /* get a one-octet bitmaks of supported algorithms based on Classmark information */</span><br><span>@@ -524,7 +525,8 @@</span><br><span> function f_expect_common_id() runs on BSC_ConnHdlr</span><br><span> {</span><br><span> if (g_pars.ran_is_geran) {</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tr_BSSMAP_LastUsedEUTRANPLMNId(g_pars.common_id_last_eutran_plmn)));</span><br><span> } else {</span><br><span> BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)));</span><br><span> }</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 8325625..7aae440 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -16,6 +16,7 @@</span><br><span> </span><br><span> import from General_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from GSM_Types all;</span><br><span> </span><br><span> import from M3UA_Types all;</span><br><span> import from M3UA_Emulation all;</span><br><span>@@ -400,7 +401,8 @@</span><br><span> ran_is_geran := ran_is_geran,</span><br><span> use_osmux := use_osmux,</span><br><span> use_ipv6 := false,</span><br><span style="color: hsl(0, 100%, 40%);">- verify_cell_id := verify_cell_id</span><br><span style="color: hsl(120, 100%, 40%);">+ verify_cell_id := verify_cell_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ common_id_last_eutran_plmn := omit</span><br><span> };</span><br><span> if (not ran_is_geran) {</span><br><span> pars.use_umts_aka := true;</span><br><span>@@ -4536,13 +4538,19 @@</span><br><span> var PDU_SGsAP lua;</span><br><span> var PDU_SGsAP mm_info;</span><br><span> var octetstring mm_info_dtap;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmMcc mcc;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmMnc mnc;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) TrackingAreaIdentityValue tai := omit;</span><br><span> </span><br><span> /* tell GSUP dispatcher to send this IMSI to us */</span><br><span> f_create_gsup_expect(hex2str(g_pars.imsi));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.common_id_last_eutran_plmn != omit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_dec_mcc_mnc(g_pars.common_id_last_eutran_plmn, mcc, mnc);</span><br><span style="color: hsl(120, 100%, 40%);">+ tai := ts_SGsAP_TAI(mcc, mnc, 555);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> lur := valueof(ts_SGsAP_LU_REQ(g_pars.imsi, mme_name, IMSI_attach,</span><br><span> ts_SGsAP_LAI('901'H, '70'H, 2342),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SGsAP_TAI('901'H, '70'H, 555)));</span><br><span style="color: hsl(120, 100%, 40%);">+ tai));</span><br><span> /* Old LAI, if MS sends it */</span><br><span> /* TMSI status, if MS has no valid TMSI */</span><br><span> /* IMEISV, if it supports "automatic device detection" */</span><br><span>@@ -4602,6 +4610,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11811, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_lu), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4641,7 +4650,6 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11812, true);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_lu_imsi_reject), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4729,6 +4737,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11814, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_expl_imsi_det_eps), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4753,6 +4762,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11814, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_impl_imsi_det_eps), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4780,6 +4790,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11815, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_expl_imsi_det_noneps), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4807,6 +4818,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11815, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_impl_imsi_det_noneps), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4858,6 +4870,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11816, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_paging_rej), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4907,6 +4920,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11817, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_paging_subscr_rej), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -4951,6 +4965,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11818, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_paging_ue_unr), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5010,6 +5025,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11819, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_paging_and_nothing), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5068,6 +5084,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11820, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_paging_and_lu), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5276,6 +5293,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11823, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_mt_sms), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5306,6 +5324,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11824, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_mo_sms), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5369,6 +5388,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11825, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_mt_sms_and_nothing), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5429,6 +5449,7 @@</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init(1, true);</span><br><span> pars := f_init_pars(11826, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> vc_conn := f_start_handler_with_pars(refers(f_tc_sgsap_mt_sms_and_reject), pars);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span>@@ -5445,6 +5466,7 @@</span><br><span> if (bssmap_lu) {</span><br><span> f_perform_lu();</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.common_id_last_eutran_plmn := f_enc_mcc_mnc('901'H, '70'H);</span><br><span> </span><br><span> f_sgs_perform_lu();</span><br><span> f_sleep(1.0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23969">change 23969</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/+/23969"/><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: I161529fd9c8cacb7d17ea18660998df06bb0b575 </div>
<div style="display:none"> Gerrit-Change-Number: 23969 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>