Change in osmo-ttcn3-hacks[master]: BSC_Tests.ttcn: Split f_connect_handler() off f_start_handler()

[Harald Welte]

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

Change subject: BSC_Tests.ttcn: Split f_connect_handler() off f_start_handler()
......................................................................

BSC_Tests.ttcn: Split f_connect_handler() off f_start_handler()

In case we want to derive other component types by extending
MSC_ConnectionHandler, we will want to connect additional ports
before starting the component.

Hence, split the connect part into f_create_handler(), while keeping
the create + start part in f_start_handler().

Change-Id: If272816b7e720e8b8f000f7ab8baa20619b35fb7
---
M bsc/BSC_Tests.ttcn
1 file changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 9b92207..40e777e 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1431,13 +1431,8 @@
 
 type function void_fn(charstring id) runs on MSC_ConnHdlr;
 
-/* helper function to create, connect and start a MSC_ConnHdlr component */
-function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars := omit)
-runs on test_CT return MSC_ConnHdlr {
-	var charstring id := testcasename();
-	var MSC_ConnHdlr vc_conn;
-
-	vc_conn := MSC_ConnHdlr.create(id);
+/* helper function to create and connect a MSC_ConnHdlr component */
+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);
@@ -1448,6 +1443,14 @@
 	}
 	connect(vc_conn:BSSAP, g_bssap.vc_BSSMAP:CLIENT);
 	connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);
+}
+
+function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars := omit)
+runs on test_CT return MSC_ConnHdlr {
+	var charstring id := testcasename();
+	var MSC_ConnHdlr vc_conn;
+	vc_conn := MSC_ConnHdlr.create(id);
+	f_connect_handler(vc_conn);
 	vc_conn.start(f_handler_init(fn, id, pars));
 	return vc_conn;
 }

-- 
To view, visit https://gerrit.osmocom.org/9409
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: If272816b7e720e8b8f000f7ab8baa20619b35fb7
Gerrit-Change-Number: 9409
Gerrit-PatchSet: 1
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/20180601/d5340a76/attachment.htm>