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