From 7b02ed0f4b7fbe906d294590e7bb1e89d86d0ec6 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 8 Jun 2017 23:08:59 +0200 Subject: [PATCH] osmo-msc: configure HLR address 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. Related: OS#2320 Change-Id: I005aa160c679fc92b248abd762888959bd5b2c55 --- src/osmo_gsm_tester/osmo_hlr.py | 3 +++ src/osmo_gsm_tester/osmo_msc.py | 1 + src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/osmo_gsm_tester/osmo_hlr.py b/src/osmo_gsm_tester/osmo_hlr.py index 354eb1d3..3492f065 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 ca0e2466..2ef88df7 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 c52d0dcc..247365ee 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}