<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17895">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: Add attribute to set 'id'<br><br>Change-Id: I8ce296c7875d557062dc13e7093ce0400050f2ce<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/epc_srs.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>M sysmocom/defaults.conf<br>6 files changed, 16 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/95/17895/1</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 59b5bfe..e0f7be0 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>@@ -37,6 +37,7 @@</span><br><span>             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 style="color: hsl(120, 100%, 40%);">+        self._id = None</span><br><span>         self._num_prb = 0</span><br><span>         self._num_cells = None</span><br><span>         self._epc = None</span><br><span>@@ -49,6 +50,8 @@</span><br><span>         for config_specifics in config_specifics_li:</span><br><span>             config.overlay(values, dict(enb=self.suite_run.config().get(config_specifics, {})))</span><br><span>         config.overlay(values, dict(enb=self._conf))</span><br><span style="color: hsl(120, 100%, 40%);">+        self._id = int(values['enb'].get('id', None))</span><br><span style="color: hsl(120, 100%, 40%);">+        assert self._id is not None</span><br><span>         self._num_prb = int(values['enb'].get('num_prb', None))</span><br><span>         assert self._num_prb</span><br><span>         self._txmode = int(values['enb'].get('transmission_mode', None))</span><br><span>@@ -78,6 +81,9 @@</span><br><span> </span><br><span>         return values</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def id(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        return self._id</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def num_ports(self):</span><br><span>         if self._txmode == 1:</span><br><span>             return 1</span><br><span>diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>index fc1ee5f..ec9dc44 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>@@ -190,8 +190,12 @@</span><br><span>         return subscriber_id</span><br><span> </span><br><span>     def enb_is_connected(self, enb):</span><br><span style="color: hsl(0, 100%, 40%);">-        # TODO: match against srsENB config: "S1 Setup Request - eNB Name: srsenb01, eNB id: 0x19"</span><br><span style="color: hsl(0, 100%, 40%);">-        return 'S1 Setup Request - eNB' in (self.process.get_stdout() or '')</span><br><span style="color: hsl(120, 100%, 40%);">+        # Match against sample line: "S1 Setup Request - eNB Name: srsenb01, eNB id: 0x19"</span><br><span style="color: hsl(120, 100%, 40%);">+        stdout_lines = (self.process.get_stdout() or '').splitlines()</span><br><span style="color: hsl(120, 100%, 40%);">+        for l in stdout_lines:</span><br><span style="color: hsl(120, 100%, 40%);">+            if l.startswith('S1 Setup Request') and l.endswith('eNB id: %s' % hex(enb.id()).lower()):</span><br><span style="color: hsl(120, 100%, 40%);">+                return True</span><br><span style="color: hsl(120, 100%, 40%);">+        return False</span><br><span> </span><br><span>     def running(self):</span><br><span>         return not self.process.terminated()</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index d4757f3..cafdab8 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -89,6 +89,7 @@</span><br><span>         'enb[].remote_user': schema.STR,</span><br><span>         'enb[].addr': schema.IPV4,</span><br><span>         'enb[].gtp_bind_addr': schema.IPV4,</span><br><span style="color: hsl(120, 100%, 40%);">+        'enb[].id': schema.UINT,</span><br><span>         'enb[].num_prb': schema.UINT,</span><br><span>         'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,</span><br><span>         'enb[].rf_dev_type': schema.STR,</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 11704b6..89e65f1 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>@@ -51,7 +51,7 @@</span><br><span>   gtp_addr: "${enb.gtp_bind_addr}",</span><br><span> </span><br><span>   /* high 20 bits of SIB1.cellIdentifier */</span><br><span style="color: hsl(0, 100%, 40%);">-  enb_id: 0x19B,</span><br><span style="color: hsl(120, 100%, 40%);">+  enb_id: ${enb.id},</span><br><span> </span><br><span>   /* list of cells */</span><br><span>   cell_list: [</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 94e724b..5f7b3ea 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>@@ -19,7 +19,7 @@</span><br><span> #</span><br><span> #####################################################################</span><br><span> [enb]</span><br><span style="color: hsl(0, 100%, 40%);">-enb_id = 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+enb_id = ${enb.id}</span><br><span> mcc = ${enb.mcc}</span><br><span> mnc = ${enb.mnc}</span><br><span> mme_addr = ${enb.mme_addr}</span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index bf5bce1..aea2791 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -106,6 +106,7 @@</span><br><span>   license_server_addr: 0.0.0.0</span><br><span> </span><br><span> enb:</span><br><span style="color: hsl(120, 100%, 40%);">+  id: 0x19B</span><br><span>   mcc: 901</span><br><span>   mnc: 70</span><br><span>   transmission_mode: 1</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17895">change 17895</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/+/17895"/><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: I8ce296c7875d557062dc13e7093ce0400050f2ce </div>
<div style="display:none"> Gerrit-Change-Number: 17895 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>