<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21099">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: Support cells from different ENBs in ncell_list<br><br>Change-Id: I1242c56ff42caea06e7f96317def82064fd11325<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl<br>M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl<br>M sysmocom/defaults.conf<br>M sysmocom/scenarios/mod-enb-cells-2ca.conf<br>M sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf<br>M sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf<br>7 files changed, 45 insertions(+), 22 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/99/21099/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 f258b52..cdf9505 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>@@ -60,7 +60,10 @@</span><br><span>         'cell_list[].cell_id': schema.UINT,</span><br><span>         'cell_list[].rf_port': schema.UINT,</span><br><span>         'cell_list[].pci': schema.UINT,</span><br><span style="color: hsl(0, 100%, 40%);">-        'cell_list[].ncell_list[]': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+        'cell_list[].ncell_list[].enb_id': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+        'cell_list[].ncell_list[].cell_id': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+        'cell_list[].ncell_list[].pci': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+        'cell_list[].ncell_list[].dl_earfcn': schema.UINT,</span><br><span>         'cell_list[].scell_list[]': schema.UINT,</span><br><span>         'cell_list[].dl_earfcn': schema.UINT,</span><br><span>         'cell_list[].root_seq_idx': 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 a0f22ff..4c7aa33 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>@@ -77,10 +77,8 @@</span><br><span>     root_sequence_index: ${loop.index * 10 + 204}, /* PRACH root sequence index */</span><br><span> </span><br><span>     ncell_list: [</span><br><span style="color: hsl(0, 100%, 40%);">-%for ncell in enb.cell_list:</span><br><span style="color: hsl(0, 100%, 40%);">-%if ncell.cell_id in cell.ncell_list:</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">-%endif</span><br><span style="color: hsl(120, 100%, 40%);">+%for ncell 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: 7 },</span><br><span> %endfor</span><br><span>     ],</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl</span><br><span>index ff51bfd..a906df7 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl</span><br><span>@@ -82,17 +82,13 @@</span><br><span>     // Cells available for handover</span><br><span>     meas_cell_list =</span><br><span>     (</span><br><span style="color: hsl(0, 100%, 40%);">-%for ncell in enb.cell_list:</span><br><span style="color: hsl(0, 100%, 40%);">-        <% loop.my_num_items = 0 if loop.index == 0 else loop.my_num_items %></span><br><span style="color: hsl(0, 100%, 40%);">-%if ncell.cell_id in cell.ncell_list:</span><br><span style="color: hsl(0, 100%, 40%);">-        ${',' if loop.my_num_items != 0 else ''}</span><br><span style="color: hsl(0, 100%, 40%);">-        <% loop.my_num_items += 1 %></span><br><span style="color: hsl(120, 100%, 40%);">+%for ncell in cell.ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+        ${',' if loop.index != 0 else ''}</span><br><span>         {</span><br><span style="color: hsl(0, 100%, 40%);">-          eci = ${hex((int(enb.id)<<8) + int(ncell.cell_id))};</span><br><span style="color: hsl(120, 100%, 40%);">+          eci = ${hex((int(ncell.enb_id)<<8) + int(ncell.cell_id))};</span><br><span>           dl_earfcn = ${ncell.dl_earfcn};</span><br><span>           pci = ${ncell.pci};</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-%endif</span><br><span> %endfor</span><br><span>     );</span><br><span> </span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index 98852aa..a9015f7 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -137,7 +137,7 @@</span><br><span>      tac: 0x0007</span><br><span>      root_seq_idx: 204</span><br><span>      scell_list: []</span><br><span style="color: hsl(0, 100%, 40%);">-     ncell_list: [0x02]</span><br><span style="color: hsl(120, 100%, 40%);">+     ncell_list: []</span><br><span>    - cell_id: 0x02</span><br><span>      pci: 0x02</span><br><span>      dl_earfcn: 2850</span><br><span>@@ -145,7 +145,7 @@</span><br><span>      tac: 0x0007</span><br><span>      root_seq_idx: 205</span><br><span>      scell_list: []</span><br><span style="color: hsl(0, 100%, 40%);">-     ncell_list: [0x01]</span><br><span style="color: hsl(120, 100%, 40%);">+     ncell_list: []</span><br><span> </span><br><span> srsenb:</span><br><span>   num_prb: 100</span><br><span>diff --git a/sysmocom/scenarios/mod-enb-cells-2ca.conf b/sysmocom/scenarios/mod-enb-cells-2ca.conf</span><br><span>index 1dbea73..4727340 100644</span><br><span>--- a/sysmocom/scenarios/mod-enb-cells-2ca.conf</span><br><span>+++ b/sysmocom/scenarios/mod-enb-cells-2ca.conf</span><br><span>@@ -1,16 +1,25 @@</span><br><span> # CA and HO config, two cells different EARFCN, cell IDs match CC index of eNB</span><br><span> modifiers:</span><br><span>   enb:</span><br><span style="color: hsl(0, 100%, 40%);">-  - cell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+  - id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+    cell_list:</span><br><span>     - cell_id: 0x00</span><br><span>       pci: 0x01</span><br><span>       dl_earfcn: 2850</span><br><span>       rf_port: 0</span><br><span>       scell_list: [0x01]</span><br><span style="color: hsl(0, 100%, 40%);">-      ncell_list: [0x01]</span><br><span style="color: hsl(120, 100%, 40%);">+      ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      - enb_id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+        cell_id: 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+        pci: 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+        dl_earfcn: 3050</span><br><span>     - cell_id: 0x01</span><br><span>       pci: 0x02</span><br><span>       dl_earfcn: 3050</span><br><span>       rf_port: 1</span><br><span>       scell_list: [0x00]</span><br><span style="color: hsl(0, 100%, 40%);">-      ncell_list: [0x00]</span><br><span style="color: hsl(120, 100%, 40%);">+      ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      - enb_id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+        cell_id: 0x00</span><br><span style="color: hsl(120, 100%, 40%);">+        pci: 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+        dl_earfcn: 2850</span><br><span>diff --git a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf</span><br><span>index 4a0a6b4..899ec4b 100644</span><br><span>--- a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf</span><br><span>+++ b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf</span><br><span>@@ -1,16 +1,25 @@</span><br><span> # HO config for intra-frequency HO between two cells (same EARFCN) on the same RF port (Amarisoft eNB)</span><br><span> modifiers:</span><br><span>   enb:</span><br><span style="color: hsl(0, 100%, 40%);">-  - cell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+  - id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+    cell_list:</span><br><span>     - cell_id: 0x01</span><br><span>       pci: 0x01</span><br><span>       dl_earfcn: 2850</span><br><span>       rf_port: 0</span><br><span>       scell_list: []</span><br><span style="color: hsl(0, 100%, 40%);">-      ncell_list: [0x02]</span><br><span style="color: hsl(120, 100%, 40%);">+      ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      - enb_id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+        cell_id: 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+        pci: 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+        dl_earfcn: 2850</span><br><span>     - cell_id: 0x02</span><br><span>       pci: 0x02</span><br><span>       dl_earfcn: 2850</span><br><span>       rf_port: 0</span><br><span>       scell_list: []</span><br><span style="color: hsl(0, 100%, 40%);">-      ncell_list: [0x01]</span><br><span style="color: hsl(120, 100%, 40%);">+      ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      - enb_id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+        cell_id: 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+        pci: 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+        dl_earfcn: 2850</span><br><span>diff --git a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf</span><br><span>index 7884a33..0dc337c 100644</span><br><span>--- a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf</span><br><span>+++ b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho.conf</span><br><span>@@ -7,10 +7,18 @@</span><br><span>       dl_earfcn: 2850</span><br><span>       rf_port: 0</span><br><span>       scell_list: []</span><br><span style="color: hsl(0, 100%, 40%);">-      ncell_list: [0x02]</span><br><span style="color: hsl(120, 100%, 40%);">+      ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      - enb_id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+        cell_id: 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+        pci: 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+        dl_earfcn: 2850</span><br><span>     - cell_id: 0x02</span><br><span>       pci: 0x02</span><br><span>       dl_earfcn: 2850</span><br><span>       rf_port: 1</span><br><span>       scell_list: []</span><br><span style="color: hsl(0, 100%, 40%);">-      ncell_list: [0x01]</span><br><span style="color: hsl(120, 100%, 40%);">+      ncell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+      - enb_id: 0x19B</span><br><span style="color: hsl(120, 100%, 40%);">+        cell_id: 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+        pci: 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+        dl_earfcn: 2850</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21099">change 21099</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/+/21099"/><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: I1242c56ff42caea06e7f96317def82064fd11325 </div>
<div style="display:none"> Gerrit-Change-Number: 21099 </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>