diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-02-26 12:14:46 +0100 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-02-26 12:14:48 +0100 |
commit | 86ea02f30575e0637ffde6781d596a5f9e713fd2 (patch) | |
tree | 8a092e9248c6d1a7a884644467b5d378c04aaddf /suites | |
parent | 2c48c349980b1a1018b83669f2dfcc6427897d57 (diff) |
osmo-msc: Use osmo-mgw instead of osmo-bsc_mgcp
osmo-msc now requires osmo-mgw and it's not expected to work properly
anymore with old mgcp code.
Change-Id: I93033f7b6133a4914f12f37511ad870b3dea3201
Diffstat (limited to 'suites')
-rwxr-xr-x | suites/aoip_debug/interactive.py | 6 | ||||
-rwxr-xr-x | suites/aoip_encryption/register_a5_0_authopt.py | 6 | ||||
-rwxr-xr-x | suites/aoip_encryption/register_a5_0_authreq.py | 6 | ||||
-rwxr-xr-x | suites/aoip_encryption/register_a5_1_authreq.py | 6 | ||||
-rwxr-xr-x | suites/aoip_smpp/esme_connect_policy_acceptall.py | 7 | ||||
-rwxr-xr-x | suites/aoip_smpp/esme_connect_policy_closed.py | 6 | ||||
-rwxr-xr-x | suites/aoip_smpp/esme_ms_sms_storeforward.py | 6 | ||||
-rwxr-xr-x | suites/aoip_smpp/esme_ms_sms_transaction.py | 6 | ||||
-rwxr-xr-x | suites/aoip_sms/mo_mt_sms.py | 6 | ||||
-rwxr-xr-x | suites/aoip_ussd/assert_extension.py | 6 | ||||
-rwxr-xr-x | suites/gprs/ping.py | 6 | ||||
-rwxr-xr-x | suites/voice/mo_mt_call.py | 6 |
12 files changed, 36 insertions, 37 deletions
diff --git a/suites/aoip_debug/interactive.py b/suites/aoip_debug/interactive.py index b08bac1..98bf174 100755 --- a/suites/aoip_debug/interactive.py +++ b/suites/aoip_debug/interactive.py @@ -3,12 +3,12 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() pcu = bts.pcu() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() ggsn = suite.ggsn() sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) modems = suite.modems(int(prompt('How many modems?'))) @@ -21,7 +21,7 @@ stp.start() ggsn.start() sgsn.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.start() diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py index 6a06078..acbbb1f 100755 --- a/suites/aoip_encryption/register_a5_0_authopt.py +++ b/suites/aoip_encryption/register_a5_0_authopt.py @@ -3,10 +3,10 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms = suite.modem() @@ -17,7 +17,7 @@ bsc.set_encryption('a5_0') hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) bsc.start() diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py index d6c67ea..789ace5 100755 --- a/suites/aoip_encryption/register_a5_0_authreq.py +++ b/suites/aoip_encryption/register_a5_0_authreq.py @@ -3,10 +3,10 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms = suite.modem() @@ -17,7 +17,7 @@ bsc.set_encryption('a5_0') hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) bsc.start() diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py index b2c446f..e7aa76c 100755 --- a/suites/aoip_encryption/register_a5_1_authreq.py +++ b/suites/aoip_encryption/register_a5_1_authreq.py @@ -3,10 +3,10 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms = suite.modem() @@ -17,7 +17,7 @@ bsc.set_encryption('a5_1') hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) bsc.start() diff --git a/suites/aoip_smpp/esme_connect_policy_acceptall.py b/suites/aoip_smpp/esme_connect_policy_acceptall.py index ef5db4e..168b4f3 100755 --- a/suites/aoip_smpp/esme_connect_policy_acceptall.py +++ b/suites/aoip_smpp/esme_connect_policy_acceptall.py @@ -7,10 +7,9 @@ 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()) +mgw_msc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) smsc = msc.smsc esme = suite.esme() @@ -22,7 +21,7 @@ esme.set_smsc(smsc) stp.start() hlr.start() msc.start() -mgcpgw.start() +mgw_msc.start() # Due to accept-all policy, connect() should work even if we didn't previously # configure the esme in the smsc, no matter the system_id / password we use. diff --git a/suites/aoip_smpp/esme_connect_policy_closed.py b/suites/aoip_smpp/esme_connect_policy_closed.py index 263b428..487e5a4 100755 --- a/suites/aoip_smpp/esme_connect_policy_closed.py +++ b/suites/aoip_smpp/esme_connect_policy_closed.py @@ -13,9 +13,9 @@ SMPP_ESME_RINVSYSID = 0x0000000F hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) smsc = msc.smsc esme = suite.esme() @@ -29,7 +29,7 @@ smsc.esme_add(esme_no_pwd) stp.start() hlr.start() msc.start() -mgcpgw.start() +mgw_msc.start() log('Test with correct credentials (no password)') esme_no_pwd.connect() diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py index 74765bc..681bc29 100755 --- a/suites/aoip_smpp/esme_ms_sms_storeforward.py +++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py @@ -14,10 +14,10 @@ SMPP_ESME_RINVDSTADR = 0x0000000B hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) bsc.bts_add(bts) @@ -28,7 +28,7 @@ msc.smsc.esme_add(esme) hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.start() bts.start() diff --git a/suites/aoip_smpp/esme_ms_sms_transaction.py b/suites/aoip_smpp/esme_ms_sms_transaction.py index 190879d..16b01cc 100755 --- a/suites/aoip_smpp/esme_ms_sms_transaction.py +++ b/suites/aoip_smpp/esme_ms_sms_transaction.py @@ -12,10 +12,10 @@ SMPP_ESME_RINVDSTADR = 0x0000000B hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) bsc.bts_add(bts) @@ -26,7 +26,7 @@ msc.smsc.esme_add(esme) hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.start() bts.start() diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py index 6ce460f..7654ea6 100755 --- a/suites/aoip_sms/mo_mt_sms.py +++ b/suites/aoip_sms/mo_mt_sms.py @@ -3,10 +3,10 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms_mo = suite.modem() ms_mt = suite.modem() @@ -14,7 +14,7 @@ ms_mt = suite.modem() hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) diff --git a/suites/aoip_ussd/assert_extension.py b/suites/aoip_ussd/assert_extension.py index 5969b01..56d853b 100755 --- a/suites/aoip_ussd/assert_extension.py +++ b/suites/aoip_ussd/assert_extension.py @@ -5,17 +5,17 @@ USSD_COMMAND_GET_EXTENSION = '*#100#' hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms = suite.modem() hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) diff --git a/suites/gprs/ping.py b/suites/gprs/ping.py index 1b6d85c..1647445 100755 --- a/suites/gprs/ping.py +++ b/suites/gprs/ping.py @@ -4,12 +4,12 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() pcu = bts.pcu() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() ggsn = suite.ggsn() sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms = suite.modem() @@ -22,7 +22,7 @@ stp.start() ggsn.start() sgsn.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.start() diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py index fa3b900..aeda80d 100755 --- a/suites/voice/mo_mt_call.py +++ b/suites/voice/mo_mt_call.py @@ -3,10 +3,10 @@ from osmo_gsm_tester.testenv import * hlr = suite.hlr() bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) +mgw_msc = suite.mgw() mgw_bsc = suite.mgw() stp = suite.stp() -msc = suite.msc(hlr, mgcpgw, stp) +msc = suite.msc(hlr, mgw_msc, stp) bsc = suite.bsc(msc, mgw_bsc, stp) ms_mo = suite.modem() ms_mt = suite.modem() @@ -14,7 +14,7 @@ ms_mt = suite.modem() hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) |