<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: add stdout counter helper to eNB objects<br><br>this patch adds the stdout counter to count events happening<br>on the stdout (known from the UE already) to the common<br>srslte class so they can also be used from the eNB.<br><br>In addition, we add a PRACH counter to be used for tests.<br><br>Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/enb_amarisoft.py<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M src/osmo_gsm_tester/obj/srslte_common.py<br>5 files changed, 33 insertions(+), 11 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/42/22042/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index 3944459..2eac0fe 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -346,4 +346,7 @@</span><br><span>     def addr(self):</span><br><span>         return self._run_node.run_addr()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def get_counter(self, counter_name):</span><br><span style="color: hsl(120, 100%, 40%);">+        raise log.Error('get_counter() not implemented!')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>index ef28100..62c5b8a 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>@@ -247,6 +247,20 @@</span><br><span>     def running(self):</span><br><span>         return not self.process.terminated()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def get_counter(self, counter_name):</span><br><span style="color: hsl(120, 100%, 40%);">+        if counter_name == 'prach_received':</span><br><span style="color: hsl(120, 100%, 40%);">+            return self._get_counter_stdout('PRACH:')</span><br><span style="color: hsl(120, 100%, 40%);">+        raise log.Error('counter %s not implemented!' % counter_name)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    def _get_counter_stdout(self, keyword):</span><br><span style="color: hsl(120, 100%, 40%);">+        # Match stdout against keyword</span><br><span style="color: hsl(120, 100%, 40%);">+        n = 0</span><br><span style="color: hsl(120, 100%, 40%);">+        stdout_lines = (self.process.get_stdout() or '').splitlines()</span><br><span style="color: hsl(120, 100%, 40%);">+        for l in stdout_lines:</span><br><span style="color: hsl(120, 100%, 40%);">+            if keyword in l:</span><br><span style="color: hsl(120, 100%, 40%);">+                n += 1</span><br><span style="color: hsl(120, 100%, 40%);">+        return n</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def get_rfemu(self, cell=0, dl=True):</span><br><span>         cell_list = self.gen_conf['enb'].get('cell_list', None)</span><br><span>         if cell_list is None or len(cell_list) < cell + 1:</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index 6afc873..221259a 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -86,7 +86,7 @@</span><br><span>         if self._run_node.is_local():</span><br><span>             return</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        # Make sure we give the UE time to tear down</span><br><span style="color: hsl(120, 100%, 40%);">+        # Make sure we give time to tear down</span><br><span>         self.sleep_after_stop()</span><br><span> </span><br><span>         # copy back files (may not exist, for instance if there was an early error of process):</span><br><span>@@ -258,6 +258,11 @@</span><br><span>     def running(self):</span><br><span>         return not self.process.terminated()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def get_counter(self, counter_name):</span><br><span style="color: hsl(120, 100%, 40%);">+        if counter_name == 'prach_received':</span><br><span style="color: hsl(120, 100%, 40%);">+            return self._get_counter_stdout('RACH:')</span><br><span style="color: hsl(120, 100%, 40%);">+        raise log.Error('counter %s not implemented!' % counter_name)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def get_rfemu(self, cell=0, dl=True):</span><br><span>         cell_list = self.gen_conf['enb'].get('cell_list', None)</span><br><span>         if cell_list is None or len(cell_list) < cell + 1:</span><br><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 610d3e6..a89ba1b 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>@@ -382,15 +382,6 @@</span><br><span>         proc.launch_sync()</span><br><span>         return proc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def _get_counter_stdout(self, keyword):</span><br><span style="color: hsl(0, 100%, 40%);">-        # Match stdout against keyword</span><br><span style="color: hsl(0, 100%, 40%);">-        n = 0</span><br><span style="color: hsl(0, 100%, 40%);">-        stdout_lines = (self.process.get_stdout() or '').splitlines()</span><br><span style="color: hsl(0, 100%, 40%);">-        for l in stdout_lines:</span><br><span style="color: hsl(0, 100%, 40%);">-            if keyword in l:</span><br><span style="color: hsl(0, 100%, 40%);">-                n += 1</span><br><span style="color: hsl(0, 100%, 40%);">-        return n</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     def get_counter(self, counter_name):</span><br><span>         if counter_name == 'handover_success':</span><br><span>             return self._get_counter_stdout('HO successful')</span><br><span>diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py</span><br><span>index e221940..3acad9e 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/srslte_common.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/srslte_common.py</span><br><span>@@ -97,4 +97,13 @@</span><br><span>             return analyzer.get_num_phy_errors(kpi)</span><br><span>         except ImportError:</span><br><span>             self.log("Can't load KPI analyzer module.")</span><br><span style="color: hsl(0, 100%, 40%);">-            return 0</span><br><span>\ No newline at end of file</span><br><span style="color: hsl(120, 100%, 40%);">+            return 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    def _get_counter_stdout(self, keyword):</span><br><span style="color: hsl(120, 100%, 40%);">+        # Match stdout against keyword</span><br><span style="color: hsl(120, 100%, 40%);">+        n = 0</span><br><span style="color: hsl(120, 100%, 40%);">+        stdout_lines = (self.process.get_stdout() or '').splitlines()</span><br><span style="color: hsl(120, 100%, 40%);">+        for l in stdout_lines:</span><br><span style="color: hsl(120, 100%, 40%);">+            if keyword in l:</span><br><span style="color: hsl(120, 100%, 40%);">+                n += 1</span><br><span style="color: hsl(120, 100%, 40%);">+        return n</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042">change 22042</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/+/22042"/><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: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 </div>
<div style="display:none"> Gerrit-Change-Number: 22042 </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>