ors-amarisoft: add lopcomm RRH

software/ors-amarisoft/buildout.hash.cfg

@@ -60,7 +60,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 1c9909f691b5bb00d3fc30d41613e26a
+md5sum = d6cf05433937853960006b7f1f73c04f
 
 [sib23.asn]
 filename = config/sib23.asn

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

@@ -7,6 +7,19 @@
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/enb.log",
 
+{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
+  rf_driver: {
+      name: "sdr",
+      args: "dev0=/dev/sdr0@0",
+      cpri_mapping: "hw",
+      cpri_mult: 16,
+      cpri_rx_delay: 0,
+      cpri_tx_delay: 0,
+      ifname: "cpri0",
+  },
+  tx_gain: 0,
+  rx_gain: 0,
+{% else %}
   rf_driver: {
       name: "sdr",
       args: "dev0=/dev/sdr0",
@@ -14,6 +27,7 @@
   },
   tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},
   rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_lte_rx_gain']) }},
+{% endif %}
   com_addr: "127.0.1.2:9001",
 
   mme_list: [
@@ -77,10 +91,12 @@
   cell_default: {
     n_antenna_dl: N_ANTENNA_DL,
     n_antenna_ul: N_ANTENNA_UL,
-    
+{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
+    {% pass %}
+{% else %}
     uldl_config: 2,
     sp_config: 7,
-
+{% endif %}
     n_rb_dl: N_RB_DL,
     cyclic_prefix: "normal",
 
@@ -136,7 +152,11 @@
     pucch_dedicated: {
       n1_pucch_sr_count: 11,
       cqi_pucch_n_rb: 1,
+{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
+      {% pass %}
+{% else %}
       tdd_ack_nack_feedback_mode: "multiplexing",
+{% endif %}
     },
 
     pusch_dedicated: {

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

@@ -23,6 +23,16 @@
       "type": "boolean"
     },
 {%- endif %}
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "Lopcomm ORAN"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",