library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union
Change-Id: I40c2a3c38799a625836e4c28f476524c92077b83
This commit is contained in:
parent
04dd5f7aa0
commit
5e51873d9c
|
@ -230,6 +230,8 @@ module RLCMAC_CSN1_Types {
|
||||||
type union PageInfo {
|
type union PageInfo {
|
||||||
PageInfoPs ps,
|
PageInfoPs ps,
|
||||||
PageInfoCs cs
|
PageInfoCs cs
|
||||||
|
} with {
|
||||||
|
variant "TAG(ps, presence = '0'B; cs, presence = '1'B)"
|
||||||
};
|
};
|
||||||
type record PacketPagingReq {
|
type record PacketPagingReq {
|
||||||
PageMode page_mode,
|
PageMode page_mode,
|
||||||
|
|
|
@ -1299,10 +1299,8 @@ testcase TC_paging_cs_from_bts() runs on RAW_PCU_Test_CT {
|
||||||
|
|
||||||
/* Receive it on BTS side towards MS */
|
/* Receive it on BTS side towards MS */
|
||||||
f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block);
|
f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block);
|
||||||
/* FIXME: we must use .ps. here instead of .cs. (the one actually sent)
|
|
||||||
because TTCN3 counts length up to octet boundary and thinks it's a
|
mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity;
|
||||||
PageInfoPs: */
|
|
||||||
mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity;
|
|
||||||
if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) {
|
if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) {
|
||||||
/* TODO: Verify MI contents encoded match */
|
/* TODO: Verify MI contents encoded match */
|
||||||
setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")");
|
setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")");
|
||||||
|
@ -1351,10 +1349,8 @@ private function f_tc_paging_cs_from_sgsn(Nsvci bvci) runs on RAW_PCU_Test_CT {
|
||||||
/* Receive it on BTS side towards MS */
|
/* Receive it on BTS side towards MS */
|
||||||
f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block);
|
f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block);
|
||||||
|
|
||||||
/* FIXME: we must use .ps. here instead of .cs. (the one actually sent)
|
/* FIXME: actually match the identity */
|
||||||
because TTCN3 counts length up to octet boundary and thinks it's a
|
mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity;
|
||||||
PageInfoPs: */
|
|
||||||
mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity;
|
|
||||||
setverdict(pass);
|
setverdict(pass);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue