Update obj classes in obj/ to use testenv instead of suite_run
Change-Id: Idf41243a497de7bc507b9f1cd1b38640f456f815
diff --git a/src/osmo_gsm_tester/obj/pcu_oc2g.py b/src/osmo_gsm_tester/obj/pcu_oc2g.py
index 4b67441..cb5e6cb 100644
--- a/src/osmo_gsm_tester/obj/pcu_oc2g.py
+++ b/src/osmo_gsm_tester/obj/pcu_oc2g.py
@@ -28,8 +28,8 @@
PCU_OC2G_BIN = 'osmo-pcu'
PCU_OC2G_CFG = 'osmo-pcu-oc2g.cfg'
- def __init__(self, suite_run, btsoc2g, conf):
- super().__init__(suite_run, btsoc2g, conf, self.PCU_OC2G_BIN)
+ def __init__(self, testenv, btsoc2g, conf):
+ super().__init__(testenv, btsoc2g, conf, self.PCU_OC2G_BIN)
self.run_dir = None
self.bsc = None
self.inst = None
@@ -39,10 +39,10 @@
self.remote_user = 'root'
def start(self, keepalive=False):
- self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
+ self.run_dir = util.Dir(self.testenv.suite().get_run_dir().new_dir(self.name()))
self.configure()
- self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-pcu-oc2g')))
+ self.inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-pcu-oc2g')))
lib = self.inst.child('lib')
if not os.path.isdir(lib):
raise log.Error('No lib/ in', self.inst)
@@ -87,7 +87,7 @@
def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False):
proc = self._process_remote(name, popen_args, remote_cwd)
- self.suite_run.remember_to_stop(proc, keepalive)
+ self.testenv.remember_to_stop(proc, keepalive)
proc.launch()
def run_local(self, name, popen_args):
@@ -104,7 +104,7 @@
self.dbg(config_file=self.config_file)
values = { 'osmo_pcu_oc2g': config.get_defaults('osmo_pcu_oc2g') }
- config.overlay(values, self.suite_run.config())
+ config.overlay(values, self.testenv.suite().config())
config.overlay(values, {
'osmo_pcu_oc2g': {
'bts_addr': self.bts.remote_addr(),