summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-05-31 22:19:39 +0200
committerHarald Welte <laforge@gnumonks.org>2018-06-03 10:34:22 +0000
commitff579f90e54ae624bfdb236ac4c1936cfe41a5b3 (patch)
tree6f3ffd5a733c4108122ddae67eb1548cfbcef3dd
parentcc0b0149038eb4159bad511d171eedd3cf4b9a96 (diff)
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
-rw-r--r--bsc/BSC_Tests.ttcn2
-rw-r--r--bsc/BSC_Tests_LCLS.ttcn15
2 files changed, 16 insertions, 1 deletions
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 @@ import from MSC_ConnectionHandler all;
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 @@ runs on LCLS_MSC_ConnHdlr {
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";