srsenb_rr.conf: add PCI, TAC and root_seq_idx as cell param
make sure to insert cell specific TAC, PCI and root seq ind
into cell config and do not depend on cell index for a particular
enb. This causes issues in multi-eNB setups.
Change-Id: I6642128a449a0562dd23f7fa393ff48ae2503006
diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index 4558478..f258b52 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -63,6 +63,8 @@
'cell_list[].ncell_list[]': schema.UINT,
'cell_list[].scell_list[]': schema.UINT,
'cell_list[].dl_earfcn': schema.UINT,
+ 'cell_list[].root_seq_idx': schema.UINT,
+ 'cell_list[].tac': schema.UINT,
'cell_list[].dl_rfemu.type': schema.STR,
'cell_list[].dl_rfemu.addr': schema.IPV4,
'cell_list[].dl_rfemu.ports[]': schema.UINT,
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 3bb2c8c..ff51bfd 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -59,9 +59,9 @@
{
rf_port = ${cell.rf_port};
cell_id = ${cell.cell_id};
- tac = 0x0007;
- pci = ${loop.index + 1};
- root_seq_idx = ${loop.index + 204};
+ tac = ${cell.tac};
+ pci = ${cell.pci};
+ root_seq_idx = ${cell.root_seq_idx};
dl_earfcn = ${cell.dl_earfcn};
//ul_earfcn = 20850;
ho_active = true;
diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf
index 8201d05..98852aa 100644
--- a/sysmocom/defaults.conf
+++ b/sysmocom/defaults.conf
@@ -134,12 +134,16 @@
pci: 0x01
dl_earfcn: 2850
rf_port: 0
+ tac: 0x0007
+ root_seq_idx: 204
scell_list: []
ncell_list: [0x02]
- cell_id: 0x02
pci: 0x02
dl_earfcn: 2850
rf_port: 0
+ tac: 0x0007
+ root_seq_idx: 205
scell_list: []
ncell_list: [0x01]