summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-08 23:08:59 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-08 23:09:01 +0200
commitab0fabab66c2a0c5a15fb2cf674a502e0ea3cb5a (patch)
treedefa9469d9607ae82e3a26f4525d4e5d3c2abad0
parentb902b299121d52cde92d0f235212b1f5cd97b872 (diff)
osmo-msc: configure HLR addressneels/msc-hlr
In db59bcf9fcdc5f05fdb9047b905ab497472440bc we added a configured GSUP server address for the osmo-hlr, but the osmo-msc is still trying to connect to 127.0.0.1. In the same way as for mgcpgw, add conf_for_msc() to OsmoHLR, and use that to configure the HLR's address in osmo-msc.cfg. Change-Id: I005aa160c679fc92b248abd762888959bd5b2c55
-rw-r--r--src/osmo_gsm_tester/osmo_hlr.py3
-rw-r--r--src/osmo_gsm_tester/osmo_msc.py1
-rw-r--r--src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/osmo_gsm_tester/osmo_hlr.py b/src/osmo_gsm_tester/osmo_hlr.py
index 354eb1d..3492f06 100644
--- a/src/osmo_gsm_tester/osmo_hlr.py
+++ b/src/osmo_gsm_tester/osmo_hlr.py
@@ -126,4 +126,7 @@ class OsmoHlr(log.Origin):
% (subscriber_id, modem.imsi(), modem.msisdn))
return subscriber_id
+ def conf_for_msc(self):
+ return dict(hlr=dict(ip_address=self.ip_address))
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py
index ca0e246..2ef88df 100644
--- a/src/osmo_gsm_tester/osmo_msc.py
+++ b/src/osmo_gsm_tester/osmo_msc.py
@@ -72,6 +72,7 @@ class OsmoMsc(log.Origin):
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.hlr.conf_for_msc())
self.dbg('MSC CONFIG:\n' + pprint.pformat(values))
diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
index c52d0dc..247365e 100644
--- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
@@ -28,3 +28,5 @@ smpp
esme test
password test
default-route
+hlr
+ remote-ip ${hlr.ip_address.addr}