enb: Add cell_list attribute
It allows configuring each cell_list up to a maximum of 'num_cells'.
Change-Id: I4fd30a3e37789b76bfaddc2beba1815154daab7f
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index a56e58d..11704b6 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -55,36 +55,23 @@
/* list of cells */
cell_list: [
- {
- // First cell
- dl_earfcn: 2850,
- rf_port: 0,
- cell_id: 0x01,
- n_id_cell: 1,
- tac: 0x0001,
- root_sequence_index: 204, /* PRACH root sequence index */
-% if enb.get('num_cells') == '2':
- scell_list: [
- { cell_id: 0x02, cross_carrier_scheduling: false, scheduling_cell_id: 0x01, ul_allowed: true},
- ],
-% endif
- },
-% if enb.get('num_cells') == '2':
+%for cell in enb.cell_list:
{
- // Second Cell
- dl_earfcn: 3050,
- rf_port: 1,
- cell_id: 0x02,
- n_id_cell: 2,
+ dl_earfcn: ${cell.dl_earfcn},
+ rf_port: ${loop.index},
+ cell_id: ${cell.cell_id},
+ n_id_cell: ${loop.index + 1},
tac: 0x0001,
- root_sequence_index: 205,
+ root_sequence_index: ${loop.index + 204}, /* PRACH root sequence index */
scell_list: [
- { cell_id: 0x01, cross_carrier_scheduling: false, scheduling_cell_id: 0x02, ul_allowed: true},
+%for scell_id in cell.scell_list:
+ { cell_id: ${scell_id}, cross_carrier_scheduling: false, scheduling_cell_id: ${cell.cell_id}, ul_allowed: true},
+%endfor
],
},
-% endif
+%endfor
], /* cell_list */
/* default cell parameters */