<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ<br><br>This way tests can match directly on specific RLCMAC blocks, giving the<br>opportunity to handle different types using altsteps.<br>Before this, a user of the port could only receive a pcu_msg DATA_REQ<br>with a octetstring containing the rlcmac block, then decode it in a<br>second step when already in the alt step.<br><br>Related: OS#4927<br><br>Change-Id: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23<br>---<br>M library/PCUIF_Types.ttcn<br>M pcu/PCUIF_Components.ttcn<br>2 files changed, 104 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn</span><br><span>index d6e0867..31721c8 100644</span><br><span>--- a/library/PCUIF_Types.ttcn</span><br><span>+++ b/library/PCUIF_Types.ttcn</span><br><span>@@ -536,6 +536,28 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template PCUIF_data tr_PCUIF_DATA(template uint8_t trx_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint8_t ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint8_t block_nr := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint32_t fn := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PCUIF_Sapi sapi := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template octetstring data := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ len := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ data := data,</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := ?, /* unused in BTS */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr := trx_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_nr := ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ block_nr := block_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* measurement parameters below unused on Tx */</span><br><span style="color: hsl(120, 100%, 40%);">+ rssi := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ ber10k := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ ta_offs_qbits := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ lqual_cb := 0</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) PCUIF_Message ts_PCUIF_DATA_REQ(uint8_t bts_nr, uint8_t trx_nr,</span><br><span> uint8_t ts_nr, uint8_t block_nr,</span><br><span> uint32_t fn, PCUIF_Sapi sapi,</span><br><span>@@ -572,21 +594,7 @@</span><br><span> bts_nr := bts_nr,</span><br><span> spare := '0000'O,</span><br><span> u := {</span><br><span style="color: hsl(0, 100%, 40%);">- data_req := {</span><br><span style="color: hsl(0, 100%, 40%);">- sapi := sapi,</span><br><span style="color: hsl(0, 100%, 40%);">- len := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- data := data,</span><br><span style="color: hsl(0, 100%, 40%);">- fn := fn,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn := ?, /* unused in BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_nr := trx_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- ts_nr := ts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- block_nr := block_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- /* measurement parameters below unused on Tx */</span><br><span style="color: hsl(0, 100%, 40%);">- rssi := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ber10k := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ta_offs_qbits := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- lqual_cb := 0</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req := tr_PCUIF_DATA(trx_nr, ts_nr, block_nr, fn, sapi, data)</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn</span><br><span>index aa2ab42..50de700 100644</span><br><span>--- a/pcu/PCUIF_Components.ttcn</span><br><span>+++ b/pcu/PCUIF_Components.ttcn</span><br><span>@@ -19,6 +19,10 @@</span><br><span> import from PCUIF_Types all;</span><br><span> import from PCUIF_CodecPort all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from RLCMAC_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from GSM_RR_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Component communication diagram:</span><br><span> *</span><br><span> * +-----+ +----------+ +---------+</span><br><span>@@ -119,11 +123,54 @@</span><br><span> data := data</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* PCUIF req_data containing decoded rlcmac/rr, for users to be able to match</span><br><span style="color: hsl(120, 100%, 40%);">+ * directly on receive()</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+type record BTS_PDTCH_Block {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_data raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ RlcmacDlBlock dl_block</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+type record BTS_PTCCH_Block {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_data raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ PTCCHDownlinkMsg dl_block</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+type record BTS_CCCH_Block {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_data raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmRrMessage rr_msg</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PCUIF_data raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ template RlcmacDlBlock dl_block := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr := bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ raw := raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_block := dl_block</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+template BTS_PTCCH_Block tr_PCUIF_DATA_PTCCH(template uint8_t bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PCUIF_data raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PTCCHDownlinkMsg dl_block := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr := bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ raw := raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_block := dl_block</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+template BTS_CCCH_Block tr_PCUIF_DATA_RR(template uint8_t bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PCUIF_data raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ template GsmRrMessage rr_msg := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr := bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ raw := raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_msg := rr_msg</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Generic port for messages and events */</span><br><span> type port RAW_PCU_MSG_PT message {</span><br><span> inout RAW_PCU_Command;</span><br><span> inout RAW_PCU_Event;</span><br><span> inout PCUIF_Message;</span><br><span style="color: hsl(120, 100%, 40%);">+ inout BTS_PDTCH_Block;</span><br><span style="color: hsl(120, 100%, 40%);">+ inout BTS_PTCCH_Block;</span><br><span style="color: hsl(120, 100%, 40%);">+ inout BTS_CCCH_Block;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span> /* TDMA frame clock generator */</span><br><span>@@ -361,11 +408,14 @@</span><br><span> [] CLCK.receive(tr_RAW_PCU_CLCK_EV) { repeat; }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_BTS_CT_handler(integer bts_nr, PCUIF_info_ind info_ind)</span><br><span style="color: hsl(120, 100%, 40%);">+function f_BTS_CT_handler(integer bts_nr, PCUIF_info_ind info_ind, boolean decode_data_req := false)</span><br><span> runs on RAW_PCU_BTS_CT {</span><br><span> var PCUIF_Message pcu_msg;</span><br><span> var RAW_PCU_Command cmd;</span><br><span> var RAW_PCU_Event event;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BTS_PDTCH_Block pcu_msg_pdtch;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BTS_PTCCH_Block pcu_msg_ptcch;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BTS_CCCH_Block pcu_msg_rr;</span><br><span> </span><br><span> /* Init TDMA clock generator (so we can stop and start it) */</span><br><span> vc_CLCK_GEN := RAW_PCU_ClckGen_CT.create("ClckGen-" & int2str(bts_nr)) alive;</span><br><span>@@ -374,6 +424,7 @@</span><br><span> /* Wait until the PCU is connected */</span><br><span> PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_AGCH);</span><br><span> alt {</span><br><span> /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */</span><br><span> [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg {</span><br><span>@@ -406,6 +457,35 @@</span><br><span> "/TS" & int2str(pcu_msg.u.act_req.ts_nr));</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg {</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring data;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* On PCH the payload is prefixed with paging group (3 octets): skip it.</span><br><span style="color: hsl(120, 100%, 40%);">+ * TODO: add an additional template parameter, so we can match it. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ data := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_AGCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ data := pcu_msg.u.data_req.data;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_rr.bts_nr := bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_rr.raw := pcu_msg.u.data_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_rr.rr_msg := dec_GsmRrMessage(data);</span><br><span style="color: hsl(120, 100%, 40%);">+ TC.send(pcu_msg_rr);</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_pdtch.bts_nr := bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_pdtch.raw := pcu_msg.u.data_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_pdtch.dl_block := dec_RlcmacDlBlock(pcu_msg_pdtch.raw.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ TC.send(pcu_msg_pdtch);</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PTCCH)) -> value pcu_msg {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_ptcch.bts_nr := bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_ptcch.raw := pcu_msg.u.data_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_msg_ptcch.dl_block := dec_PTCCHDownlinkMsg(pcu_msg_ptcch.raw.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ TC.send(pcu_msg_ptcch);</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* PCU -> test case forwarding (filter by the BTS number) */</span><br><span> [] PCUIF.receive(tr_PCUIF_MSG(?, bts_nr)) -> value pcu_msg {</span><br><span> TC.send(pcu_msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320">change 22320</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/+/22320"/><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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 </div>
<div style="display:none"> Gerrit-Change-Number: 22320 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>