From ac693462dd58e2b505252b6ab15d37664323e340 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Wed, 14 Oct 2020 20:21:44 +0200 Subject: 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 --- bts/BTS_Tests.ttcn | 6 +++--- library/RSL_Types.ttcn | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 4128406f..1a6cca32 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3010,7 +3010,7 @@ testcase TC_meas_res_sign_tchf() runs on test_CT { 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_SIGN(false, RSL_CHRT_TCH_F))); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, pcu_comp := false, trxc_comp := true); vc_conn.done; @@ -3022,7 +3022,7 @@ testcase TC_meas_res_sign_tchh() runs on test_CT { 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_SIGN(false, RSL_CHRT_TCH_H))); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, pcu_comp := false, trxc_comp := true); vc_conn.done; @@ -3059,7 +3059,7 @@ testcase TC_meas_res_sign_tchh_toa256() runs on test_CT { 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_SIGN(false, RSL_CHRT_TCH_H))); 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 05effa2c..ff60a37e 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -397,13 +397,14 @@ module RSL_Types { RSL_SpeechAlgo coding_alg_rate } with { variant (len) "LENGTHTO(reserved,dtx_d,dtx_u,spd_ind,ch_rate_type,coding_alg_rate)" } - template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN(boolean dtx_downlink := false) := { + template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN(boolean dtx_downlink := false, + RSL_ChanRateType t := RSL_CHRT_SDCCH) := { len := 0, /* overwritten */ reserved := '000000'B, dtx_d := dtx_downlink, dtx_u := false, spd_ind := RSL_SPDI_SIGN, - ch_rate_type := RSL_CHRT_SDCCH, + ch_rate_type := t, coding_alg_rate := RSL_CMOD_NO_RESOURCE } -- cgit v1.2.3