Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix CHANnel ACTIVation message in TC_meas_res_sign_tchX

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20645 )


Change subject: BTS_Tests: fix CHANnel ACTIVation message in TC_meas_res_sign_tchX
......................................................................

BTS_Tests: fix CHANnel ACTIVation message in TC_meas_res_sign_tchX

The testcase TC_meas_res_sign_tchX activates a traffic channel in
signalling mode and checks the RSL resulting measurement reports.

The CHANnel ACTIVation message sets "SDCCH" as "Channel rate and Type"
value. This is invalid, the "Channel Rate and Type" sould be set to "Half /
Full rate TCH Channel Lm / Bm" (while the speech or data indicator is
still set to "Signalling")

Change-Id: I51887b0d0379fcc1f4483d08dfdd6869e7a9f963
Related: OS#4799
---
M bts/BTS_Tests.ttcn
M library/RSL_Types.ttcn
2 files changed, 10 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/20645/1

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 221c33e..4617b5d 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2916,7 +2916,8 @@
 	var ConnHdlrPars pars;
 	f_init();
 	for (var integer tn := 1; tn <= 4; tn := tn+1) {
-		pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN));
+		pars := valueof(t_Pars(t_RslChanNr_Bm(tn),
+				ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_NO_RESOURCE, false, RSL_SPDI_SIGN)));
 		vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars,
 					   pcu_comp := false, trxc_comp := true);
 		vc_conn.done;
@@ -2928,7 +2929,8 @@
 	var ConnHdlrPars pars;
 	f_init();
 	for (var integer ss := 0; ss <= 1; ss := ss+1) {
-		pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN));
+		pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss),
+				ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_NO_RESOURCE, false, RSL_SPDI_SIGN)));
 		vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars,
 					   pcu_comp := false, trxc_comp := true);
 		vc_conn.done;
@@ -2965,7 +2967,8 @@
 	f_init();
 	f_vty_config(BTSVTY, "bts 0", "supp-meas-info toa256");
 	for (var integer ss := 0; ss <= 1; ss := ss+1) {
-		pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN));
+		pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss),
+				ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_NO_RESOURCE, false, RSL_SPDI_SIGN)));
 		pars.l1_pars.toa256_enabled := true;
 		vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars);
 		vc_conn.done;
diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index 05effa2..65ed93c 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -408,15 +408,17 @@
 	}
 
 	template (value) RSL_IE_ChannelMode ts_RSL_ChanMode(RSL_ChanRateType t, RSL_SpeechAlgo alg,
-							    boolean dtx_downlink := false) := {
+							    boolean dtx_downlink := false,
+							    RSL_SpeechDataInd spd_ind := RSL_SPDI_SPEECH) := {
 		len := 0,	/* overwritten */
 		reserved := '000000'B,
 		dtx_d := dtx_downlink,
 		dtx_u := false,
-		spd_ind := RSL_SPDI_SPEECH,
+		spd_ind := spd_ind,
 		ch_rate_type := t,
 		coding_alg_rate := alg
 	}
+
 	template RSL_IE_ChannelMode tr_RSL_ChanMode(template RSL_ChanRateType t,
 						    template RSL_SpeechAlgo alg) := {
 		len := ?,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20645
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I51887b0d0379fcc1f4483d08dfdd6869e7a9f963
Gerrit-Change-Number: 20645
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201014/764ea08e/attachment.htm>