.

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

@@ -588,6 +588,9 @@
           subcarrier_spacing: 30,
           ssb_pos_bitmap: {{ cell['ssb_pos_bitmap'] }},
 
+          root_sequence_index: 1,   // XXX adjust from cfg('root_sequence_index') XXX place
+
+
         // XXX peers for HO
 
         // XXX CA
@@ -603,7 +606,7 @@
         {%- endif %}
 
 {%-       set tdd = (cell['rf_mode'] == 'tdd') %}
-{%-       set tdd_config = lte.nr_cell_tdd_config(cell) %},   // XXX None if fdd ?
+{%-       set tdd_config = lte.nr_cell_tdd_config(cell) if tdd else None %},
 
 {%        if tdd_config == 1 %}
            tdd_ul_dl_config: {
@@ -717,15 +720,13 @@
     q_rx_lev_min: -70,
     q_qual_min: -20,
 
-    root_sequence_index: 1,         // XXX -> cell
-
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {
       prach_config_index: 160,
       msg1_subcarrier_spacing: 30,
       msg1_fdm: 1,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru.ru_type == 'sunwave' %}
       msg1_frequency_start: 0,
 {% else %}
       msg1_frequency_start: -1,
@@ -741,7 +742,7 @@
       cb_preambles_per_ssb: 8,
     },
     pdcch: {
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru.ru_type == 'sunwave' %}
       n_rb_coreset0: 48,
       n_symb_coreset0: 1,
 {% endif %}
@@ -749,7 +750,7 @@
       dedicated_coreset: {
         rb_start: -1,
         l_crb: -1,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru.ru_type == 'sunwave' %}
         duration: 1,
 {% else %}
         duration: 0,
@@ -779,7 +780,7 @@
       dmrs_add_pos: 1,
       dmrs_type: 1,
       dmrs_max_len: 1,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru.ru_type == 'sunwave' %}
       k0: 0,
       k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
 {% elif tdd_config == 3 %}
@@ -1021,7 +1022,7 @@
       mcs_table: "qam256",
       mcs_table_tp: "qam256",
       ldpc_max_its: 5,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru.ru_type == 'sunwave' %}
       k2: 4,
       msg3_k2: 7,
 {% elif tdd_config == 3 %}
@@ -1050,6 +1051,7 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
     inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
+
     drb_config: [
     {
       qci: 1,

software/ors-amarisoft/ru/input-schema.json

@@ -6,7 +6,7 @@
   "oneOf": [
     { "$ref": "sdr/input-schema.json" },
     { "$ref": "lopcomm/input-schema.json" },
-    { "$ref": "sunvawe/input-schema.json" }
+    { "$ref": "sunwave/input-schema.json" }
   ],
 
   "$defs": {

software/ors-amarisoft/ru/sunvawe/input-schema.json → software/ors-amarisoft/ru/sunwave/input-schema.json

@@ -10,8 +10,8 @@
 
   "properties": {
     "ru_type": {
-      "const":    "sunvawe",
-      "template": "sunvawe"
+      "const":    "sunwave",
+      "template": "sunwave"
     },
     "ru_link_type": {
       "const":    "cpri",

software/ors-amarisoft/slapos-render-config.py

@@ -54,8 +54,8 @@ CELL1_c = {
     'pci':          3,
     'cell_id':      '0x03',
     'ru':           {
-        'ru_type':      'ruincell_ref',     # CELL1_c shares RU with CELL1_a/CELL1_b
-        'ruincell_ref': 'CELL1_b'           # referring to ru via CELL1_b -> CELL1_a
+        'ru_type':      'ruincell_ref',     # CELL1_c shares RU with CELL1_a and CELL1_b
+        'ruincell_ref': 'CELL1_b'           # referring to RU via CELL1_b -> CELL1_a
     }
 }