Change in osmo-gsm-tester[master]: enb: Introduce support for neighbour cell list

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17893 )


Change subject: enb: Introduce support for neighbour cell list
......................................................................

enb: Introduce support for neighbour cell list

Change-Id: If604f1f2643a73f8c4da6ae3e9d24cd6c7e52d06
---
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
M sysmocom/defaults.conf
3 files changed, 14 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/93/17893/1

diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index d4757f3..cd575b5 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -109,6 +109,7 @@
         'enb[].a3_time_to_trigger': schema.INT,
         'enb[].num_cells': schema.UINT,
         'enb[].cell_list[].cell_id': 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 11704b6..7ef511e 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -61,10 +61,18 @@
     dl_earfcn: ${cell.dl_earfcn},
     rf_port: ${loop.index},
     cell_id: ${cell.cell_id},
-    n_id_cell: ${loop.index + 1},
+    n_id_cell: ${cell.cell_id},
     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.cell_id}, 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 bf5bce1..72aa483 100644
--- a/sysmocom/defaults.conf
+++ b/sysmocom/defaults.conf
@@ -126,10 +126,12 @@
   cell_list:
    - cell_id: 0x01
      dl_earfcn: 2850
-     scell_list: [0x02]
+     scell_list: []
+     ncell_list: [0x02]
    - cell_id: 0x02
      dl_earfcn: 3050
-     scell_list: [0x01]
+     scell_list: []
+     ncell_list: [0x01]
 
 srsenb:
   num_prb: 100

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17893
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: If604f1f2643a73f8c4da6ae3e9d24cd6c7e52d06
Gerrit-Change-Number: 17893
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200420/f22a7899/attachment.htm>