testenv: Get rid of 'resources' global variable

Change-Id: Id7576d21d0f9de29dd9bc4211eaf9b9ec634c990

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()

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)

src/osmo_gsm_tester/testenv.py

@@ -30,7 +30,6 @@ from .core import resource
 from .core.event_loop import MainLoop
 
 suite = None
-resources = None
 log = None
 dbg = None
 err = None
@@ -330,10 +329,9 @@ def setup(suite_run, _test):
     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