Harald Welte has submitted this change and it was merged.
Change subject: bsc: Update TC_exhaustion to recent osmo-bsc
......................................................................
bsc: Update TC_exhaustion to recent osmo-bsc
When Change-Id I10fc9f60c58c6b7ed424a86ce23bf6b9802c9eb1 was merged,
OsmoBSC started to always allocate SDCCH first, no matter what the
establishment cause. This basically means we don't do very early
assignment anymore. TC_exhaustion must be adapted to allocate all
SDCCH and all TCH before failing.
Change-Id: I9d8bbfca0deebc738385f2a1a20d4a17c3853082
---
M bsc/BSC_Tests.ttcn
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index dacb630..84d0c38 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -46,6 +46,7 @@
/* make sure to sync this with the osmo-bts.cfg you're using */
const integer NUM_TCHF_PER_BTS := 5;
+const integer NUM_SDCCH_PER_BTS := 4;
/* per-BTS state which we keep */
@@ -386,13 +387,14 @@
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; i := i+1) {
+ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) {
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);
+ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total",
+
chreq_total+NUM_TCHF_PER_BTS+NUM_SDCCH_PER_BTS);
/* now expect additional channel activations to fail */
f_ipa_tx(0, ts_RSL_CHAN_RQD('42'O, 42));
@@ -408,7 +410,7 @@
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+1);
+
chreq_total+NUM_TCHF_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);
--
To view, visit https://gerrit.osmocom.org/6171
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d8bbfca0deebc738385f2a1a20d4a17c3853082
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
