<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17893">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: Introduce support for neighbour cell list<br><br>Change-Id: If604f1f2643a73f8c4da6ae3e9d24cd6c7e52d06<br>---<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl<br>M sysmocom/defaults.conf<br>3 files changed, 14 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 6e744e5..20302d3 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -113,6 +113,7 @@</span><br><span>         'enb[].num_cells': schema.UINT,</span><br><span>         'enb[].cell_list[].cell_id': schema.UINT,</span><br><span>         'enb[].cell_list[].pci': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+        'enb[].cell_list[].ncell_list[]': schema.UINT,</span><br><span>         'enb[].cell_list[].scell_list[]': schema.UINT,</span><br><span>         'enb[].cell_list[].dl_earfcn': schema.UINT,</span><br><span>         'enb[].cell_list[].dl_rfemu.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 4dc9c60..24cd0d1 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>@@ -65,6 +65,14 @@</span><br><span>     tac: 0x0001,</span><br><span>     root_sequence_index: ${loop.index + 204}, /* PRACH root sequence index */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    ncell_list: [</span><br><span style="color: hsl(120, 100%, 40%);">+%for ncell in enb.cell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+%if ncell.cell_id in cell.ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      { n_id_cell: ${ncell.pci}, dl_earfcn: ${ncell.dl_earfcn}, cell_id: ${ncell.cell_id}, tac: 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</span><br><span style="color: hsl(120, 100%, 40%);">+    ],</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     scell_list: [</span><br><span> %for scell_id in cell.scell_list:</span><br><span>       { cell_id: ${scell_id}, cross_carrier_scheduling: false, scheduling_cell_id: ${cell.cell_id}, ul_allowed: true},</span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index b07bec2..871a45c 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -128,11 +128,13 @@</span><br><span>    - cell_id: 0x01</span><br><span>      pci: 0x01</span><br><span>      dl_earfcn: 2850</span><br><span style="color: hsl(0, 100%, 40%);">-     scell_list: [0x02]</span><br><span style="color: hsl(120, 100%, 40%);">+     scell_list: []</span><br><span style="color: hsl(120, 100%, 40%);">+     ncell_list: [0x02]</span><br><span>    - cell_id: 0x02</span><br><span>      pci: 0x02</span><br><span style="color: hsl(0, 100%, 40%);">-     dl_earfcn: 3050</span><br><span style="color: hsl(0, 100%, 40%);">-     scell_list: [0x01]</span><br><span style="color: hsl(120, 100%, 40%);">+     dl_earfcn: 2850</span><br><span style="color: hsl(120, 100%, 40%);">+     scell_list: []</span><br><span style="color: hsl(120, 100%, 40%);">+     ncell_list: [0x01]</span><br><span> </span><br><span> srsenb:</span><br><span>   num_prb: 100</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17893">change 17893</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/+/17893"/><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: If604f1f2643a73f8c4da6ae3e9d24cd6c7e52d06 </div>
<div style="display:none"> Gerrit-Change-Number: 17893 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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>