Support multiple cell_list

software/ors-amarisoft/config/enb.jinja2.cfg

+{%- set cell_list = slapparameter_dict.get('cell_list', '[{}]') %}
+{%- set cell_count = cell_list|length %}
+
 {%- if slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 2] 5ms 2UL 6DL (default)' %}
 {%- set tdd_config = 2 %}
 {%- elif slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 6] 5ms 5UL 3DL (maximum uplink)' %}
@@ -28,27 +31,52 @@
       name: "sdr",
 {%- endif %}
       args: "dev0=
-        {%- for i in range(port_in_use) -%}
+        {%- for i, k in enumerate(cell_list) %}
+        {%- set cpri_port = cell_list[k].get('cpri_port_number', i) %}
         {%- if i != 0 -%}
         ,
         {%- endif -%}
-          /dev/sdr{{ sdr_port }}@{{ i }}
+          /dev/sdr{{ slapparameter_dict.get('sdr_number', 0) }}@{{ cpri_port }}
         {%- endfor -%}
         ",
       cpri_mapping: "hw",
       {%- set cpri_mult = slapparameter_dict.get('cpri_mult', 16) %}
-      cpri_mult: {{ cpri_mult }}, {{ cpri_mult }}, {{ cpri_mult }}, {{ cpri_mult }}
+      cpri_mult: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cpri_mult }}
+        {%- endfor -%}
+        ",
       cpri_rx_delay: "
-        {%- for i in range(port_in_use) -%}
+        {%- for i, k in enumerate(cell_list) %}
         {%- if i != 0 -%}
         ,
         {%- endif -%}
-          /dev/sdr{{ sdr_port }}@{{ i }}
+          {{ cell_list[k].get('cpri_rx_delay', 0) }}
         {%- endfor -%}
         ",
-      cpri_tx_delay: 0,
-      ifname: "{{ slap_configuration.get('tap-name', '') }}",
-      cpri_debug: 2,
+      cpri_tx_delay: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cell_list[k].get('cpri_tx_delay', 0) }}
+        {%- endfor -%}
+        ",
+      ifname: "
+        {%- if cell_count == 1 -%}
+          {{ slap_configuration.get('tap-name', '') }}
+        {%- else -%}
+          {%- for i, k in enumerate(cell_list) %}
+          {%- if i != 0 -%}
+          ,
+          {%- endif -%}
+            {{ slap_configuration.get('tap-name', '') }}-{{ i }}
+          {%- endfor -%}
+        {%- endif -%}
+        ",
   },
   tx_gain: 0,
   rx_gain: 0,
@@ -101,7 +129,41 @@
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
 
   cell_list: [
+    {%- for i, k in enumerate(cell_list) %}
+    {%- if i == 0 -%}
     {
+    {%- else -%}
+    , {
+    {%- endif %}
+      rf_port: {{ i }},
+      cell_id: "{{ slapparameter_dict['cell_list'][k].get('cell_id', '0x0' + i|string) }}",
+      tac: "{{ slapparameter_dict['cell_list'][k].get('tac', '0x0001') }}",
+      n_id_cell: {{ slapparameter_dict['cell_list'][k].get('n_id_cell', i) }},
+      root_sequence_index: 204,
+      dl_earfcn: "{{ slapparameter_dict['cell_list'][k].get('dl_earfcn', earfcn) }}",
+      {%- set scell_list = [] %}
+      {%- for j, l in enumerate(cell_list) %}
+      {%-   if j != i %}
+      {%-     do scell_list.append([j, l]) %}
+      {%-   endif %}
+      {%- endfor %}
+      scell_list: [
+        {%- for j, l in enumerate(scell_list) %}
+        {%- if j == 0 -%}
+        {
+        {%- else -%}
+        , {
+        {%- endif %}
+          cell_id: "{{ slapparameter_dict['cell_list'][l[1]].get('cell_id', '0x0' + l[0]|string) }}",
+          cross_carrier_scheduling: false,
+        }
+        {%- endfor %}
+      ],
+    }
+    {%- endfor %}
+  ],
+
+  cell_default: {
     plmn_list: [
 {%- if slapparameter_dict.get('plmn_list', '') %}
 {%- for i, k in enumerate(slapparameter_dict['plmn_list']) %}
@@ -119,17 +181,6 @@
       "00101",
 {% endif %}
     ],
-
-    dl_earfcn: {{ earfcn }},
-
-    n_id_cell: {{ slapparameter_dict.get('pci', 1) }},
-    cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }},
-    tac: {{ slapparameter_dict.get('tac', '0x0001') }},
-    root_sequence_index: 204,
-  },
-  ],
-
-  cell_default: {
     n_antenna_dl: N_ANTENNA_DL,
     n_antenna_ul: N_ANTENNA_UL,
 {% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -56,6 +56,12 @@
               "type": "number",
               "default": 0
             },
+            "cpri_port_number": {
+              "title": "CPRI Port Number",
+              "description": "CPRI Port Number",
+              "type": "number",
+              "default": 0
+            },
             "dl_earfcn": {
               "title": "DL EARFCN",
               "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",