summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bsc/BSC_Tests.ttcn9
-rw-r--r--bsc/osmo-bsc.cfg6
2 files changed, 8 insertions, 7 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index e4601eb..77be6b6 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -52,7 +52,8 @@ const integer NUM_BTS := 3;
const float T3101_MAX := 12.0;
/* make sure to sync this with the osmo-bts.cfg you're using */
-const integer NUM_TCHF_PER_BTS := 5;
+const integer NUM_TCHH_PER_BTS := 2;
+const integer NUM_TCHF_PER_BTS := 4;
const integer NUM_SDCCH_PER_BTS := 4;
@@ -480,14 +481,14 @@ testcase TC_chan_exhaustion() runs on test_CT {
chreq_nochan := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel");
/* expect 5xTCH/F to succeed */
- for (i := 0; i < NUM_TCHF_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) {
+ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) {
var RslChannelNr chan_nr := f_chreq_act_ack('23'O, i);
}
IPA_RSL[0].clear;
f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total",
- chreq_total+NUM_TCHF_PER_BTS+NUM_SDCCH_PER_BTS);
+ chreq_total + NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS);
/* now expect additional channel activations to fail */
f_ipa_tx(0, ts_RSL_CHAN_RQD('42'O, 42));
@@ -503,7 +504,7 @@ testcase TC_chan_exhaustion() runs on test_CT {
rr := dec_GsmRrMessage(rsl_ud.rsl.ies[1].body.full_imm_ass_info.payload);
if (rr.header.message_type == IMMEDIATE_ASSIGNMENT_REJECT) {
f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total",
- chreq_total+NUM_TCHF_PER_BTS+NUM_SDCCH_PER_BTS+1);
+ chreq_total + NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS+1);
f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel",
chreq_nochan+1);
setverdict(pass);
diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg
index 2fa67e9..60cfcd7 100644
--- a/bsc/osmo-bsc.cfg
+++ b/bsc/osmo-bsc.cfg
@@ -149,7 +149,7 @@ network
phys_chan_config TCH/F
hopping enabled 0
timeslot 5
- phys_chan_config TCH/F
+ phys_chan_config TCH/H
hopping enabled 0
timeslot 6
phys_chan_config PDCH
@@ -239,7 +239,7 @@ network
phys_chan_config TCH/F
hopping enabled 0
timeslot 5
- phys_chan_config TCH/F
+ phys_chan_config TCH/H
hopping enabled 0
timeslot 6
phys_chan_config PDCH
@@ -329,7 +329,7 @@ network
phys_chan_config TCH/F
hopping enabled 0
timeslot 5
- phys_chan_config TCH/F
+ phys_chan_config TCH/H
hopping enabled 0
timeslot 6
phys_chan_config PDCH