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
This commit is contained in:
parent
2c48c34998
commit
86ea02f305
|
@ -35,12 +35,12 @@ class OsmoMsc(log.Origin):
|
|||
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 @@ class OsmoMsc(log.Origin):
|
|||
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())
|
||||
|
|
|
@ -24,6 +24,8 @@ cs7 instance 0
|
|||
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
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue