Configure bsc and msc to connect to the specific stp provided in test

Change-Id: I89deaa71956131766fec8fcc3bc7381ebb0e187f

11 files changed, 24 insertions, 20 deletions

diff --git a/suites/aoip_debug/interactive.py b/suites/aoip_debug/interactive.py
index 98b9170..cad68b7 100755
--- a/suites/aoip_debug/interactive.py
+++ b/suites/aoip_debug/interactive.py
@@ -4,9 +4,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 modems = suite.modems(int(prompt('How many modems?')))
 
 hlr.start()
diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py
index f528742..75614e2 100755
--- a/suites/aoip_encryption/register_a5_0_authopt.py
+++ b/suites/aoip_encryption/register_a5_0_authopt.py
@@ -5,9 +5,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
 print('start network...')
diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py
index a192ff3..07293d2 100755
--- a/suites/aoip_encryption/register_a5_0_authreq.py
+++ b/suites/aoip_encryption/register_a5_0_authreq.py
@@ -5,9 +5,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
 print('start network...')
diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py
index f5bccfb..190e5bb 100755
--- a/suites/aoip_encryption/register_a5_1_authreq.py
+++ b/suites/aoip_encryption/register_a5_1_authreq.py
@@ -5,9 +5,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
 print('start network...')
diff --git a/suites/aoip_smpp/esme_connect_policy_acceptall.py b/suites/aoip_smpp/esme_connect_policy_acceptall.py
index 34516a3..ef5db4e 100755
--- a/suites/aoip_smpp/esme_connect_policy_acceptall.py
+++ b/suites/aoip_smpp/esme_connect_policy_acceptall.py
@@ -9,7 +9,8 @@ from osmo_gsm_tester.testenv import *
 hlr = suite.hlr()
 bts = suite.bts() # bts not started, only needed for mgcpgw
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
-msc = suite.msc(hlr, mgcpgw)
+stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
 smsc = msc.smsc
 esme = suite.esme()
 
@@ -18,6 +19,7 @@ esme = suite.esme()
 smsc.set_smsc_policy(smsc.SMSC_POLICY_ACCEPT_ALL)
 esme.set_smsc(smsc)
 
+stp.start()
 hlr.start()
 msc.start()
 mgcpgw.start()
diff --git a/suites/aoip_smpp/esme_connect_policy_closed.py b/suites/aoip_smpp/esme_connect_policy_closed.py
index 79cb0c7..263b428 100755
--- a/suites/aoip_smpp/esme_connect_policy_closed.py
+++ b/suites/aoip_smpp/esme_connect_policy_closed.py
@@ -14,7 +14,8 @@ SMPP_ESME_RINVSYSID = 0x0000000F
 hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
-msc = suite.msc(hlr, mgcpgw)
+stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
 smsc = msc.smsc
 
 esme = suite.esme()
@@ -25,6 +26,7 @@ smsc.set_smsc_policy(smsc.SMSC_POLICY_CLOSED)
 smsc.esme_add(esme)
 smsc.esme_add(esme_no_pwd)
 
+stp.start()
 hlr.start()
 msc.start()
 mgcpgw.start()
diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py
index f0d5dd5..79c570e 100755
--- a/suites/aoip_smpp/esme_ms_sms_storeforward.py
+++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py
@@ -16,9 +16,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 bsc.bts_add(bts)
 
 ms = suite.modem()
diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/aoip_smpp/esme_ms_sms_transaction.py
index 2b12829..e20b2b6 100755
--- a/suites/aoip_smpp/esme_ms_sms_transaction.py
+++ b/suites/aoip_smpp/esme_ms_sms_transaction.py
@@ -14,9 +14,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 bsc.bts_add(bts)
 
 ms = suite.modem()
diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py
index 12f8f2b..76b7e51 100755
--- a/suites/aoip_sms/mo_mt_sms.py
+++ b/suites/aoip_sms/mo_mt_sms.py
@@ -5,9 +5,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms_mo = suite.modem()
 ms_mt = suite.modem()
 
diff --git a/suites/aoip_ussd/assert_extension.py b/suites/aoip_ussd/assert_extension.py
index 5204be8..181f07f 100755
--- a/suites/aoip_ussd/assert_extension.py
+++ b/suites/aoip_ussd/assert_extension.py
@@ -7,9 +7,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
 hlr.start()
diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py
index b2d6f8d..46c5ec8 100755
--- a/suites/voice/mo_mt_call.py
+++ b/suites/voice/mo_mt_call.py
@@ -5,9 +5,9 @@ hlr = suite.hlr()
 bts = suite.bts()
 mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
 mgw_bsc = suite.mgw()
-msc = suite.msc(hlr, mgcpgw)
-bsc = suite.bsc(msc, mgw_bsc)
 stp = suite.stp()
+msc = suite.msc(hlr, mgcpgw, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
 ms_mo = suite.modem()
 ms_mt = suite.modem()