Change in osmo-gsm-tester[master]: enb: add abstract method stop()

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 )

Change subject: enb: add abstract method stop()
......................................................................

enb: add abstract method stop()

implement as noop for Amarisoft eNB, srsENB will send q+Enter to stdin,
which is implemented in class srslte_common()

Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/obj/enb_amarisoft.py
M src/osmo_gsm_tester/obj/enb_srs.py
M src/osmo_gsm_tester/obj/srslte_common.py
4 files changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index d2e48a6..50a8832 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -327,6 +327,10 @@
         pass
 
     @abstractmethod
+    def stop(self):
+        pass
+
+    @abstractmethod
     def ue_add(self, ue):
         pass
 
diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py
index 60985f4..b7ede3b 100644
--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py
@@ -130,6 +130,10 @@
         self.testenv.remember_to_stop(self.process)
         self.process.launch()
 
+    def stop(self):
+        # Not implemented
+        pass
+
     def gen_conf_file(self, path, filename, values):
         self.dbg('AmarisoftENB ' + filename + ':\n' + pprint.pformat(values))
         with open(path, 'w') as f:
diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py
index bf988eb..aee3f61 100644
--- a/src/osmo_gsm_tester/obj/enb_srs.py
+++ b/src/osmo_gsm_tester/obj/enb_srs.py
@@ -119,6 +119,10 @@
         self.dbg('Enabling console trace')
         self.process.stdin_write('t\n')
 
+    def stop(self):
+        # Implemented in srslte_common.py
+        srslte_common.stop(self)
+
     def start_remotely(self):
         remote_env = { 'LD_LIBRARY_PATH': self.remote_inst.child('lib') }
         remote_binary = self.remote_inst.child('bin', srsENB.BINFILE)
diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py
index 1d03a58..21001b7 100644
--- a/src/osmo_gsm_tester/obj/srslte_common.py
+++ b/src/osmo_gsm_tester/obj/srslte_common.py
@@ -36,6 +36,8 @@
             self.stop_sleep_time = 0
 
     def stop(self):
+        # Send q+Enter to stdin to self-terminate application
+        self.process.stdin_write('q\n')
         self.testenv.stop_process(self.process)
         self.sleep_after_stop()
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181
Gerrit-Change-Number: 22054
Gerrit-PatchSet: 6
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210209/85f9670e/attachment.htm>