<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18459">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS: use existing templates for ASP_RSL_Unitdata<br><br>Change-Id: I8d7b3f8b019964ece9a3187f8232d8d23b2a53a5<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_SMSCB.ttcn<br>2 files changed, 45 insertions(+), 56 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 012df47..99a8ef9 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -315,7 +315,7 @@</span><br><span> function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc)</span><br><span> runs on test_CT {</span><br><span> log("Setting ", rsl_si_type, ": ", si_enc);</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_BCCH_INFO(rsl_si_type, si_enc)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_BCCH_INFO(rsl_si_type, si_enc)));</span><br><span> }</span><br><span> </span><br><span> function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec)</span><br><span>@@ -493,17 +493,6 @@</span><br><span> return vc_conn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template ASP_RSL_Unitdata ts_RSL_UD(template RSL_Message rsl, IpaStreamId sid := IPAC_PROTO_RSL_TRX0) := {</span><br><span style="color: hsl(0, 100%, 40%);">- streamId := sid,</span><br><span style="color: hsl(0, 100%, 40%);">- rsl := rsl</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template ASP_RSL_Unitdata tr_RSL_UD(template RSL_Message rsl,</span><br><span style="color: hsl(0, 100%, 40%);">- template IpaStreamId sid := IPAC_PROTO_RSL_TRX0) := {</span><br><span style="color: hsl(0, 100%, 40%);">- streamId := sid,</span><br><span style="color: hsl(0, 100%, 40%);">- rsl := rsl</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> private altstep as_Tguard() runs on ConnHdlr {</span><br><span> [] g_Tguard.timeout {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout");</span><br><span>@@ -1293,10 +1282,10 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, t_RslChanNr_RACH(0)))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, t_RslChanNr_RACH(0)))) {</span><br><span> T.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?, ?))) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected CHAN RQD");</span><br><span> }</span><br><span> [] RSL_CCHAN.receive { repeat; }</span><br><span>@@ -1333,7 +1322,7 @@</span><br><span> timer T := 3.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?,?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(?,?))) {</span><br><span> rsl_chrqd := rsl_chrqd + 1;</span><br><span> f_timer_safe_restart(T);</span><br><span> repeat;</span><br><span>@@ -1372,11 +1361,11 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_RACH_LOAD_IND(tr_rach_slots_per_interval, 0, 0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RACH_LOAD_IND(tr_rach_slots_per_interval, 0, 0))) {</span><br><span> setverdict(pass);</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_RACH_LOAD_IND(?, ?, ?))) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RACH_LOAD_IND(?, ?, ?))) -> value rx_ud {</span><br><span> setverdict(fail, "Unexpected RACH LOAD IND: ", rx_ud);</span><br><span> repeat;</span><br><span> }</span><br><span>@@ -1400,7 +1389,7 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_RACH_LOAD_IND(?, ?, ?))) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RACH_LOAD_IND(?, ?, ?))) -> value rx_ud {</span><br><span> setverdict(fail, "Unexpected RACH LOAD IND: ", rx_ud);</span><br><span> repeat;</span><br><span> }</span><br><span>@@ -1444,7 +1433,7 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_RACH_LOAD_IND(tr_rach_slots_per_interval, ?, ?)))</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RACH_LOAD_IND(tr_rach_slots_per_interval, ?, ?)))</span><br><span> -> value rx_ud {</span><br><span> var RSL_IE_Body ie;</span><br><span> f_rsl_find_ie(rx_ud.rsl, RSL_IE_RACH_LOAD, ie);</span><br><span>@@ -1454,7 +1443,7 @@</span><br><span> }</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_RACH_LOAD_IND(?, ?, ?))) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RACH_LOAD_IND(?, ?, ?))) -> value rx_ud {</span><br><span> setverdict(fail, "Unexpected RACH LOAD IND: ", rx_ud);</span><br><span> repeat;</span><br><span> }</span><br><span>@@ -1487,10 +1476,10 @@</span><br><span> timer T := 1.5;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [expect_pass] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [expect_pass] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(ra, fn))) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [not expect_pass] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not expect_pass] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(ra, fn))) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("RACH passed but was expected to be dropped: ", toffs256));</span><br><span> }</span><br><span> [] RSL_CCHAN.receive { repeat; }</span><br><span>@@ -2947,7 +2936,7 @@</span><br><span> </span><br><span> /* receive + ignore RSL RF RES IND */</span><br><span> altstep as_rsl_res_ind() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_RF_RES_IND)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RF_RES_IND)) {</span><br><span> repeat;</span><br><span> }</span><br><span> }</span><br><span>@@ -2986,14 +2975,14 @@</span><br><span> while (st.num_paging_sent < pkt_total) {</span><br><span> alt {</span><br><span> /* check for presence of CCCH LOAD IND (paging load) */</span><br><span style="color: hsl(0, 100%, 40%);">- [cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [cfg.exp_overload] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) {</span><br><span> st.num_overload := st.num_overload + 1;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [not cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not cfg.exp_overload] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected PCH Overload");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [cfg.exp_load_ind] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [cfg.exp_load_ind] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_LOAD_IND)) {</span><br><span> log("Rx LOAD_IND");</span><br><span> /* FIXME: analyze/verify interval + contents */</span><br><span> repeat;</span><br><span>@@ -3015,7 +3004,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Send RSL PAGING COMMAND */</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi, st.num_paging_sent mod 4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_PAGING_CMD(mi, st.num_paging_sent mod 4)));</span><br><span> </span><br><span> st.num_paging_sent := st.num_paging_sent + 1;</span><br><span> }</span><br><span>@@ -3045,8 +3034,8 @@</span><br><span> [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, cfg);</span><br><span> [] L1CTL.receive { repeat; }</span><br><span> /* 65535 == empty paging queue, we can terminate*/</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(65535))) { }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_LOAD_IND(65535))) { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_LOAD_IND)) { repeat; }</span><br><span> [] T_wait.timeout {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Waiting for empty paging queue");</span><br><span> }</span><br><span>@@ -3199,14 +3188,14 @@</span><br><span> var ChannelDescription ch_desc := valueof(ts_ChanDesc(valueof(t_RslChanNr_SDCCH4(0, 0))));</span><br><span> var GsmRrMessage ia := valueof(ts_IMM_ASS(42, i, 5, ch_desc, c_MA_null));</span><br><span> var octetstring ia_enc := enc_GsmRrMessage(ia);</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_IMM_ASSIGN(ia_enc, 0)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_IMM_ASSIGN(ia_enc, 0)));</span><br><span> num_tx := num_tx+1;</span><br><span> f_sleep(sleep_s);</span><br><span> }</span><br><span> /* FIXME: check if imm.ass arrive on Um side */</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_DELETE_IND(?, 0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_DELETE_IND(?, 0))) {</span><br><span> num_del := num_del+1;</span><br><span> repeat;</span><br><span> }</span><br><span>@@ -3720,10 +3709,10 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_ERROR_REPORT(cause))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_ERROR_REPORT(cause))) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_ERROR_REPORT(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_ERROR_REPORT(?))) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Wrong cause in RSL ERR REP");</span><br><span> }</span><br><span> [] RSL_CCHAN.receive {</span><br><span>@@ -3740,7 +3729,7 @@</span><br><span> f_init();</span><br><span> var RSL_Message rsl := valueof(ts_RSL_BCCH_INFO(RSL_SYSTEM_INFO_1, ''O));</span><br><span> rsl.ies := omit;</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl));</span><br><span> </span><br><span> f_exp_err_rep(RSL_ERR_PROTO);</span><br><span> }</span><br><span>@@ -3751,7 +3740,7 @@</span><br><span> </span><br><span> var RSL_Message rsl := valueof(ts_RSL_BCCH_INFO(RSL_SYSTEM_INFO_1, ''O));</span><br><span> rsl.ies := { rsl.ies[0] };</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl));</span><br><span> </span><br><span> f_exp_err_rep(RSL_ERR_MAND_IE_ERROR);</span><br><span> }</span><br><span>@@ -3761,7 +3750,7 @@</span><br><span> f_init();</span><br><span> var RSL_Message rsl := valueof(ts_RSL_BCCH_INFO(RSL_SYSTEM_INFO_1, ''O));</span><br><span> rsl.ies[1].body.sysinfo_type := RSL_SYSTEM_INFO_5;</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl));</span><br><span> </span><br><span> f_exp_err_rep(RSL_ERR_IE_CONTENT);</span><br><span> }</span><br><span>@@ -3815,14 +3804,14 @@</span><br><span> RSL_CCHAN.clear;</span><br><span> rsl_tx := valueof(ts_RSL_BCCH_INFO(RSL_SYSTEM_INFO_1, ''O));</span><br><span> rsl_tx.msg_type := RSL_MT_LOCATION_INFO;</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl_tx));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl_tx));</span><br><span> f_exp_err_rep(RSL_ERR_MSG_TYPE);</span><br><span> </span><br><span> /* TRX Management */</span><br><span> RSL_CCHAN.clear;</span><br><span> rsl_tx := ts_RSL_SACCH_FILL(RSL_SYSTEM_INFO_5, ''O);</span><br><span> rsl_tx.msg_type := RSL_MT_UNIT_DATA_IND;</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl_tx));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl_tx));</span><br><span> f_exp_err_rep(RSL_ERR_MSG_TYPE);</span><br><span> </span><br><span> /* Dedicated Channel */</span><br><span>@@ -4613,7 +4602,7 @@</span><br><span> mi_lv_enc := f_pad_oct(mi_lv_enc, 9, '00'O);</span><br><span> </span><br><span> /* Send RSL PAGING COMMAND */</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi, i mod 4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_PAGING_CMD(mi, i mod 4)));</span><br><span> T.start;</span><br><span> alt {</span><br><span> [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ(0, mi_lv_enc))) {</span><br><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index 08e1cef..1e17703 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -159,7 +159,7 @@</span><br><span> {</span><br><span> var RSL_IE_CbCommandType cmd_type :=</span><br><span> valueof(ts_RSL_IE_CbCmdType(RSL_CB_CMD_DEFAULT, 1, true));</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_SMSCB_CMD(cmd_type, ''O)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_SMSCB_CMD(cmd_type, ''O)));</span><br><span> }</span><br><span> </span><br><span> template RSL_IE t_RSL_IE_SMSCB_EXT := t_RSL_IE(RSL_IE_SMSCB_CHAN_INDICATOR, {smscb_chan_ind := 1});</span><br><span>@@ -181,7 +181,7 @@</span><br><span> if (extd) {</span><br><span> rsl.ies := rsl.ies & { valueof(t_RSL_IE_SMSCB_EXT) };</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl));</span><br><span> }</span><br><span> if (ispresent(pars_chan.default_msg)) {</span><br><span> msg := pars_chan.default_msg;</span><br><span>@@ -191,7 +191,7 @@</span><br><span> if (extd) {</span><br><span> rsl.ies := rsl.ies & { valueof(t_RSL_IE_SMSCB_EXT) };</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(rsl));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -720,10 +720,10 @@</span><br><span> </span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC)) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC)) -> value rx_ud {</span><br><span> setverdict(fail, "Received unexpected CBCH LOAD IND: ", rx_ud);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD)) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD)) -> value rx_ud {</span><br><span> setverdict(fail, "Received unexpected CBCH LOAD IND: ", rx_ud);</span><br><span> }</span><br><span> [] RSL_CCHAN.receive { repeat; }</span><br><span>@@ -748,18 +748,18 @@</span><br><span> RSL_CCHAN.clear;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC(false, tr_slot_count))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC(false, tr_slot_count))) {</span><br><span> basic_count := basic_count + 1;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD(false, tr_slot_count))) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD(false, tr_slot_count))) -> value rx_ud {</span><br><span> extd_count := extd_count + 1;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC)) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC)) -> value rx_ud {</span><br><span> setverdict(fail, "Received unexpected CBCH LOAD IND: ", rx_ud);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD)) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD)) -> value rx_ud {</span><br><span> setverdict(fail, "Received unexpected CBCH LOAD IND: ", rx_ud);</span><br><span> }</span><br><span> [] RSL_CCHAN.receive { repeat; }</span><br><span>@@ -824,18 +824,18 @@</span><br><span> T_total.start;</span><br><span> T_retransmit.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC(true, tr_slot_count_basic))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC(true, tr_slot_count_basic))) {</span><br><span> basic_count := basic_count + 1;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD(false, tr_slot_count_extd))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD(false, tr_slot_count_extd))) {</span><br><span> extd_count := extd_count + 1;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC)) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_BASIC)) -> value rx_ud {</span><br><span> setverdict(fail, "Received unexpected CBCH LOAD IND: ", rx_ud);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD)) -> value rx_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_CBCH_LOAD_IND_EXTD)) -> value rx_ud {</span><br><span> setverdict(fail, "Received unexpected CBCH LOAD IND: ", rx_ud);</span><br><span> }</span><br><span> [] RSL_CCHAN.receive { repeat; }</span><br><span>@@ -906,7 +906,7 @@</span><br><span> f_init_l1ctl();</span><br><span> f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_OSMO_ETWS_CMD(c_etws)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_OSMO_ETWS_CMD(c_etws)));</span><br><span> /* wait for a bit until old non-ETWS Paging messages are gone */</span><br><span> f_sleep(1.0);</span><br><span> L1CTL.clear;</span><br><span>@@ -999,11 +999,11 @@</span><br><span> f_init_l1ctl();</span><br><span> f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_OSMO_ETWS_CMD(c_etws)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_OSMO_ETWS_CMD(c_etws)));</span><br><span> /* wait for a bit until old non-ETWS Paging messages are gone */</span><br><span> f_sleep(3.0);</span><br><span> /* disable the ETWS PN again */</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_OSMO_ETWS_CMD(''O)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_OSMO_ETWS_CMD(''O)));</span><br><span> f_sleep(2.0);</span><br><span> T.start;</span><br><span> L1CTL.clear;</span><br><span>@@ -1033,7 +1033,7 @@</span><br><span> f_init_l1ctl();</span><br><span> f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_OSMO_ETWS_CMD(c_etws)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_OSMO_ETWS_CMD(c_etws)));</span><br><span> </span><br><span> T.start;</span><br><span> alt {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18459">change 18459</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/+/18459"/><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: I8d7b3f8b019964ece9a3187f8232d8d23b2a53a5 </div>
<div style="display:none"> Gerrit-Change-Number: 18459 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>