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

BTS_Tests: make TRX number configurable for ConnHdlr 

This change allows running test cases against additional transceivers.

Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3
Related: SYS#4918
This commit is contained in:
Vadim Yanitskiy 2020-11-16 18:00:15 +07:00
parent d0eb659fd2
commit f54db11cbc
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bts/BTS_Tests.ttcn
View File

@ -300,6 +300,7 @@ friend type record FreqHopPars {
};
type record ConnHdlrPars {
uint8_t trx_nr,
RslChannelNr chan_nr,
RSL_IE_ChannelMode chan_mode,
float t_guard,
@ -733,7 +734,7 @@ runs on ConnHdlr {
g_Tguard.start(pars.t_guard);
activate(as_Tguard());
f_rslem_register(0, pars.chan_nr);
f_rslem_register(pars.trx_nr, pars.chan_nr);
/* call the user-supplied test case function */
fn.apply(id);
@ -797,7 +798,8 @@ friend function f_rsl_chan_deact() runs on ConnHdlr {
friend template ConnHdlrPars t_Pars(template RslChannelNr chan_nr,
template RSL_IE_ChannelMode chan_mode,
template (omit) TestSpecUnion spec := omit,
float t_guard := 20.0) := {
uint8_t trx_nr := 0, float t_guard := 20.0) := {
trx_nr := trx_nr,
chan_nr := valueof(chan_nr),
chan_mode := valueof(chan_mode),
t_guard := t_guard,
@ -2220,8 +2222,9 @@ private function f_rach_req_wait_chan_rqd(integer ra) runs on ConnHdlr return Gs
/* Tune to a dedicated channel: L1CTL only */
private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) {
if (not pars.fhp.enabled) {
var TrxParsItem trx_pars := mp_trx_pars[pars.trx_nr];
pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, pars.tsc,
mp_trx_pars[0].arfcn));
trx_pars.arfcn));
} else {
pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, pars.tsc,
pars.fhp.maio_hsn.hsn,
@ -2241,7 +2244,8 @@ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies
if (g_pars.fhp.enabled) {
ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn, g_pars.tsc));
} else {
ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc));
var TrxParsItem trx_pars := mp_trx_pars[g_pars.trx_nr];
ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, trx_pars.arfcn, g_pars.tsc));
}
/* enable dedicated mode */

5
bts/BTS_Tests_LAPDm.ttcn
View File

@ -43,7 +43,8 @@ function f_lapdm_exit() runs on lapdm_test_CT {
/* master function switching to a dedicated radio channel */
function f_switch_dcch() runs on ConnHdlr {
var GsmBandArfcn arfcn := valueof(ts_GsmBandArfcn(mp_trx_pars[0].arfcn));
var TrxParsItem trx_pars := mp_trx_pars[g_pars.trx_nr];
var GsmBandArfcn arfcn := valueof(ts_GsmBandArfcn(trx_pars.arfcn));
var BCCH_tune_req tune_req := { arfcn := arfcn, combined_ccch := true };
var DCCH_switch_req sw_req;
@ -55,7 +56,7 @@ function f_switch_dcch() runs on ConnHdlr {
sw_req.ma := g_pars.fhp.ma;
} else {
sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr,
mp_trx_pars[0].arfcn,
trx_pars.arfcn,
g_pars.tsc));
sw_req.ma := omit;
}