<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18196">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;">obj: Fix objects placing their content in suite rundir instead of test rundir<br><br>Change-Id: I421d35473575086b93d5c8db98b909cc6c83d896<br>---<br>M src/osmo_gsm_tester/obj/bsc_osmo.py<br>M src/osmo_gsm_tester/obj/bts_nanobts.py<br>M src/osmo_gsm_tester/obj/bts_oc2g.py<br>M src/osmo_gsm_tester/obj/bts_octphy.py<br>M src/osmo_gsm_tester/obj/bts_osmotrx.py<br>M src/osmo_gsm_tester/obj/bts_osmovirtual.py<br>M src/osmo_gsm_tester/obj/bts_sysmo.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/epc_amarisoft.py<br>M src/osmo_gsm_tester/obj/epc_srs.py<br>M src/osmo_gsm_tester/obj/ggsn_osmo.py<br>M src/osmo_gsm_tester/obj/hlr_osmo.py<br>M src/osmo_gsm_tester/obj/iperf3.py<br>M src/osmo_gsm_tester/obj/mgcpgw_osmo.py<br>M src/osmo_gsm_tester/obj/mgw_osmo.py<br>M src/osmo_gsm_tester/obj/ms_amarisoft.py<br>M src/osmo_gsm_tester/obj/ms_ofono.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M src/osmo_gsm_tester/obj/msc_osmo.py<br>M src/osmo_gsm_tester/obj/nitb_osmo.py<br>M src/osmo_gsm_tester/obj/osmocon.py<br>M src/osmo_gsm_tester/obj/pcu_oc2g.py<br>M src/osmo_gsm_tester/obj/pcu_osmo.py<br>M src/osmo_gsm_tester/obj/pcu_sysmo.py<br>M src/osmo_gsm_tester/obj/sgsn_osmo.py<br>M src/osmo_gsm_tester/obj/stp_osmo.py<br>27 files changed, 29 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/bsc_osmo.py b/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>index 22b2dad..1763dcd 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>@@ -51,7 +51,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-bsc')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-bsc')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_nanobts.py b/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>index 5c07bda..a818a8f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>@@ -94,7 +94,7 @@</span><br><span> def start(self, keepalive=False):</span><br><span> if self.conf.get('ipa_unit_id') is None:</span><br><span> raise log.Error('No attribute ipa_unit_id provided in conf!')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self._configure()</span><br><span> </span><br><span> unitid = int(self.conf.get('ipa_unit_id'))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_oc2g.py b/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>index ee86cc3..2d55637 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>@@ -100,7 +100,7 @@</span><br><span> if self.bsc is None:</span><br><span> raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started')</span><br><span> log.log('Starting OsmoBtsOC2G to connect to', self.bsc)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst(OsmoBtsOC2G.BTS_OC2G_BIN)))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_octphy.py b/src/osmo_gsm_tester/obj/bts_octphy.py</span><br><span>index c4d3910..d97ac84 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_octphy.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_octphy.py</span><br><span>@@ -120,7 +120,7 @@</span><br><span> self.testenv.poll()</span><br><span> </span><br><span> self.log('Starting to connect to', self.bsc)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-bts')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_osmotrx.py b/src/osmo_gsm_tester/obj/bts_osmotrx.py</span><br><span>index 42ed3f8..1456802 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_osmotrx.py</span><br><span>@@ -158,7 +158,7 @@</span><br><span> self.testenv.poll()</span><br><span> </span><br><span> self.log('Starting to connect to', self.bsc)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> # Power cycle all TRX if needed (right now only TRX0 for SC5):</span><br><span>@@ -199,7 +199,7 @@</span><br><span> super().__init__(log.C_RUN, name)</span><br><span> self.testenv = testenv</span><br><span> self.conf = conf</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.listen_ip = conf.get('osmo_trx', {}).get('trx_ip')</span><br><span> self.remote_user = conf.get('osmo_trx', {}).get('remote_user', None)</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_osmovirtual.py b/src/osmo_gsm_tester/obj/bts_osmovirtual.py</span><br><span>index b6470c1..2c1c153 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_osmovirtual.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_osmovirtual.py</span><br><span>@@ -98,7 +98,7 @@</span><br><span> self.testenv.poll()</span><br><span> </span><br><span> self.log('Starting to connect to', self.bsc)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-bts')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_sysmo.py b/src/osmo_gsm_tester/obj/bts_sysmo.py</span><br><span>index 8f76ecb..3f48f93 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_sysmo.py</span><br><span>@@ -94,7 +94,7 @@</span><br><span> if self.bsc is None:</span><br><span> raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started')</span><br><span> log.log('Starting sysmoBTS to connect to', self.bsc)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst(SysmoBts.BTS_SYSMO_BIN)))</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 a534708..fa79cbf 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>@@ -98,7 +98,7 @@</span><br><span> def start(self, epc):</span><br><span> self.log('Starting AmarisoftENB')</span><br><span> self._epc = epc</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> self._start()</span><br><span> </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 95de16f..4311d60 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>@@ -94,7 +94,7 @@</span><br><span> def start(self, epc):</span><br><span> self.log('Starting srsENB')</span><br><span> self._epc = epc</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> if self.remote_user:</span><br><span> self.start_remotely()</span><br><span>diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>index b5304bf..e9f1e82 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>@@ -74,7 +74,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting amarisoftepc')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> if self._run_node.is_local():</span><br><span> self.start_locally()</span><br><span>diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>index c5e762f..2ee486f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>@@ -74,7 +74,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting srsepc')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> if self._run_node.is_local():</span><br><span> self.start_locally()</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ggsn_osmo.py b/src/osmo_gsm_tester/obj/ggsn_osmo.py</span><br><span>index 1435fdb..c22ca86 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ggsn_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ggsn_osmo.py</span><br><span>@@ -35,7 +35,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-ggsn')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-ggsn')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/hlr_osmo.py b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>index 79175f6..9b911d6 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>@@ -41,7 +41,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-hlr')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-hlr')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>index ff09f17..2901e79 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>@@ -84,7 +84,7 @@</span><br><span> def start(self):</span><br><span> self.log('Starting iperf3-srv')</span><br><span> self.log_copied = False</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.log_file = self.run_dir.new_file(IPerf3Server.LOGFILE)</span><br><span> if self.runs_locally():</span><br><span> self.start_locally()</span><br><span>@@ -195,7 +195,7 @@</span><br><span> </span><br><span> self.log('Preparing iperf3-client connecting to %s:%d (time=%ds)' % (self.server.addr(), self.server.port(), time_sec))</span><br><span> self.log_copied = False</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)</span><br><span> if self.runs_locally():</span><br><span> return self.prepare_test_proc_locally(downlink, netns, time_sec)</span><br><span>diff --git a/src/osmo_gsm_tester/obj/mgcpgw_osmo.py b/src/osmo_gsm_tester/obj/mgcpgw_osmo.py</span><br><span>index 3afa3f1..550cabd 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/mgcpgw_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/mgcpgw_osmo.py</span><br><span>@@ -37,7 +37,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-mgcpgw')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-nitb')))</span><br><span> binary = inst.child('bin', 'osmo-bsc_mgcp')</span><br><span>diff --git a/src/osmo_gsm_tester/obj/mgw_osmo.py b/src/osmo_gsm_tester/obj/mgw_osmo.py</span><br><span>index 70572a1..5bb6f99 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/mgw_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/mgw_osmo.py</span><br><span>@@ -36,7 +36,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-mgw')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-mgw')))</span><br><span> binary = inst.child('bin', 'osmo-mgw')</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index 451bbd0..d79756b 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -133,7 +133,7 @@</span><br><span> def connect(self, enb):</span><br><span> self.log('Starting amarisoftue')</span><br><span> self.enb = enb</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> if self.setup_runs_locally():</span><br><span> self.start_locally()</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_ofono.py b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>index 2598eee..e1ddbc8 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>@@ -382,7 +382,7 @@</span><br><span> self._ki = None</span><br><span> self._imsi = None</span><br><span> self._apn_ipaddr = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(testenv.suite().get_run_dir().new_dir(self.name().strip('/')))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(testenv.test().get_run_dir().new_dir(self.name().strip('/')))</span><br><span> self.sms_received_list = []</span><br><span> self.dbus = ModemDbusInteraction(self.dbuspath)</span><br><span> self.register_attempts = 0</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 8604d32..5805fef 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>@@ -137,7 +137,7 @@</span><br><span> def connect(self, enb):</span><br><span> self.log('Starting srsue')</span><br><span> self.enb = enb</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> if self.setup_runs_locally():</span><br><span> self.start_locally()</span><br><span>diff --git a/src/osmo_gsm_tester/obj/msc_osmo.py b/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>index 162614c..173bc94 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>@@ -50,7 +50,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-msc')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-msc')))</span><br><span> binary = inst.child('bin', 'osmo-msc')</span><br><span>diff --git a/src/osmo_gsm_tester/obj/nitb_osmo.py b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>index 88ff721..c12648f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-nitb')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-nitb')))</span><br><span> binary = inst.child('bin', 'osmo-nitb')</span><br><span>diff --git a/src/osmo_gsm_tester/obj/osmocon.py b/src/osmo_gsm_tester/obj/osmocon.py</span><br><span>index 5d1e5ae..c37cf36 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/osmocon.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/osmocon.py</span><br><span>@@ -62,7 +62,7 @@</span><br><span> # TODO: make sure the pone is powered off before starting osmocon</span><br><span> </span><br><span> self.log('Starting osmocon')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> </span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmocom-bb')))</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/pcu_oc2g.py b/src/osmo_gsm_tester/obj/pcu_oc2g.py</span><br><span>index cb5e6cb..5b638f8 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/pcu_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu_oc2g.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> self.remote_user = 'root'</span><br><span> </span><br><span> def start(self, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-pcu-oc2g')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/pcu_osmo.py b/src/osmo_gsm_tester/obj/pcu_osmo.py</span><br><span>index 86e6bbe..c6a2a0e 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/pcu_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu_osmo.py</span><br><span>@@ -35,7 +35,7 @@</span><br><span> self.env = {}</span><br><span> </span><br><span> def start(self, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-pcu')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/pcu_sysmo.py b/src/osmo_gsm_tester/obj/pcu_sysmo.py</span><br><span>index 103ad00..cab0845 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/pcu_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu_sysmo.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> self.remote_user = 'root'</span><br><span> </span><br><span> def start(self, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-pcu-sysmo')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/sgsn_osmo.py b/src/osmo_gsm_tester/obj/sgsn_osmo.py</span><br><span>index a7c7adb..adb1637 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/sgsn_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/sgsn_osmo.py</span><br><span>@@ -37,7 +37,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-sgsn')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-sgsn')))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/stp_osmo.py b/src/osmo_gsm_tester/obj/stp_osmo.py</span><br><span>index e8bb4e0..1382016 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/stp_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/stp_osmo.py</span><br><span>@@ -35,7 +35,7 @@</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-stp')</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span> inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-stp')))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18196">change 18196</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/+/18196"/><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: I421d35473575086b93d5c8db98b909cc6c83d896 </div>
<div style="display:none"> Gerrit-Change-Number: 18196 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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>