.

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

 // DRB configuration for LTE cell {{ cell_ref }} @ {{ ru_ref }}.
 // DRB configuration vary in beteen FDD and TDD modes.
 
-// {{ cell.rf_mode | upper }}
-{%- if cell.rf_mode == 'tdd' %}
-#define T_REORDERING 65
-{%- else %}
-#define T_REORDERING 35
-{%- endif %}
+{%  set T_REORDERING = {'fdd': 35, 'tdd': 65} [cell.rf_mode] %}
+// {{ cell.rf_mode | upper }}  T_REORDERING={{ T_REORDERING }}
 
 [
   {
@@ -34,7 +30,7 @@
       },
       dl_um: {
         sn_FieldLength: 5,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -69,7 +65,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -102,7 +98,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -136,7 +132,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },
@@ -175,7 +171,7 @@
       },
       dl_um: {
         sn_FieldLength: 5,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -210,7 +206,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -245,7 +241,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -280,7 +276,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },
@@ -315,7 +311,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },
@@ -349,7 +345,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
       },
     },
     logical_channel_config: {
@@ -383,7 +379,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },
@@ -421,7 +417,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },
@@ -456,7 +452,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },
@@ -491,7 +487,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: {{ T_REORDERING }},
         t_StatusProhibit: 10,
       },
     },

software/ors-amarisoft/config/out/CELL1_a-drb.cfg

 // DRB configuration for LTE cell CELL1_a @ _CELL1_a_ru.
 // DRB configuration vary in beteen FDD and TDD modes.
 
-// TDD
-#define T_REORDERING 65
+
+// TDD  T_REORDERING=65
 
 [
   {
@@ -30,7 +30,7 @@
       },
       dl_um: {
         sn_FieldLength: 5,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -65,7 +65,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -98,7 +98,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -132,7 +132,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -171,7 +171,7 @@
       },
       dl_um: {
         sn_FieldLength: 5,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -206,7 +206,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -241,7 +241,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -276,7 +276,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -311,7 +311,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -345,7 +345,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -379,7 +379,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -417,7 +417,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -452,7 +452,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -487,7 +487,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },

software/ors-amarisoft/config/out/CELL1_a-sib23.asn

-// SIB2/SIB3 for LTE cell CELL1_a @ _CELL1_a_ru.
+/* SIB2/SIB3 for LTE cell CELL1_a @ _CELL1_a_ru. */
 {
   message c1: systemInformation: {
     criticalExtensions systemInformation-r8: {

software/ors-amarisoft/config/out/CELL1_b-drb.cfg

 // DRB configuration for LTE cell CELL1_b @ _CELL1_a_ru.
 // DRB configuration vary in beteen FDD and TDD modes.
 
-// TDD
-#define T_REORDERING 65
+
+// TDD  T_REORDERING=65
 
 [
   {
@@ -30,7 +30,7 @@
       },
       dl_um: {
         sn_FieldLength: 5,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -65,7 +65,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -98,7 +98,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -132,7 +132,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -171,7 +171,7 @@
       },
       dl_um: {
         sn_FieldLength: 5,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -206,7 +206,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -241,7 +241,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -276,7 +276,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -311,7 +311,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -345,7 +345,7 @@
       },
       dl_um: {
         sn_FieldLength: 10,
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
       },
     },
     logical_channel_config: {
@@ -379,7 +379,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -417,7 +417,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -452,7 +452,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },
@@ -487,7 +487,7 @@
         maxRetxThreshold: 32,
       },
       dl_am: {
-        t_Reordering: T_REORDERING,
+        t_Reordering: 65,
         t_StatusProhibit: 10,
       },
     },

software/ors-amarisoft/config/out/CELL1_b-sib23.asn

-// SIB2/SIB3 for LTE cell CELL1_b @ _CELL1_a_ru.
+/* SIB2/SIB3 for LTE cell CELL1_b @ _CELL1_a_ru. */
 {
   message c1: systemInformation: {
     criticalExtensions systemInformation-r8: {

software/ors-amarisoft/config/out/CELL1_c-sib23.asn

-// SIB2/SIB3 for NR cell CELL1_c @ _CELL1_a_ru.
+/* SIB2/SIB3 for NR cell CELL1_c @ _CELL1_a_ru. */
 {
   message c1: systemInformation: {
     criticalExtensions systemInformation-r8: {

software/ors-amarisoft/config/sib23.jinja2.asn

-// SIB2/SIB3 for {{ cell.cell_type | upper }} cell {{ cell_ref }} @ {{ ru_ref }}.
+/* SIB2/SIB3 for {{ cell.cell_type | upper }} cell {{ cell_ref }} @ {{ ru_ref }}. */
 {%- set bbu = "zzz" %}{# XXX temp hack #}
 {
   message c1: systemInformation: {

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -188,58 +188,6 @@
       "description": "RRH MAC address used for DNSMASQ",
       "type": "string"
     },
-{%- endif %}
-{%- if ru == 'lopcomm' %}
-    "txa0cc00_active": {
-      "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",
-      "description": "Activate or inactivate Lopcomm ORAN TX array carriers (TXA0CC00)",
-      "type": "string",
-      "default": "INACTIVE",
-      "enum": [
-        "ACTIVE",
-        "INACTIVE"
-      ]
-    },
-    "rxa0cc00_active": {
-      "title": "Lopcomm ORAN RX array carriers (RXA0CC00)",
-      "description": "Activate or inactivate Lopcomm ORAN RX array carriers (RXA0CC00)",
-      "type": "string",
-      "default": "INACTIVE",
-      "enum": [
-        "ACTIVE",
-        "INACTIVE"
-      ]
-    },
-    "txa0cc00_center_frequency": {
-      "title": "Lopcomm ORAN DL Center Frequency in MHz (TXA0CC00)",
-      "description": "Lopcomm ORAN Center Frequency in MHz (TXA0CC00)",
-      "type": "number",
-      "default": 2140
-    },
-    "rxa0cc00_center_frequency_earfcn": {
-      "title": "Lopcomm ORAN UL Center Frequency EARFCN (RXA0CC00)",
-      "description": "Lopcomm ORAN Center Frequency EARFCN (RXA0CC00)",
-      "type": "number",
-      "default": 18300
-    },
-    "rxa0cc00_center_frequency": {
-      "title": "Lopcomm ORAN UL Center Frequency in MHz (RXA0CC00)",
-      "description": "Lopcomm ORAN Center Frequency in MHz (RXA0CC00)",
-      "type": "number",
-      "default": 1950
-    },
-    "txa0cc00_gain": {
-      "title": "ORAN Gain",
-      "description": "Lopcomm ORAN Gain (TXA0CC00)",
-      "type": "number",
-      "default": -20
-    },
-    "user-authorized-key": {
-      "title": "User Authorized Key",
-      "description": "SSH public key in order to connect to the SSH server of this instance.",
-      "textarea": true,
-      "type": "string"
-    },
 {%- endif %}
     "enb_id": {
       "title": "eNB ID",