tests: Replace 'suite' with 'tenv'
Change-Id: I777ec59ffd83b861ddc09e85e52d7a8896264b8c
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)