Change in osmo-ttcn3-hacks[master]: LCLS: Introduce a copy+pasted f_connect_handler() function

[Harald Welte]

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

Change subject: LCLS: Introduce a copy+pasted f_connect_handler() function
......................................................................

LCLS: Introduce a copy+pasted f_connect_handler() function

... using the original one is hitting a ttcn3_compiler bug in
TITAN 6.3.1, see https://www.eclipse.org/forums/index.php/m/1789918/

Change-Id: I7c2dfd3c6e63b54c019fba0c07a1bb777d68f6b5
---
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_LCLS.ttcn
2 files changed, 16 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 3830e7d..f99d46b 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1432,7 +1432,7 @@
 type function void_fn(charstring id) runs on MSC_ConnHdlr;
 
 /* helper function to create and connect a MSC_ConnHdlr component */
-function f_connect_handler(inout MSC_ConnHdlr vc_conn) runs on test_CT {
+private function f_connect_handler(inout MSC_ConnHdlr vc_conn) runs on test_CT {
 	connect(vc_conn:BSSMAPEM, g_bssap.vc_BSSMAP:PROC);
 	connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC);
 	connect(vc_conn:RSL, bts[0].rsl.vc_RSL:CLIENT_PT);
diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn
index 42feb57..fd37b4b 100644
--- a/bsc/BSC_Tests_LCLS.ttcn
+++ b/bsc/BSC_Tests_LCLS.ttcn
@@ -151,6 +151,21 @@
 	fn.apply(id);
 }
 
+/* helper function to create and connect a MSC_ConnHdlr component */
+/* FIXME: Why can't we use BSC_Tests.f_connect_andler() ?!? */
+private function f_connect_handler(inout LCLS_MSC_ConnHdlr vc_conn) runs on lcls_test_CT {
+	connect(vc_conn:BSSMAPEM, g_bssap.vc_BSSMAP:PROC);
+	connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC);
+	connect(vc_conn:RSL, bts[0].rsl.vc_RSL:CLIENT_PT);
+	connect(vc_conn:RSL_PROC, bts[0].rsl.vc_RSL:RSL_PROC);
+	if (isvalue(bts[1])) {
+		connect(vc_conn:RSL1, bts[1].rsl.vc_RSL:CLIENT_PT);
+		connect(vc_conn:RSL1_PROC, bts[1].rsl.vc_RSL:RSL_PROC);
+	}
+	connect(vc_conn:BSSAP, g_bssap.vc_BSSMAP:CLIENT);
+	connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);
+}
+
 /* function creating the two ConnHdlrs, connecting them + starting them */
 private function f_lcls_test_init(TestHdlrParams pars_a, TestHdlrParams pars_b) runs on lcls_test_CT {
 	var charstring id_a := testcasename() & "-A";

-- 
To view, visit https://gerrit.osmocom.org/9413
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: I7c2dfd3c6e63b54c019fba0c07a1bb777d68f6b5
Gerrit-Change-Number: 9413
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180603/6d9ca96d/attachment.htm>