<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13161">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP_Test: Test AMR octet-aligned/bandwith-efficient mode conversion<br><br>osmo-mgw now implements a conversion between the AMR octet-aligned<br>and banwith-efficient payload format. Lets add tests for this<br><br>Change-Id: I050bfeabfb5fdbf986d429eef3af69fe8158d56e<br>depends: osmo-mgw I622c01874b25f5049d4f59eb8157e0ea3cbe16ba<br>related: SYS#4470<br>---<br>M mgw/MGCP_Test.ttcn<br>M mgw/expected-results.xml<br>2 files changed, 67 insertions(+), 0 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/61/13161/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 a0a836b..467ebfc 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -1380,6 +1380,67 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </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 between AMR octet-aligned and bandwith</span><br><span style="color: hsl(120, 100%, 40%);">+ * efficient-mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ function f_TC_amr_x_x_rtp_conversion(octetstring pl0, octetstring pl1, charstring fmtp0, charstring fmtp1) 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%);">+ /* from us to MGW */</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/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 := pl0;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].rtp_cfg.tx_fixed_payload := pl0;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0].fmtp := fmtp0;</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, 112, "AMR/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 := pl1;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].rtp_cfg.tx_fixed_payload := pl1;</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1].fmtp := fmtp1;</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%);">+ 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%);">+ testcase TC_amr_oa_bwe_rtp_conversion() runs on dummy_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_amr_x_x_rtp_conversion('100c4e9ba850e30d5d53d04de41e7c'O, '10d3a6ea1438c35754f41379079f'O, "octet-align=1", "octet-align=0");</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%);">+ testcase TC_amr_oa_oa_rtp_conversion() runs on dummy_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_amr_x_x_rtp_conversion('100c4e9ba850e30d5d53d04de41e7c'O, '100c4e9ba850e30d5d53d04de41e7c'O, "octet-align=1", "octet-align=1");</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%);">+ testcase TC_amr_bwe_bwe_rtp_conversion() runs on dummy_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_amr_x_x_rtp_conversion('10d3a6ea1438c35754f41379079f'O, '10d3a6ea1438c35754f41379079f'O, "octet-align=0", "octet-align=0");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* TODO: Double-DLCX (no retransmission) */</span><br><span> </span><br><span>@@ -1432,5 +1493,8 @@</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> execute(TC_ts101318_rfc5993_rtp_conversion());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_amr_oa_bwe_rtp_conversion());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_amr_oa_oa_rtp_conversion());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_amr_bwe_bwe_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 f5bc1a0..5c520c5 100644</span><br><span>--- a/mgw/expected-results.xml</span><br><span>+++ b/mgw/expected-results.xml</span><br><span>@@ -38,4 +38,7 @@</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> <testcase classname='MGCP_Test' name='TC_ts101318_rfc5993_rtp_conversion' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MGCP_Test' name='TC_amr_oa_bwe_rtp_conversion' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MGCP_Test' name='TC_amr_oa_oa_rtp_conversion' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MGCP_Test' name='TC_amr_bwe_bwe_rtp_conversion' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13161">change 13161</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/13161"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I050bfeabfb5fdbf986d429eef3af69fe8158d56e </div>
<div style="display:none"> Gerrit-Change-Number: 13161 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>