commit b452ed6db14dd9fc1ab8543c41f89641ee4f5771
author Pau Espin Pedrol <pespin@sysmocom.de> Tue May 26 12:51:44 2020 +0200
committer pespin <pespin@sysmocom.de> Thu May 28 13:13:05 2020 +0000
tree 148475b0d01f750ee92968698cfa30d0a015a8d4
parent 5f826be20aaf72882169167e13fee0a174e2b3f3

enb_{srs,amarisoft}: Support selecting tgz based on run_node's run label

Change-Id: Ie1c8ccd2ffc9680bd72159872f3de0d59f1b9b0b

src/osmo_gsm_tester/obj/enb_amarisoft.py

diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py
index c331cd8..8f624e6 100644
--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py
@@ -76,7 +76,7 @@
         if self._bin_prefix is None:
             self._bin_prefix = os.getenv('AMARISOFT_PATH_ENB', None)
             if self._bin_prefix == None:
-                self._bin_prefix  = self.testenv.suite().trial().get_inst('amarisoftenb')
+                self._bin_prefix  = self.testenv.suite().trial().get_inst('amarisoftenb', self._run_node.run_label())
         return self._bin_prefix
 
     def cleanup(self):

src/osmo_gsm_tester/obj/enb_srs.py

diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py
index 9e93541..e192530 100644
--- a/src/osmo_gsm_tester/obj/enb_srs.py
+++ b/src/osmo_gsm_tester/obj/enb_srs.py
@@ -132,7 +132,7 @@
             f.write(r)
 
     def configure(self):
-        self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('srslte')))
+        self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('srslte',  self._run_node.run_label())))
         if not os.path.isdir(self.inst.child('lib')):
             raise log.Error('No lib/ in', self.inst)
         if not self.inst.isfile('bin', srsENB.BINFILE):