.

software/ors-amarisoft/XXX-instance-gnb-input-schema.json

@@ -94,54 +94,6 @@
       ],
       "default": 100
     },
-    "ncell_list": {
-      "title": "Neighbour Cell Info",
-      "description": "Neighbour Cell Info",
-      "patternProperties": {
-        ".*": {
-          "properties": {
-            "dl_nr_arfcn": {
-              "title": "DL NR ARFCN",
-              "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
-            },
-            "ssb_nr_arfcn": {
-              "title": "SSB NR ARFCN",
-              "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
-            },
-            "pci": {
-              "title": "Physical Cell ID",
-              "description": "Physical Cell ID of the neighbour cell",
-              "type": "number"
-            },
-            "nr_cell_id": {
-              "title": "NR Cell ID",
-              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string"
-            },
-            "gnb_id_bits": {
-              "title": "gNB ID bits",
-              "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-              "type": "number"
-            },
-            "nr_band": {
-              "title": "NR band",
-              "description": "NR band number",
-              "type": "number"
-            },
-            "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
-            }
-          },
-          "type": "object"
-        }
-      },
-      "type": "object",
-      "default": {}
-    },
     "xn_peers": {
       "title": "XN Peers",
       "description": "XN Peers",

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

@@ -113,7 +113,47 @@
 %}
 
 
-# XXX also translate peers to ishared ?
+{#- inject peer cells synthesized from ORS-specific parameters #}
+{%- for k, ncell in slapparameter_dict.ncell_list|dictsort %}
+{%-   set peercell = {'cell_kind': 'enb_peer'} %}
+{%-   macro param1(name, default)  %}
+{%-     if default is defined %}
+{%-       do peercell.update({name: default}) %}
+{%-     endif %}
+{%-     if name in ncell  %}
+{%-       do peercell.update({name: ncell[name]}) %}
+{%-     endif %}
+{%-   endmacro  %}
+{%-   if enb_mode == 'enb' %}
+{%-     do peercell.update({'cell_type':  'lte'})  %}
+{%-     do peercell.update({'bandwidth':  slapparameter_dict.bandwidth})  %}
+{%-     if 'cell_id' in ncell %}
+{%-       do peercell.update({'e_cell_id': ncell.cell_id) %}
+{%-     endif %}
+{%-     do param1('pci')  %}
+{%-     do param1('dl_earfcn')  %}
+{%-     do param1('tac', '0x0001')  %}
+{%-   elif enb_mode == 'gnb'  %}
+{%-     do peercell.update({'cell_type':  'nr'})  %}
+{%-     do param1('nr_cell_id') %}
+{%-     do param1('gnb_id_bits')  %}
+{%-     do param1('pci')  %}
+{%-     do param1('dl_nr_arfcn')  %}
+{%-     do param1('ssb_nr_arfcn') %}
+{%-     do param1('tac', '0x0001')  %}
+{%-     do param1('nr_band')  %}
+{%-   endif %}
+{%-   do ishared_list.append({
+      'slave_title':      '%s_PEERCELL%s' % (slap_configuration['slap-computer-partition-id'], k),
+      'slave_reference':  'XXX',
+      '_': peercell | tojson
+      })
+%}
+{%- endfor %}
+
+
+# XXX also inject peer enb nodes
+
 
 {#- backward compatibility: if ORS is running in gnb mode, and gnb_* parameters
     are present, replace their generic enb_* counterparts with gnb_* ones #}