<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10154">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP_Test: add function to check for RTP err counters<br><br>At the moment we check the error counters of the RTP statistics in<br>the testcases. However, in most situations we will do the check to<br>make sure that no errors occurred (all counters == 0). Rather than<br>having a long tail of if statements in the testcases we should have<br>a function for this. This also makes it much easier in case we add<br>more error countes lateron.<br><br>- add and use function f_rtpem_stats_err_check()<br><br>Change-Id: I69e5f80b0765284ec99056ce62c315461967d2a1<br>Related: OS#3384<br>---<br>M library/RTP_Emulation.ttcn<br>M mgw/MGCP_Test.ttcn<br>2 files changed, 44 insertions(+), 47 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/54/10154/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn</span><br><span>index 2a358a9..c752c22 100644</span><br><span>--- a/library/RTP_Emulation.ttcn</span><br><span>+++ b/library/RTP_Emulation.ttcn</span><br><span>@@ -242,6 +242,36 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Check the statistics for general signs of errors. This is a basic general</span><br><span style="color: hsl(120, 100%, 40%);">+ * check that will fit most situations and is intended to be executed by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the testcases as as needed. */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_rtpem_stats_err_check(RtpemStats s) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("stats: ", s);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if there was some activity at either on the RX or on the</span><br><span style="color: hsl(120, 100%, 40%);">+ * TX side, but complete silence would indicate some problem */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.num_pkts_tx < 1 and s.num_pkts_rx < 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "no RTP packet activity detected (packets)");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.bytes_payload_tx < 1 and s.bytes_payload_rx < 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "no RTP packet activity detected (bytes)");</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%);">+ /* Check error counters */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.num_pkts_rx_err_seq != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packet sequence number errors occurred");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.num_pkts_rx_err_ts != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packet timestamp errors occurred");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.num_pkts_rx_err_pt != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packet payload type errors occurred");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.num_pkts_rx_err_disabled != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets received while RX was disabled");</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> template PDU_RTP ts_RTP(BIT32_BO_LAST ssrc, INT7b pt, LIN2_BO_LAST seq, uint32_t ts,</span><br><span> octetstring payload, BIT1 marker := '0'B) := {</span><br><span> version := 2,</span><br><span>diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn</span><br><span>index 264ac28..a6d3460 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -961,21 +961,8 @@</span><br><span> if (stats.bytes_payload_tx < 190) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_seq != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_ts != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_pt != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_disabled != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_stats_err_check(stats);</span><br><span> </span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1005,18 +992,8 @@</span><br><span> if (stats.bytes_payload_tx != stats.bytes_payload_rx) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_seq != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_ts != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_pt != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats.num_pkts_rx_err_disabled != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_stats_err_check(stats);</span><br><span> </span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1068,10 +1045,8 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (stats[0].num_pkts_rx_err_pt > 0 or stats[1].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 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> </span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1174,20 +1149,15 @@</span><br><span> setverdict(fail, "number of packets not within normal parameters");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats[0].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx;</span><br><span> if (temp > 3 or temp < -3) {</span><br><span> setverdict(fail, "number of packets not within normal parameters");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (stats[0].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</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> </span><br><span> /* Tear down */</span><br><span> f_flow_delete(RTPEM[0]);</span><br><span>@@ -1240,10 +1210,8 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (stats[0].num_pkts_rx_err_pt > 0 or stats[1].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 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[0]);</span><br><span> </span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1308,10 +1276,9 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (stats[0].num_pkts_rx_err_pt > 0 or stats[1].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 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%);">+ f_rtpem_stats_err_check(stats[2]);</span><br><span> </span><br><span> setverdict(pass);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10154">change 10154</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/10154"/><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: I69e5f80b0765284ec99056ce62c315461967d2a1 </div>
<div style="display:none"> Gerrit-Change-Number: 10154 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>