<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12981">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Max: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP_Test: Add VTY access<br><br>The MGCP_Test testsuite currenty lacks VTY access capabilities, lets<br>add them so that future testcases can access the VTY in order to change<br>options on the fly.<br><br>Depends: osmo-ttcn3-hacks Ife949c61156222de3026280071226ef6f5dbd959<br>Change-Id: If383f81af3306f8f5bdf50152498ae1303d390df<br>Related: OS#3807<br>---<br>M mgw/MGCP_Test.default<br>M mgw/MGCP_Test.ttcn<br>M mgw/gen_links.sh<br>M mgw/regen_makefile.sh<br>4 files changed, 37 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default</span><br><span>index 16027cc..4336033 100644</span><br><span>--- a/mgw/MGCP_Test.default</span><br><span>+++ b/mgw/MGCP_Test.default</span><br><span>@@ -2,12 +2,22 @@</span><br><span> FileMask := LOG_ALL | TTCN_MATCHING;</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_MODE := "client"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_HOSTNAME := "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_PORTNUM := "4243"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_LOGIN_SKIPPED := "yes"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_READMODE := "buffered"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MGWVTY.PROMPT1 := "OsmoMGW> "</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span> mp_local_udp_port := 2727;</span><br><span> mp_local_ip:= "127.0.0.1";</span><br><span> mp_remote_udp_port := 2427;</span><br><span> mp_remote_ip:= "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMGW";</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span> </span><br><span>diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn</span><br><span>index 9adeb2a..9eff8c2 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -9,6 +9,12 @@</span><br><span> import from RTP_CodecPort_CtrlFunct all;</span><br><span> import from RTP_Emulation all;</span><br><span> import from IPL4asp_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from General_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Native_Functions all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from IPCP_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from IP_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Osmocom_VTY_Functions all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from TELNETasp_PortType 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>@@ -24,6 +30,8 @@</span><br><span> </span><br><span> var RTP_Emulation_CT vc_RTPEM[3];</span><br><span> port RTPEM_CTRL_PT RTPEM[3];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ port TELNETasp_PT MGWVTY;</span><br><span> };</span><br><span> </span><br><span> function get_next_trans_id() runs on dummy_CT return MgcpTransId {</span><br><span>@@ -44,6 +52,12 @@</span><br><span> PortNumber mp_local_rtp_port_base := 10000;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ private function f_init_vty() runs on dummy_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ map(self:MGWVTY, system:MGWVTY);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_set_prompts(MGWVTY);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(MGWVTY, "enable");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_rtpem_init(inout RTP_Emulation_CT comp_ref, integer i)</span><br><span> runs on dummy_CT {</span><br><span> comp_ref := RTP_Emulation_CT.create("RTPEM" & int2str(i));</span><br><span>@@ -85,6 +99,8 @@</span><br><span> /* do a DLCX on all connections of the EP */</span><br><span> f_dlcx_ignore(valueof(ep));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_vty();</span><br><span> }</span><br><span> </span><br><span> testcase TC_selftest() runs on dummy_CT {</span><br><span>diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh</span><br><span>index 8b2def7..632f2e3 100755</span><br><span>--- a/mgw/gen_links.sh</span><br><span>+++ b/mgw/gen_links.sh</span><br><span>@@ -29,10 +29,20 @@</span><br><span> FILES="RTP_EncDec.cc RTP_Types.ttcn"</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DIR=$BASEDIR/titan.ProtocolModules.IP/src</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="IP_EncDec.cc IP_Types.ttcn"</span><br><span style="color: hsl(120, 100%, 40%);">+gen_links $DIR $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DIR=$BASEDIR/titan.TestPorts.TELNETasp/src</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn"</span><br><span style="color: hsl(120, 100%, 40%);">+gen_links $DIR $FILES</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> FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="Osmocom_VTY_Functions.ttcn "</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 2b7d1f4..64a4fc5 100755</span><br><span>--- a/mgw/regen_makefile.sh</span><br><span>+++ b/mgw/regen_makefile.sh</span><br><span>@@ -1,5 +1,5 @@</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 IuUP_EncDec.cc "</span><br><span style="color: hsl(120, 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 IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IP_EncDec.cc "</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/12981">change 12981</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/12981"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If383f81af3306f8f5bdf50152498ae1303d390df </div>
<div style="display:none"> Gerrit-Change-Number: 12981 </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-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>