pcu: Drop mp_osmo_pcu_newer_than_0_9_0
osmo-pcu 1.0.0 was released, so we can drop references to older osmo-pcu versions. Change-Id: Ife37fc92c5b1ebf7e87b66c136ae900f44861510
This commit is contained in:
parent
4c23aeabc4
commit
1538c3b616
|
@ -71,8 +71,6 @@ modulepar {
|
|||
|
||||
charstring mp_ctrl_neigh_ip := ""; /* Use new PCUIF over IPA multiplex for Neigh Addr Resolution */
|
||||
integer mp_ctrl_neigh_port := 4248;
|
||||
|
||||
boolean mp_osmo_pcu_newer_than_0_9_0 := true; /* Drop after OsmoPCU > 0.9.0 was released */
|
||||
}
|
||||
|
||||
|
||||
|
@ -465,14 +463,8 @@ testcase TC_pcuif_suspend_active_tbf() runs on RAW_PCU_Test_CT {
|
|||
/* Make sure we don't receive data for that TBF since it was released
|
||||
* before. Also check our TBF is not polled for UL. */
|
||||
f_pcuif_rx_data_req_pdtch(data_msg);
|
||||
if (mp_osmo_pcu_newer_than_0_9_0 and data_msg.dl_block == omit) {
|
||||
if (data_msg.dl_block == omit) {
|
||||
/* IDLE block, expected on new PCU versions */
|
||||
} else if (not mp_osmo_pcu_newer_than_0_9_0 and match(data_msg.dl_block, tr_RLCMAC_DUMMY_CTRL())) {
|
||||
/* Dummy RLCMAC block, expected on older PCU versions */
|
||||
if (data_msg.dl_block.ctrl.mac_hdr.usf != USF_UNUSED) {
|
||||
setverdict(fail, "Unexpected USF ", data_msg.dl_block.ctrl.mac_hdr.usf);
|
||||
f_shutdown(__BFILE__, __LINE__);
|
||||
}
|
||||
} else {
|
||||
setverdict(fail, "Unexpected dl_block", data_msg.dl_block);
|
||||
f_shutdown(__BFILE__, __LINE__);
|
||||
|
@ -620,17 +612,11 @@ testcase TC_ta_ptcch_idle() runs on RAW_PCU_Test_CT {
|
|||
[] BTS.receive(tr_PCUIF_DATA_PTCCH(0,
|
||||
tr_PCUIF_DATA(0, 7, sapi := PCU_IF_SAPI_PTCCH),
|
||||
omit)) {
|
||||
if (not mp_osmo_pcu_newer_than_0_9_0) {
|
||||
setverdict(fail, "Expected PTCCH/D block instead of IDLE block");
|
||||
f_shutdown(__BFILE__, __LINE__);
|
||||
}
|
||||
}
|
||||
[] as_rx_ptcch(pcu_msg, tr_PTCCHDownlinkMsg) {
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
setverdict(fail, "Expected IDLE block instead of PTCCH/D block");
|
||||
f_shutdown(__BFILE__, __LINE__);
|
||||
}
|
||||
}
|
||||
[] BTS.receive(PCUIF_Message:?) { repeat; }
|
||||
[] T.timeout {
|
||||
setverdict(fail, "Timeout waiting for a PTCCH/D block");
|
||||
|
@ -1535,7 +1521,7 @@ testcase TC_n3101_max_t3169() runs on RAW_PCU_Test_CT {
|
|||
}
|
||||
/* We may already receive empty (idle) blocks before our own TTCN3 timer
|
||||
* triggers due to the TBF being released. Keep going until our T_3169 triggers. */
|
||||
[mp_osmo_pcu_newer_than_0_9_0 and n3101 == N3101_MAX + 1] as_pcuif_rx_ignore_empty(nr);
|
||||
[n3101 == N3101_MAX + 1] as_pcuif_rx_ignore_empty(nr);
|
||||
[] T_3169.timeout {
|
||||
log("T_3169 expired");
|
||||
/* Done in alt */
|
||||
|
@ -1999,17 +1985,12 @@ testcase TC_n3105_max_t3195() runs on RAW_PCU_Test_CT {
|
|||
}
|
||||
/* 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);
|
||||
[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
|
||||
* above case before continuing (expect empty blocks on new
|
||||
* versions, Dummy block on older versions): */
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
* above case before continuing (expect empty block): */
|
||||
dl_block_exp := omit;
|
||||
} else {
|
||||
dl_block_exp := tr_RLCMAC_DUMMY_CTRL;
|
||||
}
|
||||
BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr,
|
||||
tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH),
|
||||
dl_block_exp));
|
||||
|
@ -2488,7 +2469,6 @@ testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT {
|
|||
|
||||
f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
|
||||
|
@ -2502,7 +2482,6 @@ testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
}
|
||||
|
||||
testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {
|
||||
|
@ -2510,7 +2489,7 @@ testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {
|
|||
var template (present) CodingScheme exp_dl_cs_mcs := mcs_egprs_any;
|
||||
|
||||
f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
|
||||
|
@ -2524,7 +2503,6 @@ testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
}
|
||||
|
||||
testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {
|
||||
|
@ -2536,7 +2514,6 @@ testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {
|
|||
|
||||
f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
|
||||
|
@ -2550,7 +2527,6 @@ testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
}
|
||||
|
||||
/* Test scenario where SGSN wants to send some data against MS and it is
|
||||
|
@ -3246,7 +3222,6 @@ testcase TC_ul_tbf_reestablish_with_pkt_resource_req() runs on RAW_PCU_Test_CT {
|
|||
/* ACK the ACK */
|
||||
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1 },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 0, max := 0 },
|
||||
|
@ -3260,7 +3235,6 @@ testcase TC_ul_tbf_reestablish_with_pkt_resource_req() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min := 1, max := 1 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -3598,7 +3572,6 @@ runs on RAW_PCU_Test_CT {
|
|||
f_pcuif_rx_pch_pag_req1(tr_MI_IMSI(imsi), imsi_suff_tx);
|
||||
}
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.pcu.sgsn.0.rx_paging_ps", mtype := "c", min := 1, max := 1 },
|
||||
/* After the PCU receives the paging request from SGSN,
|
||||
|
@ -3607,7 +3580,6 @@ runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.pch.requests", mtype := "c", min := 1, max := 1 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
}
|
||||
|
||||
testcase TC_paging_ps_from_sgsn_sign_ptmsi() runs on RAW_PCU_Test_CT {
|
||||
|
@ -3873,7 +3845,6 @@ testcase TC_egprs_pkt_chan_req_signalling() runs on RAW_PCU_Test_CT {
|
|||
f_TC_egprs_pkt_chan_req(req, imm_ass);
|
||||
}
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
|
||||
|
@ -3886,7 +3857,6 @@ testcase TC_egprs_pkt_chan_req_signalling() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -3924,7 +3894,6 @@ testcase TC_egprs_pkt_chan_req_one_phase() runs on RAW_PCU_Test_CT {
|
|||
f_TC_egprs_pkt_chan_req(req, imm_ass);
|
||||
}
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
|
||||
|
@ -3937,7 +3906,6 @@ testcase TC_egprs_pkt_chan_req_one_phase() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -3973,7 +3941,6 @@ testcase TC_egprs_pkt_chan_req_two_phase() runs on RAW_PCU_Test_CT {
|
|||
f_TC_egprs_pkt_chan_req(req, imm_ass);
|
||||
}
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
|
||||
|
@ -3986,7 +3953,6 @@ testcase TC_egprs_pkt_chan_req_two_phase() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -4054,7 +4020,6 @@ testcase TC_egprs_pkt_chan_req_reject_content() runs on RAW_PCU_Test_CT {
|
|||
f_TC_egprs_pkt_chan_req_reject('111111'B & ext_ra, 1337 + i, rest);
|
||||
}
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
|
||||
|
@ -4066,7 +4031,6 @@ testcase TC_egprs_pkt_chan_req_reject_content() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -4099,7 +4063,6 @@ testcase TC_egprs_pkt_chan_req_reject_emergency() runs on RAW_PCU_Test_CT {
|
|||
f_TC_egprs_pkt_chan_req_reject(ra11, 1337 + i, rest);
|
||||
}
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := num_req, max := num_req },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := num_req, max := num_req },
|
||||
|
@ -4111,7 +4074,6 @@ testcase TC_egprs_pkt_chan_req_reject_emergency() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -4155,7 +4117,6 @@ testcase TC_egprs_pkt_chan_req_reject_exhaustion() runs on RAW_PCU_Test_CT {
|
|||
/* At this point, the IUT should run out of free USFs */
|
||||
f_TC_egprs_pkt_chan_req_reject(ra11, 1870, rest, wi := info_ind.t3142);
|
||||
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
var StatsDExpects expect := {
|
||||
{ name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 8, max := 8 },
|
||||
{ name := "TTCN3.bts.0.rach.requests.11bit", mtype := "c", min := 8, max := 8 },
|
||||
|
@ -4170,7 +4131,6 @@ testcase TC_egprs_pkt_chan_req_reject_exhaustion() runs on RAW_PCU_Test_CT {
|
|||
{ name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 0, max := 0 }
|
||||
};
|
||||
f_statsd_expect(expect);
|
||||
}
|
||||
|
||||
f_shutdown(__BFILE__, __LINE__, final := true);
|
||||
}
|
||||
|
@ -6762,9 +6722,8 @@ control {
|
|||
execute( TC_paging_ps_from_sgsn_sign_ptmsi() );
|
||||
execute( TC_paging_ps_from_sgsn_sign() );
|
||||
execute( TC_paging_ps_from_sgsn_ptp() );
|
||||
if (mp_osmo_pcu_newer_than_0_9_0) {
|
||||
execute( TC_paging_pch_timeout() );
|
||||
}
|
||||
|
||||
execute( TC_paging_cs_multi_ms_imsi_tmsi() );
|
||||
execute( TC_paging_cs_multi_ms_imsi() );
|
||||
execute( TC_paging_cs_multi_ms_tmsi() );
|
||||
|
|
Loading…
Reference in New Issue