<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: add abstract method stop()<br><br>implement as noop for Amarisoft eNB, srsENB will send q+Enter to stdin,<br>which is implemented in class srslte_common()<br><br>Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181<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/srslte_common.py<br>4 files changed, 14 insertions(+), 0 deletions(-)<br><br></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 d2e48a6..50a8832 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>@@ -327,6 +327,10 @@</span><br><span>         pass</span><br><span> </span><br><span>     @abstractmethod</span><br><span style="color: hsl(120, 100%, 40%);">+    def stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    @abstractmethod</span><br><span>     def ue_add(self, ue):</span><br><span>         pass</span><br><span> </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 60985f4..b7ede3b 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>@@ -130,6 +130,10 @@</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        # Not implemented</span><br><span style="color: hsl(120, 100%, 40%);">+        pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def gen_conf_file(self, path, filename, values):</span><br><span>         self.dbg('AmarisoftENB ' + filename + ':\n' + pprint.pformat(values))</span><br><span>         with open(path, 'w') as f:</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 bf988eb..aee3f61 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>@@ -119,6 +119,10 @@</span><br><span>         self.dbg('Enabling console trace')</span><br><span>         self.process.stdin_write('t\n')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        # Implemented in srslte_common.py</span><br><span style="color: hsl(120, 100%, 40%);">+        srslte_common.stop(self)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def start_remotely(self):</span><br><span>         remote_env = { 'LD_LIBRARY_PATH': self.remote_inst.child('lib') }</span><br><span>         remote_binary = self.remote_inst.child('bin', srsENB.BINFILE)</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 1d03a58..21001b7 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>@@ -36,6 +36,8 @@</span><br><span>             self.stop_sleep_time = 0</span><br><span> </span><br><span>     def stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        # Send q+Enter to stdin to self-terminate application</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process.stdin_write('q\n')</span><br><span>         self.testenv.stop_process(self.process)</span><br><span>         self.sleep_after_stop()</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054">change 22054</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/+/22054"/><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: Ide606e1a6b523997215aa2fa39d4d56ae1f49181 </div>
<div style="display:none"> Gerrit-Change-Number: 22054 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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>