<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13735">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;">BTS_Tests.ttcn: add TC_pcu_ext_rach_content() for 11-bit RACH<br><br>According to 3GPP TS 04.60, section 11.2.5a, the extended (11-bit)<br>Access Burst on RACH/PRACH is used by the MS to indicate its EGPRS<br>capability. One of the alternative synch. sequences (see 3GPP TS<br>05.02, TS1 and TS2) shall be used.<br><br>Add a test case to verify extended (11-bit) RACH decoding.<br><br>Depends: (OsmocomBB) I36fd20cd5502ce33c52f644ee4c22abb83350df8<br>Change-Id: I8fe156aeac9de3dc1e71a4950821d4942ba9a253<br>Related: OS#1854<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/expected-results.xml<br>M library/L1CTL_PortType.ttcn<br>3 files changed, 88 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index e617323..711947a 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -989,6 +989,12 @@</span><br><span> return ra;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* generate a random 11-bit RA (packet-switched only) */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_rnd_ra11_ps() return BIT11 {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer ra11 := f_rnd_int(bit2int('11111111111'B));</span><br><span style="color: hsl(120, 100%, 40%);">+ return int2bit(ra11, 11);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Send 1000 RACH requests and check their RA+FN on the RSL side */</span><br><span> testcase TC_rach_content() runs on test_CT {</span><br><span> f_init(testcasename());</span><br><span>@@ -2969,6 +2975,64 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Send extended (11-bit, TS1 & TS2) RACH bursts from the Um side,</span><br><span style="color: hsl(120, 100%, 40%);">+ * expect them to show up on PCU socket (with proper BURST_TYPE_*). */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_pcu_ext_rach_content() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PCUIF_Message pcu_rach_ind;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmFrameNumber fn_last := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var L1ctlRachSynchSeq synch_seq;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PCUIF_BurstType pcu_bt;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmFrameNumber fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BIT11 ra11;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_pcu_test();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_l1ctl();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1_tune(L1CTL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < 1000; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We need to test both TS1 & TS2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i rem 2 == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ synch_seq := RACH_SYNCH_SEQ_TS1;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_bt := BURST_TYPE_1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ synch_seq := RACH_SYNCH_SEQ_TS2;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_bt := BURST_TYPE_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%);">+ ra11 := f_rnd_ra11_ps();</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := f_L1CTL_EXT_RACH(L1CTL, bit2int(ra11), synch_seq);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fn == fn_last) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Two RACH in same FN?!?");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_last := fn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Compose the expected message */</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_rach_ind := tr_PCUIF_RACH_IND(</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ ra := bit2int(ra11),</span><br><span style="color: hsl(120, 100%, 40%);">+ is_11bit := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ burst_type := pcu_bt,</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := fn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 2.0;</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%);">+ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, pcu_rach_ind)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ T.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RACH_IND)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RACH IND");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RACH IND");</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%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_pad_oct(octetstring str, integer len, OCT1 pad) return octetstring {</span><br><span> var integer strlen := lengthof(str);</span><br><span> for (var integer i := 0; i < len-strlen; i := i+1) {</span><br><span>@@ -4311,6 +4375,7 @@</span><br><span> execute( TC_pcu_data_req_agch() );</span><br><span> execute( TC_pcu_data_req_imm_ass_pch() );</span><br><span> execute( TC_pcu_rach_content() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_pcu_ext_rach_content() );</span><br><span> execute( TC_pcu_paging_from_rsl() );</span><br><span> } else {</span><br><span> log("PCU socket path not available, skipping PCU tests");</span><br><span>diff --git a/bts/expected-results.xml b/bts/expected-results.xml</span><br><span>index 2eadffd..7d89da3 100644</span><br><span>--- a/bts/expected-results.xml</span><br><span>+++ b/bts/expected-results.xml</span><br><span>@@ -77,6 +77,7 @@</span><br><span> <testcase classname='BTS_Tests' name='TC_pcu_data_req_agch' time='MASKED'/></span><br><span> <testcase classname='BTS_Tests' name='TC_pcu_data_req_imm_ass_pch' time='MASKED'/></span><br><span> <testcase classname='BTS_Tests' name='TC_pcu_rach_content' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='BTS_Tests' name='TC_pcu_ext_rach_content' time='MASKED'/></span><br><span> <testcase classname='BTS_Tests' name='TC_pcu_paging_from_rsl' time='MASKED'/></span><br><span> <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_act_deact' time='MASKED'/></span><br><span> <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_unsol_deact' time='MASKED'/></span><br><span>diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn</span><br><span>index 8e03c02..7dac4c3 100644</span><br><span>--- a/library/L1CTL_PortType.ttcn</span><br><span>+++ b/library/L1CTL_PortType.ttcn</span><br><span>@@ -87,6 +87,28 @@</span><br><span> return fn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ function f_L1CTL_EXT_RACH(</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_PT pt, uint16_t ra11, L1ctlRachSynchSeq seq,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t combined := 1, uint16_t offset := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ) return GsmFrameNumber {</span><br><span style="color: hsl(120, 100%, 40%);">+ var L1ctlDlMessage rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmFrameNumber fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 2.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%);">+ pt.send(ts_L1CTL_EXT_RACH_REQ(ra11, seq, combined, offset));</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn := rc.dl_info.frame_nr };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive { repeat; };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout in extended RACH");</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_L1CTL_PARAM(L1CTL_PT pt, uint8_t ta, uint8_t tx_power) {</span><br><span> pt.send(ts_L1CTL_PAR_REQ(ta, tx_power));</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13735">change 13735</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/13735"/><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: I8fe156aeac9de3dc1e71a4950821d4942ba9a253 </div>
<div style="display:none"> Gerrit-Change-Number: 13735 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>