Change in osmo-gsm-tester[master]: enb: add optional bind_addr paramter to enb class

[srs_andre]

srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17814 )


Change subject: enb: add optional bind_addr paramter to enb class
......................................................................

enb: add optional bind_addr paramter to enb class

this allows to optionally specify a bind_addr for a enb object
in the resources.conf

this address is then used for binding the listening socket for gtpu/s1c
which, in turn, allows to run the enb and epc on the same host.

when bind_addr is not specified, addr is used by default

Change-Id: I4fe38f31401428ed3e74e1d0b64960f0af122d37
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
M src/osmo_gsm_tester/templates/srsenb.conf.tmpl
4 files changed, 9 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/14/17814/1

diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index bb5053f..777d745 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -32,6 +32,9 @@
         self._addr = conf.get('addr', None)
         if self._addr is None:
             raise log.Error('addr not set')
+        self._bind_addr = conf.get('bind_addr', None)
+        if self._bind_addr is None:
+            self._bind_addr = self._addr
         self.set_name('%s_%s' % (name, self._addr))
         self._txmode = 0
         self._num_prb = 0
@@ -52,6 +55,7 @@
         config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))
         assert self._epc is not None
         config.overlay(values, dict(enb={ 'mme_addr': self._epc.addr() }))
+        config.overlay(values, dict(enb={ 'bind_addr': self._bind_addr }))
         return values
 
     def num_ports(self):
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 61f2b11..33d67d6 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -88,6 +88,7 @@
         'enb[].type': schema.STR,
         'enb[].remote_user': schema.STR,
         'enb[].addr': schema.IPV4,
+        'enb[].bind_addr': schema.IPV4,
         'enb[].num_prb': schema.UINT,
         'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,
         'enb[].num_cells': schema.UINT,
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index d87e66a..8b8cb8e 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -34,7 +34,7 @@
   log_filename: "${enb.log_filename}",
 
   /* Enable remote API and Web interface */
-  com_addr: "${enb.addr}:9001",
+  com_addr: "${enb.bind_addr}:9001",
 
   /* RF driver configuration */
   include "amarisoft_rf_driver.cfg",
@@ -48,7 +48,7 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the MME). Must be modified if the MME runs on a different host. */
-  gtp_addr: "${enb.addr}",
+  gtp_addr: "${enb.bind_addr}",
 
   /* high 20 bits of SIB1.cellIdentifier */
   enb_id: 0x19B,
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index 954b63f..1380c2a 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -23,8 +23,8 @@
 mcc = ${enb.mcc}
 mnc = ${enb.mnc}
 mme_addr = ${enb.mme_addr}
-gtp_bind_addr = ${enb.addr}
-s1c_bind_addr = ${enb.addr}
+gtp_bind_addr = ${enb.bind_addr}
+s1c_bind_addr = ${enb.bind_addr}
 n_prb = ${enb.num_prb}
 tm = ${enb.transmission_mode}
 nof_ports = ${enb.num_ports}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17814
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I4fe38f31401428ed3e74e1d0b64960f0af122d37
Gerrit-Change-Number: 17814
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200414/dd72a7e5/attachment.htm>