diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 6e744e52..20302d31 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -113,6 +113,7 @@ RESOURCES_SCHEMA = { 'enb[].num_cells': schema.UINT, 'enb[].cell_list[].cell_id': schema.UINT, 'enb[].cell_list[].pci': schema.UINT, + 'enb[].cell_list[].ncell_list[]': schema.UINT, 'enb[].cell_list[].scell_list[]': schema.UINT, 'enb[].cell_list[].dl_earfcn': schema.UINT, 'enb[].cell_list[].dl_rfemu.type': schema.STR, diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 4dc9c605..24cd0d18 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -65,6 +65,14 @@ tac: 0x0001, root_sequence_index: ${loop.index + 204}, /* PRACH root sequence index */ + ncell_list: [ +%for ncell in enb.cell_list: +%if ncell.cell_id in cell.ncell_list: + { n_id_cell: ${ncell.pci}, dl_earfcn: ${ncell.dl_earfcn}, cell_id: ${ncell.cell_id}, tac: 1 }, +%endif +%endfor + ], + scell_list: [ %for scell_id in cell.scell_list: { cell_id: ${scell_id}, cross_carrier_scheduling: false, scheduling_cell_id: ${cell.cell_id}, ul_allowed: true}, diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index b07bec21..871a45cf 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -128,11 +128,13 @@ enb: - cell_id: 0x01 pci: 0x01 dl_earfcn: 2850 - scell_list: [0x02] + scell_list: [] + ncell_list: [0x02] - cell_id: 0x02 pci: 0x02 - dl_earfcn: 3050 - scell_list: [0x01] + dl_earfcn: 2850 + scell_list: [] + ncell_list: [0x01] srsenb: num_prb: 100