<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17734">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amarisoft_enb: add handling of num_cells modifier<br><br>the num_cells modifier allows to create multiple cells in a single enb<br>both cells are by default configured for CA<br><br>Change-Id: Ie9f16ce06ee56002c01097f2d338278f09ea4337<br>---<br>M src/osmo_gsm_tester/amarisoft_enb.py<br>M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl<br>2 files changed, 55 insertions(+), 21 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/34/17734/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/amarisoft_enb.py b/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>index e4f3d64..374393a 100644</span><br><span>--- a/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>+++ b/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>@@ -175,7 +175,6 @@</span><br><span> + ',tx_port1=tcp://' + self.addr() + ':2002' \</span><br><span> + ',rx_port0=tcp://' + self.ue.addr() + ':2001' \</span><br><span> + ',rx_port1=tcp://' + self.ue.addr() + ':2003' \</span><br><span style="color: hsl(0, 100%, 40%);">- + ',tx_freq=2630e6,rx_freq=2510e6,tx_freq2=2650e6,rx_freq2=2530e6' \</span><br><span> + ',id=enb,base_srate=' + str(base_srate)</span><br><span> config.overlay(values, dict(enb=dict(sample_rate = base_srate / (1000*1000),</span><br><span> rf_dev_args=rf_dev_args)))</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 532472a..763af08 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>@@ -56,31 +56,44 @@</span><br><span> /* list of cells */</span><br><span> cell_list: [</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ // First cell</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn: 2850,</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_port: 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_id: 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_id_cell: 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ tac: 0x0001,</span><br><span style="color: hsl(120, 100%, 40%);">+ root_sequence_index: 204, /* PRACH root sequence index */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+% if enb.get('num_cells') == '2':</span><br><span style="color: hsl(120, 100%, 40%);">+ scell_list: [</span><br><span style="color: hsl(120, 100%, 40%);">+ { cell_id: 0x02, cross_carrier_scheduling: false, scheduling_cell_id: 0x01, ul_allowed: true},</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%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+% if enb.get('num_cells') == '2':</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ // Second Cell</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn: 3050,</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_port: 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_id: 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_id_cell: 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ tac: 0x0001,</span><br><span style="color: hsl(120, 100%, 40%);">+ root_sequence_index: 205,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ scell_list: [</span><br><span style="color: hsl(120, 100%, 40%);">+ { cell_id: 0x01, cross_carrier_scheduling: false, scheduling_cell_id: 0x02, ul_allowed: true},</span><br><span style="color: hsl(120, 100%, 40%);">+ ],</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%);">+ ], /* cell_list */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* default cell parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_default: {</span><br><span> /* Broadcasted PLMN identities */</span><br><span> plmn_list: [</span><br><span> "${enb.mcc}${enb.mnc}",</span><br><span> ],</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 300, /* DL center frequency: 2132 MHz (Band 1) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 900, /* DL center frequency: 1960 MHz (Band 2) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 1575, /* DL center frequency: 1842.5 MHz (Band 3) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 2150, /* DL center frequency: 2130 MHz (Band 4) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 2525, /* DL center frequency: 881.5 MHz (Band 5) */</span><br><span style="color: hsl(0, 100%, 40%);">- dl_earfcn: 2850, /* DL center frequency: 2680 MHz (Band 7) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 6300, /* 806 MHz (Band 20) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 38050, /* 2600 MHz (band 38) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 40620, /* 2593 MHz (band 41) */</span><br><span style="color: hsl(0, 100%, 40%);">- //dl_earfcn: 42590, /* 3500 MHz (band 42) */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- n_id_cell: 1,</span><br><span style="color: hsl(0, 100%, 40%);">- cell_id: 0x01,</span><br><span style="color: hsl(0, 100%, 40%);">- tac: 0x0001,</span><br><span style="color: hsl(0, 100%, 40%);">- root_sequence_index: 204, /* PRACH root sequence index */</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- ], /* cell_list */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* default cell parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- cell_default: {</span><br><span> n_antenna_dl: 1, /* number of DL antennas */</span><br><span> n_antenna_ul: 1, /* number of UL antennas */</span><br><span> n_rb_dl: ${enb.num_prb}, /* Bandwidth: 25: 5 MHz, 50: 10 MHz, 75: 15 MHz, 100: 20 MHz */</span><br><span>@@ -144,6 +157,28 @@</span><br><span> m_ri = 0 (default) disables RI reporting. */</span><br><span> // m_ri: 8,</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ pucch_dedicated: {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ack/nack feedback mode when carrier aggregation is</span><br><span style="color: hsl(120, 100%, 40%);">+ enabled. It can be "cs" (for at most two scells) or "pucch3"</span><br><span style="color: hsl(120, 100%, 40%);">+ (used in all cases if more than two cells). */</span><br><span style="color: hsl(120, 100%, 40%);">+ ack_nack_feedback_mode_ca: "cs",</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TDD ack/nack feedback mode when a rel 10 UE is detected. It</span><br><span style="color: hsl(120, 100%, 40%);">+ can be "bundling", "multiplexing", "cs" or "pucch3". By</span><br><span style="color: hsl(120, 100%, 40%);">+ default is it the same as tdd_ack_nack_feedback_mode. */</span><br><span style="color: hsl(120, 100%, 40%);">+ // tdd_ack_nack_feedback_mode_r10: "cs",</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* number of PUCCH 1b CS resources. It determines</span><br><span style="color: hsl(120, 100%, 40%);">+ the maximum number of UEs that can be scheduled in one TTI</span><br><span style="color: hsl(120, 100%, 40%);">+ using carrier aggregation with PUCCH 1b CS ack/nack feedback. */</span><br><span style="color: hsl(120, 100%, 40%);">+ n1_pucch_an_cs_count: 1,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* number of resource blocks for PUCCH 3. It determines</span><br><span style="color: hsl(120, 100%, 40%);">+ the maximum number of UEs that can be scheduled in one TTI</span><br><span style="color: hsl(120, 100%, 40%);">+ using carrier aggregation with PUCCH 3 ack/nack feedback. */</span><br><span style="color: hsl(120, 100%, 40%);">+ n3_pucch_an_n_rb: 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* SRS dedicated config. All UEs share these</span><br><span> parameters. srs_config_index and freq_domain_position are</span><br><span> allocated for each UE) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17734">change 17734</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/+/17734"/><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: Ie9f16ce06ee56002c01097f2d338278f09ea4337 </div>
<div style="display:none"> Gerrit-Change-Number: 17734 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>