<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26302">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Drop mp_osmo_pcu_newer_than_0_9_0<br><br>osmo-pcu 1.0.0 was released, so we can drop references to older osmo-pcu<br>versions.<br><br>Change-Id: Ife37fc92c5b1ebf7e87b66c136ae900f44861510<br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 142 insertions(+), 183 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index d7ab69b..7fcab4a 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -71,8 +71,6 @@</span><br><span> </span><br><span> charstring mp_ctrl_neigh_ip := ""; /* Use new PCUIF over IPA multiplex for Neigh Addr Resolution */</span><br><span> integer mp_ctrl_neigh_port := 4248;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- boolean mp_osmo_pcu_newer_than_0_9_0 := true; /* Drop after OsmoPCU > 0.9.0 was released */</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -465,14 +463,8 @@</span><br><span> /* Make sure we don't receive data for that TBF since it was released</span><br><span> * before. Also check our TBF is not polled for UL. */</span><br><span> f_pcuif_rx_data_req_pdtch(data_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0 and data_msg.dl_block == omit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (data_msg.dl_block == omit) {</span><br><span> /* IDLE block, expected on new PCU versions */</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (not mp_osmo_pcu_newer_than_0_9_0 and match(data_msg.dl_block, tr_RLCMAC_DUMMY_CTRL())) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Dummy RLCMAC block, expected on older PCU versions */</span><br><span style="color: hsl(0, 100%, 40%);">- if (data_msg.dl_block.ctrl.mac_hdr.usf != USF_UNUSED) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Unexpected USF ", data_msg.dl_block.ctrl.mac_hdr.usf);</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> } else {</span><br><span> setverdict(fail, "Unexpected dl_block", data_msg.dl_block);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span>@@ -620,16 +612,10 @@</span><br><span> [] BTS.receive(tr_PCUIF_DATA_PTCCH(0,</span><br><span> tr_PCUIF_DATA(0, 7, sapi := PCU_IF_SAPI_PTCCH),</span><br><span> omit)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (not mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected PTCCH/D block instead of IDLE block");</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> [] as_rx_ptcch(pcu_msg, tr_PTCCHDownlinkMsg) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected IDLE block instead of PTCCH/D block");</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Expected IDLE block instead of PTCCH/D block");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> [] BTS.receive(PCUIF_Message:?) { repeat; }</span><br><span> [] T.timeout {</span><br><span>@@ -1535,7 +1521,7 @@</span><br><span> }</span><br><span> /* We may already receive empty (idle) blocks before our own TTCN3 timer</span><br><span> * triggers due to the TBF being released. Keep going until our T_3169 triggers. */</span><br><span style="color: hsl(0, 100%, 40%);">- [mp_osmo_pcu_newer_than_0_9_0 and n3101 == N3101_MAX + 1] as_pcuif_rx_ignore_empty(nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ [n3101 == N3101_MAX + 1] as_pcuif_rx_ignore_empty(nr);</span><br><span> [] T_3169.timeout {</span><br><span> log("T_3169 expired");</span><br><span> /* Done in alt */</span><br><span>@@ -1999,17 +1985,12 @@</span><br><span> }</span><br><span> /* We may already receive idle blocks before our own TTCN3 timer</span><br><span> * triggers due to the TBF being released. Keep going until our T_3195 triggers. */</span><br><span style="color: hsl(0, 100%, 40%);">- [mp_osmo_pcu_newer_than_0_9_0 and N3105 == N3105_MAX] as_pcuif_rx_ignore_empty(nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ [N3105 == N3105_MAX] as_pcuif_rx_ignore_empty(nr);</span><br><span> [T_3195.running] T_3195.timeout {</span><br><span> log("T_3195 timeout");</span><br><span> /* Done in alt, wait for pending RTS initiated previously in</span><br><span style="color: hsl(0, 100%, 40%);">- * above case before continuing (expect empty blocks on new</span><br><span style="color: hsl(0, 100%, 40%);">- * versions, Dummy block on older versions): */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- dl_block_exp := omit;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- dl_block_exp := tr_RLCMAC_DUMMY_CTRL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ * above case before continuing (expect empty block): */</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_block_exp := omit;</span><br><span> BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr,</span><br><span> tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH),</span><br><span> dl_block_exp));</span><br><span>@@ -2488,21 +2469,19 @@</span><br><span> </span><br><span> f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> }</span><br><span> </span><br><span> testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {</span><br><span>@@ -2510,21 +2489,20 @@</span><br><span> var template (present) CodingScheme exp_dl_cs_mcs := mcs_egprs_any;</span><br><span> </span><br><span> f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> }</span><br><span> </span><br><span> testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {</span><br><span>@@ -2536,21 +2514,19 @@</span><br><span> </span><br><span> f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> }</span><br><span> </span><br><span> /* Test scenario where SGSN wants to send some data against MS and it is</span><br><span>@@ -3246,21 +3222,19 @@</span><br><span> /* ACK the ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -3598,16 +3572,14 @@</span><br><span> f_pcuif_rx_pch_pag_req1(tr_MI_IMSI(imsi), imsi_suff_tx);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.pcu.sgsn.0.rx_paging_ps", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- /* After the PCU receives the paging request from SGSN,</span><br><span style="color: hsl(0, 100%, 40%);">- * and it doesn't have any errors, PCU sends it to the</span><br><span style="color: hsl(0, 100%, 40%);">- * BTS to do paging over PCH. */</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.pch.requests", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.pcu.sgsn.0.rx_paging_ps", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ /* After the PCU receives the paging request from SGSN,</span><br><span style="color: hsl(120, 100%, 40%);">+ * and it doesn't have any errors, PCU sends it to the</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS to do paging over PCH. */</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.pch.requests", mtype := "c", min := 1, max := 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> }</span><br><span> </span><br><span> testcase TC_paging_ps_from_sgsn_sign_ptmsi() runs on RAW_PCU_Test_CT {</span><br><span>@@ -3873,20 +3845,18 @@</span><br><span> f_TC_egprs_pkt_chan_req(req, imm_ass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -3924,20 +3894,18 @@</span><br><span> f_TC_egprs_pkt_chan_req(req, imm_ass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -3973,20 +3941,18 @@</span><br><span> f_TC_egprs_pkt_chan_req(req, imm_ass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -4054,19 +4020,17 @@</span><br><span> f_TC_egprs_pkt_chan_req_reject('111111'B & ext_ra, 1337 + i, rest);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -4099,19 +4063,17 @@</span><br><span> f_TC_egprs_pkt_chan_req_reject(ra11, 1337 + i, rest);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := num_req, max := num_req },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -4155,22 +4117,20 @@</span><br><span> /* At this point, the IUT should run out of free USFs */</span><br><span> f_TC_egprs_pkt_chan_req_reject(ra11, 1870, rest, wi := info_ind.t3142);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- var StatsDExpects expect := {</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 8, max := 8 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 8, max := 8 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 8, max := 8 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 7, max := 7 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 7, max := 7 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- f_statsd_expect(expect);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ var StatsDExpects expect := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 8, max := 8 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 8, max := 8 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.one_phase", mtype := "c", min := 8, max := 8 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.rach.requests.unexpected", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 7, max := 7 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.one_phase", mtype := "c", min := 7, max := 7 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.two_phase", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_ul.contention_resolution_success", mtype := "c", min := 0, max := 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_rej", mtype := "c", min := 1, max := 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ f_statsd_expect(expect);</span><br><span> </span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span>@@ -6762,9 +6722,8 @@</span><br><span> execute( TC_paging_ps_from_sgsn_sign_ptmsi() );</span><br><span> execute( TC_paging_ps_from_sgsn_sign() );</span><br><span> execute( TC_paging_ps_from_sgsn_ptp() );</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_pcu_newer_than_0_9_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_paging_pch_timeout() );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_paging_pch_timeout() );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> execute( TC_paging_cs_multi_ms_imsi_tmsi() );</span><br><span> execute( TC_paging_cs_multi_ms_imsi() );</span><br><span> execute( TC_paging_cs_multi_ms_tmsi() );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26302">change 26302</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/+/26302"/><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: Ife37fc92c5b1ebf7e87b66c136ae900f44861510 </div>
<div style="display:none"> Gerrit-Change-Number: 26302 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>