<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11555">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;">BSC LCLS: restructure tests<br><br>Move duplicated code into separate functions to simplify adding test<br>cases which do not use MGW MDCX methods for closing the loop.<br><br>Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe<br>Related: OS#3659<br>---<br>M bsc/BSC_Tests_LCLS.ttcn<br>1 file changed, 52 insertions(+), 60 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>index 0151329..585059e 100644</span><br><span>--- a/bsc/BSC_Tests_LCLS.ttcn</span><br><span>+++ b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>@@ -255,11 +255,28 @@</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_lcls_recv_ls_exp_mgcp() runs on lcls_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpCommand mgcp_cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ interleave {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* not needed, as this MDCX is still handled within MSC_ConnectionHandler</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_B.send(f_build_mdcx_rsp(mgcp_cmd));</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_tc_lcls_gcr_bway_connect(boolean hr) runs on lcls_test_CT {</span><br><span> var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);</span><br><span> var TestHdlrParams pars_b;</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(0, 100%, 40%);">- var MgcpCommand mgcp_cmd;</span><br><span> </span><br><span> f_lcls_init();</span><br><span> </span><br><span>@@ -281,14 +298,8 @@</span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span> </span><br><span> CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_lcls_recv_ls_exp_mgcp();</span><br><span> </span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span>@@ -366,6 +377,12 @@</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* check for the cases where LCLS is not possible due to some reason */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_lcls_not_yet_ls() runs on lcls_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */</span><br><span> testcase TC_lcls_gcr_bway_dont_connect() runs on lcls_test_CT {</span><br><span>@@ -387,9 +404,7 @@</span><br><span> pars_b.lcls.exp_sts := LCLS_STS_not_yet_ls;</span><br><span> </span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lcls_not_yet_ls();</span><br><span> f_wait_fail_notify();</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span>@@ -435,12 +450,26 @@</span><br><span> pars_b.lcls.exp_sts := LCLS_STS_not_yet_ls;</span><br><span> </span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lcls_not_yet_ls();</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Expect given LCLS status alongside with corresponding MDCX commands */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_lcls_sts_mgcp(BIT4 expected_status) runs on lcls_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpCommand mgcp_cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ interleave {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(expected_status)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(expected_status));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(120, 100%, 40%);">+ CONN_B.send(f_build_mdcx_rsp(mgcp_cmd));</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> /* Send an ASSIGNMENT REQ with "do not connect" and enable later using LCLS CTRL */</span><br><span> testcase TC_lcls_gcr_bway_dont_connect_csc() runs on lcls_test_CT {</span><br><span> var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);</span><br><span>@@ -463,9 +492,7 @@</span><br><span> </span><br><span> /* start call and expect it to be "not yet" LS */</span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lcls_not_yet_ls();</span><br><span> f_sleep(2.0);</span><br><span> </span><br><span> /* send "connect" on A side, expect call to remain in "not yet" */</span><br><span>@@ -475,16 +502,7 @@</span><br><span> </span><br><span> /* send "connect" on B side, expect call to go LS, with notify to A side */</span><br><span> CONN_B.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_connect)));</span><br><span style="color: hsl(0, 100%, 40%);">- interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(LCLS_STS_locally_switched)));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_B.send(f_build_mdcx_rsp(mgcp_cmd));</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_lcls_sts_mgcp(LCLS_STS_locally_switched);</span><br><span> f_wait_fail_notify();</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span>@@ -510,7 +528,6 @@</span><br><span> var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);</span><br><span> var TestHdlrParams pars_b;</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(0, 100%, 40%);">- var MgcpCommand mgcp_cmd;</span><br><span> </span><br><span> f_lcls_init();</span><br><span> </span><br><span>@@ -528,19 +545,8 @@</span><br><span> /* Expect LS to be established successfully */</span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span> CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-/* not needed, as this MDCX is still handled within MSC_ConnectionHandler</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_B.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(0, 100%, 40%);">- }</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_lcls_recv_ls_exp_mgcp()</span><br><span> </span><br><span> /* request LS release on "A" side; call continues to be locally switched */</span><br><span> CONN_A.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_release_lcls)));</span><br><span>@@ -549,16 +555,8 @@</span><br><span> </span><br><span> /* request LS release on "B" side; call LS is released */</span><br><span> CONN_B.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_release_lcls)));</span><br><span style="color: hsl(0, 100%, 40%);">- interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_B.send(f_build_mdcx_rsp(mgcp_cmd));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(LCLS_STS_no_longer_ls)));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_no_longer_ls));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lcls_sts_mgcp(LCLS_STS_no_longer_ls)</span><br><span> </span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span>@@ -587,14 +585,8 @@</span><br><span> /* Expect LS to be established successfully */</span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span> CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched));</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span style="color: hsl(0, 100%, 40%);">- [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span style="color: hsl(0, 100%, 40%);">- CONN_A.send(f_build_mdcx_rsp(mgcp_cmd));</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_lcls_recv_ls_exp_mgcp();</span><br><span> </span><br><span> /* Perform hard BSSMAP Clear on "A" side, expect no LS on "B" side */</span><br><span> var myBSSMAP_Cause cause_val := GSM0808_CAUSE_CALL_CONTROL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11555">change 11555</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/11555"/><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: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe </div>
<div style="display:none"> Gerrit-Change-Number: 11555 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </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: daniel <dwillmann@sysmocom.de> </div>