diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a1da67be3..440d133fd 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5332,13 +5332,14 @@ runs on RAW_PCU_Test_CT { } } -/* Start NACC from MS side */ +/* Start NACC from MS side, propose a GERAN cell */ private function f_outbound_nacc_success(inout GprsMS ms, PCUIF_info_ind info_ind, boolean exp_rac_ci_query := true, boolean exp_si_query := true, boolean skip_final_ctrl_ack := false, boolean use_old_ctrl_iface := false) runs on RAW_PCU_Test_CT { var template (value) RlcmacUlCtrlMsg cell_chg_notif; + var template RlcmacDlCtrlMsg cell_chg_cont; var RlcmacDlBlock dl_block; var uint32_t sched_fn; var GsmArfcn req_arfcn := 862; @@ -5361,9 +5362,15 @@ runs on RAW_PCU_Test_CT { /* Announce SI back to MS, continue NACC procedure */ f_ms_handle_pkt_neighbor_cell_data(ms, si_default); - /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + /* Obtain a Downlink block and make sure it is a PacketCellChangeContinue, also verify that + * the PacketCellChangeContinue message contains the ARFCN and BSIC which was proposed in + * the PacketCellChangeNotification before. */ f_rx_rlcmac_dl_block(dl_block, sched_fn); - if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + cell_chg_cont := tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE + cell_chg_cont.u.cell_chg_continue.arfcn_bsic_presence := '1'B + cell_chg_cont.u.cell_chg_continue.arfcn := req_arfcn; + cell_chg_cont.u.cell_chg_continue.bsic := req_bsic; + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, cell_chg_cont))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); f_shutdown(__BFILE__, __LINE__); }