testenv: Get rid of 'resources' global variable
Change-Id: Id7576d21d0f9de29dd9bc4211eaf9b9ec634c990
diff --git a/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py b/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py
index c9558d8..c3a1dd5 100644
--- a/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py
+++ b/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py
@@ -1,14 +1,14 @@
-ip_address = resources.ip_address()
-nitb = resources.nitb()
-bts = resources.bts()
-ms_mo = resources.modem()
-ms_mt = resources.modem()
+ip_address = tenv.ip_address()
+nitb = tenv.nitb()
+bts = tenv.bts()
+ms_mo = tenv.modem()
+ms_mt = tenv.modem()
nitb.start(ip_address)
bts.start(nitb)
-nitb.add_subscriber(ms_mo, resources.msisdn())
-nitb.add_subscriber(ms_mt, resources.msisdn())
+nitb.add_subscriber(ms_mo, tenv.msisdn())
+nitb.add_subscriber(ms_mt, tenv.msisdn())
ms_mo.start()
ms_mt.start()
diff --git a/selftest/suite_test/suitedirA/test_suite/mo_sms.py b/selftest/suite_test/suitedirA/test_suite/mo_sms.py
index 768a99c..48923d2 100644
--- a/selftest/suite_test/suitedirA/test_suite/mo_sms.py
+++ b/selftest/suite_test/suitedirA/test_suite/mo_sms.py
@@ -1,9 +1,9 @@
-ip_address = resources.ip_address()
-nitb = resources.nitb()
-bts = resources.bts()
-ms_ext = resources.msisdn()
-fake_ext = resources.msisdn()
-ms = resources.modem()
+ip_address = tenv.ip_address()
+nitb = tenv.nitb()
+bts = tenv.bts()
+ms_ext = tenv.msisdn()
+fake_ext = tenv.msisdn()
+ms = tenv.modem()
nitb.configure(ip_address, bts)
bts.configure(nitb)
diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py
index 789e291..f3ac02e 100644
--- a/src/osmo_gsm_tester/testenv.py
+++ b/src/osmo_gsm_tester/testenv.py
@@ -30,7 +30,6 @@
from .core.event_loop import MainLoop
suite = None
-resources = None
log = None
dbg = None
err = None
@@ -330,10 +329,9 @@
from .core.event_loop import MainLoop
from .obj.sms import Sms as Sms_class
- global test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Sms, process, tenv
+ global test, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Sms, process, tenv
test = _test
- resources = suite_run.reserved_resources # TODO: remove this global, only used in selftest
log = test.log
dbg = test.dbg
err = test.err