Update Release Candidate

component/apache/buildout.cfg

@@ -22,8 +22,8 @@ extends =
 [apr]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 1.7.2
-md5sum = 9a00835e4da8c215348e263b550fc130
+version = 1.7.4
+md5sum = f8a62f3984898ba0ea8b6f26b851cb99
 url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 environment =
   LDFLAGS=-Wl,-rpath=${libuuid:location}/lib
@@ -44,9 +44,9 @@ environment =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.54
+version = 2.4.57
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 861b43073ab416d689f1fc4dfa087711
+md5sum = 34575e92f91fb625f3842d6ca382caa5
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/haproxy/buildout.cfg

@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.11.tar.gz
-md5sum = 1c5b8b0399158e44826c616424396df6
+url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz
+md5sum = ecac9724e3ca6368624fb2fab29dd366
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

component/libxml2/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [libxml2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.tar.xz
-md5sum = f9edac7fac232b3657a003fd9a5bbe42
+url = https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.tar.xz
+md5sum = b2e7332289f5784087448a0717f45ac3
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -7,8 +7,8 @@ parts =
   libxslt
 
 [libxslt]
-url = https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.tar.xz
-md5sum = 84e86fc8a1b7495674016e05e4c5da44
+url = https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.tar.xz
+md5sum = 7d6e43db810177ddf9818ef394027019
 recipe = slapos.recipe.cmmi
 shared = true
 # --disable-static is temporarilly removed due to build error

component/openssl/buildout.cfg

@@ -17,8 +17,8 @@ parts =
 [openssl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.openssl.org/source/openssl-1.1.1t.tar.gz
-md5sum = 1cfee919e0eac6be62c88c5ae8bcd91e
+url = https://www.openssl.org/source/openssl-1.1.1v.tar.gz
+md5sum = 9edcfdd9b96523df82b312c404f4b169
 location = @@LOCATION@@
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with DESTDIR). Used by slapos.package.git/obs
@@ -48,8 +48,8 @@ environment =
 
 [openssl-quictls]
 <= openssl
-url = https://github.com/quictls/openssl/archive/refs/tags/OpenSSL_1_1_1t-quic1.tar.gz
-md5sum = 8281790102204592d944e08d6ee09c5f
+url = https://github.com/quictls/openssl/archive/refs/tags/OpenSSL_1_1_1v-quic1.tar.gz
+md5sum = 4b0e4a81590644a027b78a54c26a75e2
 
 [openssl-output]
 # Shared binary location to ease migration

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = efcb5965bdf766d94b43c6ba2328275d
+md5sum = 50e83105328c6434ba94f77c5753cbf8
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -28,7 +28,7 @@ md5sum = c930c28365c685a6066f382c9b5d8893
 
 [lopcomm-rrh-stats.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-stats.jinja2.py
-md5sum = 6d6cc0c311ff4fe807e919ce3cb3d0d8
+md5sum = f0451b3c2494f103042bda04433c943d
 
 [lopcomm-rrh-config.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-config.jinja2.py
@@ -36,11 +36,11 @@ md5sum = b34fe47a73890097fbc6ea6374aeb38d
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 8b6e778ec21e03ef3f832ee420d7e83a
+md5sum = 62252527eb4998de5bb23058dbbdbd75
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = a94322f85f438dccba699e0f5ea09e3a
+md5sum = b4d7406d9d7df7fafbbf0ddbc792f5fb
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
@@ -48,7 +48,7 @@ md5sum = eda157219444c3ac10272626dd5cea10
 
 [template-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 29b6aa006a636589da5e2b2e365b84fb
+md5sum = 587531b7a43fecbcdc2f1bffac74a363
 
 [template-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 584a75944dc9aee68fafb1b63e9c1b2b
+md5sum = 1680fde9d6d5f8c1678fb11d7a891191
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
@@ -72,7 +72,7 @@ md5sum = 0af07bba51f8d4e773f9bfef4f2ca535
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 322affd5986b049fa6a1a96ece7108cf
+md5sum = f1e7f37a9c0866c08237b03cecdcd2c7
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh
@@ -92,11 +92,11 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue-lte.jinja2.cfg]
 filename = config/ue-lte.jinja2.cfg
-md5sum = 9e9fd1349d8e11f9fcfaa08c2f846d63
+md5sum = c0313f9d15543361f7c8e19af96c737a
 
 [ue-nr.jinja2.cfg]
 filename = config/ue-nr.jinja2.cfg
-md5sum = acb578df69ad990f677a323a8a34d965
+md5sum = 824233ab4d53ec428d358fb67bca8ba2
 
 [CreateProcessingEle.jinja2.xml]
 filename = netconf/CreateProcessingEle.jinja2.xml
@@ -104,7 +104,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [cu_config.jinja2.xml]
 filename = netconf/cu_config.jinja2.xml
-md5sum = edd54bb35c13526291924de8d1d3b795
+md5sum = 39ef850c68ea6cb1282176e718819c4a
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

software/ors-amarisoft/changelog.rst

 Changelog
 =========
+Version 1.0.332 (2023-09-04)
+-------------
+
+* Add 4G Intra eNB Handover
+* Add public websocket URL protected by password
+* Reorganize softwares: ORS now need to use software-tdd-ors or software-fdd-ors
+* Support multiple cells for BBUs
+
 Version 1.0.330 (2023-07-19)
 -------------
 

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

+{%- set cell_list = slapparameter_dict.get('cell_list', {'default': {}}) %}
+{%- set cell_count = cell_list|length %}
+
 {%- if slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 2] 5ms 2UL 6DL (default)' %}
 {%- set tdd_config = 2 %}
 {%- elif slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 6] 5ms 5UL 3DL (maximum uplink)' %}
@@ -8,7 +11,19 @@
 {% else %}
 #define TDD                 0
 {% endif %}
-#define N_RB_DL             {{ slapparameter_dict.get('n_rb_dl', slap_configuration['configuration.default_lte_n_rb_dl']) }}
+{%- if   slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '1.4 MHz' %}
+#define N_RB_DL             6
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '3 MHz' %}
+#define N_RB_DL             15
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '5 MHz' %}
+#define N_RB_DL             25
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '10 MHz' %}
+#define N_RB_DL             50
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '15 MHz' %}
+#define N_RB_DL             75
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '20 MHz' %}
+#define N_RB_DL             100
+{%- endif %}
 #define N_ANTENNA_DL        {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}
 #define N_ANTENNA_UL        {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }}
 
@@ -27,13 +42,53 @@
 {%- else %}
       name: "sdr",
 {%- endif %}
-      args: "dev0=/dev/sdr0@0",
+      args: "dev0=
+        {%- for i, k in enumerate(cell_list) %}
+        {%- set cpri_port = cell_list[k].get('cpri_port_number', i) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          /dev/sdr{{ slapparameter_dict.get('sdr_number', 0) }}@{{ cpri_port }}
+        {%- endfor -%}
+        ",
       cpri_mapping: "hw",
-      cpri_mult: 16,
-      cpri_rx_delay: 0,
-      cpri_tx_delay: 0,
-      ifname: "{{ slap_configuration.get('tap-name', '') }}",
-      cpri_debug: 2,
+      {%- set cpri_mult = slapparameter_dict.get('cpri_mult', 16) %}
+      cpri_mult: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cpri_mult }}
+        {%- endfor -%}
+        ",
+      cpri_rx_delay: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cell_list[k].get('cpri_rx_delay', 0) }}
+        {%- endfor -%}
+        ",
+      cpri_tx_delay: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cell_list[k].get('cpri_tx_delay', 0) }}
+        {%- endfor -%}
+        ",
+      ifname: "
+        {%- if cell_count == 1 -%}
+          {{ slap_configuration.get('tap-name', '') }}
+        {%- else -%}
+          {%- for i, k in enumerate(cell_list) %}
+          {%- if i != 0 -%}
+          ,
+          {%- endif -%}
+            {{ slap_configuration.get('tap-name', '') }}-{{ i }}
+          {%- endfor -%}
+        {%- endif -%}
+        ",
   },
   tx_gain: 0,
   rx_gain: 0,
@@ -54,7 +109,14 @@
   tx_gain: {{ tx_gain }},
   rx_gain: {{ rx_gain }},
 {% endif %}
+  {%- if slapparameter_dict.get('websocket_password', '') %}
+  com_addr: "[{{ gtp_addr_v6 }}]:9001",
+  com_auth: {
+    password: "{{ slapparameter_dict['websocket_password'] }}",
+  },
+  {%- else %}
   com_addr: "127.0.1.2:9001",
+  {%- endif %}
 
   mme_list: [
 {% if slapparameter_dict.get('mme_list', '') %}
@@ -86,7 +148,57 @@
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
 
   cell_list: [
+    {%- for i, k in enumerate(cell_list) %}
+    {%- if i == 0 -%}
+    {
+    {%- else -%}
+    , {
+    {%- endif %}
+      rf_port: {{ i }},
+      cell_id: {{ cell_list[k].get('cell_id', slapparameter_dict.get('cell_id', '0x0' + i|string)) }},
+      tac: {{ cell_list[k].get('tac', slapparameter_dict.get('tac', '0x0001')) }},
+      n_id_cell: {{ cell_list[k].get('pci', slapparameter_dict.get('pci', i)) }},
+      root_sequence_index: {{ cell_list[k].get('root_sequence_index', slapparameter_dict.get('root_sequence_index', 204 + i)) }},
+      dl_earfcn: {{ cell_list[k].get('dl_earfcn', slapparameter_dict.get('dl_earfcn', earfcn)) }},
+      {%- if slapparameter_dict.get('ncell_list', '') %}
+      ncell_list: [
+      {%- for i, k in enumerate(slapparameter_dict['ncell_list']) %}
+      {%- if i == 0 -%}
+        {
+      {%- else -%}
+        , {
+      {%- endif %}
+          n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('pci', '') }},
+          dl_earfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_earfcn', '') }},
+          cell_id: {{ slapparameter_dict['ncell_list'][k].get('cell_id', '') }},
+          tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }},
+        }
+      {%- endfor -%}
+      ],
+      {% endif %}
+      {%- set scell_list = [] %}
+      {%- for j, l in enumerate(cell_list) %}
+      {%-   if j != i %}
+      {%-     do scell_list.append([j, l]) %}
+      {%-   endif %}
+      {%- endfor %}
+      scell_list: [
+        {%- for j, l in enumerate(scell_list) %}
+        {%- if j == 0 -%}
         {
+        {%- else -%}
+        , {
+        {%- endif %}
+          cell_id: {{ cell_list[l[1]].get('cell_id', '0x0' + l[0]|string) }},
+          cross_carrier_scheduling: false,
+        }
+        {%- endfor %}
+      ],
+    }
+    {%- endfor %}
+  ],
+
+  cell_default: {
     plmn_list: [
 {%- if slapparameter_dict.get('plmn_list', '') %}
 {%- for i, k in enumerate(slapparameter_dict['plmn_list']) %}
@@ -104,17 +216,6 @@
       "00101",
 {% endif %}
     ],
-
-    dl_earfcn: {{ earfcn }},
-
-    n_id_cell: {{ slapparameter_dict.get('pci', 1) }},
-    cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }},
-    tac: {{ slapparameter_dict.get('tac', '0x0001') }},
-    root_sequence_index: 204,
-  },
-  ],
-
-  cell_default: {
     n_antenna_dl: N_ANTENNA_DL,
     n_antenna_ul: N_ANTENNA_UL,
 {% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
@@ -769,7 +870,23 @@
       logicalChannelSR_Prohibit: false,
     },
   },
-  ]
+  ],
 
+  meas_config_desc: {
+    a1_report_type: "rsrp",
+    a1_rsrp: -70,
+    a1_hysteresis: 0,
+    a1_time_to_trigger: 640,
+    a2_report_type: "rsrp",
+    a2_rsrp: -80,
+    a2_hysteresis: 0,
+    a2_time_to_trigger: 640,
+    a3_report_type: "rsrp",
+    a3_offset: {{ slapparameter_dict.get('lte_handover_a3_offset', 6) }},
+    a3_hysteresis: 0,
+    a3_time_to_trigger: {{ slapparameter_dict.get('lte_handover_a3_time_to_trigger', 480) }},
+  },
+  meas_gap_config: "gp0",
+  ho_from_meas: true,
   },
 }

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

@@ -53,7 +53,14 @@
   tx_gain: {{ tx_gain }},
   rx_gain: {{ rx_gain }},
 {% endif %}
+  {%- if slapparameter_dict.get('websocket_password', '') %}
+  com_addr: "[{{ gtp_addr_v6 }}]:9001",
+  com_auth: {
+    password: "{{ slapparameter_dict['websocket_password'] }}",
+  },
+  {%- else %}
   com_addr: "127.0.1.2:9001",
+  {%- endif %}
   amf_list: [
 {% if slapparameter_dict.get('amf_list', '') %}
 {%- for i, k in enumerate(slapparameter_dict['amf_list']) %}

software/ors-amarisoft/config/ue-lte.jinja2.cfg

+{%- if   slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '1.4 MHz' %}
+#define N_RB_DL             6
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '3 MHz' %}
+#define N_RB_DL             15
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '5 MHz' %}
+#define N_RB_DL             25
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '10 MHz' %}
+#define N_RB_DL             50
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '15 MHz' %}
+#define N_RB_DL             75
+{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '20 MHz' %}
+#define N_RB_DL             100
+{%- endif %}
 {
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/ue.log",
@@ -16,7 +29,7 @@ rf_driver: {
     multi_ue: true,
     cells: [
       {
-        bandwidth: {{ slapparameter_dict.get('n_rb_dl', slap_configuration['configuration.default_lte_n_rb_dl']) }},
+        bandwidth: N_RB_DL,
         dl_earfcn: {{ slapparameter_dict.get('dl_earfcn', 0) }},
         n_antenna_dl: {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }},
         n_antenna_ul: {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }},

software/ors-amarisoft/config/ue-nr.jinja2.cfg

@@ -17,7 +17,7 @@ rf_driver: {
       multi_ue: false,
       cells: [{
         rf_port: 0,
-        bandwidth: {{ slapparameter_dict.get('nr_bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
+        bandwidth: {{ slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
         band: {{ slapparameter_dict.get('nr_band', 0) }},
         dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', 0) }},
         ssb_nr_arfcn: {{ slapparameter_dict.get('ssb_nr_arfcn', 0) }},

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

@@ -69,7 +69,7 @@ configuration.ims_ws_port = 9003
 configuration.ims_addr = 127.0.0.1
 configuration.ims_bind = 127.0.0.2
 configuration.enb_addr = 127.0.1.1
-configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }}
+configuration.default_lte_bandwidth = {{ default_lte_bandwidth }}
 configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
 configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
 configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
@@ -104,6 +104,15 @@ version = {{ slapparameter_dict.get("enb_config_version") }}
 offline = false
 {% endif %}
 
+{% if slapparameter_dict.get("cu_config_link", None) %}
+[cu-config-dl]
+recipe = slapos.recipe.build:download
+url = {{ slapparameter_dict.get("cu_config_link") }}
+version = {{ slapparameter_dict.get("cu_config_version") }}
+offline = false
+{% endif %}
+
+
 [enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
@@ -166,7 +175,11 @@ drb_stats_logspec =
 {%- endif %}
 rotatespec = 100MB.9
 logspec = ${:stats_logspec} ${:drb_stats_logspec}
+{%- if slapparameter_dict.get("websocket_password", "") %}
+websock = ws://[${slap-configuration:ipv6-random}]:9001
+{%- else %}
 websock = ws://127.0.1.2:9001
+{%- endif %}
 xamari = {{ buildout_directory }}/bin/xamari
 logfile = ${monitor-directory:public}/enb.xlog
 inline =
@@ -252,6 +265,8 @@ extensions = jinja2.ext.do
 log-output = ${directory:var}/log/lopcomm-rrh-stats.log
 json-log-output = ${directory:var}/log/lopcomm-rrh-stats.json.log
 cfg-json-log-output = ${directory:var}/log/lopcomm-rrh-config.json.log
+supervision-json-log-output = ${directory:var}/log/lopcomm-rrh-supervision.json.log
+ncsession-json-log-output = ${directory:var}/log/lopcomm-rrh-ncsession.json.log
 context =
   section directory directory
   section slap_configuration slap-configuration
@@ -259,6 +274,8 @@ context =
   key log_file :log-output
   key json_log_file :json-log-output
   key cfg_json_log_file :cfg-json-log-output
+  key supervision_json_log_file :supervision-json-log-output
+  key ncsession_json_log_file :ncsession-json-log-output
   raw testing {{ slapparameter_dict.get("testing", False) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
   import netaddr netaddr
@@ -268,7 +285,11 @@ output = ${directory:bin}/lopcomm-rrh-stats.py
 
 [lopcomm-cu-config]
 <= config-base
+{% if slapparameter_dict.get("cu_config_link", None) %}
+url = ${enb-config-dl:target}
+{% else %}
 url = {{ cu_config_template }}
+{% endif %}
 output = ${directory:etc}/cu_config.xml
 
 [lopcomm-rrh-config-template]
@@ -327,7 +348,11 @@ context =
   raw tx_gain {{ ors_version['current-tx-gain'] }}
   raw rx_gain {{ ors_version['current-rx-gain'] }}
   raw earfcn  {{ ors_version['current-earfcn'] }}
+  raw software_name {{ software_name }}
   raw rf_mode {{ rf_mode }}
+  raw trx {{ trx }}
+  raw bbu {{ bbu }}
+  raw ru {{ ru }}
   import  netaddr netaddr
   ${:extra-context}
 
@@ -350,6 +375,9 @@ extra-context =
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
+{%- if slapparameter_dict.get("websocket_password", "") %}
+websocket_url = ws://[${slap-configuration:ipv6-random}]:9001
+{%- endif %}
 enb-ipv6 = ${slap-configuration:ipv6-random}
 enb-ipv4 = {{ lan_ipv4 }}
 ors-version = {{ ors_version['ors-version'] }}

software/ors-amarisoft/instance-fdd-lopcomm-ue-lte-input-schema.json

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "rue_addr": {
+      "title": "[Required] Remote UE address",
+      "description": "[Required] Address of remote UE server. Default port is 2152.",
+      "type": "string",
+      "default": ""
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number"
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number"
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number"
+    },
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth",
+      "type": "string",
+      "enum": [
+        "1.4 MHz",
+        "3 MHz",
+        "5 MHz",
+        "10 MHz",
+        "15 MHz",
+        "20 MHz"
+      ],
+      "default": "20 MHz"
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "imsi": {
+      "title": "IMSI",
+      "description": "IMSI",
+      "type": "string",
+      "default": "001010123456789"
+    },
+    "k": {
+      "title": "K",
+      "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
+      "type": "string",
+      "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": ""
+    },
+    "impi": {
+      "title": "impi",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
+    }
+  }
+}

software/ors-amarisoft/instance-fdd-lopcomm-ue-nr-input-schema.json

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "rue_addr": {
+      "title": "[Required] Remote UE address",
+      "description": "[Required] Address of remote UE server. Default port is 2152.",
+      "type": "string",
+      "default": ""
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number"
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number"
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number"
+    },
+    "band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number"
+    },
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
+    },
+    "ssb_nr_arfcn": {
+      "title": "SSB NR ARFCN",
+      "description": "SSB NR ARFCN, you can retrieve from ENB/GNB side",
+      "type": "number"
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "imsi": {
+      "title": "IMSI",
+      "description": "IMSI",
+      "type": "string",
+      "default": "001010123456789"
+    },
+    "k": {
+      "title": "K",
+      "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
+      "type": "string",
+      "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": ""
+    },
+    "impi": {
+      "title": "impi",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
+    }
+  }
+}

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

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth",
+      "type": "string",
+      "enum": [
+        "1.4 MHz",
+        "3 MHz",
+        "5 MHz",
+        "10 MHz",
+        "15 MHz",
+        "20 MHz"
+      ],
+      "default": "20 MHz"
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "1 or 2. Number of DL antennas.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "1 or 2. Number of UL antennas.",
+      "type": "number",
+      "default": 2
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number"
+    },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
+    "tac": {
+      "title": "Tracking Area Code",
+      "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
+      "default": "0x0001",
+      "type": "string"
+    },
+    "root_sequence_index": {
+      "title": "Root Sequence Index",
+      "description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
+      "type": "number",
+      "default": 204
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number"
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
+    },
+    "mme_list": {
+      "title": "MME list",
+      "description": "Optionnal. List of MME to which the gNodeB is connected",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "mme_addr": {
+              "title": "MME Address",
+              "description": "IP address (and optional port) of S1AP SCTP connection to the MME. The default port is 36412.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "plmn_list": {
+      "title": "PLMN list",
+      "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "plmn": {
+              "default": "00101",
+              "title": "Public Land Mobile Network",
+              "description": "Public Land Mobile Network",
+              "type": "string"
+            },
+            "attach_without_pdn": {
+              "default": false,
+              "title": "Attach Without PDN",
+              "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
+              "type": "boolean"
+            },
+            "reserved": {
+              "default": false,
+              "title": "Reserved",
+              "description": "True if the cell is reserved for operator use.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "lte_handover_a3_offset": {
+      "title": "A3 offset for LTE handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6
+    },
+    "lte_handover_time_to_trigger": {
+      "title": "Time to Trigger for LTE handover",
+      "description": "Time to triger after which LTE handover will be triggered if A3 offset is reached",
+      "type": "number",
+      "enum": [
+        0,
+        40,
+        64,
+        80,
+        100,
+        128,
+        160,
+        256,
+        320,
+        480,
+        512,
+        640,
+        1024,
+        1280,
+        2560,
+        5120
+      ],
+      "default": 480
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "dl_earfcn": {
+              "title": "DL EARFCN",
+              "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
+              "type": "number"
+            },
+            "pci": {
+              "title": "Physical Cell ID",
+              "description": "Physical Cell ID of the neighbour cell",
+              "type": "number"
+            },
+            "cell_id": {
+              "title": "Cell ID",
+              "description": "Concatenation of enb_id and cell_id of the neighbour cell",
+              "type": "string"
+            },
+            "tac": {
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "websocket_password": {
+      "title": "Websocket password",
+      "description": "Activates websocket for remote control and sets password",
+      "type": "string"
+    },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "disable_sdr": {
+      "default": false,
+      "title": "Disable SDR",
+      "description": "Disables radio",
+      "type": "boolean"
+    },
+    "use_ipv4": {
+      "default": false,
+      "title": "Use IPv4",
+      "description": "Set to true to use IPv4 for AMF / MME addresses",
+      "type": "boolean"
+    },
+    "enb_stats_fetch_period": {
+      "title": "eNB statistics fetch period (seconds)",
+      "description": "Describes how often a call to Amarisoft remote API is made to get eNB statistics",
+      "type": "number",
+      "default": 60
+    },
+    "enb_drb_stats_enabled": {
+      "title": "Enable eNB drb statistics",
+      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
+    "max_rx_sample_db": {
+      "title": "Maximum RX sample value (dB)",
+      "description": "Maximum RX sample threshold above which RX saturated promise will fail",
+      "type": "number",
+      "default": 0
+    },
+    "min_txrx_delay": {
+      "title": "Minimum available time for radio front end processing (ms)",
+      "description": "Baseband latency promise will fail if minimum TX/RX diff reaches threshold (higher than this value)",
+      "type": "number",
+      "default": 5
+    },
+    "avg_txrx_delay": {
+      "title": "Average available time for radio front end processing (ms)",
+      "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
+      "type": "number",
+      "default": 7
+    },
+    "xlog_fluentbit_forward_host": {
+      "title": "Address to Forward Xlog by Fluenbit",
+      "description": "Address of Remote Fluentd or Fluentbit Server to Forward Xlog",
+      "type": "string"
+    },
+    "xlog_fluentbit_forward_port": {
+      "title": "Port to Forward Xlog by Fluentbit",
+      "description": "Optional Port of Remote Fluentd or Fluentbit Server to Forward Xlog",
+      "type": "string"
+    },
+    "xlog_fluentbit_forward_shared_key": {
+      "title": "Shared Key to Forward Xlog by Fluentbit",
+      "description": "Secret Key Shared with Remote Fluentd or Fluentbit Server for Authentication when Forwarding Xlog",
+      "type": "string"
+    }
+  }
+}

software/ors-amarisoft/instance-fdd-ors-ue-lte-input-schema.json

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "rue_addr": {
+      "title": "[Required] Remote UE address",
+      "description": "[Required] Address of remote UE server. Default port is 2152.",
+      "type": "string",
+      "default": ""
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number"
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number"
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number"
+    },
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth",
+      "type": "string",
+      "enum": [
+        "1.4 MHz",
+        "3 MHz",
+        "5 MHz",
+        "10 MHz",
+        "15 MHz",
+        "20 MHz"
+      ],
+      "default": "20 MHz"
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "imsi": {
+      "title": "IMSI",
+      "description": "IMSI",
+      "type": "string",
+      "default": "001010123456789"
+    },
+    "k": {
+      "title": "K",
+      "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
+      "type": "string",
+      "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": ""
+    },
+    "impi": {
+      "title": "impi",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
+    }
+  }
+}

software/ors-amarisoft/instance-fdd-ors-ue-nr-input-schema.json

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "rue_addr": {
+      "title": "[Required] Remote UE address",
+      "description": "[Required] Address of remote UE server. Default port is 2152.",
+      "type": "string",
+      "default": ""
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number"
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number"
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number"
+    },
+    "band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number"
+    },
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
+    },
+    "ssb_nr_arfcn": {
+      "title": "SSB NR ARFCN",
+      "description": "SSB NR ARFCN, you can retrieve from ENB/GNB side",
+      "type": "number"
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "imsi": {
+      "title": "IMSI",
+      "description": "IMSI",
+      "type": "string",
+      "default": "001010123456789"
+    },
+    "k": {
+      "title": "K",
+      "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
+      "type": "string",
+      "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": ""
+    },
+    "impi": {
+      "title": "impi",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
+    }
+  }
+}

software/ors-amarisoft/instance-fdd-ue-lte-input-schema.json

@@ -24,11 +24,19 @@
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
       "type": "number"
     },
-    "n_rb_dl": {
-      "title": "DL RB",
-      "description": "number of DL resource blocks",
-      "type": "number",
-      "default": 100
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth",
+      "type": "string",
+      "enum": [
+        "1.4 MHz",
+        "3 MHz",
+        "5 MHz",
+        "10 MHz",
+        "15 MHz",
+        "20 MHz"
+      ],
+      "default": "20 MHz"
     },
     "n_antenna_dl": {
       "title": "Number of DL antennas",

software/ors-amarisoft/instance-fdd-ue-nr-input-schema.json

@@ -24,12 +24,12 @@
       "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
       "type": "number"
     },
-    "nr_band": {
+    "band": {
       "title": "NR band",
       "description": "NR band number",
       "type": "number"
     },
-    "nr_bandwidth": {
+    "bandwidth": {
       "title": "Bandwidth",
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",

software/ors-amarisoft/instance-gnb.jinja2.cfg

@@ -143,7 +143,11 @@ drb_stats_logspec =
 rotatespec = 100MB.9
 logspec = ${:stats_logspec} ${:drb_stats_logspec}
 logspec = ${:stats_logspec} ${:drb_stats_logspec}
+{% if slapparameter_dict.get("websocket_password", "") %}
+websock = ws://[${slap-configuration:ipv6-random}]:9001
+{% else %}
 websock = ws://127.0.1.2:9001
+{% endif %}
 xamari = {{ buildout_directory }}/bin/xamari
 logfile = ${monitor-directory:public}/gnb.xlog
 inline =
@@ -253,7 +257,11 @@ context =
   raw rx_gain {{ ors_version['current-rx-gain'] }}
   raw nr_arfcn {{ ors_version['current-nr-arfcn'] }}
   raw nr_band {{ ors_version['current-nr-band'] }}
+  raw software_name {{ software_name }}
   raw rf_mode {{ rf_mode }}
+  raw trx {{ trx }}
+  raw bbu {{ bbu }}
+  raw ru {{ ru }}
   import  netaddr netaddr
 
 [gnb-config]
@@ -268,6 +276,9 @@ output = ${directory:etc}/gnb.cfg
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
+{%- if slapparameter_dict.get("websocket_password", "") %}
+websocket_url = ws://[${slap-configuration:ipv6-random}]:9001
+{%- endif %}
 gnb-ipv6 = ${slap-configuration:ipv6-random}
 gnb-ipv4 = {{ lan_ipv4 }}
 ors-version = {{ ors_version['ors-version'] }}

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

@@ -3,50 +3,91 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-    "log_phy_debug": {
-      "title": "Physical layer log debug",
-      "description": "Enable debug mode for physical layer logs",
-      "type": "boolean",
-      "default": false
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "type": "number"
-    },
-    "rx_gain": {
-      "title": "Rx gain",
-      "description": "Rx gain (in dB)",
-      "type": "number"
-    },
-    "gps_sync": {
-      "default": false,
-      "title": "GPS synchronisation",
-      "description": "True if GPS should be used for synchronisation",
-      "type": "boolean"
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth",
+      "type": "string",
+      "enum": [
+        "1.4 MHz",
+        "3 MHz",
+        "5 MHz",
+        "10 MHz",
+        "15 MHz",
+        "20 MHz"
+      ],
+      "default": "20 MHz"
     },
     "n_antenna_dl": {
       "title": "Number of DL antennas",
-      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "description": "1, 2, 4 or 8. Number of DL antennas.",
       "type": "number",
       "default": 2
     },
     "n_antenna_ul": {
       "title": "Number of UL antennas",
-      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "description": "1, 2, 4 or 8. Number of UL antennas.",
       "type": "number",
       "default": 2
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
+    "sdr_number": {
+      "title": "SDR Number",
+      "description": "SDR Number",
+      "type": "number",
+      "default": 0
+    },
+    "cell_list": {
+      "title": "Cell List",
+      "description": "Cell List",
+      "patternProperties": {
+        ".*": {
+          "properties": {
             "dl_earfcn": {
               "title": "DL EARFCN",
               "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
               "type": "number"
             },
-    "n_rb_dl": {
-      "title": "DL RB",
-      "description": "number of DL resource blocks",
-      "type": "number",
-      "default": 100
+            "pci": {
+              "title": "Physical Cell ID",
+              "description": "Physical Cell IDs",
+              "type": "number"
+            },
+            "cell_id": {
+              "title": "Cell ID",
+              "description": "Cell IDs",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number"
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     },
     "mme_list": {
       "title": "MME list",
@@ -66,24 +107,6 @@
       "type": "object",
       "default": {}
     },
-    "enb_id": {
-      "title": "eNB ID",
-      "description": "eNB ID",
-      "type": "string",
-      "default": "0x1A2D0"
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 1
-    },
-    "tac": {
-      "title": "Tracking Area Code",
-      "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
-      "default": "0x0001",
-      "type": "string"
-    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
@@ -115,21 +138,91 @@
       "type": "object",
       "default": {}
     },
+    "lte_handover_a3_offset": {
+      "title": "A3 offset for LTE handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6
+    },
+    "lte_handover_time_to_trigger": {
+      "title": "Time to Trigger for LTE handover",
+      "description": "Time to triger after which LTE handover will be triggered if A3 offset is reached",
+      "type": "number",
+      "enum": [
+        0,
+        40,
+        64,
+        80,
+        100,
+        128,
+        160,
+        256,
+        320,
+        480,
+        512,
+        640,
+        1024,
+        1280,
+        2560,
+        5120
+      ],
+      "default": 480
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "dl_earfcn": {
+              "title": "DL EARFCN",
+              "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
+              "type": "number"
+            },
+            "pci": {
+              "title": "Physical Cell ID",
+              "description": "Physical Cell ID of the neighbour cell",
+              "type": "number"
+            },
+            "cell_id": {
+              "title": "Cell ID",
+              "description": "Concatenation of enb_id and cell_id of the neighbour cell",
+              "type": "string"
+            },
+            "tac": {
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "websocket_password": {
+      "title": "Websocket password",
+      "description": "Activates websocket for remote control and sets password",
+      "type": "string"
+    },
     "inactivity_timer": {
       "title": "Inactivity Timer",
       "description": "Send RRC connection release after this time (in ms) of network inactivity.",
       "type": "number",
       "default": 10000
     },
-    "tdd_ul_dl_config": {
-      "title": "TDD",
-      "description": "TDD",
-      "type": "string",
-      "enum": [
-        "[Configuration 2] 5ms 2UL 6DL (default)",
-        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
-      ],
-      "default": "5ms 2UL 7DL 4/6 (default)"
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
     },
     "disable_sdr": {
       "default": false,

software/ors-amarisoft/instance-tdd-ue-lte-input-schema.json

@@ -24,11 +24,19 @@
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
       "type": "number"
     },
-    "n_rb_dl": {
-      "title": "DL RB",
-      "description": "number of DL resource blocks",
-      "type": "number",
-      "default": 100
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth",
+      "type": "string",
+      "enum": [
+        "1.4 MHz",
+        "3 MHz",
+        "5 MHz",
+        "10 MHz",
+        "15 MHz",
+        "20 MHz"
+      ],
+      "default": "20 MHz"
     },
     "n_antenna_dl": {
       "title": "Number of DL antennas",

software/ors-amarisoft/instance-tdd-ue-nr-input-schema.json

@@ -24,12 +24,12 @@
       "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
       "type": "number"
     },
-    "nr_band": {
+    "band": {
       "title": "NR band",
       "description": "NR band number",
       "type": "number"
     },
-    "nr_bandwidth": {
+    "bandwidth": {
       "title": "Bandwidth",
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",

software/ors-amarisoft/instance-ue-lte.jinja2.cfg

@@ -36,7 +36,7 @@ url = {{ slap_connection['server-url'] }}
 key = {{ slap_connection['key-file'] }}
 cert = {{ slap_connection['cert-file'] }}
 
-configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }}
+configuration.default_lte_bandwidth = {{ default_lte_bandwidth }}
 configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
 configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 configuration.default_lte_imsi = {{ default_lte_imsi }}