.

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

@@ -106,7 +106,7 @@
 {%-   do ru.update({'.rf_port': rf_port})                                   %}
 {%-   if ru['ru_type'] == 'sdr'                                             %}
         XXX move to ru/sdr ?
-{%-     for n in ru['dev_list']                                             %}
+{%-     for n in ru['sdr_dev_list']                                             %}
 {%-       do dev_argv.append("dev%d=/dev/sdr%d" % (len(dev_argv), n))       %}
 {%-     endfor                                                              %}
       rx_antenna:"tx_rx",   XXX -> ru/sdr ?  FIXME don't repeat multiple times

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

@@ -5,12 +5,12 @@ n_antenna_dl  int
 n_antenna_ul  int
 
 if ru_link_type = "cpri":
+  cpri_link:
     sdr_dev   number  # e.g. sdrX@Y
     sfp_port  number
-  //cpri_link: string  # e.g. sdrX@Y
 
-  cpri_mult:        int
-  cpri_mapping:     standard|hw|spread|bf1    <- selected by ru model ?
-  cpri_rx_delay:    int			      <- selected by ru model
-  cpri_tx_delay:    int			      <- ? selected by ru or not ?
-  cpri_tx_dbm:      float
+    mult:        int
+    mapping:     standard|hw|spread|bf1    <- selected by ru model ?
+    rx_delay:    int			      <- selected by ru model
+    tx_delay:    int			      <- ? selected by ru or not ?
+    tx_dbm:      float

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

@@ -4,6 +4,7 @@
   "type": "object",
   "required": [
     "ru_type",
+    "ru_link_type",
     "mac_addr",
     "txa0cc00_active",
     "rxa0cc00_active",

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

@@ -20,7 +20,7 @@
       "options":  { "hidden": true }
     },
 
-    "dev_list": {
+    "sdr_dev_list": {
       "title": "SDR boards",
       "description": "Which SDR boards to use as combined RF port",
       "type": "array",

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

@@ -11,12 +11,48 @@ json_params_empty = """{
     }
 }"""
 
-CELL1 = {
+RU1 = {
+    'ru_type':      'sdr',
+    'ru_link_type': 'sdr',
+    'sdr_dev_list': [3, 4],
+    'n_antenna_dl': 4,
+    'n_antenna_ul': 2,
 }
 
 RU2 = {
+    'ru_type':      'lopcomm',
+    'ru_link_type': 'cpri',
+    'mac_addr':     'XXX',
+    'cpri_link':    {
+        'sdr_dev':  2,
+        'sfp_port': 0,
+        'mult':     8,
+        'mapping':  'bf1',
+        'rx_delay': 10,
+        'tx_delay': 11,
+        'tx_dbm':   50
+    }
+    'n_antenna_dl': 2,
+    'n_antenna_ul': 1,
 }
 
+CELL1 = {
+    'cell_type':    'lte',
+    'rf_mode':      'fdd',
+    'bandwidth':    '5 MHz',
+    'dl_earfcn':    3350,
+    'pci':          1,
+    'cell_id':      "0x01",
+    'ru':           RU1,        # RU definition embedded into CELL
+}
+
+# XXX CELL2 TDD LTE
+# XXX CELL3 FDD NR
+
+# XXX RU embedded
+# XXX RU_ref
+# XXX RU_ref_incell
+
 jCELL1 = json.dumps(CELL1)
 jRU2   = json.dumps(RU2)
 json_params = """{