aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2021-07-20 23:21:36 +0200
committerlaforge <laforge@osmocom.org>2021-08-06 14:03:28 +0000
commitc7b1f6dd3f9a9e55307a3adee600a61792407470 (patch)
tree418cebe9e9f99b0d7bce40204c8092a926608eea
parentfeda88e51de3bb4f66f9d5501b0fb361627be3d6 (diff)
bsc: TC_cm_reestablishment(): do second lchan on bts 1
So far the test ran both lchans on bts 0, which is not really a realistic scenario for a CM Re-Establishment Request. Move the second channel to bts 1, using various RSL port args added recently. Change-Id: Ia930f7b8986ba27c5f507478dbff0a2942f207d8
-rw-r--r--bsc/BSC_Tests.ttcn14
1 files changed, 9 insertions, 5 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 0ab8bdeb..0a11a48e 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -9500,7 +9500,7 @@ private function f_tc_cm_reestablishment_2(charstring id) runs on MSC_ConnHdlr {
var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_info);
f_create_bssmap_exp(l3_enc);
- RSL_Emulation.f_chan_est(g_pars.ra, l3_enc, g_pars.link_id, g_pars.fn);
+ RSL_Emulation.f_chan_est(g_pars.ra, l3_enc, g_pars.link_id, g_pars.fn, rsl_pt := RSL1, rsl_proc_pt := RSL1_PROC);
BSSAP.receive(tr_BSSMAP_ComplL3(l3_enc));
/* MSC got the CM Re-Establishment request and first off clears the previous conn. */
@@ -9526,15 +9526,16 @@ private function f_tc_cm_reestablishment_2(charstring id) runs on MSC_ConnHdlr {
};
f_create_mgcp_expect(mgcpcrit);
- f_rslem_dchan_queue_enable();
+ f_rslem_dchan_queue_enable(RSL1_PROC);
BSSAP.send(ass_cmd);
var PDU_BSSAP bssap;
alt {
- [] as_assignment(st);
- [] as_Media();
+ [] as_assignment(st, rsl_pt := RSL1, rsl_proc_pt := RSL1_PROC);
+ [] as_Media_ipacc(RSL1, RSL2);
+ [] as_Media_mgw();
[st.assignment_done] BSSAP.receive(expect_assignment_compl) {
break;
}
@@ -9543,7 +9544,7 @@ private function f_tc_cm_reestablishment_2(charstring id) runs on MSC_ConnHdlr {
f_sleep(3.0);
f_logp(BSCVTY, "f_tc_cm_reestablishment_2 clearing");
- f_perform_clear();
+ f_perform_clear(RSL1, RSL1_PROC);
f_expect_dlcx_conns();
}
@@ -9555,6 +9556,9 @@ testcase TC_cm_reestablishment() runs on test_CT {
var MSC_ConnHdlr vc_conn2;
pars2.imsi := pars1.imsi;
pars2.media_nr := 2;
+ /* f_tc_cm_reestablishment_2 uses 'bts 1'.
+ * BTS 1 has BSIC 11 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 3 */
+ pars2.expect_tsc := 3;
f_init(2, true, guard_timeout := 40.0);
f_sleep(1.0);