summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2018-09-27 17:52:14 +0200
committerPhilipp Maier <pmaier@sysmocom.de>2018-10-05 12:47:18 +0200
commit7695a0d879877bf004ed1cb7f48ee95b3da72fd9 (patch)
tree26a5cdd6b94fb143d4269443938361414c933930
parent99a7aca62da081e309cf816f4767a998abce3139 (diff)
BSC_Tests: use consistant AMR S0-S15 bits
At the moment we use the default S0-S15 bits for the AMR config, regardless what RSL_IE_Body mr_conf or osmo-bsc.cfg sets. - Make sure consistant S0-S15 bits are used for AMR related tests. This is a re-submit of change I794e6d4fe8abc67337428cbe0bcc8802fae37a6e, which had to be reverted because the depending patch in osmo-bsc is not yet merged into master. This caused TC_assignment_codec_amr_f and TC_assignment_codec_amr_h to fail. Change-Id: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Depends: osmo-bsc: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529
-rw-r--r--bsc/BSC_Tests.ttcn20
1 files changed, 16 insertions, 4 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 25df52d..4a34310 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1923,6 +1923,10 @@ testcase TC_assignment_codec_efr() runs on test_CT {
testcase TC_assignment_codec_amr_f() runs on test_CT {
var TestHdlrParams pars := valueof(t_def_TestHdlrPars);
var MSC_ConnHdlr vc_conn;
+
+ /* Note: This setups the codec configuration. The parameter payload in
+ * mr_conf must be consistant with the parameter codecElements in pars
+ * and also must match the amr-config in osmo-bsc.cfg! */
var RSL_IE_Body mr_conf := {
other := {
len := 2,
@@ -1930,11 +1934,14 @@ testcase TC_assignment_codec_amr_f() runs on test_CT {
}
};
+ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F}));
+ pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B;
+ pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B;
+ pars.expect_mr_conf_ie := mr_conf;
+
f_init(1, true);
f_sleep(1.0);
- pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F}));
- pars.expect_mr_conf_ie := mr_conf;
vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);
vc_conn.done;
}
@@ -1942,6 +1949,8 @@ testcase TC_assignment_codec_amr_f() runs on test_CT {
testcase TC_assignment_codec_amr_h() runs on test_CT {
var TestHdlrParams pars := valueof(t_def_TestHdlrPars);
var MSC_ConnHdlr vc_conn;
+
+ /* See note above */
var RSL_IE_Body mr_conf := {
other := {
len := 2,
@@ -1949,11 +1958,14 @@ testcase TC_assignment_codec_amr_h() runs on test_CT {
}
};
+ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H}));
+ pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B;
+ pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B;
+ pars.expect_mr_conf_ie := mr_conf;
+
f_init(1, true);
f_sleep(1.0);
- pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H}));
- pars.expect_mr_conf_ie := mr_conf;
vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);
vc_conn.done;
}