Update obj classes in obj/ to use testenv instead of suite_run
Change-Id: Idf41243a497de7bc507b9f1cd1b38640f456f815
diff --git a/src/osmo_gsm_tester/obj/sgsn_osmo.py b/src/osmo_gsm_tester/obj/sgsn_osmo.py
index 6824d80..a7c7adb 100644
--- a/src/osmo_gsm_tester/obj/sgsn_osmo.py
+++ b/src/osmo_gsm_tester/obj/sgsn_osmo.py
@@ -25,22 +25,22 @@
class OsmoSgsn(log.Origin):
- def __init__(self, suite_run, hlr, ggsn, ip_address):
+ def __init__(self, testenv, hlr, ggsn, ip_address):
super().__init__(log.C_RUN, 'osmo-sgsn_%s' % ip_address.get('addr'))
self.run_dir = None
self.config_file = None
self.process = None
- self.suite_run = suite_run
+ self.testenv = testenv
self.hlr = hlr
self.ggsn = ggsn
self.ip_address = ip_address
def start(self):
self.log('Starting osmo-sgsn')
- 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()
- inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-sgsn')))
+ inst = util.Dir(os.path.abspath(self.testenv.suite().trial().get_inst('osmo-sgsn')))
binary = inst.child('bin', 'osmo-sgsn')
if not os.path.isfile(binary):
@@ -49,7 +49,7 @@
if not os.path.isdir(lib):
raise log.Error('No lib/ in', inst)
- pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None,
+ pcap_recorder.PcapRecorder(self.testenv, self.run_dir.new_dir('pcap'), None,
'host %s' % self.addr())
env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }
@@ -59,7 +59,7 @@
(binary,
'-c', os.path.abspath(self.config_file)),
env=env)
- self.suite_run.remember_to_stop(self.process)
+ self.testenv.remember_to_stop(self.process)
self.process.launch()
def configure(self):
@@ -67,7 +67,7 @@
self.dbg(config_file=self.config_file)
values = dict(sgsn=config.get_defaults('sgsn'))
- config.overlay(values, self.suite_run.config())
+ config.overlay(values, self.testenv.suite().config())
config.overlay(values, dict(sgsn=dict(ip_address=self.ip_address)))
config.overlay(values, self.hlr.conf_for_client())
config.overlay(values, self.ggsn.conf_for_client())