<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18067">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: add rf_port to cell list param<br><br>we need to make the rf_port a param in the cell list because for CA with<br>two cells on different EARFNCs, the RF port is different<br><br>for two cells without CA on the same EARFCN the RF port is the same<br><br>so we need to be able to configure it<br><br>Change-Id: I32e83cc34811588757104c5ce1cae7277402addd<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>4 files changed, 5 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 4848ea4..42ff647 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>@@ -51,6 +51,7 @@</span><br><span>         'a3_time_to_trigger': schema.INT,</span><br><span>         'num_cells': schema.UINT,</span><br><span>         'cell_list[].cell_id': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+        'cell_list[].rf_port': schema.UINT,</span><br><span>         'cell_list[].pci': schema.UINT,</span><br><span>         'cell_list[].ncell_list[]': schema.UINT,</span><br><span>         'cell_list[].scell_list[]': 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 46bdf10..29b5fb8 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>@@ -59,7 +59,7 @@</span><br><span> %for cell in enb.cell_list:</span><br><span>   {</span><br><span>     dl_earfcn: ${cell.dl_earfcn},</span><br><span style="color: hsl(0, 100%, 40%);">-    rf_port: 0, /* FIXME: this may need to be configurable based on device specifics (B2xx vs X310) */</span><br><span style="color: hsl(120, 100%, 40%);">+    rf_port: ${cell.rf_port},</span><br><span>     cell_id: ${cell.cell_id},</span><br><span>     n_id_cell: ${cell.pci},</span><br><span>     tac: 0x0001,</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 597f6ef..2e25f6b 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>@@ -65,7 +65,7 @@</span><br><span> %for cell in enb.cell_list:</span><br><span>   ${',' if loop.index != 0 else ''}</span><br><span>   {</span><br><span style="color: hsl(0, 100%, 40%);">-    // rf_port = 0; Not yet implemented!</span><br><span style="color: hsl(120, 100%, 40%);">+    rf_port = ${cell.rf_port};</span><br><span>     cell_id = ${cell.cell_id};</span><br><span>     tac = 0x0001;</span><br><span>     pci = ${loop.index + 1};</span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index 871a45c..6694652 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(120, 100%, 40%);">+     rf_port: 0</span><br><span>      scell_list: []</span><br><span>      ncell_list: [0x02]</span><br><span>    - cell_id: 0x02</span><br><span>      pci: 0x02</span><br><span>      dl_earfcn: 2850</span><br><span style="color: hsl(120, 100%, 40%);">+     rf_port: 0</span><br><span>      scell_list: []</span><br><span>      ncell_list: [0x01]</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18067">change 18067</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/+/18067"/><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: I32e83cc34811588757104c5ce1cae7277402addd </div>
<div style="display:none"> Gerrit-Change-Number: 18067 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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-MessageType: merged </div>