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/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/6929 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 --- M src/osmo_gsm_tester/osmo_msc.py M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl M suites/aoip_debug/interactive.py M suites/aoip_encryption/register_a5_0_authopt.py M suites/aoip_encryption/register_a5_0_authreq.py M suites/aoip_encryption/register_a5_1_authreq.py M suites/aoip_smpp/esme_connect_policy_acceptall.py M suites/aoip_smpp/esme_connect_policy_closed.py M suites/aoip_smpp/esme_ms_sms_storeforward.py M suites/aoip_smpp/esme_ms_sms_transaction.py M suites/aoip_sms/mo_mt_sms.py M suites/aoip_ussd/assert_extension.py M suites/gprs/ping.py M suites/voice/mo_mt_call.py 14 files changed, 41 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/29/6929/1 diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py index 3ff2d6a..0e458fe 100644 --- a/src/osmo_gsm_tester/osmo_msc.py +++ b/src/osmo_gsm_tester/osmo_msc.py @@ -35,12 +35,12 @@ encryption = None authentication = None - def __init__(self, suite_run, hlr, mgcpgw, stp, ip_address): + def __init__(self, suite_run, hlr, mgw, stp, ip_address): super().__init__(log.C_RUN, 'osmo-msc_%s' % ip_address.get('addr')) self.suite_run = suite_run self.ip_address = ip_address self.hlr = hlr - self.mgcpgw = mgcpgw + self.mgw = mgw self.stp = stp self.smsc = smsc.Smsc((ip_address.get('addr'), 2775)) @@ -76,7 +76,7 @@ values = dict(msc=config.get_defaults('msc')) config.overlay(values, self.suite_run.config()) config.overlay(values, dict(msc=dict(ip_address=self.ip_address))) - config.overlay(values, self.mgcpgw.conf_for_msc()) + config.overlay(values, self.mgw.conf_for_client()) config.overlay(values, self.hlr.conf_for_client()) config.overlay(values, self.stp.conf_for_client()) config.overlay(values, self.smsc.get_config()) diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index e54e8c8..76f1001 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -24,6 +24,8 @@ routing-key 1 0.0.1 msc mgw remote-ip ${mgw.ip_address.addr} + mgw endpoint-range 1 31 + mgw bts-base 8000 assign-tmsi cs7-instance-iu 0 cs7-instance-a 0 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ hlr.start() stp.start() msc.start() -mgcpgw.start() +mgw_msc.start() mgw_bsc.start() bsc.bts_add(bts) -- To view, visit https://gerrit.osmocom.org/6929 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93033f7b6133a4914f12f37511ad870b3dea3201 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>