fix TCH/H for TC_chan_exhaustion
At the moment we use onle TCH/F and PDCH in our osmo-bsc config, but the tests TC_assignment_codec_amr_h and TC_assignment_codec_h requre a half rate channel in order to work. Configuring one TCH/F to TCH/H seems not to hurt any tests except TC_chan_exhaustion - also regard half rate channels in TC_chan_exhaustion - change included sample osmo-bsc.cfg Change-Id: Idd5a9602f1b49b5aa0fc510faa151fe16c0b404d Related: OS#3100
This commit is contained in:
parent
206587e073
commit
cb6cc481d1
|
@ -52,7 +52,8 @@ const integer NUM_BTS := 3;
|
||||||
const float T3101_MAX := 12.0;
|
const float T3101_MAX := 12.0;
|
||||||
|
|
||||||
/* make sure to sync this with the osmo-bts.cfg you're using */
|
/* 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;
|
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");
|
chreq_nochan := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel");
|
||||||
|
|
||||||
/* expect 5xTCH/F to succeed */
|
/* 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);
|
var RslChannelNr chan_nr := f_chreq_act_ack('23'O, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
IPA_RSL[0].clear;
|
IPA_RSL[0].clear;
|
||||||
|
|
||||||
f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total",
|
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 */
|
/* now expect additional channel activations to fail */
|
||||||
f_ipa_tx(0, ts_RSL_CHAN_RQD('42'O, 42));
|
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);
|
rr := dec_GsmRrMessage(rsl_ud.rsl.ies[1].body.full_imm_ass_info.payload);
|
||||||
if (rr.header.message_type == IMMEDIATE_ASSIGNMENT_REJECT) {
|
if (rr.header.message_type == IMMEDIATE_ASSIGNMENT_REJECT) {
|
||||||
f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total",
|
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",
|
f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel",
|
||||||
chreq_nochan+1);
|
chreq_nochan+1);
|
||||||
setverdict(pass);
|
setverdict(pass);
|
||||||
|
|
|
@ -149,7 +149,7 @@ network
|
||||||
phys_chan_config TCH/F
|
phys_chan_config TCH/F
|
||||||
hopping enabled 0
|
hopping enabled 0
|
||||||
timeslot 5
|
timeslot 5
|
||||||
phys_chan_config TCH/F
|
phys_chan_config TCH/H
|
||||||
hopping enabled 0
|
hopping enabled 0
|
||||||
timeslot 6
|
timeslot 6
|
||||||
phys_chan_config PDCH
|
phys_chan_config PDCH
|
||||||
|
@ -239,7 +239,7 @@ network
|
||||||
phys_chan_config TCH/F
|
phys_chan_config TCH/F
|
||||||
hopping enabled 0
|
hopping enabled 0
|
||||||
timeslot 5
|
timeslot 5
|
||||||
phys_chan_config TCH/F
|
phys_chan_config TCH/H
|
||||||
hopping enabled 0
|
hopping enabled 0
|
||||||
timeslot 6
|
timeslot 6
|
||||||
phys_chan_config PDCH
|
phys_chan_config PDCH
|
||||||
|
@ -329,7 +329,7 @@ network
|
||||||
phys_chan_config TCH/F
|
phys_chan_config TCH/F
|
||||||
hopping enabled 0
|
hopping enabled 0
|
||||||
timeslot 5
|
timeslot 5
|
||||||
phys_chan_config TCH/F
|
phys_chan_config TCH/H
|
||||||
hopping enabled 0
|
hopping enabled 0
|
||||||
timeslot 6
|
timeslot 6
|
||||||
phys_chan_config PDCH
|
phys_chan_config PDCH
|
||||||
|
|
Loading…
Reference in New Issue