<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13001">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Daniel Willmann: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP_Test: Add testcase to test ts101318/rfc5993 conversion<br><br>The MGW recentenly adds support to convert between ts101318 and rfc5993<br>when GSM-HR is used. Lets add a testcase for that.<br><br>depends: osmo-mgw Iceef19e5619f8c92dfa7c8cdecb2e9b15f0a11a1<br>Change-Id: I96df45fe45b53088e07b26f14173a75498a84143<br>Related: OS#3807<br>---<br>M mgw/MGCP_Test.ttcn<br>M mgw/expected-results.xml<br>2 files changed, 59 insertions(+), 0 deletions(-)<br><br></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 9eff8c2..4969a3f 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -1314,6 +1314,63 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* create two local RTP emulations; create two connections on MGW EP, see if</span><br><span style="color: hsl(120, 100%, 40%);">+ * exchanged data is converted bwtween ts101318 and rfc5993 */</span><br><span style="color: hsl(120, 100%, 40%);">+ testcase TC_ts101318_rfc5993_rtp_conversion() runs on dummy_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var RtpFlowData flow[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ var RtpemStats stats[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpResponse resp;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpCallId call_id := '1226'H;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(ep);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Turn on conversion mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_enter_config(MGWVTY);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(MGWVTY, "mgcp");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(MGWVTY, "rtp-patch rfc5993hr");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* from us to MGW */</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bind local RTP emulation sockets */</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].em.portnr := 10000;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].rtp_cfg := c_RtpemDefaultCfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].rtp_cfg.tx_payload_type := flow[0].pt;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].rtp_cfg.rx_fixed_payload := '0b11b3eede60be4e3ec68838c7b5'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].rtp_cfg.tx_fixed_payload := '0b11b3eede60be4e3ec68838c7b5'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* from MGW back to us */</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].em.portnr := 20000;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].rtp_cfg := c_RtpemDefaultCfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].rtp_cfg.tx_payload_type := flow[1].pt;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].rtp_cfg.rx_fixed_payload := '000b11b3eede60be4e3ec68838c7b5'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].rtp_cfg.tx_fixed_payload := '000b11b3eede60be4e3ec68838c7b5'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_flow_delete(RTPEM[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_flow_delete(RTPEM[1], ep, call_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ stats[0] := f_rtpem_stats_get(RTPEM[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ stats[1] := f_rtpem_stats_get(RTPEM[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_stats_err_check(stats[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_stats_err_check(stats[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Turn off conversion mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(MGWVTY, "no rtp-patch rfc5993hr");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* TODO: Double-DLCX (no retransmission) */</span><br><span> </span><br><span> </span><br><span>@@ -1364,5 +1421,6 @@</span><br><span> execute(TC_two_crcx_mdcx_and_rtp());</span><br><span> execute(TC_two_crcx_and_unsolicited_rtp());</span><br><span> execute(TC_two_crcx_and_one_mdcx_rtp_ho());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_ts101318_rfc5993_rtp_conversion());</span><br><span> }</span><br><span> }</span><br><span>diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml</span><br><span>index b45ba1f..f5bc1a0 100644</span><br><span>--- a/mgw/expected-results.xml</span><br><span>+++ b/mgw/expected-results.xml</span><br><span>@@ -37,4 +37,5 @@</span><br><span> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_rtp' time='MASKED'/></span><br><span> <testcase classname='MGCP_Test' name='TC_two_crcx_and_unsolicited_rtp' time='MASKED'/></span><br><span> <testcase classname='MGCP_Test' name='TC_two_crcx_and_one_mdcx_rtp_ho' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MGCP_Test' name='TC_ts101318_rfc5993_rtp_conversion' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13001">change 13001</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/13001"/><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: I96df45fe45b53088e07b26f14173a75498a84143 </div>
<div style="display:none"> Gerrit-Change-Number: 13001 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Daniel Willmann <dwillmann@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>