summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2018-09-27 17:45:33 +0200
committerHarald Welte <laforge@gnumonks.org>2018-09-28 23:02:47 +0000
commit0be8716e01a30ea2e9a66aa67ab1e2e44607f041 (patch)
treee544bff8efe9dc4c38e04a86c1a5e9e256b43148
parent8e1f3c5d2fc419e29c6fea8613c4d9b8ba20141c (diff)
Revert "BSC_Tests: use consistant AMR S0-S15 bits"
The change depends on another change in osmo-bsc, which is not in master yet. Because of this TC_assignment_codec_amr_f and TC_assignment_codec_amr_h are currently failing. So lets revert this patch and re-submit it later. See also: osmo-bsc change I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 This reverts commit 7f5609ad3e65098cca3d79565a1aa80460c49bed. Change-Id: Ib16d14c723773ce67508c7e6028e594c15779506
-rw-r--r--bsc/BSC_Tests.ttcn20
1 files changed, 4 insertions, 16 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 4a34310..25df52d 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1923,10 +1923,6 @@ 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,
@@ -1934,14 +1930,11 @@ 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;
}
@@ -1949,8 +1942,6 @@ 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,
@@ -1958,14 +1949,11 @@ 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;
}