fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41697?usp=email )

Change subject: bts: properly set BTS_Tests.mp_trx_pars for hopping cfg ......................................................................

bts: properly set BTS_Tests.mp_trx_pars for hopping cfg

The pchan assignment is *different* for the hopping and non-hopping configurations, so let's override it in the BTS_Tests_FH.cfg.

Change-Id: Ib8861c3eee5157436fb213da212f22477639883f --- M bts/BTS_Tests_FH.cfg 1 file changed, 55 insertions(+), 0 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved

diff --git a/bts/BTS_Tests_FH.cfg b/bts/BTS_Tests_FH.cfg index 9adb812..5f5508e 100644 --- a/bts/BTS_Tests_FH.cfg +++ b/bts/BTS_Tests_FH.cfg @@ -4,6 +4,7 @@ [LOGGING] /* The following hopping configuration corresponds to osmo-bsc-fh.confmerge. * See https://gerrit.osmocom.org/c/docker-playground/+/19160/ for more details. + * NOTE: the pchan assignment here is *different* from BTS_Tests.default. * * == Physical channel configuration (FDMA) == * @@ -131,3 +132,57 @@ } } } +BTS_Tests.mp_trx_pars := { + { # TRX0 + arfcn := 871, + ts := { + { config := GSM_PCHAN_CCCH_SDCCH4 }, + { config := GSM_PCHAN_TCHF }, + { config := GSM_PCHAN_TCHF }, + { config := GSM_PCHAN_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH }, + { config := GSM_PCHAN_SDCCH8 }, + { config := GSM_PCHAN_PDCH } + } + }, + { # TRX1 + arfcn := 873, + ts := { + { config := GSM_PCHAN_TCHF }, + { config := GSM_PCHAN_SDCCH8 }, + { config := GSM_PCHAN_TCHH }, + { config := GSM_PCHAN_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH }, + { config := GSM_PCHAN_PDCH }, + { config := GSM_PCHAN_PDCH } + } + }, + { # TRX2 + arfcn := 875, + ts := { + { config := GSM_PCHAN_TCHF }, + { config := GSM_PCHAN_SDCCH8 }, + { config := GSM_PCHAN_TCHF }, + { config := GSM_PCHAN_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH }, + { config := GSM_PCHAN_PDCH }, + { config := GSM_PCHAN_PDCH } + } + }, + { # TRX3 + arfcn := 877, + ts := { + { config := GSM_PCHAN_TCHF }, + { config := GSM_PCHAN_SDCCH8 }, + { config := GSM_PCHAN_TCHH }, + { config := GSM_PCHAN_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH_TCHF_PDCH }, + { config := GSM_PCHAN_TCHH }, + { config := GSM_PCHAN_SDCCH8 }, + { config := GSM_PCHAN_PDCH } + } + } +}