ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

Remove CSFB references from RR Chan Release CellSelectionIndicator IE 

The IE contains a cell list for the MS to register after the channel
is released. The IE is used in CSFB, but not only in that case: it's
also used in SRVCC.
Hence let's remove the CSFB references since the scope is more wide.

Related: SYS#5337
Change-Id: Ia1eeda98fc21aa92bb2e41b5e4761c5cf6516a7e
This commit is contained in:
Pau Espin 2021-04-15 13:00:24 +02:00 committed by pespin
parent 60548b1096
commit 36bd4fa06a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bsc/BSC_Tests.ttcn
View File

@ -1748,7 +1748,7 @@ function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr,
boolean expect_rll_rel_req := true,
boolean handle_rll_rel := true,
boolean is_csfb := false,
template CellSelIndValue csfb_expect_cells := omit,
template CellSelIndValue expect_cells := omit,
template RR_Cause expect_rr_cause := ?
) runs on test_CT {
@ -1767,7 +1767,7 @@ function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr,
got_deact_sacch := true;
repeat;
}
[is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CSFB))) -> value ud {
[is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CellSelectInd))) -> value ud {
got_rr_chan_rel := true;
if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) {
@ -1776,16 +1776,16 @@ function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr,
}
l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload);
if (not istemplatekind(csfb_expect_cells, "omit")) {
if (not istemplatekind(expect_cells, "omit")) {
var CellSelIndValue cells := dec_CellSelIndValue(
l3.msgs.rrm.channelRelease.cellSelectionIndicator.cellSelectionIndicatorValue);
log("GOT RR CHANNEL RELEASE CSFB CELLS: ", cells);
if (match(cells, csfb_expect_cells)) {
log("GOT RR CHANNEL RELEASE WITH CELLS: ", cells);
if (match(cells, expect_cells)) {
setverdict(pass);
} else {
log("EXPECTED CSFB CELLS: ", csfb_expect_cells);
setverdict(fail, "Received CSFB cells list on RR Channel Release does not match expectations");
log("EXPECTED CELLS: ", expect_cells);
setverdict(fail, "Received cells list on RR Channel Release does not match expectations");
}
}
@ -2323,7 +2323,7 @@ function f_test_si2quater(integer total_earfcns, template SystemInformationConfi
}
f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, is_csfb := true,
csfb_expect_cells := expect_cells);
expect_cells := expect_cells);
}
for (var integer i := 1; i < total_earfcns; i := i + 1) {

2
library/L3_Templates.ttcn
View File

@ -910,7 +910,7 @@ template PDU_ML3_NW_MS tr_RRM_RR_RELEASE(template OCT1 cause := ?) := {
}
}
template PDU_ML3_NW_MS tr_RRM_RR_RELEASE_CSFB(template OCT1 cause := ?) modifies tr_RRM_RR_RELEASE := {
template PDU_ML3_NW_MS tr_RRM_RR_RELEASE_CellSelectInd(template OCT1 cause := ?) modifies tr_RRM_RR_RELEASE := {
msgs := {
rrm := {
channelRelease := {