software/ors-amarisoft: add more parameters about RU

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

@@ -29,11 +29,11 @@
 {%- endif %}
       args: "dev0=/dev/sdr0@0",
       cpri_mapping: "hw",
-      cpri_mult: 16,
-      cpri_rx_delay: 0,
-      cpri_tx_delay: 0,
+      cpri_mult: "{{ slapparameter_dict.get('cpri_mult', 16) }}",
+      cpri_rx_delay: "{{ slapparameter_dict.get('cpri_rx_delay', 25.11) }}",
+      cpri_tx_delay: "{{ slapparameter_dict.get('cpri_tx_delay', 14.71) }}",
+      cpri_tx_dbm: "{{ slapparameter_dict.get('cpri_tx_dbm', 63) }}",
       ifname: "{{ slap_configuration.get('tap-name', '') }}",
-      cpri_debug: 2,
   },
   tx_gain: 0,
   rx_gain: 0,
@@ -74,11 +74,15 @@
 {% endif %}
   ],
 {% if slapparameter_dict.get('mme_list', '') %}
-{%   if slapparameter_dict.get('use_ipv4', False) %}
-  gtp_addr: "{{ gtp_addr_v4 }}",
-{%   else %}
+	{% if slapparameter_dict.get('gtp_addr') %}
+    gtp_addr: "{{ slapparameter_dict.get('gtp_addr') }}",
+  {% else %}
+    {% if slapparameter_dict.get('use_ipv4', False) %}
       gtp_addr: "{{ gtp_addr_v6 }}",
-{%   endif %}
+    {% else %}
+      gtp_addr: "{{ gtp_addr_v4 }}",
+    {% endif %}
+  {% endif %}
 {% else %}
   gtp_addr: "127.0.1.1",
 {% endif %}

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

@@ -15,25 +15,25 @@
       ]
     },
     "cpri_mult": {
-      "title": "cpri_mult",
+      "title": "CPRI Mult",
       "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
       "type": "number",
       "default": 16
     },
     "cpri_rx_delay": {
-      "title": "cpri_rx_delay",
+      "title": "CPRI RX Delay",
       "description": "Delay between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
       "type": "number",
       "default": 0
     },
     "cpri_tx_delay": {
-      "title": "cpri_tx_delay",
+      "title": "CPRI TX Delay",
       "description": "Advance Start of Frame relative to PPS to compensate for delays in transmit line and RRH. This should be set to T12 + T2a.",
       "type": "number",
       "default": 0
     },
     "cpri_tx_dbm": {
-      "title": "cpri_tx_dbm",
+      "title": "CPRI TX dBm",
       "description": "Optional floating point value in dBm (default 0). Needed by ENB/GNB to have a notion of actual output power. Computed from maximum power output of the RRH for a 0dBFS input signal (full scale). ",
       "type": "number",
       "default": 0
@@ -106,6 +106,12 @@
       "type": "number",
       "default": 20000000
     },
+    "txa0cc00_gain": {	
+      "title": "ORAN Gain",	
+      "description": "Lopcomm ORAN Gain (TXA0CC00)",	
+      "type": "number",	
+      "default": -20	
+    },
 {%- endif %}
     "log_phy_debug": {
       "title": "Physical layer log debug",
@@ -152,6 +158,12 @@
       "type": "number",
       "default": {{ default_lte_n_rb_dl }}
     },
+    "gtp_addr": {	
+      "title": "GTP Address",	
+      "description": "String. Set the IP address (and optional port) on which the GTP-U packets are received. The default port is 2152. It is normally the IP address of the network interface connected to the core network.",	
+      "type": "string",	
+      "default": "127.0.1.1"	
+    },
     "mme_list": {
       "title": "MME list",
       "description": "Optionnal. List of MME to which the gNodeB is connected",

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

@@ -14,25 +14,25 @@
       ]
     },
     "cpri_mult": {
-      "title": "cpri_mult",
+      "title": "CPRI Mult",
       "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
       "type": "number",
       "default": 16
     },
     "cpri_rx_delay": {
-      "title": "cpri_rx_delay",
+      "title": "CPRI RX Delay",
       "description": "Delay between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
       "type": "number",
       "default": 0
     },
     "cpri_tx_delay": {
-      "title": "cpri_tx_delay",
+      "title": "CPRI TX Delay",
       "description": "Advance Start of Frame relative to PPS to compensate for delays in transmit line and RRH. This should be set to T12 + T2a.",
       "type": "number",
       "default": 0
     },
     "cpri_tx_dbm": {
-      "title": "cpri_tx_dbm",
+      "title": "CPRI TX dBm",
       "description": "Optional floating point value in dBm (default 0). Needed by ENB/GNB to have a notion of actual output power. Computed from maximum power output of the RRH for a 0dBFS input signal (full scale). ",
       "type": "number",
       "default": 0
@@ -105,6 +105,12 @@
       "type": "number",
       "default": 20000000
     },
+    "txa0cc00_gain": {	
+      "title": "ORAN Gain",	
+      "description": "Lopcomm ORAN Gain (TXA0CC00)",	
+      "type": "number",	
+      "default": -20	
+    },
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -150,6 +156,12 @@
       "type": "number",
       "default": 100
     },
+    "gtp_addr": {	
+      "title": "GTP Address",	
+      "description": "String. Set the IP address (and optional port) on which the GTP-U packets are received. The default port is 2152. It is normally the IP address of the network interface connected to the core network.",	
+      "type": "string",	
+      "default": "127.0.1.1"	
+    },
     "mme_list": {
       "title": "MME list",
       "description": "Optionnal. List of MME to which the gNodeB is connected",

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

@@ -48,6 +48,12 @@
       "type": "number",
       "default": 100
     },
+    "gtp_addr": {	
+      "title": "GTP Address",	
+      "description": "String. Set the IP address (and optional port) on which the GTP-U packets are received. The default port is 2152. It is normally the IP address of the network interface connected to the core network.",	
+      "type": "string",	
+      "default": "127.0.1.1"	
+    },
     "mme_list": {
       "title": "MME list",
       "description": "Optionnal. List of MME to which the gNodeB is connected",