.

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

@@ -29,8 +29,8 @@ XXX link to rrh
       ],
       "properties": {
         "cell_type": {
-          "const": "cell_lte",
-          "template": "cell_lte",
+          "const": "lte",
+          "template": "lte",
           "options": {
             "hidden": true
           }
@@ -53,7 +53,7 @@ XXX link to rrh
         if rf_mode == "TDD":
             "tdd_ul_dl_config": {
               "title": "TDD",
-              "description": "TDD",
+              "description": "TDD Configuration",
               "type": "string",
               "enum": [
                 "[Configuration 2] 5ms 2UL 6DL (default)",
@@ -98,8 +98,8 @@ XXX link to rrh
       ],
       "properties": {
         "cell_type": {
-          "const": "cell_nr",
-          "template": "cell_nr",
+          "const": "nr",
+          "template": "nr",
           "options": {
             "hidden": true
           }
@@ -154,7 +154,7 @@ XXX link to rrh
   "$defs": {
     "rf_mode": {
       "title": "RF mode",
-      "description": "Frequency- or Time- based multiplexing",
+      "description": "Mode for TX/RX radio multiplexing: Frequency- or Time- based",
       "enum": ["FDD", "TDD"]
     },
     "pci": {

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

@@ -138,7 +138,7 @@
   # LTE cells
   cell_list: [
 {%- for i, cell in enumerate(cell_list) %}
-{%-   if cell['cell_type'] == 'cell_lte' %}
+{%-   if cell['cell_type'] == 'lte' %}
         {
           rf_port: XXX get from rrh,
           n_antenna_dl: N_ANTENNA_DL,         # XXX from rrh
@@ -153,7 +153,7 @@
 {#-       CA in between all LTE cells #}
           scell_list: [
 {%-       for j, cell2 in enumerate(cell_list) %}
-{%-         if j != i  and  cell2['cell_type'] == 'cell_lte' %}
+{%-         if j != i  and  cell2['type'] == 'cell_lte' %}
             {
               cell_id: {{ cell2['cell_id'] }},
               cross_carrier_scheduling: false,
@@ -163,7 +163,7 @@
           ],
 
 {#        tune LTE parameters for the cell #}
-{%-       set tdd = (cell['rf_mode'] == 'tdd') %}
+{%-       set tdd = (cell['rf_mode'] == 'TDD') %}
 {%-       if tdd %}
             uldl_config: {{ lte.cell_tdd_config(cell} }},
             sp_config: 7,
@@ -303,6 +303,7 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
 
+    # XXX -> cell ?
     inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_lte_inactivity_timer']) }},
 
     srb_config: [

software/ors-amarisoft/rrh_lopcomm/rrh-input-schema.json

@@ -40,31 +40,31 @@
         "INACTIVE"
       ]
     },
-    "txa0cc00_center_frequency_earfcn  XXX -> cell ?": {
+    "txa0cc00_center_frequency_earfcn": {
       "title": "Center Frequency EARFCN (TXA0CC00)",
       "description": "Center Frequency EARFCN (TXA0CC00)",
       "type": "number",
       "default": 300
     },
-    "txa0cc00_center_frequency  XXX -> cell ?": {
+    "txa0cc00_center_frequency": {
       "title": "Center Frequency in Hz (TXA0CC00)",
       "description": "Center Frequency in Hz (TXA0CC00)",
       "type": "number",
       "default": 2140000000
     },
-    "txa0cc00_bandwidth  XXX -> cell ?": {
+    "txa0cc00_bandwidth": {
       "title": "bandwidth in Hz (TXA0CC00)",
       "description": "bandwidth in Hz (TXA0CC00)",
       "type": "number",
       "default": 20000000
     },
-    "rxa0cc00_center_frequency_earfcn  XXX -> cell ?": {
+    "rxa0cc00_center_frequency_earfcn": {
       "title": "Center Frequency EARFCN (RXA0CC00)",
       "description": "Center Frequency EARFCN (RXA0CC00)",
       "type": "number",
       "default": 18300
     },
-    "rxa0cc00_center_frequency  XXX -> cell ?": {
+    "rxa0cc00_center_frequency": {
       "title": "Center Frequency in Hz (RXA0CC00)",
       "description": "Center Frequency in Hz (RXA0CC00)",
       "type": "number",
@@ -75,14 +75,6 @@
       "description": "Lopcomm ORAN bandwidth in Hz (RXA0CC00)",
       "type": "number",
       "default": 20000000
-    },
-    "loop_property1": {
-        "title": "Loopcom-specific property1",
-        "type":  "string"
-    },
-    "loop_property2": {
-          "title": "Loopcom-specific property2",
-          "type":  "number"
     }
   }
 }