AmarisoftENB: Support setting PCI value
Change-Id: Ibffb95f9b55e145d76ba64119a73ef9f1ed7cdef
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index ded8568..6e744e5 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -112,6 +112,7 @@
'enb[].a3_time_to_trigger': schema.INT,
'enb[].num_cells': schema.UINT,
'enb[].cell_list[].cell_id': schema.UINT,
+ 'enb[].cell_list[].pci': 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 89e65f1..4dc9c60 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -61,7 +61,7 @@
dl_earfcn: ${cell.dl_earfcn},
rf_port: ${loop.index},
cell_id: ${cell.cell_id},
- n_id_cell: ${loop.index + 1},
+ n_id_cell: ${cell.pci},
tac: 0x0001,
root_sequence_index: ${loop.index + 204}, /* PRACH root sequence index */
diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf
index 36a2f42..b07bec2 100644
--- a/sysmocom/defaults.conf
+++ b/sysmocom/defaults.conf
@@ -126,9 +126,11 @@
a3_time_to_trigger: 480
cell_list:
- cell_id: 0x01
+ pci: 0x01
dl_earfcn: 2850
scell_list: [0x02]
- cell_id: 0x02
+ pci: 0x02
dl_earfcn: 3050
scell_list: [0x01]