fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29622 ) Change subject: library: s/tr_RLCMAC_DUMMY_CTRL/tr_RLCMAC_DL_DUMMY_CTRL/ ...................................................................... library: s/tr_RLCMAC_DUMMY_CTRL/tr_RLCMAC_DL_DUMMY_CTRL/ There also exists UL equivalent of this message, for which I am planning to add a template. Let's clarify direction in the name. Change-Id: I3b19c6679eb432b062e28aee9dd1220dbf33ee31 --- M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 16 insertions(+), 16 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index e398491..3b1e40a 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -529,7 +529,7 @@ } } - template RlcmacDlBlock tr_RLCMAC_DUMMY_CTRL(template uint3_t usf := ?, template PageMode page_mode := ?) := { + template RlcmacDlBlock tr_RLCMAC_DL_DUMMY_CTRL(template uint3_t usf := ?, template PageMode page_mode := ?) := { ctrl := { mac_hdr := { payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index d6749d7..0f16d02 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -549,7 +549,7 @@ var BTS_PDTCH_Block data_msg; [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL())) -> value data_msg { BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -579,7 +579,7 @@ var BTS_PDTCH_Block data_msg; [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL())) -> value data_msg { setverdict(fail, "Unexpected Dummy Ctrl block ", data_msg); f_shutdown(__BFILE__, __LINE__); } @@ -1192,7 +1192,7 @@ var uint32_t dl_fn; f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); - if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (not match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { setverdict(fail, "Failed to match Packet DUMMY DL"); f_shutdown(__BFILE__, __LINE__); } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 8012daa..611ca23 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -857,7 +857,7 @@ /* we will receive UL ACK/NACK from time to time. In that case, check CdCofing increases */ f_rx_rlcmac_dl_block(dl_block, unused_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) and @@ -927,7 +927,7 @@ while (true) { f_ms_tx_ul_data_block(ms, f_rnd_octstring(10), cv := 15); f_rx_rlcmac_dl_block(dl_block, unused_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } @@ -1092,7 +1092,7 @@ bsn := i mod bsn_mod; f_rx_rlcmac_dl_block(dl_block, fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL)) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL)) { /* No more data to receive, done */ break; } @@ -1200,7 +1200,7 @@ while (true) { f_ms_tx_ul_data_block(ms, f_rnd_octstring(10), cv := 15); f_rx_rlcmac_dl_block(dl_block, unused_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } @@ -1636,7 +1636,7 @@ * above case before continuing (expect /* Dummy block): */ BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)); + tr_RLCMAC_DL_DUMMY_CTRL)); } [] BTS.receive { setverdict(fail, "Unexpected BTS message"); @@ -1979,7 +1979,7 @@ */ [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { if (not T_3195.running) { T_3195.start; /* We even send some new data, nothing should be sent to MS */ @@ -2256,7 +2256,7 @@ /* we will receive UL ACK/NACK from time to time, handle it. */ f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) and @@ -2992,7 +2992,7 @@ alt { [data_received] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) { /* done */ } + tr_RLCMAC_DL_DUMMY_CTRL)) { /* done */ } [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DATA)) -> value data_msg { @@ -3429,7 +3429,7 @@ */ [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { if (not T_3195.running) { T_3195.start; } @@ -3455,7 +3455,7 @@ /* We receive Dummy blocks in between Pkt Ul Ass while PCU waits for us to ack it */ [not T_3195.running] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { log("Ignoring Dummy block FN ", data_msg.raw.fn); nr := ts_TsTrxBtsNum; BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, @@ -4632,7 +4632,7 @@ for (var integer i := 0; i < 800; i := i + 1) { f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL)) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL)) { /* No more data to receive, done */ break; } @@ -4894,7 +4894,7 @@ var integer i := 0; while (true) { f_rx_rlcmac_dl_block(dl_block, sched_fn); - if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (not match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { break; } if (max_num_iter > 0 and i > max_num_iter) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b19c6679eb432b062e28aee9dd1220dbf33ee31 Gerrit-Change-Number: 29622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged