Change in osmo-gsm-tester[master]: obj: Fix objects placing their content in suite rundir instead of tes...

2020-05-11 Thread pespin 
pespin 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()))
+

Change in osmo-gsm-tester[master]: obj: Fix objects placing their content in suite rundir instead of tes...

2020-05-11 Thread pespin 
pespin has posted comments on 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
..


Patch Set 1: Code-Review+2


--
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 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 11 May 2020 11:01:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-gsm-tester[master]: obj: Fix objects placing their content in suite rundir instead of tes...

2020-05-11 Thread pespin 
pespin has uploaded this change for review. ( 
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(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/96/18196/1

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 =