<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18472">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs: add max rolling average as metric operation<br><br>this allows to calculate the rolling average over a specific<br>window in time and take the maximum of that<br><br>this is useful to get average value for 30s UDP traffic for<br>example from the UE metrics<br><br>Change-Id: I34bbfe08dbc1f27b86c9805f54649d44d697fa18<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>1 file changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/72/18472/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index fc60044..571a964 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -332,7 +332,7 @@</span><br><span>             return self._get_counter_handover_success()</span><br><span>         raise log.Error('counter %s not implemented!' % counter_name)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def verify_metric(self, value, operation='avg', metric='dl_brate', criterion='gt'):</span><br><span style="color: hsl(120, 100%, 40%);">+    def verify_metric(self, value, operation='avg', metric='dl_brate', criterion='gt', window=1):</span><br><span>         # file is not properly flushed until the process has stopped.</span><br><span>         if self.running():</span><br><span>             self.stop()</span><br><span>@@ -346,13 +346,13 @@</span><br><span>                     self.err('Failed copying back metrics file from remote host')</span><br><span>                     raise e</span><br><span>         metrics = srsUEMetrics(self.metrics_file)</span><br><span style="color: hsl(0, 100%, 40%);">-        return metrics.verify(value, operation, metric, criterion)</span><br><span style="color: hsl(120, 100%, 40%);">+        return metrics.verify(value, operation, metric, criterion, window)</span><br><span> </span><br><span> numpy = None</span><br><span> </span><br><span> class srsUEMetrics(log.Origin):</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    VALID_OPERATIONS = ['avg', 'sum']</span><br><span style="color: hsl(120, 100%, 40%);">+    VALID_OPERATIONS = ['avg', 'sum', 'max_rolling_avg']</span><br><span>     VALID_CRITERION = ['eq','gt','lt']</span><br><span>     CRITERION_TO_SYM = { 'eq' : '==', 'gt' : '>', 'lt' : '<' }</span><br><span>     CRYTERION_TO_SYM_OPPOSITE = { 'eq' : '!=', 'gt' : '<=', 'lt' : '>=' }</span><br><span>@@ -373,7 +373,7 @@</span><br><span>             self.err("Error parsing metrics CSV file %s" % self.metrics_file)</span><br><span>             raise error</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def verify(self, value, operation='avg', metric='dl_brate', criterion='gt'):</span><br><span style="color: hsl(120, 100%, 40%);">+    def verify(self, value, operation='avg', metric='dl_brate', criterion='gt', window=1):</span><br><span>         if operation not in self.VALID_OPERATIONS:</span><br><span>             raise log.Error('Unknown operation %s not in %r' % (operation, self.VALID_OPERATIONS))</span><br><span>         if criterion not in self.VALID_CRITERION:</span><br><span>@@ -389,6 +389,10 @@</span><br><span>             result = numpy.average(sel_data)</span><br><span>         elif operation == 'sum':</span><br><span>             result = numpy.sum(sel_data)</span><br><span style="color: hsl(120, 100%, 40%);">+        elif operation == 'max_rolling_avg':</span><br><span style="color: hsl(120, 100%, 40%);">+            # calculate rolling average over window and take maximum value</span><br><span style="color: hsl(120, 100%, 40%);">+            result = numpy.amax(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid'))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         self.dbg(result=result, value=value)</span><br><span> </span><br><span>         success = False</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18472">change 18472</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-gsm-tester/+/18472"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I34bbfe08dbc1f27b86c9805f54649d44d697fa18 </div>
<div style="display:none"> Gerrit-Change-Number: 18472 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>