<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18473">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs: allow + operator when specifying CSV columns<br><br>this allows to sum dl_brate and ul_brate and perform<br>the known operations, like max, average, etc. on both<br>UL and DL bitrate combined<br><br>For examples, with this CSV ..<br><br>time;cc;pci;earfcn;rsrp;pl;cfo;dl_mcs;dl_snr;dl_turbo;dl_brate;dl_bler;ul_ta;ul_mcs;ul_buff;ul_brate;ul_bler;rf_o;rf_u;rf_l;is_attached<br>1999;0;1;3400;-67;59;913;27;29;0.50;10432.000000;0;2.6;20;0.0;10848.000000;0;0.0;0.0;0.0;1.0<br>2998;0;1;3400;-67;59;912;28;29;0.50;2136.000000;0;2.6;20;0.0;1680.000000;0;0.0;0.0;0.0;1.0<br>3997;0;1;3400;-69;61;909;28;29;0.50;2136.000000;0;2.6;20;0.0;1680.000000;0;0.0;0.0;0.0;1.0<br><br>.. one could calculate the average of DL and UL bit rate with:<br><br>ue.verify_metric(1e6, operation='avg', metric='dl_brate+ul_brate', criterion='gt', window=test_duration)<br><br>and veriy that it's average is greater than 1 Mbit/s<br><br>Change-Id: I5c7c80bb107fa6b93b215176e6ebbb5dc8594860<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>1 file changed, 16 insertions(+), 7 deletions(-)<br><br></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 a147ce6..a8e86d3 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>@@ -378,17 +378,26 @@</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', window=1):</span><br><span style="color: hsl(120, 100%, 40%);">+ def verify(self, value, operation='avg', metric_str='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> raise log.Error('Unknown operation %s not in %r' % (operation, self.VALID_CRITERION))</span><br><span> # check if given metric exists in data</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- sel_data = self.raw_data[metric]</span><br><span style="color: hsl(0, 100%, 40%);">- except ValueError as err:</span><br><span style="color: hsl(0, 100%, 40%);">- print('metric %s not available' % metric)</span><br><span style="color: hsl(0, 100%, 40%);">- raise err</span><br><span style="color: hsl(120, 100%, 40%);">+ sel_data = numpy.array([])</span><br><span style="color: hsl(120, 100%, 40%);">+ metrics_list = metric_str.split('+') # allow addition operator for columns</span><br><span style="color: hsl(120, 100%, 40%);">+ for metric in metrics_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ vec = numpy.array(self.raw_data[metric])</span><br><span style="color: hsl(120, 100%, 40%);">+ except ValueError as err:</span><br><span style="color: hsl(120, 100%, 40%);">+ print('metric %s not available' % metric)</span><br><span style="color: hsl(120, 100%, 40%);">+ raise err</span><br><span style="color: hsl(120, 100%, 40%);">+ if sel_data.size == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Initialize with dimension of first metric vector</span><br><span style="color: hsl(120, 100%, 40%);">+ sel_data = vec</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Sum them up assuming same array dimension</span><br><span style="color: hsl(120, 100%, 40%);">+ sel_data += vec</span><br><span> </span><br><span> if operation == 'avg':</span><br><span> result = numpy.average(sel_data)</span><br><span>@@ -407,7 +416,7 @@</span><br><span> success = True</span><br><span> </span><br><span> # Convert bitrate in Mbit/s:</span><br><span style="color: hsl(0, 100%, 40%);">- if metric.find('brate') > 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if metric_str.find('brate') > 0:</span><br><span> result /= 1e6</span><br><span> value /= 1e6</span><br><span> mbit_str = ' Mbit/s'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18473">change 18473</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/+/18473"/><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: I5c7c80bb107fa6b93b215176e6ebbb5dc8594860 </div>
<div style="display:none"> Gerrit-Change-Number: 18473 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>