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
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