Update Release Candidate

component/git/buildout.cfg

@@ -32,7 +32,7 @@ environment =
   NO_TCLTK=y
   PATH=${curl:location}/bin:${gettext:location}/bin:${tar:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${curl:location}/lib
 
 [gitweb]
 <= git

component/re6stnet/buildout.cfg

 [buildout]
 extends =
+  ../../stack/slapos.cfg
   ../defaults.cfg
   ../babeld/buildout.cfg
   ../geoip2/buildout.cfg

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.305'
+version = '1.0.326'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/neoppod.py

@@ -24,6 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+import six
 import os
 import shlex
 from zc.buildout import UserError
@@ -41,7 +42,7 @@ class Cluster(object):
     for node in sorted(options['nodes'].split()):
       node = buildout[node]
       node_list.append(node)
-      for k, v in result_dict.iteritems():
+      for k, v in six.iteritems(result_dict):
         x = node[k]
         if x:
           v.append(x)

slapos/recipe/postgres.py

@@ -194,6 +194,28 @@ class Recipe(GenericBaseRecipe):
     def createDatabase(self):
         self.runPostgresCommand(cmd='CREATE DATABASE "%s"' % self.options['dbname'])
 
+    def isPosgresServerRunning(self):
+        pgdata = self.options['pgdata-directory']
+        postmaster_pid_file = os.path.join(pgdata, 'postmaster.pid')
+        if os.path.exists(postmaster_pid_file):
+            pg_ctl_binary = os.path.join(self.options['bin'], 'pg_ctl')
+            self.check_exists(pg_ctl_binary)
+
+            # Check the postgres is running or not
+            # if not, delete the ppostmaster.pid and run it again
+            try:
+              output1 = subprocess.check_output([pg_ctl_binary, 'status', '-D', pgdata], stderr=subprocess.STDOUT)
+            except subprocess.CalledProcessError as e:
+              if e.returncode == 3:
+                # If the server is not running, pg_ctl returns an exit status of 3
+                # see https://www.postgresql.org/docs/current/app-pg-ctl.html
+                os.remove(postmaster_pid_file)
+                return False
+              else:
+                raise
+            return True
+        else:
+          return False
 
     def updateSuperuser(self):
         """\
@@ -211,7 +233,7 @@ class Recipe(GenericBaseRecipe):
         change_password_query = """ALTER USER "%s" ENCRYPTED PASSWORD '%s'""" % (user, enc_password)
 
         pgdata = self.options['pgdata-directory']
-        if os.path.exists(os.path.join(pgdata, 'postmaster.pid')):
+        if self.isPosgresServerRunning():
             psql_binary = os.path.join(self.options['bin'], 'psql')
             # connect to a running postgres deamon
             p = subprocess.Popen([

slapos/test/recipe/test_postgres.py

@@ -90,6 +90,26 @@ class PostgresTest(unittest.TestCase):
         self.assertEqual(cursor.fetchone(), (2,))
     cnx.close()
 
+  def test_stale_pid_file_does_not_prevent_install(self):
+    self.recipe.install()
+
+    # Malformed postmaster.pid file should not prevent the service running
+    pgdata_directory = os.path.join(self.pgdata_directory, 'pgdata')
+    postmaster_pid_file =os.path.join(pgdata_directory, 'postmaster.pid')
+    content = '''\
+1074626
+/srv/slapgrid/slappart33/srv/runner/instance/slappart0/srv/postgresql
+1686241354
+5432
+/srv/slapgrid/slappart33/srv/runner/instance/slappart0/srv/postgresql
+10.0.156.45
+  5432001   1179658
+ready'''
+    with open(postmaster_pid_file, 'w') as file:
+      file.write(content)
+
+    self.recipe.install()
+
   def test_update_password(self):
     self.recipe.install()
     self.start_postgres_server()

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = a0c646cb609946b3535ee1383c401e01
+md5sum = 972db83abdb868e242a2ece1a052f800
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -28,15 +28,15 @@ md5sum = c930c28365c685a6066f382c9b5d8893
 
 [lopcomm-rrh-stats.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-stats.jinja2.py
-md5sum = 6339dd6c5dcbef95b58ed52a9fadc9a4
+md5sum = 6d6cc0c311ff4fe807e919ce3cb3d0d8
 
 [lopcomm-rrh-config.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-config.jinja2.py
-md5sum = e0b68a87238282568e0e04c792ec7288
+md5sum = b34fe47a73890097fbc6ea6374aeb38d
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 8fc0bff45b68c89928f0623188470ded
+md5sum = 040d9317773ff6e653a4edb9a8e484d2
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = e4b31e8ced0e2ffa08a877e59b8a9793
+md5sum = fa71282e06c0f097b67578e6c7578037
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -84,7 +84,7 @@ md5sum = 48b577daa5b53c2cf7fe2d30ea9c0235
 
 [dnsmasq.jinja2.cfg]
 filename = config/dnsmasq.jinja2.cfg
-md5sum = 1eb5703c1c60bddea65f3a49f2391173
+md5sum = 5f67c7f750e7c7bd9b9839c527a06853
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg
@@ -104,7 +104,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [cu_config.jinja2.xml]
 filename = netconf/cu_config.jinja2.xml
-md5sum = 50b8f86cf4ed87be179f6a62284c56d7
+md5sum = edd54bb35c13526291924de8d1d3b795
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

software/ors-amarisoft/changelog.rst

 Changelog
 =========
+Version 1.0.326 (2023-06-14)
+-------------
+
+* Add DHCP for Lopcomm RU's M-plane
+* Add support for FDD
+* Add more parameters and tests for lopcomm RU
 
 Version 1.0.323 (2023-05-17)
 -------------

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

+{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
+dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
+port=5354
+dhcp-range=::1,::1,constructor:{{ slap_configuration.get('tap-name', '') }},ra-names,64,12h
+dhcp-host={{ slapparameter_dict.get('rrh_mac_addr', '00:0a:00:00:10:20') }},[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) }}]
+dhcp-option=option6:dns-server,[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) + 1 }}],[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) + 2 }}]
+dhcp-option=option6:domain-search,bbu.local
+enable-ra
+ra-param=adv-send-advert
+ra-param=adv-managed-flag
+ra-param=adv-other-config-flag
+ra-param=adv-autonomous
+{% else %}
 interface={{ slap_configuration.get('tun-name', '') }}
 port=5353
-
 {%- set filtered_slave_instance_list = [] %}
 {%- for slave_instance in slap_configuration.get('slave-instance-list', []) %}
 {%-   if slave_instance.get('_', '') != '' %}
@@ -16,3 +28,4 @@ port=5353
 {% for i, slave in enumerate(filtered_slave_instance_list) -%}
 address=/{{ slave['subdomain'] }}.{{ slap_configuration['configuration'].get('local_domain', '') }}/{{ slave.get('ip', '') }}
 {% endfor -%}
+{% endif %}

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

+{% if rf_mode == 'tdd' %}
+#define TDD                 1
+{% else %}
+#define TDD                 0
+{% endif %}
 #define N_RB_DL             {{ slapparameter_dict.get('n_rb_dl', slap_configuration['configuration.default_lte_n_rb_dl']) }}
 #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']) }}
@@ -99,13 +104,10 @@
   cell_default: {
     n_antenna_dl: N_ANTENNA_DL,
     n_antenna_ul: N_ANTENNA_UL,
-{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
-    // uldl_config: 2,
-    // sp_config: 7,
-{% else %}
+#if TDD == 1
     uldl_config: 2,
     sp_config: 7,
-{% endif %}
+#endif
     n_rb_dl: N_RB_DL,
     cyclic_prefix: "normal",
 
@@ -160,11 +162,9 @@
     pucch_dedicated: {
       n1_pucch_sr_count: 11,
       cqi_pucch_n_rb: 1,
-{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
-      // tdd_ack_nack_feedback_mode: "multiplexing",
-{% else %}
-      tdd_ack_nack_feedback_mode: "multiplexing",
-{% endif %}
+#if TDD == 1
+      tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
+#endif
     },
 
     pusch_dedicated: {
@@ -251,7 +251,11 @@
       }
     ],
 
+#if defined(TDD) && TDD == 1
 #define T_REORDERING 65
+#else
+#define T_REORDERING 35
+#endif
     drb_config: [
 
   {

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

@@ -3,7 +3,7 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-{%- if rf_mode == 'tdd' %}
+{%- if rf_mode == 'fdd' %}
     "rrh": {
       "title": "RRH",
       "description": "RRH",
@@ -14,11 +14,47 @@
         "Lopcomm ORAN"
       ]
     },
+    "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",
+      "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",
+      "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",
+      "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
+    },
+    "dnsmasq": {
+      "default": false,
+      "title": "dnsmasq",
+      "description": "dnsmasq",
+      "type": "boolean"
+    },
+    "rrh_mac_addr": {
+      "default": "00:0a:00:00:10:20",
+      "title": "RRH MAC address",
+      "description": "RRH MAC address used for DNSMASQ",
+      "type": "string"
+    },
     "txa0cc00_active": {
       "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",
       "description": "Activate or inactivate Lopcomm ORAN TX array carriers (TXA0CC00)",
       "type": "string",
-      "default": "ACTIVE",
+      "default": "INACTIVE",
       "enum": [
         "ACTIVE",
         "INACTIVE"
@@ -28,12 +64,48 @@
       "title": "Lopcomm ORAN RX array carriers (RXA0CC00)",
       "description": "Activate or inactivate Lopcomm ORAN RX array carriers (RXA0CC00)",
       "type": "string",
-      "default": "ACTIVE",
+      "default": "INACTIVE",
       "enum": [
         "ACTIVE",
         "INACTIVE"
       ]
     },
+    "txa0cc00_center_frequency_earfcn": {
+      "title": "Lopcomm ORAN Center Frequency EARFCN (TXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency EARFCN (TXA0CC00)",
+      "type": "number",
+      "default": 300
+    },
+    "txa0cc00_center_frequency": {
+      "title": "Lopcomm ORAN Center Frequency in Hz (TXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency in Hz (TXA0CC00)",
+      "type": "number",
+      "default": 2140000000
+    },
+    "txa0cc00_bandwidth": {
+      "title": "Lopcomm ORAN bandwidth in Hz (TXA0CC00)",
+      "description": "Lopcomm ORAN bandwidth in Hz (TXA0CC00)",
+      "type": "number",
+      "default": 20000000
+    },
+    "rxa0cc00_center_frequency_earfcn": {
+      "title": "Lopcomm ORAN Center Frequency EARFCN (RXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency EARFCN (RXA0CC00)",
+      "type": "number",
+      "default": 18300
+    },
+    "rxa0cc00_center_frequency": {
+      "title": "Lopcomm ORAN Center Frequency in Hz (RXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency in Hz (RXA0CC00)",
+      "type": "number",
+      "default": 1950000000
+    },
+    "rxa0cc00_bandwidth": {
+      "title": "Lopcomm ORAN bandwidth in Hz (RXA0CC00)",
+      "description": "Lopcomm ORAN bandwidth in Hz (RXA0CC00)",
+      "type": "number",
+      "default": 20000000
+    },
 {%- endif %}
     "log_phy_debug": {
       "title": "Physical layer log debug",

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

@@ -12,9 +12,16 @@ parts =
   lopcomm-rrh-config-template
   lopcomm-cu-config
   check-lopcomm-vswr.py
+  check-lopcomm-pa-current.py
   check-lopcomm-lof.py
   check-lopcomm-rssi.py
+  check-lopcomm-sync.py
+  check-lopcomm-config-log.py
+  check-lopcomm-stats-log.py
   check-cpri-lock.py
+{% endif %}
+{% if slapparameter_dict.get("dnsmasq", None) %}
+  dnsmasq-service
 {% endif %}
   check-sdr-busy.py
   check-baseband-latency.py
@@ -73,7 +80,6 @@ configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 recipe = slapos.cookbook:mkdirectory
 software = {{ buildout_directory }}
 home = ${buildout:directory}
-etc = ${:home}/etc
 var = ${:home}/var
 etc = ${:home}/etc
 bin = ${:home}/bin
@@ -131,6 +137,25 @@ environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
+{% if slapparameter_dict.get("dnsmasq", None) %}
+[dnsmasq-service]
+recipe = slapos.cookbook:wrapper
+port = 5353
+ip = ${slap-configuration:tun-ipv4-addr}
+command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file={{ dnsmasq_config_path }} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
+wrapper-path = ${directory:service}/dnsmasq
+mode = 0775
+hash-files =
+  {{ dnsmasq_config_path }}
+
+#[dnsmasq-listen-promise]
+#<= monitor-promise-base
+#promise = check_socket_listening
+#name = dnsmasq-port-listening.py
+#config-host = ${dnsmasq-service:ip}
+#config-port = ${dnsmasq-service:port}
+{% endif %}
+
 [xamari-xlog-script]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
@@ -194,12 +219,14 @@ json-log-output = ${directory:var}/log/lopcomm-rrh-stats.json.log
 cfg-json-log-output = ${directory:var}/log/lopcomm-rrh-config.json.log
 context =
   section directory directory
+  section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
   key log_file :log-output
   key json_log_file :json-log-output
   key cfg_json_log_file :cfg-json-log-output
   raw testing {{ slapparameter_dict.get("testing", False) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
+  import netaddr netaddr
 mode = 0775
 url = {{ lopcomm_rrh_stats_template }}
 output = ${directory:bin}/lopcomm-rrh-stats.py
@@ -215,12 +242,14 @@ extensions = jinja2.ext.do
 log-output = ${directory:var}/log/lopcomm-rrh-config.log
 context =
   section directory directory
+  section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
   key log_file :log-output
   raw testing {{ slapparameter_dict.get("testing", False) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
   raw CreateProcessingEle_template {{ CreateProcessingEle_template }}
   key cu_config_template lopcomm-cu-config:output
+  import netaddr netaddr
 mode = 0775
 url = {{ lopcomm_rrh_config_template }}
 output = ${directory:script}/lopcomm-rrh-config.py
@@ -252,6 +281,7 @@ hash-files =
 [config-base]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
+extra-context =
 context =
   section directory directory
   section slap_configuration slap-configuration
@@ -260,6 +290,7 @@ context =
   raw gtp_addr_v4 {{ lan_ipv4 }}
   raw sib23 {{ sib23 }}
   import  netaddr netaddr
+  ${:extra-context}
 
 [enb-config]
 <= config-base
@@ -269,6 +300,8 @@ url = ${enb-config-dl:target}
 url = {{ enb_template }}
 {% endif %}
 output = ${directory:etc}/enb.cfg
+extra-context =
+    raw rf_mode rf_mode
 
 [publish-connection-information]
 <= monitor-publish
@@ -325,6 +358,20 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
+[check-lopcomm-pa-current.py]
+<= macro.promise
+promise = check_lopcomm_pa_current
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
+[check-lopcomm-sync.py]
+<= macro.promise
+promise = check_lopcomm_sync
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 [check-lopcomm-lof.py]
 <= macro.promise
 promise = check_lopcomm_lof
@@ -332,6 +379,20 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
+[check-lopcomm-stats-log.py]
+<= macro.promise
+promise = check_lopcomm_stats_log
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-stats-log = ${lopcomm-rrh-stats-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
+[check-lopcomm-config-log.py]
+<= macro.promise
+promise = check_lopcomm_config_log
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-config-log = ${lopcomm-rrh-config-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 [check-cpri-lock.py]
 <= macro.promise
 promise = check_cpri_lock

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

+{
+  "type": "object",
+  "$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"
+      ]
+    },
+    "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",
+      "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",
+      "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",
+      "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
+    },
+    "dnsmasq": {
+      "default": false,
+      "title": "dnsmasq",
+      "description": "dnsmasq",
+      "type": "boolean"
+    },
+    "rrh_mac_addr": {
+      "default": "00:0a:00:00:10:20",
+      "title": "RRH MAC address",
+      "description": "RRH MAC address used for DNSMASQ",
+      "type": "string"
+    },
+    "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_earfcn": {
+      "title": "Lopcomm ORAN Center Frequency EARFCN (TXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency EARFCN (TXA0CC00)",
+      "type": "number",
+      "default": 300
+    },
+    "txa0cc00_center_frequency": {
+      "title": "Lopcomm ORAN Center Frequency in Hz (TXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency in Hz (TXA0CC00)",
+      "type": "number",
+      "default": 2140000000
+    },
+    "txa0cc00_bandwidth": {
+      "title": "Lopcomm ORAN bandwidth in Hz (TXA0CC00)",
+      "description": "Lopcomm ORAN bandwidth in Hz (TXA0CC00)",
+      "type": "number",
+      "default": 20000000
+    },
+    "rxa0cc00_center_frequency_earfcn": {
+      "title": "Lopcomm ORAN Center Frequency EARFCN (RXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency EARFCN (RXA0CC00)",
+      "type": "number",
+      "default": 18300
+    },
+    "rxa0cc00_center_frequency": {
+      "title": "Lopcomm ORAN Center Frequency in Hz (RXA0CC00)",
+      "description": "Lopcomm ORAN Center Frequency in Hz (RXA0CC00)",
+      "type": "number",
+      "default": 1950000000
+    },
+    "rxa0cc00_bandwidth": {
+      "title": "Lopcomm ORAN bandwidth in Hz (RXA0CC00)",
+      "description": "Lopcomm ORAN bandwidth in Hz (RXA0CC00)",
+      "type": "number",
+      "default": 20000000
+    },
+    "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",
+      "default": 60
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 45
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "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
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 0
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
+    },
+    "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": {}
+    },
+    "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
+    },
+    "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": {}
+    },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
+    "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
+    }
+  }
+}

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

+{
+  "type": "object",
+  "$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
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd 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": 100
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 60
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 45
+    },
+    "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
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 0
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 0
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
+    },
+    "amf_list": {
+      "title": "AMF list",
+      "description": "Optionnal. List of AMF to which the gNodeB is connected",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "amf_addr": {
+              "title": "AMF Address",
+              "description": "IP address (and optional port) of NGAP SCTP connection to the AMF. The default port is 38412.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "dl_nr_arfcn": {
+              "title": "DL NR ARFCN",
+              "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
+              "type": "number"
+            },
+            "ssb_nr_arfcn": {
+              "title": "SSB NR ARFCN",
+              "description": "SSB NR 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"
+            },
+            "nr_cell_id": {
+              "title": "NR Cell ID",
+              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
+              "type": "string"
+            },
+            "gnb_id_bits": {
+              "title": "gNB ID bits",
+              "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
+              "type": "number"
+            },
+            "nr_band": {
+              "title": "NR band",
+              "description": "NR band number",
+              "type": "number"
+            },
+            "tac": {
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "xn_peers": {
+      "title": "XN Peers",
+      "description": "XN Peers",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "xn_addr": {
+              "title": "XN Address",
+              "description": "XN Address of the neighbour cell (gNB Address)",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
+    },
+    "gnb_id_bits": {
+      "title": "gNB ID bits",
+      "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
+      "type": "number",
+      "default": 28
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 500
+    },
+    "ssb_pos_bitmap": {
+      "title": "SSB Position Bitmap",
+      "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
+      "type": "string",
+      "default": 10000000
+    },
+    "plmn_list": {
+      "title": "PLMN list",
+      "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "plmn": {
+              "default": "00101",
+              "title": "Public Land Mobile Network",
+              "description": "Public Land Mobile Network",
+              "type": "string"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            },
+            "ranac": {
+              "title": "Optional integer (range 0 to 255)",
+              "description": "RAN Area Code",
+              "type": "number"
+            },
+            "reserved": {
+              "default": false,
+              "title": "Reserved",
+              "description": "True if the cell is reserved for operator use.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "nssai": {
+      "title": "AMF slices configuration",
+      "description": "AMF slices configuration.",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "sst": {
+              "default": 1,
+              "title": "Slice Service Type",
+              "description": "Integer (range 1 to 255).",
+              "type": "number"
+            },
+            "sd": {
+              "default": 50,
+              "title": "Slice Differentiator",
+              "description": "Optional integer (range 0 to 0xFFFFFE)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
+    "use_ipv4": {
+      "default": false,
+      "title": "Use IPv4",
+      "description": "Set to true to use IPv4 for AMF / MME addresses",
+      "type": "boolean"
+    },
+    "gnb_stats_fetch_period": {
+      "title": "gNB statistics fetch period (seconds)",
+      "description": "Describes how often a call to Amarisoft remote API is made to get gNB statistics",
+      "type": "number",
+      "default": 60
+    },
+    "gnb_drb_stats_enabled": {
+      "title": "Enable gNB drb statistics",
+      "description": "Enable gNB 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": "Minimum TX/RX diff threshold above which baseband latency promise will fail",
+      "type": "number",
+      "default": 5
+    },
+    "avg_txrx_delay": {
+      "title": "Average available time for radio front end processing (ms)",
+      "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
+      "type": "number",
+      "default": 7
+    }
+  }
+}

software/ors-amarisoft/instance-fdd-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",
+      "default": 60
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 45
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 0
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
+    },
+    "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-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",
+      "default": 60
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 45
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 0
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 0
+    },
+    "nr_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",
+      "default": 0
+    },
+    "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-tdd-enb-input-schema.json

@@ -3,36 +3,6 @@
   "$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"
-      ]
-    },
-    "txa0cc00_active": {
-      "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",
-      "description": "Activate or inactivate Lopcomm ORAN TX array carriers (TXA0CC00)",
-      "type": "string",
-      "default": "ACTIVE",
-      "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": "ACTIVE",
-      "enum": [
-        "ACTIVE",
-        "INACTIVE"
-      ]
-    },
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance.cfg

@@ -116,6 +116,10 @@ extra-context =
     raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw min_frequency ${default-params:min-frequency}
     raw max_frequency ${default-params:max-frequency}
+    raw rf_mode ${rf-mode:rf-mode}
+    raw dnsmasq_template   ${dnsmasq.jinja2.cfg:target}
+    raw dnsmasq_location ${dnsmasq:location}
+    key dnsmasq_config_path dnsmasq-config:output
 
 [dynamic-template-gnb]
 < = jinja2-template-base
@@ -228,4 +232,8 @@ extensions = jinja2.ext.do
 output = $${directory:etc}/$${:filename}
 context =
     import json_module json
+    import netaddr netaddr
+    section directory directory
     section slap_configuration slap-configuration
+    key slapparameter_dict slap-configuration:configuration
+

software/ors-amarisoft/lopcomm-rrh-config.jinja2.py

@@ -67,7 +67,7 @@ if __name__ == '__main__':
     nc = LopcommNetconfClient()
     while True:
         try:
-            nc.connect("192.168.0.210", 830, "oranuser", "oranpassword")
+            nc.connect("{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) }}", 830, "oranuser", "oranpassword")
             nc.edit_config(["{{ CreateProcessingEle_template }}", "{{ cu_config_template }}"])
             break
         except Exception as e:

software/ors-amarisoft/lopcomm-rrh-stats.jinja2.py

@@ -95,7 +95,7 @@ if __name__ == '__main__':
     nc = LopcommNetconfClient()
     while True:
       try:
-          nc.connect("192.168.0.210", 830, "oranuser", "oranpassword")
+          nc.connect("{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) }}", 830, "oranuser", "oranpassword")
           nc.subscribe()
           while True:
             nc.get_notification()

software/ors-amarisoft/render-templates

@@ -84,6 +84,18 @@ rf_mode_context_list = [
             'default_ssb_nr_arfcn'         : 0,
             'min_frequency'                : 0,
             'max_frequency'                : 0,
+        }, {
+            'rf_mode'                      : 'fdd',
+            'default_dl_earfcn'            : 0,
+            'default_lte_dl_freq'          : 0.0,
+            'default_lte_band'             : 0,
+            'default_dl_nr_arfcn'          : 0,
+            'default_nr_band'              : 0,
+            'default_nr_dl_freq'           : 0.0,
+            'default_nr_ssb_pos_bitmap'    : "10000000",
+            'default_ssb_nr_arfcn'         : 0,
+            'min_frequency'                : 0,
+            'max_frequency'                : 0,
         }
 ]
 

software/ors-amarisoft/software-base.cfg

@@ -41,6 +41,7 @@ parts +=
   dnsmasq
   eggs
   xamari
+  setcap
 # unimplemented parts - the http monitor and better log handling using logrotate
 #  apache-php
 #  logrotate
@@ -203,6 +204,11 @@ recipe = zc.recipe.egg
 eggs = ${xlte:egg}
 scripts = xamari
 
+[setcap]
+recipe = plone.recipe.command
+command = sudo -n /opt/amarisoft/setcap ${dnsmasq:location}/sbin/dnsmasq || true
+update-command = ${:command}
+
 [versions]
 websocket-client = 1.4.2
 ncclient = 0.6.13

software/ors-amarisoft/software-fdd.cfg

+# This file was generated using a jinja2 template and the render-templates script, don't modify directly.
+[buildout]
+extends =
+  software-base.cfg
+
+[default-params]
+default-dl-earfcn = 0
+default-lte-dl-freq = 0.0
+default-lte-band = 0
+default-lte-n-rb-dl = 100
+default-lte-tx-gain = 60
+default-lte-rx-gain = 45
+default-lte-inactivity-timer = 10000
+default-lte-imsi = 001010123456789
+default-lte-k = 00112233445566778899aabbccddeeff
+
+default-dl-nr-arfcn = 0
+default-nr-band = 0
+default-nr-dl-freq = 0.0
+default-nr-bandwidth = 40
+default-nr-tx-gain = 60
+default-nr-rx-gain = 45
+default-nr-ssb-pos-bitmap = 10000000
+default-ssb-nr-arfcn = 0
+default-nr-inactivity-timer = 10000
+default-nr-imsi = 001010123456789
+default-nr-k = 00112233445566778899aabbccddeeff
+
+min-frequency = 0
+max-frequency = 0
+default-n-antenna-dl =2
+default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = fdd
+

software/ors-amarisoft/software-fdd.cfg.json

+{
+  "name": "ORS Amarisoft",
+  "description": "4G and 5G amarisoft stack for ORS",
+  "serialisation": "json-in-xml",
+  "software-type": {
+
+    "enb": {
+      "title": "eNB",
+      "software-type": "enb",
+      "description": "eNodeB Configuration",
+      "request": "instance-fdd-enb-input-schema.json",
+      "response": "instance-fdd-enb-schema.json",
+      "index": 0
+    },
+    "gnb": {
+      "title": "gNB",
+      "software-type": "gnb",
+      "description": "gNodeB Configuration",
+      "request": "instance-fdd-gnb-input-schema.json",
+      "response": "instance-fdd-gnb-schema.json",
+      "index": 1
+    },
+    "core-network": {
+      "title": "Core Network",
+      "software-type": "core-network",
+      "description": "Core Network Configuration",
+      "request": "instance-core-network-input-schema.json",
+      "response": "instance-core-network-schema.json",
+      "index": 2
+    },
+    "core-network-slave": {
+      "title": "Core Network Sim Card",
+      "description": "Core Network Sim Card Configuration",
+      "software-type": "core-network",
+      "request": "instance-core-network-slave-input-schema.json",
+      "response": "instance-core-network-slave-schema.json",
+      "shared": true,
+      "index": 3
+    }
+  }
+}

software/ors-amarisoft/software-tdd.cfg

@@ -30,3 +30,8 @@ min-frequency = 0
 max-frequency = 0
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd1900.cfg

@@ -30,3 +30,8 @@ min-frequency = 1880.0
 max-frequency = 1920
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd2600.cfg

@@ -30,3 +30,8 @@ min-frequency = 2570
 max-frequency = 2620
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd3500.cfg

@@ -30,3 +30,8 @@ min-frequency = 3400
 max-frequency = 3600
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd3700.cfg

@@ -30,3 +30,8 @@ min-frequency = 3600
 max-frequency = 3800
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software.jinja2.cfg

@@ -30,3 +30,10 @@ min-frequency = {{ min_frequency }}
 max-frequency = {{ max_frequency }}
 default-n-antenna-dl ={{ default_n_antenna_dl }}
 default-n-antenna-ul ={{ default_n_antenna_ul }}
+
+[rf-mode]
+{% if 'tdd' in rf_mode %}
+rf-mode = tdd
+{% else %}
+rf-mode = fdd
+{% endif %}

stack/slapos.cfg

@@ -296,7 +296,7 @@ sgmllib3k = 1.0.0
 simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
-slapos.cookbook = 1.0.305
+slapos.cookbook = 1.0.326
 slapos.core = 1.9.3
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
@@ -304,7 +304,7 @@ slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.56
 slapos.recipe.cmmi = 0.19
 slapos.recipe.template = 5.1
-slapos.toolbox = 0.136
+slapos.toolbox = 0.137
 smmap = 5.0.0
 sniffio = 1.3.0
 sortedcontainers = 2.4.0