[MERGED] osmo-ttcn3-hacks[master]: msc: Start to integrate MGCP_Emulation component

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: msc: Start to integrate MGCP_Emulation component
......................................................................


msc: Start to integrate MGCP_Emulation component

Change-Id: I5330a06b7868b3f3a362cb5b640cd0cb985f2143
---
M msc_tests/BSC_ConnectionHandler.ttcn
M msc_tests/MSC_Tests.ttcn
M msc_tests/gen_links.sh
3 files changed, 33 insertions(+), 2 deletions(-)

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



diff --git a/msc_tests/BSC_ConnectionHandler.ttcn b/msc_tests/BSC_ConnectionHandler.ttcn
index 656fb4e..58b64d3 100644
--- a/msc_tests/BSC_ConnectionHandler.ttcn
+++ b/msc_tests/BSC_ConnectionHandler.ttcn
@@ -14,13 +14,16 @@
 import from MNCC_Types all;
 import from MNCC_Emulation all;
 
+import from MGCP_Types all;
+import from MGCP_Emulation all;
+
 import from MobileL3_Types all;
 import from MobileL3_CommonIE_Types all;
 import from MobileL3_MM_Types all;
 import from L3_Templates all;
 
 /* this component represents a single subscriber connection */
-type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr {
+type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr {
 	var BSC_ConnHdlrPars g_pars;
 }
 
diff --git a/msc_tests/MSC_Tests.ttcn b/msc_tests/MSC_Tests.ttcn
index 5f49d3a..87e3e78 100644
--- a/msc_tests/MSC_Tests.ttcn
+++ b/msc_tests/MSC_Tests.ttcn
@@ -26,6 +26,11 @@
 import from MNCC_Emulation all;
 import from MNCC_Types all;
 
+import from MGCP_Emulation all;
+import from MGCP_Types all;
+import from MGCP_Templates all;
+import from SDP_Types all;
+
 import from GSUP_Emulation all;
 import from GSUP_Types all;
 import from IPA_Emulation all;
@@ -47,6 +52,7 @@
 
 	/* no 'adapter_CT' for MNCC or GSUP */
 	var MNCC_Emulation_CT vc_MNCC;
+	var MGCP_Emulation_CT vc_MGCP;
 	var GSUP_Emulation_CT vc_GSUP;
 	var IPA_Emulation_CT vc_GSUP_IPA;
 
@@ -80,6 +86,24 @@
 	vc_MNCC := MNCC_Emulation_CT.create(id);
 	map(vc_MNCC:MNCC, system:MNCC_CODEC_PT);
 	vc_MNCC.start(MNCC_Emulation.main(ops, id, mp_msc_mncc));
+}
+
+function f_init_mgcp(charstring id) runs on MTC_CT {
+	id := id & "-MGCP";
+	var MGCPOps ops := {
+		create_cb := refers(MGCP_Emulation.ExpectedCreateCallback),
+		unitdata_cb := refers(MGCP_Emulation.DummyUnitdataCallback)
+	}
+	var MGCP_conn_parameters pars := {
+		callagent_ip := "127.0.0.1",
+		callagent_udp_port := -1,
+		mgw_ip := "127.0.0.1",
+		mgw_udp_port := 2427
+	}
+
+	vc_MGCP := MGCP_Emulation_CT.create(id);
+	map(vc_MGCP:MGCP, system:MGCP_CODEC_PT);
+	vc_MGCP.start(MGCP_Emulation.main(ops, pars, id));
 }
 
 function f_init_gsup(charstring id) runs on MTC_CT {
@@ -121,6 +145,7 @@
 	f_bssap_init("MSC_Test", BSC_BssmapOps);
 	f_ipa_ctrl_start(mp_msc_ip, mp_msc_ctrl_port);
 	f_init_mncc("MSC_Test");
+	f_init_mgcp("MSC_Test");
 	f_init_gsup("MSC_Test");
 
 	map(self:MSCVTY, system:MSCVTY);
@@ -347,6 +372,9 @@
 	/* MNCC part */
 	connect(vc_conn:MNCC, vc_MNCC:MNCC_CLIENT);
 	connect(vc_conn:MNCC_PROC, vc_MNCC:MNCC_PROC);
+	/* MGCP part */
+	connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);
+	connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC);
 	/* GSUP part */
 	connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);
 	connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);
diff --git a/msc_tests/gen_links.sh b/msc_tests/gen_links.sh
index 30ebed1..b501c55 100755
--- a/msc_tests/gen_links.sh
+++ b/msc_tests/gen_links.sh
@@ -78,7 +78,7 @@
 FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn "
 FILES+="IPA_Types.ttcn IPA_Emulation.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc RSL_Types.ttcn GSUP_Types.ttcn GSUP_Emulation.ttcn "
 FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn L3_Templates.ttcn "
-FILES+="BSSMAP_Emulation.ttcn BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn BSSAP_Adapter.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn IPA_Emulation.ttcn "
+FILES+="BSSMAP_Emulation.ttcn BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn BSSAP_Adapter.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn IPA_Emulation.ttcn "
 FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc "
 FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc "
 gen_links $DIR $FILES

-- 
To view, visit https://gerrit.osmocom.org/6090
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5330a06b7868b3f3a362cb5b640cd0cb985f2143
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder