Change in osmo-ttcn3-hacks[master]: Revert "BSC_Tests: use consistant AMR S0-S15 bits"

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Sep 28 23:02:48 UTC 2018


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11129 )

Change subject: Revert "BSC_Tests: use consistant AMR S0-S15 bits"
......................................................................

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
---
M bsc/BSC_Tests.ttcn
1 file changed, 4 insertions(+), 16 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 4a34310..25df52d 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1923,10 +1923,6 @@
 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 @@
 		}
 	};
 
-	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_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 @@
 		}
 	};
 
-	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;
 }

-- 
To view, visit https://gerrit.osmocom.org/11129
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib16d14c723773ce67508c7e6028e594c15779506
Gerrit-Change-Number: 11129
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180928/cf2d4675/attachment.htm>


More information about the gerrit-log mailing list