<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17894">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srsenb: Support neighbour and secondary cell lists in config file<br><br>Change-Id: I8fe0703b7d9db69658c112066404d2da1c3d1e09<br>---<br>M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl<br>1 file changed, 29 insertions(+), 49 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/94/17894/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 2dcdb2a..c675d33 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>@@ -62,29 +62,46 @@</span><br><span> </span><br><span> cell_list =</span><br><span> (</span><br><span style="color: hsl(120, 100%, 40%);">+%for cell in enb.cell_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%);">- // rf_port = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- cell_id = 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_port = ${loop.index};</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_id = ${cell.cell_id};</span><br><span> tac = 0x0001;</span><br><span style="color: hsl(0, 100%, 40%);">- pci = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- // root_seq_idx = 204;</span><br><span style="color: hsl(0, 100%, 40%);">- dl_earfcn = 2850;</span><br><span style="color: hsl(120, 100%, 40%);">+ pci = ${loop.index + 1};</span><br><span style="color: hsl(120, 100%, 40%);">+ root_seq_idx = ${loop.index + 204};</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn = ${cell.dl_earfcn};</span><br><span> //ul_earfcn = 20850;</span><br><span> ho_active = false;</span><br><span> </span><br><span> // CA cells</span><br><span> scell_list = (</span><br><span style="color: hsl(0, 100%, 40%);">- {cell_id = 0x02; cross_carrier_scheduling = false; scheduling_cell_id = 0x02; ul_allowed = true}</span><br><span style="color: hsl(120, 100%, 40%);">+%for scell_id in cell.scell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ ${',' if loop.index != 0 else ''}</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_id = ${scell_id};</span><br><span style="color: hsl(120, 100%, 40%);">+ cross_carrier_scheduling = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ scheduling_cell_id = ${cell.cell_id};</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_allowed = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</span><br><span> )</span><br><span> </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%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- eci = 0x19C02;</span><br><span style="color: hsl(0, 100%, 40%);">- dl_earfcn = 2850;</span><br><span style="color: hsl(0, 100%, 40%);">- pci = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+%for ncell in enb.cell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ <% loop.my_num_items = 0 if loop.index == 0 else loop.my_num_items %></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%);">+ ${',' if loop.my_num_items != 0 else ''}</span><br><span style="color: hsl(120, 100%, 40%);">+ <% loop.my_num_items += 1 %></span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ eci = ${ncell.cell_id};</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn = ${ncell.dl_earfcn};</span><br><span style="color: hsl(120, 100%, 40%);">+ pci = ${loop.index + 1};</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</span><br><span> );</span><br><span> </span><br><span> // ReportCfg (only A3 supported)</span><br><span>@@ -96,42 +113,5 @@</span><br><span> rsrq_config = 4;</span><br><span> };</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-% if enb.get('num_cells') == '2':</span><br><span style="color: hsl(0, 100%, 40%);">- ,</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- rf_port = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- cell_id = 0x02;</span><br><span style="color: hsl(0, 100%, 40%);">- tac = 0x0002;</span><br><span style="color: hsl(0, 100%, 40%);">- pci = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- root_seq_idx = 205;</span><br><span style="color: hsl(0, 100%, 40%);">- dl_earfcn = 3050;</span><br><span style="color: hsl(0, 100%, 40%);">- //ul_earfcn = 21050;</span><br><span style="color: hsl(0, 100%, 40%);">- ho_active = false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- // CA cells</span><br><span style="color: hsl(0, 100%, 40%);">- scell_list = (</span><br><span style="color: hsl(0, 100%, 40%);">- {cell_id = 0x01; cross_carrier_scheduling = false; scheduling_cell_id = 0x01; ul_allowed = true}</span><br><span style="color: hsl(0, 100%, 40%);">- )</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- // Cells available for handover</span><br><span style="color: hsl(0, 100%, 40%);">- meas_cell_list =</span><br><span style="color: hsl(0, 100%, 40%);">- (</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- eci = 0x19C02;</span><br><span style="color: hsl(0, 100%, 40%);">- dl_earfcn = 2850;</span><br><span style="color: hsl(0, 100%, 40%);">- pci = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- // ReportCfg (only A3 supported)</span><br><span style="color: hsl(0, 100%, 40%);">- meas_report_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- a3_report_type = "RSRP";</span><br><span style="color: hsl(0, 100%, 40%);">- a3_offset = 6;</span><br><span style="color: hsl(0, 100%, 40%);">- a3_hysteresis = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- a3_time_to_trigger = 480;</span><br><span style="color: hsl(0, 100%, 40%);">- rsrq_config = 4;</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-% endif</span><br><span style="color: hsl(0, 100%, 40%);">- // Add here more cells</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</span><br><span> );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17894">change 17894</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/+/17894"/><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: I8fe0703b7d9db69658c112066404d2da1c3d1e09 </div>
<div style="display:none"> Gerrit-Change-Number: 17894 </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>