From 36bd4fa06aaa9c51725e79c30531c406ccfba08c Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Thu, 15 Apr 2021 13:00:24 +0200
Subject: [PATCH] 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
---
 bsc/BSC_Tests.ttcn        | 16 ++++++++--------
 library/L3_Templates.ttcn |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index e4e2d1a80..6170e481f 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -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) {
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 5bd87eb11..5d688de09 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -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 := {