<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14901">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: check IMEI: move reject LU into new function<br><br>Change-Id: Ifad259e21df035a89e97831a57c0675502308eb6<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 22 insertions(+), 48 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 e951400..fb2d888 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -642,6 +642,24 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_expect_lu_reject() runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_DTAP_MT dtap_mt;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 5.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</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(tr_PDU_DTAP_MT(?)) -> value dtap_mt {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for LU reject");</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%);">+</span><br><span> function f_foo() runs on BSC_ConnHdlr{</span><br><span> /* SCCP CC handled by RAN_Emulation_CT.main() */</span><br><span> /* Expect auth, if enabled */</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 15ff17c..c463dd5 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -5601,7 +5601,6 @@</span><br><span> </span><br><span> private function f_tc_lu_imsi_auth_tmsi_check_imei_nack(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> var PDU_ML3_MS_NW l3_lu;</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_DTAP_MT dtap_mt;</span><br><span> </span><br><span> pars.net.expect_auth := true;</span><br><span> pars.net.expect_imei := true;</span><br><span>@@ -5617,17 +5616,7 @@</span><br><span> f_mm_common();</span><br><span> f_msc_lu_hlr();</span><br><span> f_mm_imei();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect reject */</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_lu_reject();</span><br><span> f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_nack() runs on MTC_CT {</span><br><span>@@ -5642,7 +5631,6 @@</span><br><span> </span><br><span> private function f_tc_lu_imsi_auth_tmsi_check_imei_err(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> var PDU_ML3_MS_NW l3_lu;</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_DTAP_MT dtap_mt;</span><br><span> </span><br><span> pars.net.expect_auth := true;</span><br><span> pars.net.expect_imei := true;</span><br><span>@@ -5658,17 +5646,7 @@</span><br><span> f_mm_common();</span><br><span> f_msc_lu_hlr();</span><br><span> f_mm_imei();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect reject */</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_lu_reject();</span><br><span> f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_err() runs on MTC_CT {</span><br><span>@@ -5746,7 +5724,6 @@</span><br><span> </span><br><span> private function f_tc_lu_imsi_auth_tmsi_check_imei_early_nack(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> var PDU_ML3_MS_NW l3_lu;</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_DTAP_MT dtap_mt;</span><br><span> </span><br><span> pars.net.expect_auth := true;</span><br><span> pars.net.expect_imei_early := true;</span><br><span>@@ -5760,17 +5737,7 @@</span><br><span> BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));</span><br><span> </span><br><span> f_mm_imei_early();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect reject */</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_lu_reject();</span><br><span> f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_early_nack() runs on MTC_CT {</span><br><span>@@ -5785,7 +5752,6 @@</span><br><span> </span><br><span> private function f_tc_lu_imsi_auth_tmsi_check_imei_early_err(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> var PDU_ML3_MS_NW l3_lu;</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_DTAP_MT dtap_mt;</span><br><span> </span><br><span> pars.net.expect_auth := true;</span><br><span> pars.net.expect_imei_early := true;</span><br><span>@@ -5799,17 +5765,7 @@</span><br><span> BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));</span><br><span> </span><br><span> f_mm_imei_early();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect reject */</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_lu_reject();</span><br><span> f_expect_clear();</span><br><span> }</span><br><span> testcase TC_lu_imsi_auth_tmsi_check_imei_early_err() runs on MTC_CT {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14901">change 14901</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/+/14901"/><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: Ifad259e21df035a89e97831a57c0675502308eb6 </div>
<div style="display:none"> Gerrit-Change-Number: 14901 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>