<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18046">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: Replace 'suite' with 'tenv'<br><br>Change-Id: I777ec59ffd83b861ddc09e85e52d7a8896264b8c<br>---<br>M doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py<br>M doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py<br>M doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py<br>M doc/examples/4g_srsLTE/suites/4g/ping.py<br>M selftest/suite_test/test_suite/hello_world.py<br>M selftest/suite_test/test_suite/test_error.py<br>M selftest/suite_test/test_suite/test_fail.py<br>M src/osmo_gsm_tester/testenv.py<br>M sysmocom/suites/4g/iperf3_dl.py<br>M sysmocom/suites/4g/iperf3_ul.py<br>M sysmocom/suites/4g/ping.py<br>M sysmocom/suites/debug/interactive.py<br>M sysmocom/suites/dynts/switch_tch_pdch.py<br>M sysmocom/suites/encryption/lib/testlib.py<br>M sysmocom/suites/encryption/register_a5_0_authopt.py<br>M sysmocom/suites/encryption/register_a5_0_authreq.py<br>M sysmocom/suites/encryption/register_a5_1_authreq.py<br>M sysmocom/suites/encryption/register_a5_3_authreq.py<br>M sysmocom/suites/gprs/cs_paging_gprs_active.py<br>M sysmocom/suites/gprs/iperf3.py<br>M sysmocom/suites/gprs/iperf3m4.py<br>M sysmocom/suites/gprs/lib/testlib.py<br>M sysmocom/suites/gprs/ping.py<br>M sysmocom/suites/gprs/ping_idle_ping.py<br>M sysmocom/suites/nitb_debug/interactive.py<br>M sysmocom/suites/nitb_netreg/register.py<br>M sysmocom/suites/nitb_netreg/register_default.py<br>M sysmocom/suites/nitb_netreg_mass/register_default_mass.py<br>M sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py<br>M sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py<br>M sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py<br>M sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py<br>M sysmocom/suites/nitb_sms/mo_mt_sms.py<br>M sysmocom/suites/nitb_ussd/assert_extension.py<br>M sysmocom/suites/smpp/esme_connect_policy_acceptall.py<br>M sysmocom/suites/smpp/esme_connect_policy_closed.py<br>M sysmocom/suites/smpp/esme_ms_sms_storeforward.py<br>M sysmocom/suites/smpp/esme_ms_sms_transaction.py<br>M sysmocom/suites/sms/mo_mt_sms.py<br>M sysmocom/suites/ussd/assert_extension.py<br>M sysmocom/suites/voice/lib/testlib.py<br>M sysmocom/suites/voice/mo_mt_call.py<br>M sysmocom/suites/voice/mo_mt_call_osmux.py<br>M sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py<br>M sysmocom/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py<br>45 files changed, 212 insertions(+), 212 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/46/18046/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py b/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py</span><br><span>index 7654ea6..51e78c0 100755</span><br><span>--- a/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py</span><br><span>+++ b/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py</span><br><span>@@ -1,15 +1,15 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mo = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mt = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mo = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mt = tenv.modem()</span><br><span> </span><br><span> hlr.start()</span><br><span> stp.start()</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>index 88ae82d..d4fa649 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>@@ -12,10 +12,10 @@</span><br><span> print_result_node(cli_res, 'client')</span><br><span> print_result_node(srv_res, 'server')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc = suite.epc()</span><br><span style="color: hsl(0, 100%, 40%);">-enb = suite.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv = suite.iperf3srv({'addr': epc.tun_addr()})</span><br><span style="color: hsl(120, 100%, 40%);">+epc = tenv.epc()</span><br><span style="color: hsl(120, 100%, 40%);">+enb = tenv.enb()</span><br><span style="color: hsl(120, 100%, 40%);">+ue = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})</span><br><span> iperf3srv.set_run_node(epc.run_node())</span><br><span> iperf3cli = iperf3srv.create_client()</span><br><span> iperf3cli.set_run_node(ue.run_node())</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>index 597b50d..64d476b 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>@@ -12,10 +12,10 @@</span><br><span> print_result_node(cli_res, 'client')</span><br><span> print_result_node(srv_res, 'server')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc = suite.epc()</span><br><span style="color: hsl(0, 100%, 40%);">-enb = suite.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv = suite.iperf3srv({'addr': epc.tun_addr()})</span><br><span style="color: hsl(120, 100%, 40%);">+epc = tenv.epc()</span><br><span style="color: hsl(120, 100%, 40%);">+enb = tenv.enb()</span><br><span style="color: hsl(120, 100%, 40%);">+ue = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})</span><br><span> iperf3srv.set_run_node(epc.run_node())</span><br><span> iperf3cli = iperf3srv.create_client()</span><br><span> iperf3cli.set_run_node(ue.run_node())</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/ping.py b/doc/examples/4g_srsLTE/suites/4g/ping.py</span><br><span>index 17eee78..c81a35d 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/ping.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/ping.py</span><br><span>@@ -1,9 +1,9 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc = suite.epc()</span><br><span style="color: hsl(0, 100%, 40%);">-enb = suite.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+epc = tenv.epc()</span><br><span style="color: hsl(120, 100%, 40%);">+enb = tenv.enb()</span><br><span style="color: hsl(120, 100%, 40%);">+ue = tenv.modem()</span><br><span> </span><br><span> epc.subscriber_add(ue)</span><br><span> epc.start()</span><br><span>diff --git a/selftest/suite_test/test_suite/hello_world.py b/selftest/suite_test/test_suite/hello_world.py</span><br><span>index a69f95a..81a9624 100644</span><br><span>--- a/selftest/suite_test/test_suite/hello_world.py</span><br><span>+++ b/selftest/suite_test/test_suite/hello_world.py</span><br><span>@@ -1,5 +1,5 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> print('hello world')</span><br><span style="color: hsl(0, 100%, 40%);">-print('I am %r / %r' % (suite.suite().name(), test.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+print('I am %r / %r' % (tenv.suite().name(), test.name()))</span><br><span> print('one\ntwo\nthree')</span><br><span>diff --git a/selftest/suite_test/test_suite/test_error.py b/selftest/suite_test/test_suite/test_error.py</span><br><span>index 70d14a1..6a258e3 100755</span><br><span>--- a/selftest/suite_test/test_suite/test_error.py</span><br><span>+++ b/selftest/suite_test/test_suite/test_error.py</span><br><span>@@ -1,5 +1,5 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print('I am %r / %r' % (suite.suite().name(), test.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+print('I am %r / %r' % (tenv.suite().name(), test.name()))</span><br><span> </span><br><span> assert False</span><br><span>diff --git a/selftest/suite_test/test_suite/test_fail.py b/selftest/suite_test/test_suite/test_fail.py</span><br><span>index ffb7218..83c9b44 100755</span><br><span>--- a/selftest/suite_test/test_suite/test_fail.py</span><br><span>+++ b/selftest/suite_test/test_suite/test_fail.py</span><br><span>@@ -1,6 +1,6 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print('I am %r / %r' % (suite.suite().name(), test.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+print('I am %r / %r' % (tenv.suite().name(), test.name()))</span><br><span> </span><br><span> test.set_fail('EpicFail', 'This failure is expected')</span><br><span>diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py</span><br><span>index 0e0860d..416fc58 100644</span><br><span>--- a/src/osmo_gsm_tester/testenv.py</span><br><span>+++ b/src/osmo_gsm_tester/testenv.py</span><br><span>@@ -37,7 +37,6 @@</span><br><span> from .obj import ms</span><br><span> </span><br><span> suite = None</span><br><span style="color: hsl(0, 100%, 40%);">-test = None</span><br><span> resources = None</span><br><span> log = None</span><br><span> dbg = None</span><br><span>@@ -49,6 +48,7 @@</span><br><span> prompt = None</span><br><span> Sms = None</span><br><span> process = None</span><br><span style="color: hsl(120, 100%, 40%);">+tenv = None</span><br><span> </span><br><span> class Timeout(Exception):</span><br><span> pass</span><br><span>@@ -313,7 +313,7 @@</span><br><span> from .core.event_loop import MainLoop</span><br><span> from .obj.sms import Sms as Sms_class</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- global suite, test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Sms, process</span><br><span style="color: hsl(120, 100%, 40%);">+ global test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Sms, process, tenv</span><br><span> </span><br><span> test = _test</span><br><span> resources = suite_run.reserved_resources # TODO: remove this global, only used in selftest</span><br><span>@@ -326,8 +326,8 @@</span><br><span> poll = MainLoop.poll</span><br><span> Sms = Sms_class</span><br><span> process = process_module</span><br><span style="color: hsl(0, 100%, 40%);">- suite = TestEnv(suite_run, _test) # stored in "suite" for backward compatibility</span><br><span style="color: hsl(0, 100%, 40%);">- prompt = suite.prompt</span><br><span style="color: hsl(0, 100%, 40%);">- return suite</span><br><span style="color: hsl(120, 100%, 40%);">+ tenv = TestEnv(suite_run, _test)</span><br><span style="color: hsl(120, 100%, 40%);">+ prompt = tenv.prompt</span><br><span style="color: hsl(120, 100%, 40%);">+ return tenv</span><br><span> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>index 88ae82d..d4fa649 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_dl.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>@@ -12,10 +12,10 @@</span><br><span> print_result_node(cli_res, 'client')</span><br><span> print_result_node(srv_res, 'server')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc = suite.epc()</span><br><span style="color: hsl(0, 100%, 40%);">-enb = suite.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv = suite.iperf3srv({'addr': epc.tun_addr()})</span><br><span style="color: hsl(120, 100%, 40%);">+epc = tenv.epc()</span><br><span style="color: hsl(120, 100%, 40%);">+enb = tenv.enb()</span><br><span style="color: hsl(120, 100%, 40%);">+ue = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})</span><br><span> iperf3srv.set_run_node(epc.run_node())</span><br><span> iperf3cli = iperf3srv.create_client()</span><br><span> iperf3cli.set_run_node(ue.run_node())</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>index 597b50d..64d476b 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_ul.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>@@ -12,10 +12,10 @@</span><br><span> print_result_node(cli_res, 'client')</span><br><span> print_result_node(srv_res, 'server')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc = suite.epc()</span><br><span style="color: hsl(0, 100%, 40%);">-enb = suite.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv = suite.iperf3srv({'addr': epc.tun_addr()})</span><br><span style="color: hsl(120, 100%, 40%);">+epc = tenv.epc()</span><br><span style="color: hsl(120, 100%, 40%);">+enb = tenv.enb()</span><br><span style="color: hsl(120, 100%, 40%);">+ue = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})</span><br><span> iperf3srv.set_run_node(epc.run_node())</span><br><span> iperf3cli = iperf3srv.create_client()</span><br><span> iperf3cli.set_run_node(ue.run_node())</span><br><span>diff --git a/sysmocom/suites/4g/ping.py b/sysmocom/suites/4g/ping.py</span><br><span>index 17eee78..c81a35d 100755</span><br><span>--- a/sysmocom/suites/4g/ping.py</span><br><span>+++ b/sysmocom/suites/4g/ping.py</span><br><span>@@ -1,9 +1,9 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc = suite.epc()</span><br><span style="color: hsl(0, 100%, 40%);">-enb = suite.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+epc = tenv.epc()</span><br><span style="color: hsl(120, 100%, 40%);">+enb = tenv.enb()</span><br><span style="color: hsl(120, 100%, 40%);">+ue = tenv.modem()</span><br><span> </span><br><span> epc.subscriber_add(ue)</span><br><span> epc.start()</span><br><span>diff --git a/sysmocom/suites/debug/interactive.py b/sysmocom/suites/debug/interactive.py</span><br><span>index 89f967f..fa53cc8 100755</span><br><span>--- a/sysmocom/suites/debug/interactive.py</span><br><span>+++ b/sysmocom/suites/debug/interactive.py</span><br><span>@@ -1,17 +1,17 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span> pcu = bts.pcu()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-ggsn = suite.ggsn()</span><br><span style="color: hsl(0, 100%, 40%);">-sgsn = suite.sgsn(hlr, ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ggsn = tenv.ggsn()</span><br><span style="color: hsl(120, 100%, 40%);">+sgsn = tenv.sgsn(hlr, ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-modems = suite.modems(int(prompt('How many modems?')))</span><br><span style="color: hsl(120, 100%, 40%);">+modems = tenv.modems(int(prompt('How many modems?')))</span><br><span> </span><br><span> bsc.bts_add(bts)</span><br><span> sgsn.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/dynts/switch_tch_pdch.py b/sysmocom/suites/dynts/switch_tch_pdch.py</span><br><span>index f0bbd38..7be4be7 100755</span><br><span>--- a/sysmocom/suites/dynts/switch_tch_pdch.py</span><br><span>+++ b/sysmocom/suites/dynts/switch_tch_pdch.py</span><br><span>@@ -32,18 +32,18 @@</span><br><span> wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0)</span><br><span> print('hangup success')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span> pcu = bts.pcu()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-ggsn = suite.ggsn()</span><br><span style="color: hsl(0, 100%, 40%);">-sgsn = suite.sgsn(hlr, ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mo = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mt = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ggsn = tenv.ggsn()</span><br><span style="color: hsl(120, 100%, 40%);">+sgsn = tenv.sgsn(hlr, ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mo = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mt = tenv.modem()</span><br><span> </span><br><span> bsc.bts_add(bts)</span><br><span> sgsn.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/encryption/lib/testlib.py b/sysmocom/suites/encryption/lib/testlib.py</span><br><span>index 3948941..ed76e6f 100644</span><br><span>--- a/sysmocom/suites/encryption/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/encryption/lib/testlib.py</span><br><span>@@ -2,14 +2,14 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> def encryption_test_setup_run(enable_auth, algo):</span><br><span style="color: hsl(0, 100%, 40%);">- hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">- bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">- stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">- msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">- bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">- ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = tenv.modem()</span><br><span> </span><br><span> print('start network...')</span><br><span> msc.set_authentication(enable_auth)</span><br><span>diff --git a/sysmocom/suites/encryption/register_a5_0_authopt.py b/sysmocom/suites/encryption/register_a5_0_authopt.py</span><br><span>index 1b7f471..e99946e 100755</span><br><span>--- a/sysmocom/suites/encryption/register_a5_0_authopt.py</span><br><span>+++ b/sysmocom/suites/encryption/register_a5_0_authopt.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import encryption_test_setup_run</span><br><span> </span><br><span> encryption_test_setup_run(False, 'a5_0')</span><br><span>diff --git a/sysmocom/suites/encryption/register_a5_0_authreq.py b/sysmocom/suites/encryption/register_a5_0_authreq.py</span><br><span>index feca525..648b49e 100755</span><br><span>--- a/sysmocom/suites/encryption/register_a5_0_authreq.py</span><br><span>+++ b/sysmocom/suites/encryption/register_a5_0_authreq.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import encryption_test_setup_run</span><br><span> </span><br><span> encryption_test_setup_run(True, 'a5_0')</span><br><span>diff --git a/sysmocom/suites/encryption/register_a5_1_authreq.py b/sysmocom/suites/encryption/register_a5_1_authreq.py</span><br><span>index 077819b..5391f14 100755</span><br><span>--- a/sysmocom/suites/encryption/register_a5_1_authreq.py</span><br><span>+++ b/sysmocom/suites/encryption/register_a5_1_authreq.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import encryption_test_setup_run</span><br><span> </span><br><span> encryption_test_setup_run(True, 'a5_1')</span><br><span>diff --git a/sysmocom/suites/encryption/register_a5_3_authreq.py b/sysmocom/suites/encryption/register_a5_3_authreq.py</span><br><span>index 219c109..0fb487b 100755</span><br><span>--- a/sysmocom/suites/encryption/register_a5_3_authreq.py</span><br><span>+++ b/sysmocom/suites/encryption/register_a5_3_authreq.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import encryption_test_setup_run</span><br><span> </span><br><span> encryption_test_setup_run(True, 'a5_3')</span><br><span>diff --git a/sysmocom/suites/gprs/cs_paging_gprs_active.py b/sysmocom/suites/gprs/cs_paging_gprs_active.py</span><br><span>index b7dead2..f765f80 100755</span><br><span>--- a/sysmocom/suites/gprs/cs_paging_gprs_active.py</span><br><span>+++ b/sysmocom/suites/gprs/cs_paging_gprs_active.py</span><br><span>@@ -6,7 +6,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import setup_run_iperf3_test_parallel</span><br><span> </span><br><span> def ready_cb_place_voicecall(ms_li):</span><br><span>diff --git a/sysmocom/suites/gprs/iperf3.py b/sysmocom/suites/gprs/iperf3.py</span><br><span>index e25519a..bcf14a9 100755</span><br><span>--- a/sysmocom/suites/gprs/iperf3.py</span><br><span>+++ b/sysmocom/suites/gprs/iperf3.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import setup_run_iperf3_test_parallel</span><br><span> </span><br><span> setup_run_iperf3_test_parallel(1)</span><br><span>diff --git a/sysmocom/suites/gprs/iperf3m4.py b/sysmocom/suites/gprs/iperf3m4.py</span><br><span>index 1cc27ed..713757c 100755</span><br><span>--- a/sysmocom/suites/gprs/iperf3m4.py</span><br><span>+++ b/sysmocom/suites/gprs/iperf3m4.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import setup_run_iperf3_test_parallel</span><br><span> </span><br><span> setup_run_iperf3_test_parallel(4)</span><br><span>diff --git a/sysmocom/suites/gprs/lib/testlib.py b/sysmocom/suites/gprs/lib/testlib.py</span><br><span>index c1a1bc1..8e42248 100644</span><br><span>--- a/sysmocom/suites/gprs/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/gprs/lib/testlib.py</span><br><span>@@ -35,30 +35,30 @@</span><br><span> </span><br><span> </span><br><span> def setup_run_iperf3_test_parallel(num_ms, ready_cb=None):</span><br><span style="color: hsl(0, 100%, 40%);">- hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">- bts = suite.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = tenv.bts()</span><br><span> pcu = bts.pcu()</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">- stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">- ggsn = suite.ggsn()</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn = suite.sgsn(hlr, ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">- msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">- bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn = tenv.ggsn()</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn = tenv.sgsn(hlr, ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- iperf3srv_addr = suite.ip_address()</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv_addr = tenv.ip_address()</span><br><span> servers = []</span><br><span> clients = []</span><br><span> ms_li = []</span><br><span> for i in range(num_ms):</span><br><span style="color: hsl(0, 100%, 40%);">- iperf3srv = suite.iperf3srv(iperf3srv_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv = tenv.iperf3srv(iperf3srv_addr)</span><br><span> iperf3srv.set_port(iperf3srv.DEFAULT_SRV_PORT + i)</span><br><span> servers.append(iperf3srv)</span><br><span> </span><br><span> iperf3cli = iperf3srv.create_client()</span><br><span> clients.append(iperf3cli)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = tenv.modem()</span><br><span> ms_li.append(ms)</span><br><span> </span><br><span> bsc.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/gprs/ping.py b/sysmocom/suites/gprs/ping.py</span><br><span>index 22fe80a..9a7acde 100755</span><br><span>--- a/sysmocom/suites/gprs/ping.py</span><br><span>+++ b/sysmocom/suites/gprs/ping.py</span><br><span>@@ -1,17 +1,17 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span> pcu = bts.pcu()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-ggsn = suite.ggsn()</span><br><span style="color: hsl(0, 100%, 40%);">-sgsn = suite.sgsn(hlr, ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ggsn = tenv.ggsn()</span><br><span style="color: hsl(120, 100%, 40%);">+sgsn = tenv.sgsn(hlr, ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span> </span><br><span> bsc.bts_add(bts)</span><br><span> sgsn.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/gprs/ping_idle_ping.py b/sysmocom/suites/gprs/ping_idle_ping.py</span><br><span>index 02e2cdf..88ecbdb 100755</span><br><span>--- a/sysmocom/suites/gprs/ping_idle_ping.py</span><br><span>+++ b/sysmocom/suites/gprs/ping_idle_ping.py</span><br><span>@@ -6,17 +6,17 @@</span><br><span> </span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span> pcu = bts.pcu()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-ggsn = suite.ggsn()</span><br><span style="color: hsl(0, 100%, 40%);">-sgsn = suite.sgsn(hlr, ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ggsn = tenv.ggsn()</span><br><span style="color: hsl(120, 100%, 40%);">+sgsn = tenv.sgsn(hlr, ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span> </span><br><span> bsc.bts_add(bts)</span><br><span> sgsn.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_debug/interactive.py b/sysmocom/suites/nitb_debug/interactive.py</span><br><span>index 595cfd9..bd68a57 100755</span><br><span>--- a/sysmocom/suites/nitb_debug/interactive.py</span><br><span>+++ b/sysmocom/suites/nitb_debug/interactive.py</span><br><span>@@ -2,9 +2,9 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> print('use resources...')</span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-modems = suite.modems(int(prompt('How many modems?')))</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+modems = tenv.modems(int(prompt('How many modems?')))</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_netreg/register.py b/sysmocom/suites/nitb_netreg/register.py</span><br><span>index d5fbeb7..fd171b3 100755</span><br><span>--- a/sysmocom/suites/nitb_netreg/register.py</span><br><span>+++ b/sysmocom/suites/nitb_netreg/register.py</span><br><span>@@ -2,9 +2,9 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> print('use resources...')</span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_netreg/register_default.py b/sysmocom/suites/nitb_netreg/register_default.py</span><br><span>index 545525d..6531049 100755</span><br><span>--- a/sysmocom/suites/nitb_netreg/register_default.py</span><br><span>+++ b/sysmocom/suites/nitb_netreg/register_default.py</span><br><span>@@ -2,9 +2,9 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> print('use resources...')</span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_netreg_mass/register_default_mass.py b/sysmocom/suites/nitb_netreg_mass/register_default_mass.py</span><br><span>index 262b271..f6b94ad 100644</span><br><span>--- a/sysmocom/suites/nitb_netreg_mass/register_default_mass.py</span><br><span>+++ b/sysmocom/suites/nitb_netreg_mass/register_default_mass.py</span><br><span>@@ -7,11 +7,11 @@</span><br><span> from datetime import timedelta</span><br><span> </span><br><span> print('Claiming resources for the test')</span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms_driver = suite.ms_driver()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms_driver = tenv.ms_driver()</span><br><span> ul = ms_driver.add_test('ul_test')</span><br><span style="color: hsl(0, 100%, 40%);">-modems = suite.all_resources(suite.modem)</span><br><span style="color: hsl(120, 100%, 40%);">+modems = tenv.all_resources(tenv.modem)</span><br><span> </span><br><span> print('Launching a simple network')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py b/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py</span><br><span>index 904226b..85abb9b 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_connect_policy_acceptall.py</span><br><span>@@ -6,9 +6,9 @@</span><br><span> </span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span> smsc = nitb.smsc</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span> </span><br><span> # Here we deliberately omit calling smsc.esme_add() to avoid having it included</span><br><span> # in the smsc config.</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py b/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py</span><br><span>index eaabb3d..41a74f2 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_connect_policy_closed.py</span><br><span>@@ -11,10 +11,10 @@</span><br><span> SMPP_ESME_RINVPASWD = 0x0000000E</span><br><span> SMPP_ESME_RINVSYSID = 0x0000000F</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span> smsc = nitb.smsc</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(0, 100%, 40%);">-esme_no_pwd = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+esme_no_pwd = tenv.esme()</span><br><span> esme_no_pwd.set_password('')</span><br><span> </span><br><span> smsc.set_smsc_policy(smsc.SMSC_POLICY_CLOSED)</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>index 391a040..29a5ced 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>@@ -12,10 +12,10 @@</span><br><span> </span><br><span> SMPP_ESME_RINVDSTADR = 0x0000000B</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>index adc9dae..2963b6e 100755</span><br><span>--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>@@ -10,10 +10,10 @@</span><br><span> </span><br><span> SMPP_ESME_RINVDSTADR = 0x0000000B</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_sms/mo_mt_sms.py b/sysmocom/suites/nitb_sms/mo_mt_sms.py</span><br><span>index 10897ff..d1cece6 100755</span><br><span>--- a/sysmocom/suites/nitb_sms/mo_mt_sms.py</span><br><span>+++ b/sysmocom/suites/nitb_sms/mo_mt_sms.py</span><br><span>@@ -1,10 +1,10 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mo = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mt = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mo = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mt = tenv.modem()</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/nitb_ussd/assert_extension.py b/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>index 8ccab2d..6246e61 100755</span><br><span>--- a/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>+++ b/sysmocom/suites/nitb_ussd/assert_extension.py</span><br><span>@@ -3,9 +3,9 @@</span><br><span> </span><br><span> USSD_COMMAND_GET_EXTENSION = '*#100#'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nitb = suite.nitb()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+nitb = tenv.nitb()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span> </span><br><span> print('start nitb and bts...')</span><br><span> nitb.bts_add(bts)</span><br><span>diff --git a/sysmocom/suites/smpp/esme_connect_policy_acceptall.py b/sysmocom/suites/smpp/esme_connect_policy_acceptall.py</span><br><span>index 168b4f3..9a53446 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_connect_policy_acceptall.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_connect_policy_acceptall.py</span><br><span>@@ -6,12 +6,12 @@</span><br><span> </span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span> smsc = msc.smsc</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span> </span><br><span> # Here we deliberately omit calling smsc.esme_add() to avoid having it included</span><br><span> # in the smsc config.</span><br><span>diff --git a/sysmocom/suites/smpp/esme_connect_policy_closed.py b/sysmocom/suites/smpp/esme_connect_policy_closed.py</span><br><span>index 487e5a4..fc4145c 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_connect_policy_closed.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_connect_policy_closed.py</span><br><span>@@ -11,15 +11,15 @@</span><br><span> SMPP_ESME_RINVPASWD = 0x0000000E</span><br><span> SMPP_ESME_RINVSYSID = 0x0000000F</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span> smsc = msc.smsc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(0, 100%, 40%);">-esme_no_pwd = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+esme_no_pwd = tenv.esme()</span><br><span> esme_no_pwd.set_password('')</span><br><span> </span><br><span> smsc.set_smsc_policy(smsc.SMSC_POLICY_CLOSED)</span><br><span>diff --git a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>index 681bc29..232d1d3 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>@@ -12,17 +12,17 @@</span><br><span> </span><br><span> SMPP_ESME_RINVDSTADR = 0x0000000B</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span> bsc.bts_add(bts)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span> msc.smsc.esme_add(esme)</span><br><span> </span><br><span> hlr.start()</span><br><span>diff --git a/sysmocom/suites/smpp/esme_ms_sms_transaction.py b/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>index 16b01cc..d42012b 100755</span><br><span>--- a/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>+++ b/sysmocom/suites/smpp/esme_ms_sms_transaction.py</span><br><span>@@ -10,17 +10,17 @@</span><br><span> </span><br><span> SMPP_ESME_RINVDSTADR = 0x0000000B</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span> bsc.bts_add(bts)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-esme = suite.esme()</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+esme = tenv.esme()</span><br><span> msc.smsc.esme_add(esme)</span><br><span> </span><br><span> hlr.start()</span><br><span>diff --git a/sysmocom/suites/sms/mo_mt_sms.py b/sysmocom/suites/sms/mo_mt_sms.py</span><br><span>index 7654ea6..51e78c0 100755</span><br><span>--- a/sysmocom/suites/sms/mo_mt_sms.py</span><br><span>+++ b/sysmocom/suites/sms/mo_mt_sms.py</span><br><span>@@ -1,15 +1,15 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mo = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mt = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mo = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ms_mt = tenv.modem()</span><br><span> </span><br><span> hlr.start()</span><br><span> stp.start()</span><br><span>diff --git a/sysmocom/suites/ussd/assert_extension.py b/sysmocom/suites/ussd/assert_extension.py</span><br><span>index 475de09..bac311f 100755</span><br><span>--- a/sysmocom/suites/ussd/assert_extension.py</span><br><span>+++ b/sysmocom/suites/ussd/assert_extension.py</span><br><span>@@ -3,14 +3,14 @@</span><br><span> </span><br><span> USSD_COMMAND_GET_EXTENSION = '*#100#'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ms = tenv.modem()</span><br><span> </span><br><span> hlr.start()</span><br><span> stp.start()</span><br><span>diff --git a/sysmocom/suites/voice/lib/testlib.py b/sysmocom/suites/voice/lib/testlib.py</span><br><span>index 7d934f1..3ec6d67 100644</span><br><span>--- a/sysmocom/suites/voice/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/voice/lib/testlib.py</span><br><span>@@ -2,15 +2,15 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> def test_mo_mt_call(use_osmux=False, force_osmux=False):</span><br><span style="color: hsl(0, 100%, 40%);">- hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">- bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">- stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">- msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">- bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">- ms_mo = suite.modem()</span><br><span style="color: hsl(0, 100%, 40%);">- ms_mt = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_msc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_bsc = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ stp = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = tenv.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc = tenv.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_mo = tenv.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_mt = tenv.modem()</span><br><span> </span><br><span> hlr.start()</span><br><span> stp.start()</span><br><span>diff --git a/sysmocom/suites/voice/mo_mt_call.py b/sysmocom/suites/voice/mo_mt_call.py</span><br><span>index 740b1fe..2a2afa4 100755</span><br><span>--- a/sysmocom/suites/voice/mo_mt_call.py</span><br><span>+++ b/sysmocom/suites/voice/mo_mt_call.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import test_mo_mt_call</span><br><span> </span><br><span> test_mo_mt_call(False, False)</span><br><span>diff --git a/sysmocom/suites/voice/mo_mt_call_osmux.py b/sysmocom/suites/voice/mo_mt_call_osmux.py</span><br><span>index acf7d71..c65caab 100755</span><br><span>--- a/sysmocom/suites/voice/mo_mt_call_osmux.py</span><br><span>+++ b/sysmocom/suites/voice/mo_mt_call_osmux.py</span><br><span>@@ -2,7 +2,7 @@</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import test_mo_mt_call</span><br><span> </span><br><span> test_mo_mt_call(True, True)</span><br><span>diff --git a/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py b/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>index 288450f..0eceef7 100644</span><br><span>--- a/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>+++ b/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>@@ -4,13 +4,13 @@</span><br><span> </span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def run_ttcn3(suite, test_obj, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute, ttcn3_test_extra_module_params=""):</span><br><span style="color: hsl(120, 100%, 40%);">+def run_ttcn3(tenv, test_obj, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute, ttcn3_test_extra_module_params=""):</span><br><span> own_dir = testdir</span><br><span> script_file = os.path.join(testdir, 'scripts', 'run_ttcn3_docker.sh')</span><br><span> bts_tmpl_file = os.path.join(testdir, 'scripts', 'BTS_Tests.cfg.tmpl')</span><br><span> script_run_dir = test_obj.get_run_dir().new_dir('ttcn3')</span><br><span> bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')</span><br><span style="color: hsl(0, 100%, 40%);">- junit_ttcn3_dst_file = os.path.join(str(suite.trial.get_run_dir()), 'trial-') + test_obj.basename + '.xml'</span><br><span style="color: hsl(120, 100%, 40%);">+ junit_ttcn3_dst_file = os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-') + test_obj.basename + '.xml'</span><br><span> if bts.bts_type() == 'osmo-bts-trx':</span><br><span> pcu_available = True</span><br><span> pcu_sk = bts.pcu_socket_path()</span><br><span>diff --git a/sysmocom/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/sysmocom/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>index a34c847..b7c5781 100755</span><br><span>--- a/sysmocom/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>+++ b/sysmocom/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>@@ -3,20 +3,20 @@</span><br><span> </span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> import testlib</span><br><span style="color: hsl(0, 100%, 40%);">-suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+tenv.test_import_modules_register_for_cleanup(testlib)</span><br><span> from testlib import run_ttcn3</span><br><span> </span><br><span> ttcn3_test_execute="BTS_Tests.control"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr_dummy = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_dummy = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp_dummy = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc_dummy = suite.msc(hlr_dummy, mgw_dummy, stp_dummy)</span><br><span style="color: hsl(0, 100%, 40%);">-ggsn_dummy = suite.ggsn()</span><br><span style="color: hsl(0, 100%, 40%);">-sgsn_dummy = suite.sgsn(hlr_dummy, ggsn_dummy)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc_dummy, mgw_dummy, stp_dummy)</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-osmocon = suite.osmocon()</span><br><span style="color: hsl(120, 100%, 40%);">+hlr_dummy = tenv.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+mgw_dummy = tenv.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+stp_dummy = tenv.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+msc_dummy = tenv.msc(hlr_dummy, mgw_dummy, stp_dummy)</span><br><span style="color: hsl(120, 100%, 40%);">+ggsn_dummy = tenv.ggsn()</span><br><span style="color: hsl(120, 100%, 40%);">+sgsn_dummy = tenv.sgsn(hlr_dummy, ggsn_dummy)</span><br><span style="color: hsl(120, 100%, 40%);">+bsc = tenv.bsc(msc_dummy, mgw_dummy, stp_dummy)</span><br><span style="color: hsl(120, 100%, 40%);">+bts = tenv.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+osmocon = tenv.osmocon()</span><br><span> </span><br><span> bts.set_num_trx(1)</span><br><span> bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4')</span><br><span>@@ -34,7 +34,7 @@</span><br><span> msc_dummy.start()</span><br><span> mgw_dummy.start()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-nat_rsl_ip = suite.ip_address().get('addr')</span><br><span style="color: hsl(120, 100%, 40%);">+nat_rsl_ip = tenv.ip_address().get('addr')</span><br><span> bsc.set_rsl_ip(nat_rsl_ip)</span><br><span> bsc.bts_add(bts)</span><br><span> sgsn_dummy.bts_add(bts)</span><br><span>@@ -46,4 +46,4 @@</span><br><span> osmocon.start()</span><br><span> </span><br><span> testdir = os.path.dirname(os.path.realpath(__file__))</span><br><span style="color: hsl(0, 100%, 40%);">-run_ttcn3(suite, test, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute)</span><br><span style="color: hsl(120, 100%, 40%);">+run_ttcn3(tenv. test, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18046">change 18046</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18046"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I777ec59ffd83b861ddc09e85e52d7a8896264b8c </div>
<div style="display:none"> Gerrit-Change-Number: 18046 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>