<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24820">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP_Test: add control interface to MGW testsuite<br><br>The testsuite for osmo-mgw does not use the control interface yet.<br><br>Change-Id: I7324802bf6e692ce8b7d9b269dd2385a7d3d0d77<br>---<br>M mgw/MGCP_Test.ttcn<br>M mgw/gen_links.sh<br>M mgw/regen_makefile.sh<br>3 files changed, 15 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/24820/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn</span><br><span>index 307f0a8..d36eb4c 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -30,6 +30,9 @@</span><br><span> import from IP_Types all;</span><br><span> import from Osmocom_VTY_Functions all;</span><br><span> import from TELNETasp_PortType all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Osmocom_CTRL_Functions all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Osmocom_CTRL_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Osmocom_CTRL_Adapter all;</span><br><span> </span><br><span> const charstring c_mgw_domain := "mgw";</span><br><span> const charstring c_mgw_ep_rtpbridge := "rtpbridge/";</span><br><span>@@ -37,7 +40,7 @@</span><br><span> /* any variables declared in the component will be available to</span><br><span> * all functions that 'run on' the named component, similar to</span><br><span> * class members in C++ */</span><br><span style="color: hsl(0, 100%, 40%);">- type component dummy_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ type component dummy_CT extends CTRL_Adapter_CT {</span><br><span> port MGCP_CODEC_PT MGCP;</span><br><span> var boolean initialized := false;</span><br><span> var ConnectionId g_mgcp_conn_id := -1;</span><br><span>@@ -71,6 +74,7 @@</span><br><span> charstring mp_remote_ipv6 := "::1";</span><br><span> PortNumber mp_local_rtp_port_base := 10000;</span><br><span> PortNumber mp_local_osmux_port := 1985;</span><br><span style="color: hsl(120, 100%, 40%);">+ PortNumber mp_mgw_ctrl_port := 4267;</span><br><span> }</span><br><span> </span><br><span> private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT {</span><br><span>@@ -143,6 +147,8 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ f_ipa_ctrl_start_client(mp_remote_ipv4, mp_mgw_ctrl_port);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (isvalue(ep)) {</span><br><span> /* do a DLCX on all connections of the EP */</span><br><span> f_dlcx_ignore(valueof(ep));</span><br><span>diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh</span><br><span>index 8893954..a4f11f6 100755</span><br><span>--- a/mgw/gen_links.sh</span><br><span>+++ b/mgw/gen_links.sh</span><br><span>@@ -37,6 +37,8 @@</span><br><span> FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn"</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DIR=../library</span><br><span> FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn</span><br><span> MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc "</span><br><span>@@ -45,6 +47,9 @@</span><br><span> FILES+="Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn "</span><br><span> FILES+="Osmocom_VTY_Functions.ttcn "</span><br><span> FILES+="RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> ignore_pp_results</span><br><span>diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh</span><br><span>index 4662933..cd4a734 100755</span><br><span>--- a/mgw/regen_makefile.sh</span><br><span>+++ b/mgw/regen_makefile.sh</span><br><span>@@ -1,5 +1,7 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FILES="*.ttcn SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc OSMUX_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IP_EncDec.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc OSMUX_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IP_EncDec.cc"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL"</span><br><span> </span><br><span> ../regen-makefile.sh MGCP_Test.ttcn $FILES</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24820">change 24820</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24820"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7324802bf6e692ce8b7d9b269dd2385a7d3d0d77 </div>
<div style="display:none"> Gerrit-Change-Number: 24820 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>