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