<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17814">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: add optional gtp_bind_addr paramter to enb class<br><br>this allows to optionally specify a the GTP bind_address for a enb object<br>in the resources.conf<br><br>this address is then used for binding the listening socket for gtp connections<br>which, in turn, allows to run the enb and epc on the same host.<br><br>when gtp_bind_addr is not specified, addr is used by default<br><br>this is especially useful if eNB and EPC run on the same host<br>and ZMQ is used for RF between eNB and UE. Two eNB addresses<br>are needed in this case, one bind address and one "remote-accessable"<br>address for the UEs ZMQ radio to connect to<br><br>Change-Id: I4fe38f31401428ed3e74e1d0b64960f0af122d37<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>4 files changed, 7 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index bb5053f..d1f8687 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -32,6 +32,9 @@</span><br><span> self._addr = conf.get('addr', None)</span><br><span> if self._addr is None:</span><br><span> raise log.Error('addr not set')</span><br><span style="color: hsl(120, 100%, 40%);">+ self._gtp_bind_addr = conf.get('gtp_bind_addr', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._gtp_bind_addr is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._gtp_bind_addr = self._addr</span><br><span> self.set_name('%s_%s' % (name, self._addr))</span><br><span> self._txmode = 0</span><br><span> self._num_prb = 0</span><br><span>@@ -52,6 +55,7 @@</span><br><span> config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))</span><br><span> assert self._epc is not None</span><br><span> config.overlay(values, dict(enb={ 'mme_addr': self._epc.addr() }))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(enb={ 'gtp_bind_addr': self._gtp_bind_addr }))</span><br><span> return values</span><br><span> </span><br><span> def num_ports(self):</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 61f2b11..bcdbb94 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -88,6 +88,7 @@</span><br><span> 'enb[].type': schema.STR,</span><br><span> 'enb[].remote_user': schema.STR,</span><br><span> 'enb[].addr': schema.IPV4,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'enb[].gtp_bind_addr': schema.IPV4,</span><br><span> 'enb[].num_prb': schema.UINT,</span><br><span> 'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,</span><br><span> 'enb[].num_cells': schema.UINT,</span><br><span>diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl</span><br><span>index d87e66a..a56e58d 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl</span><br><span>@@ -48,7 +48,7 @@</span><br><span> ],</span><br><span> /* GTP bind address (=address of the ethernet interface connected to</span><br><span> the MME). Must be modified if the MME runs on a different host. */</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_addr: "${enb.addr}",</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_addr: "${enb.gtp_bind_addr}",</span><br><span> </span><br><span> /* high 20 bits of SIB1.cellIdentifier */</span><br><span> enb_id: 0x19B,</span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>index df12762..94e724b 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>@@ -23,7 +23,7 @@</span><br><span> mcc = ${enb.mcc}</span><br><span> mnc = ${enb.mnc}</span><br><span> mme_addr = ${enb.mme_addr}</span><br><span style="color: hsl(0, 100%, 40%);">-gtp_bind_addr = ${enb.addr}</span><br><span style="color: hsl(120, 100%, 40%);">+gtp_bind_addr = ${enb.gtp_bind_addr}</span><br><span> s1c_bind_addr = ${enb.addr}</span><br><span> n_prb = ${enb.num_prb}</span><br><span> tm = ${enb.transmission_mode}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17814">change 17814</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17814"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4fe38f31401428ed3e74e1d0b64960f0af122d37 </div>
<div style="display:none"> Gerrit-Change-Number: 17814 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>