<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9900">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSC_Tests: Also test LCLS with halfrate codecs<br><br>At the moment LCLS is only tested using GSM-FR. There are not LCLS<br>tests that test with GSM-HR yet. Lets make GSM-HR available and see<br>what happens when we run BSC_Tests_LCLS.TC_lcls_gcr_bway_connect<br>on HR instead of FR.<br><br>- set channelType depending on g_pars.ass_codec_list.codecElements[0]<br>- add testcase TC_lcls_gcr_bway_connect_hr<br><br>Related OS#1602<br>Change-Id: I2421519a642bdb7453ae4a9058e177845690a489<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/BSC_Tests_LCLS.ttcn<br>M bsc/expected-results.xml<br>3 files changed, 24 insertions(+), 4 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/00/9900/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 2a8ad5f..149d5b7 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -1735,7 +1735,7 @@</span><br><span> }</span><br><span> </span><br><span> /* determine BSSMAP_IE_ChannelType from *first* element of BSSMAP_FIELD_CodecElement */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_BSSMAP_chtype_from_codec(BSSMAP_FIELD_CodecElement a_elem)</span><br><span style="color: hsl(120, 100%, 40%);">+function f_BSSMAP_chtype_from_codec(BSSMAP_FIELD_CodecElement a_elem)</span><br><span> return BSSMAP_IE_ChannelType {</span><br><span> /* FIXME: actually look at all elements of BSSMAP_IE_SpeechCodecList */</span><br><span> var BSSMAP_IE_ChannelType ret := valueof(ts_BSSMAP_IE_ChannelType);</span><br><span>diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>index b99ba58..da9fe94 100644</span><br><span>--- a/bsc/BSC_Tests_LCLS.ttcn</span><br><span>+++ b/bsc/BSC_Tests_LCLS.ttcn</span><br><span>@@ -128,8 +128,12 @@</span><br><span> private function f_lcls_connhdlr_main(charstring id) runs on LCLS_MSC_ConnHdlr {</span><br><span> /* 1) establish the connection between RSL and BSSAP side */</span><br><span> var PDU_BSSAP ass_req := f_gen_ass_req();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> var template PDU_BSSAP ass_compl := f_gen_exp_compl();</span><br><span> ass_req.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list;</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_req.pdu.bssmap.assignmentRequest.channelType :=</span><br><span style="color: hsl(120, 100%, 40%);">+ f_BSSMAP_chtype_from_codec(g_pars.ass_codec_list.codecElements[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> f_establish_fully(ass_req, ass_compl);</span><br><span> </span><br><span> /* 2) notify master that assignment has completed */</span><br><span>@@ -251,8 +255,7 @@</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect connect both-way */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_lcls_gcr_bway_connect() runs on lcls_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+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>@@ -260,7 +263,11 @@</span><br><span> </span><br><span> f_lcls_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hr == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR}));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> pars_a.lcls.gcr := valueof(ts_GCR('010203'O, '0405'O, '060708090a'O));</span><br><span> pars_a.lcls.cfg := LCLS_CFG_both_way;</span><br><span> pars_a.lcls.csc := LCLS_CSC_connect;</span><br><span>@@ -272,6 +279,7 @@</span><br><span> pars_b.lcls.exp_sts := LCLS_STS_locally_switched;</span><br><span> </span><br><span> f_lcls_test_init(pars_a, pars_b);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);</span><br><span> interleave {</span><br><span> [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));</span><br><span>@@ -285,6 +293,16 @@</span><br><span> f_lcls_test_fini();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect connect both-way (full rate)*/</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lcls_gcr_bway_connect() runs on lcls_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_lcls_gcr_bway_connect(false)</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%);">+/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect connect both-way (half rate) */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lcls_gcr_bway_connect_hr() runs on lcls_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_lcls_gcr_bway_connect(true)</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 LCLS CFG+CSC enabling LCLS but GCR doesn't match! */</span><br><span> testcase TC_lcls_gcr_nomatch_bway_connect() runs on lcls_test_CT {</span><br><span> var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);</span><br><span>@@ -581,6 +599,7 @@</span><br><span> </span><br><span> execute( TC_lcls_gcr_only() );</span><br><span> execute( TC_lcls_gcr_bway_connect() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lcls_gcr_bway_connect_hr() );</span><br><span> execute( TC_lcls_gcr_nomatch_bway_connect() );</span><br><span> execute( TC_lcls_gcr_bway_dont_connect() );</span><br><span> execute( TC_lcls_gcr_unsuppported_cfg() );</span><br><span>diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml</span><br><span>index 969660e..dbe3d2c 100644</span><br><span>--- a/bsc/expected-results.xml</span><br><span>+++ b/bsc/expected-results.xml</span><br><span>@@ -87,6 +87,7 @@</span><br><span> <testcase classname='BSC_Tests' name='TC_dyn_pdch_osmo_act_nack' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_only' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_bway_connect' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_bway_connect_hr' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_nomatch_bway_connect' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_bway_dont_connect' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_unsuppported_cfg' time='MASKED'/></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9900">change 9900</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/9900"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2421519a642bdb7453ae4a9058e177845690a489 </div>
<div style="display:none"> Gerrit-Change-Number: 9900 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>