.

software/ors-amarisoft/config/enb.cfg

@@ -55,13 +55,13 @@
           n_antenna_dl: 4,
           n_antenna_ul: 2,
 
-          cell_id:    0x01,
-          tac:        0x0001,
-          n_id_cell:  1,
-          dl_earfcn:  38050,
+          cell_id:      0x01,
+          tac:          0x0001,
+          n_id_cell:    1,
+          dl_earfcn:    38050,
           root_sequence_index: 204,
 
-          // Handover
+          // Handover   XXX same code for both LTE and NR
           ncell_list: [
             // Intra-ENB HO
             {
@@ -107,6 +107,8 @@
           ],
 
 
+
+
           uldl_config: 2,
           sp_config: 7,
           n_rb_dl: 25,
@@ -646,13 +648,13 @@
           n_antenna_dl: 4,
           n_antenna_ul: 2,
 
-          cell_id:    0x02,
-          tac:        0x0001,
-          n_id_cell:  2,
-          dl_earfcn:  38100,
+          cell_id:      0x02,
+          tac:          0x0001,
+          n_id_cell:    2,
+          dl_earfcn:    38100,
           root_sequence_index: 205,
 
-          // Handover
+          // Handover   XXX same code for both LTE and NR
           ncell_list: [
             // Intra-ENB HO
             {
@@ -698,6 +700,8 @@
           ],
 
 
+
+
           uldl_config: 2,
           sp_config: 7,
           n_rb_dl: 25,
@@ -1237,13 +1241,13 @@
           n_antenna_dl: 2,
           n_antenna_ul: 1,
 
-          cell_id:    0x21,
-          tac:        0x0001,
-          n_id_cell:  21,
-          dl_earfcn:  3350,
+          cell_id:      0x21,
+          tac:          0x0001,
+          n_id_cell:    21,
+          dl_earfcn:    3350,
           root_sequence_index: 206,
 
-          // Handover
+          // Handover   XXX same code for both LTE and NR
           ncell_list: [
             // Intra-ENB HO
             {
@@ -1289,6 +1293,8 @@
           ],
 
 
+
+
           n_rb_dl: 25,
           si_coderate: 0.2,
 
@@ -1824,13 +1830,13 @@
           n_antenna_dl: 2,
           n_antenna_ul: 1,
 
-          cell_id:    0x22,
-          tac:        0x0001,
-          n_id_cell:  22,
-          dl_earfcn:  3410,
+          cell_id:      0x22,
+          tac:          0x0001,
+          n_id_cell:    22,
+          dl_earfcn:    3410,
           root_sequence_index: 207,
 
-          // Handover
+          // Handover   XXX same code for both LTE and NR
           ncell_list: [
             // Intra-ENB HO
             {
@@ -1876,6 +1882,8 @@
           ],
 
 
+
+
           n_rb_dl: 25,
           si_coderate: 0.2,
 
@@ -2504,4 +2512,10 @@
   },
 
   // NR cells (TODO)
+  nr_cell_list: [
+
+
+
+
+  ],
 }
\ No newline at end of file

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

@@ -9,9 +9,15 @@
       'gnb_id': '0x12345',
       'gnb_id_bits': 28,
 
-      'cell': {
+      'cell/lte': {
         'pci':  1,
         'tac':  "0x0001",
+        'tdd_ul_dl_config': '[Configuration 2] 5ms 2UL 6DL (default)',
+      },
+      'cell/nr': {
+        'pci':  500,
+        'ssb_pos_bitmap':   '10000000',
+        'tdd_ul_dl_config': '5ms 2UL 7DL 4/6 (default)',
       },
       'cpri_link': {
         'mapping': 'hw',
@@ -116,7 +122,7 @@
 {%-     do iru_dict.update({ref: iru})                                %}
 {%-   elif 'cell_type' in _                                           %}
 {%-     set icell = slave                                             %}
-{%-     for k, v in defaults['cell'].items()                          %}
+{%-     for k, v in defaults['cell/' + _['cell_type']].items()        %}
 {%-       do _.setdefault(k, v)                                       %}
 {%-     endfor                                                        %}
 {%-     do icell_dict.update({ref: icell})                            %}
@@ -137,7 +143,7 @@
 {#- do print('\n>>> iru_dict:'),   pprint(iru_dict)   #}
 {#- do print('\n>>> icell_dict:'), pprint(icell_dict) #}
 
-{#- XXX verify cell_type = lte|nr #}
+{#- XXX verify cell_type = lte|nr   XXX no - this should be verified by json-schema #}
 
 {#- verify that there is no dangling cell->ru references #}
 {#- XXX also verify that there is no dangling cell -> cell refs in ruincell_ref #}
@@ -172,6 +178,12 @@
       sync: "gps",
 {%- endif %}
 
+{#- XXX emit big warning if both cpri and sdr are present
+        to protect users from unclear eNB failues
+        see https://support.amarisoft.com/issues/26021 for details
+
+    XXX belowe we continue as if sdr and cpri are both supported by enb simultaneously #}
+
 {%- set dev_argv = []                                                       %}
 {%- set ru_sdr_dict = {}  %}  {# dev -> ru  for ru with ru_type = sdr       #}
 {%- set ru_cpri_dict = {} %}  {# dev -> ru  for ru with link_kind = cpri    #}
@@ -296,9 +308,9 @@
   cell_list: [
 {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
 {%    set cell = icell['_']                   %}
-{%-   if cell['cell_type'] == 'lte' %}
+{%-   if cell['cell_type'] == 'lte'           %}
 {%-     set ru_ref = J(jcell_ru_ref(icell))   %}
-{%-     set iru = iru_dict[ru_ref]             %}
+{%-     set iru = iru_dict[ru_ref]            %}
 {%-     set ru = iru['_']                     %}
         // {{ J(jref_of_shared(icell)) }}
         {
@@ -306,15 +318,15 @@
           n_antenna_dl: {{ ru['n_antenna_dl'] }},
           n_antenna_ul: {{ ru['n_antenna_ul'] }},
 
-          cell_id:    {{ cell['cell_id'] }},
-          tac:        {{ cell['tac'] }},
-          n_id_cell:  {{ cell['pci'] }},
-          dl_earfcn:  {{ cell['dl_earfcn'] }},
+          cell_id:      {{ cell['cell_id'] }},
+          tac:          {{ cell['tac'] }},
+          n_id_cell:    {{ cell['pci'] }},
+          dl_earfcn:    {{ cell['dl_earfcn'] }},
           root_sequence_index: {{ cell.get('root_sequence_index',
                                     slapparameter_dict.get('root_sequence_index',
                                       204 + i)) }},
 
-          // Handover
+          // Handover   XXX same code for both LTE and NR
           ncell_list: [
             // Intra-ENB HO
 {%-       for cell2_ref, icell2 in icell_dict|dictsort %}
@@ -369,6 +381,8 @@
 {%-       endfor %}
           ],
 
+
+
 {#        tune LTE parameters for the cell #}
 {%-       set tdd = (cell['rf_mode'] == 'tdd') %}
 {%-       if tdd %}
@@ -551,6 +565,30 @@
   },
 
   // NR cells (TODO)
-  {#- XXX + nr_cell_list        #}
+  nr_cell_list: [
+{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
+{%    set cell = icell['_']                   %}
+{%-   if cell['cell_type'] == 'nr'            %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))   %}
+{%-     set iru = iru_dict[ru_ref]            %}
+{%-     set ru = iru['_']                     %}
+        // {{ J(jref_of_shared(icell)) }}
+        {
+          rf_port:      {{ ru['.rf_port'] }},
+          n_antenna_dl: {{ ru['n_antenna_dl'] }},
+          n_antenna_ul: {{ ru['n_antenna_ul'] }},
+
+          cell_id:      {{ cell['cell_id'] }},
+          n_id_cell:    {{ cell['pci'] }},
+          band:         {{ cell['nr_band'] }},
+          dl_nr_arfcn:  {{ cell['dl_nr_arfcn'] }},
+          bandwidth:    {{ cell['bandwidth'] }},
+
+          subcarrier_spacing: 30,
+          ssb_pos_bitmap: {{ cell['ssb_pos_bitmap'] }},
+        },
+{%-   endif %}
+{%- endfor %}
+  ],
   {#- XXX + nr_cell_default     #}
 }