diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-11-12 17:24:33 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-11-15 11:13:11 +0100 |
| commit | 518e82faf9c97e0e0558c453c49797d158a7ce63 (patch) | |
| tree | 10c2693196d3958e37189aa334e06809f13ac03b /pcu | |
| parent | b758187c869451c9135029357b47bb7e9e08465f (diff) | |
pcu: Introduce as_ms_rx_ignore_empty helper
It will be further used in follow-up patches.
Change-Id: I3c80ba4b8d229fa4a75dfd04abb7c5aae26e221c
Diffstat (limited to 'pcu')
| -rw-r--r-- | pcu/GPRS_Components.ttcn | 15 | ||||
| -rw-r--r-- | pcu/PCU_Tests.ttcn | 16 |
2 files changed, 18 insertions, 13 deletions
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 10144985..d6749d7d 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -559,6 +559,21 @@ runs on MS_BTS_IFACE_CT { } } +altstep as_pcuif_rx_ignore_empty(template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + 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), + omit)) -> 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, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } +} + altstep as_rx_fail_dummy(template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var BTS_PDTCH_Block data_msg; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 2cc6fadb..c3477616 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1984,19 +1984,9 @@ testcase TC_n3105_max_t3195() runs on RAW_PCU_Test_CT { block_nr := nr.blk_nr)); repeat; } - [mp_osmo_pcu_newer_than_0_9_0 and 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), - omit)) -> value data_msg { - /* We may already receive idle blocks before our own TTCN3 timer - * triggers due to the TBF being released. Keep going until our T_3195 triggers. */ - nr := ts_TsTrxBtsNum; - BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, - sapi := PCU_IF_SAPI_PDTCH, fn := 0, - arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), - block_nr := nr.blk_nr)); - repeat; - } + /* We may already receive idle blocks before our own TTCN3 timer + * triggers due to the TBF being released. Keep going until our T_3195 triggers. */ + [mp_osmo_pcu_newer_than_0_9_0 and N3105 == N3105_MAX] as_pcuif_rx_ignore_empty(nr); [T_3195.running] T_3195.timeout { log("T_3195 timeout"); /* Done in alt, wait for pending RTS initiated previously in |