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