Update Release Candidate

component/egg-patch/RestrictedPython/0001-compile-implicitly-enable-__future__.print_function-.patch

+From 4c132f622f33575aca8da1d0450caa3a33b8c0a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Thu, 4 Jan 2024 00:13:08 +0900
+Subject: [PATCH] compile: implicitly enable __future__.print_function when
+ compiling functions
+
+---
+ src/RestrictedPython/compile.py           | 5 +++--
+ tests/test_compile_restricted_function.py | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/RestrictedPython/compile.py b/src/RestrictedPython/compile.py
+index 3fc2881..98f3026 100644
+--- a/src/RestrictedPython/compile.py
++++ b/src/RestrictedPython/compile.py
+@@ -3,6 +3,7 @@ from RestrictedPython._compat import IS_CPYTHON
+ from RestrictedPython._compat import IS_PY2
+ from RestrictedPython.transformer import RestrictingNodeTransformer
+ 
++import __future__
+ import ast
+ import warnings
+ 
+@@ -134,7 +135,7 @@ def compile_restricted_function(
+         name,
+         filename='<string>',
+         globalize=None,  # List of globals (e.g. ['here', 'context', ...])
+-        flags=0,
++        flags=__future__.print_function.compiler_flag,
+         dont_inherit=False,
+         policy=RestrictingNodeTransformer):
+     """Compile a restricted code object for a function.
+@@ -144,7 +145,7 @@ def compile_restricted_function(
+     """
+     # Parse the parameters and body, then combine them.
+     try:
+-        body_ast = ast.parse(body, '<func code>', 'exec')
++        body_ast = compile(body, '<func code>', 'exec', ast.PyCF_ONLY_AST | flags, dont_inherit)
+     except SyntaxError as v:
+         error = syntax_error_template.format(
+             lineno=v.lineno,
+diff --git a/tests/test_compile_restricted_function.py b/tests/test_compile_restricted_function.py
+index 5c81f86..a49e475 100644
+--- a/tests/test_compile_restricted_function.py
++++ b/tests/test_compile_restricted_function.py
+@@ -9,7 +9,7 @@ from types import FunctionType
+ def test_compile_restricted_function():
+     p = ''
+     body = """
+-print("Hello World!")
++print("Hello", "World!")
+ return printed
+ """
+     name = "hello_world"
+-- 
+2.42.0
+

component/egg-patch/Zope/0001-Fix-redirections-to-URLS-with-host-given-as-IP-litte.patch

+From 8e7c9a6a86104e306aee2224ff5e517ee201b28f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Tue, 9 Jan 2024 17:15:11 +0900
+Subject: [PATCH] Fix redirections to URLS with host given as IP-litteral
+ (#1192)
+
+When redirecting to an URL with an IPv6 host with surrounding brackets,
+we should not escape the surrounding brackets.
+
+The patch updates referenced RFC from 2396 to 3986, which obsoletes it
+and change the safe characters for the netloc part to allow [ and ].
+The RFC specifies that [ and ] are only allowed when they are the first
+and last characters, but we don't need to be more specific here, because
+using [ or ] in other places of the host is rejected by urlparse above.
+
+Fixes #1191
+---
+ src/ZPublisher/HTTPResponse.py           | 14 +++++++-------
+ src/ZPublisher/tests/testHTTPResponse.py |  8 ++++++--
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/ZPublisher/HTTPResponse.py b/src/ZPublisher/HTTPResponse.py
+index b0b4ca2b1..b1a824151 100644
+--- a/src/ZPublisher/HTTPResponse.py
++++ b/src/ZPublisher/HTTPResponse.py
+@@ -230,24 +230,24 @@ class HTTPBaseResponse(BaseResponse):
+         # To be entirely correct, we must make sure that all non-ASCII
+         # characters are quoted correctly.
+         parsed = list(urlparse(location))
+-        rfc2396_unreserved = "-_.!~*'()"  # RFC 2396 section 2.3
++        rfc3986_unreserved = "-_.!~*'()"  # RFC 3986 section 2.3
+         for idx, idx_safe in (
+                 # authority
+-                (1, ";:@?/&=+$,"),  # RFC 2396 section 3.2, 3.2.1, 3.2.3
++                (1, "[];:@?/&=+$,"),  # RFC 3986 section 3.2, 3.2.1, 3.2.3
+                 # path
+-                (2, "/;:@&=+$,"),  # RFC 2396 section 3.3
++                (2, "/;:@&=+$,"),  # RFC 3986 section 3.3
+                 # params - actually part of path; empty in Python 3
+-                (3, "/;:@&=+$,"),  # RFC 2396 section 3.3
++                (3, "/;:@&=+$,"),  # RFC 3986 section 3.3
+                 # query
+-                (4, ";/?:@&=+,$"),  # RFC 2396 section 3.4
++                (4, ";/?:@&=+,$"),  # RFC 3986 section 3.4
+                 # fragment
+-                (5, ";/?:@&=+$,"),  # RFC 2396 section 4
++                (5, ";/?:@&=+$,"),  # RFC 3986 section 4
+         ):
+             # Make a hacky guess whether the component is already
+             # URL-encoded by checking for %. If it is, we don't touch it.
+             if '%' not in parsed[idx]:
+                 parsed[idx] = quote(parsed[idx],
+-                                    safe=rfc2396_unreserved + idx_safe)
++                                    safe=rfc3986_unreserved + idx_safe)
+         location = urlunparse(parsed)
+ 
+         self.setStatus(status, lock=lock)
+diff --git a/src/ZPublisher/tests/testHTTPResponse.py b/src/ZPublisher/tests/testHTTPResponse.py
+index a7f816c04..08a1674ba 100644
+--- a/src/ZPublisher/tests/testHTTPResponse.py
++++ b/src/ZPublisher/tests/testHTTPResponse.py
+@@ -767,15 +767,19 @@ class HTTPResponseTests(unittest.TestCase):
+         self._redirectURLCheck(ENC_URL)
+ 
+     def test_redirect_unreserved_chars(self):
+-        # RFC 2396 section 2.3, characters that should not be encoded
++        # RFC 3986 section 2.3, characters that should not be encoded
+         url = "http://example.com/-_.!~*'()"
+         self._redirectURLCheck(url)
+ 
+     def test_redirect_reserved_chars(self):
+-        # RFC 2396 section 3.3, characters with reserved meaning in a path
++        # RFC 3986 section 3.3, characters with reserved meaning in a path
+         url = 'http://example.com/+/$/;/,/=/?/&/@@index.html'
+         self._redirectURLCheck(url)
+ 
++    def test_redirect_ipv6(self):
++        url = "http://[fe80::1ff:fe23:4567:890a]:1234"
++        self._redirectURLCheck(url)
++
+     def test__encode_unicode_no_content_type_uses_default_encoding(self):
+         UNICODE = u'<h1>Tr\u0039s Bien</h1>'
+         response = self._makeOne()
+-- 
+2.42.0
+

component/python-pim-dm/buildout.cfg

 [buildout]
 extends =
+  ../cython/buildout.cfg
   ../libpcap/buildout.cfg
+  ../macros/macro.pythonpath.eggs.cfg
   ../python-PyYAML/buildout.cfg
 
 parts =
   eggs
 
+# this section is used to pass info from macro pythonpath.eggs to the python-pim-dm section
+[pimdm-env]
+
+[pimdm-pythonpath]
+<= macro.pythonpath.eggs
+environment = pimdm-env
+eggs = ${cython:egg}
+
 [python-pim-dm]
 recipe = zc.recipe.egg:custom
 egg = pim-dm
@@ -15,6 +25,8 @@ library-dirs =
   ${libpcap:location}/lib
 rpath =
   ${libpcap:location}/lib/
+environment = pimdm-env
+depends = ${pimdm-pythonpath:recipe}
 
 [eggs]
 recipe = zc.recipe.egg

component/zodbtools/buildout.cfg

@@ -30,4 +30,4 @@ eggs    = ${zodbtools:eggs}
 
 
 [versions]
-zodbtools = 0.0.0.dev8
+zodbtools = 0.0.0.dev9

software/beremiz-runtime/software.cfg

@@ -6,6 +6,7 @@ extends =
   ../../component/open62541/buildout.cfg
   ../../component/numpy/buildout.cfg
   ../../component/lxml-python/buildout.cfg
+  ../../component/python-sslpsk/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -78,7 +79,7 @@ eggs = click
        opcua
        ${beremiz:egg}
        ${Twisted:egg}
-       sslpsk
+       ${python-sslpsk:egg}
 
 [instance-profile]
 recipe = slapos.recipe.template:jinja2

software/erp5/README.rst

@@ -90,7 +90,6 @@ This software release assigns the following port ranges by default:
   balancer              2150-2199
   zope                  2200-*
   jupyter               8888
-  caucase               8890,8891
   ====================  ==========
 
 Non-zope partitions are unique in an ERP5 cluster, so you shouldn't have to

software/erp5/instance-erp5-input-schema.json

@@ -5,7 +5,7 @@
   "additionalProperties": false,
   "definitions": {
     "routing-rule-list": {
-      "description": "Maps the path received in requests to given zope path. Rules are applied in the order they are given. This requires the path received from the outside world (typically: frontend) to have its root correspond to Zope's root (for frontend: 'path' parameter must be empty), with the customary VirtualHostMonster construct (for frontend: 'type' must be 'zope').",
+      "description": "Maps the path received in requests to given zope path. Rules are applied in the order they are given, after 'internal-path' from 'frontend' parameter. This also supports legacy frontends, using Rapid CDN with \"zope\" type.",
       "type": "array",
       "default": [
         [
@@ -37,7 +37,7 @@
   },
   "properties": {
     "sla-dict": {
-      "description": "Where to request instances. Each key is a query string for criterions (e.g. \"computer_guid=foo\"), and each value is a list of partition references (note: Zope partitions reference must be prefixed with \"zope-\").",
+      "description": "Where to request instances. Each key is a query string for criterions (e.g. \"computer_guid=foo\"), and each value is a list of partition references (notes: Zope partitions reference must be prefixed with \"zope-\", frontends must be prefixed with \"frontend-\").",
       "additionalProperties": {
         "type": "array",
         "items": {
@@ -111,7 +111,7 @@
       "description": "Family-wide options, possibly overriding global options",
       "default": {},
       "patternProperties": {
-        ".*": {
+        "^[a-zA-Z0-9_-]+$": {
           "default": {},
           "properties": {
             "webdav": {
@@ -159,33 +159,41 @@
       "type": "object"
     },
     "frontend": {
-      "description": "Front-end slave instance request parameters",
-      "properties": {
-        "software-url": {
-          "description": "Front-end's software type. If this parameter is empty, no front-end instance is requested. Else, sla-dict must specify 'frontend' which is a special value matching all frontends (e.g. {\"instance_guid=bar\": [\"frontend\"]}).",
-          "default": "",
-          "type": "string",
-          "format": "uri"
-        },
-        "domain": {
-          "description": "The domain name to request front-end to respond as.",
-          "default": "",
-          "type": "string"
-        },
-        "software-type": {
-          "description": "Request a front-end slave instance of this software type.",
-          "default": "RootSoftwareInstance",
-          "type": "string"
-        },
-        "virtualhostroot-http-port": {
-          "description": "Front-end slave http port. Port where http requests to frontend will be redirected.",
-          "default": 80,
-          "type": "integer"
-        },
-        "virtualhostroot-https-port": {
-          "description": "Front-end slave https port. Port where https requests to frontend will be redirected.",
-          "default": 443,
-          "type": "integer"
+      "description": "Frontend shared instances requests parameters. When this parameter is unset, the system defaults to requesting a frontend, but only when exactly one family exists in `zope-partition-dict`. For more complex zope partition layout, the frontend layout also have to be explicitly defined.",
+      "default": {
+        "default": {}
+      },
+      "patternProperties": {
+        "^[a-zA-Z0-9_-]+$": {
+          "required": [
+            "zope-family"
+          ],
+          "properties": {
+            "zope-family": {
+              "description": "The zope family to which the requests will be routed.",
+              "type": "string"
+            },
+            "internal-path": {
+              "description": "Internal path from the backend. `%(site-id)s` is substituted by the site id.",
+              "type": "string",
+              "default": "/%(site-id)s"
+            },
+            "software-url": {
+              "description": "Software URL of the frontend shared instance.",
+              "type": "string",
+              "format": "uri",
+              "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
+            },
+            "software-type": {
+              "description": "Software type of the frontend shared instance.",
+              "type": "string"
+            },
+            "instance-parameters": {
+              "description": "Instance parameters for the frontend shared instance.",
+              "$ref": "../rapid-cdn/instance-slave-input-schema.json"
+            }
+          },
+          "type": "object"
         }
       },
       "type": "object"
@@ -196,13 +204,14 @@
         "1": {}
       },
       "patternProperties": {
-        ".*": {
+        "^[a-zA-Z0-9_-]+$": {
           "additionalProperties": false,
           "properties": {
             "family": {
               "description": "The family this partition is part of. For example: 'public', 'admin', 'backoffice', 'web-service'... Each family gets its own balancer entry. It has no special meaning for the system.",
               "default": "default",
-              "type": "string"
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9_-]+$"
             },
             "instance-count": {
               "description": "Number of Zopes to setup on this partition",
@@ -505,7 +514,7 @@
           "properties": {
             "url": {
               "title": "Caucase URL",
-              "description": "URL of existing caucase instance to use. If empty, a new caucase instance will be deployed. If not empty, other properties in this section will be ignored.",
+              "description": "URL of existing caucase instance to use. If empty, caucase instances will be deployed inside partitions.",
               "default": "",
               "type": "string",
               "format": "uri"
@@ -712,15 +721,9 @@
               },
               "uniqueItems": true
             },
-            "caucase-url": {
-              "title": "Caucase URL",
-              "description": "URL of caucase service to use. If not set, global setting will be used.",
-              "type": "string",
-              "format": "uri"
-            },
             "csr": {
               "title": "csr",
-              "description": "PEM-encoded certificate signature request to request server certificate with. If not provided, HTTPS will be disabled.",
+              "description": "PEM-encoded certificate signature request to request server certificate with.",
               "type": "string"
             },
             "max-crl-update-delay": {

software/erp5/instance-erp5-output-schema.json

@@ -69,7 +69,7 @@
       "type": "string"
     },
     "caucase-http-url": {
-      "description": "Caucase url on HTTP. For HTTPS URL, uses https scheme, if port is explicitely specified in http URL, take that port and add 1 and use it as https port. If it is not specified.",
+      "description": "Caucase url on HTTP. For HTTPS URL, uses https scheme, if port is explicitely specified in http URL, take that port and add 1 and use it as https port.",
       "pattern": "^http://",
       "type": "string"
     }
@@ -79,6 +79,11 @@
       "description": "Zope family access information",
       "pattern": "^https://",
       "type": "string"
+    },
+    "url-frontend-.*": {
+      "description": "Frontend URL, following `url-frontend-{frontend_name}` naming scheme",
+      "pattern": "^https://",
+      "type": "string"
     }
   },
   "type": "object"

software/erp5/test/test/__init__.py

@@ -314,7 +314,7 @@ class CaucaseCertificate(ManagedResource):
     )
     return os.path.join(software_release_root_path, 'bin', 'caucase')
 
-  def request(self, common_name: str, caucase: CaucaseService) -> None:
+  def request(self, common_name: str, caucase: CaucaseService, san: x509.SubjectAlternativeName=None) -> None:
     """Generate certificate and request signature to the caucase service.
 
     This overwrite any previously requested certificate for this instance.
@@ -345,11 +345,10 @@ class CaucaseCertificate(ManagedResource):
                 NameOID.COMMON_NAME,
                 common_name,
             ),
-        ])).sign(
-            key,
-            hashes.SHA256(),
-            default_backend(),
-        )
+        ]))
+    if san:
+      csr = csr.add_extension(san, critical=True)
+    csr = csr.sign(key, hashes.SHA256(), default_backend())
     with open(self.csr_file, 'wb') as f:
       f.write(csr.public_bytes(serialization.Encoding.PEM))
 

software/neoppod/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = e000e7134113b9d1c63d40861eaf0489
 
 [root-common]
 filename = root-common.cfg.in
-md5sum = ae00507d9e69209a0babd725cf6be536
+md5sum = c91b5540f94ce76af31f84584df7a3ef
 
 [instance-neo-admin]
 filename = instance-neo-admin.cfg.in

software/neoppod/root-common.cfg.in

@@ -6,12 +6,12 @@
 {%   do sla_dict.update(dict.fromkeys(ref_list, sla)) -%}
 {% endfor -%}
 
-{% macro sla(name, required=False) -%}
+{% macro sla(name, required=False, default_to_same_computer=True) -%}
 {% if required or name in sla_dict -%}
 {%  for k, (v,) in six.iteritems(urllib_parse.parse_qs(sla_dict.pop(name), strict_parsing=1)) -%}
 sla-{{ k }} = {{ v }}
 {%  endfor -%}
-{% else -%}
+{% elif default_to_same_computer -%}
 sla-computer_guid = ${slap-connection:computer-id}
 {% endif -%}
 {% endmacro -%}

software/ors-amarisoft/README.md

@@ -9,29 +9,6 @@ How to deploy from scratch
   2. Install ors playbook
   3. Deploy this SR
 
-## Generated buildout configurations and json input schemas
-
-Since there are multiple ors-amarisoft softwares releases and software types, the following files are
-generated with jinja2 templates with the render-templates script before being pushed to gitlab:
-
- * instance-tdd-enb-input-schema.json
- * instance-fdd-enb-input-schema.json
- * software-fdd.cfg
- * software-tdd.cfg.json
- * instance-fdd-ue-nr-input-schema.json
- * instance-tdd-gnb-input-schema.json
- * instance-tdd-ue-nr-input-schema.json
- * test/testFDD.py
- * test/testTDD.py
- * software-tdd.cfg
- * instance-tdd-ue-lte-input-schema.json
- * instance-fdd-gnb-input-schema.json
- * software-fdd.cfg.json
- * instance-fdd-ue-lte-input-schema.json
-
-These files should not be modified directly, and the render-templates scripts should be run along
-with update-hash before each commit.
-
 ## Services
 
 We run 2 binaries from Amarisoft LTE stack:

software/ors-amarisoft/buildout.hash.cfg

@@ -16,19 +16,19 @@
 
 [template]
 filename = instance.cfg
-md5sum = fa81cd744e5a9382aa203c3777adc3a8
+md5sum = 22e06207fab996bcc1c26992106618ab
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = 56a2c2b8245e86f3a8ed2eebeb8e88d9
+md5sum = f5c76c3443b75569eb18503dce38e783
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = 566efd38f12e6d42769399f421e77d6c
+md5sum = 871ade334f445e22d6cb473e4d4e3522
 
 [ru_amarisoft-stats.jinja2.py]
 _update_hash_filename_ = ru/amarisoft-stats.jinja2.py
-md5sum = c4d5e9fcf460d88bc2b4bcfbdfe554f7
+md5sum = 674dcc250c0b6bb43d8546624552fc5d
 
 [ru_amarisoft-rf-info.jinja2.py]
 _update_hash_filename_ = ru/amarisoft-rf-info.jinja2.py
@@ -36,19 +36,19 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 30c262a427de2132d6d66d9fb3597426
+md5sum = 2dda7713832be83d94522c7abb4901f9
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
-md5sum = de71c63b8df940207409de7e948f7c8c
+md5sum = b7906ca3a6b17963f78f680fc0842b74
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 71508d94a47db493f30af30188c48d64
+md5sum = 41ea7248b54ea893cb83a01655018711
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
-md5sum = c855ee7a6132899eb53b8d80ec27701a
+md5sum = bc5d82b8737b6990674b280ef2774be7
 
 [ru_lopcomm_ncclient_common.py]
 _update_hash_filename_ = ru/lopcomm/ncclient_common.py
@@ -76,7 +76,11 @@ md5sum = 2b08bb666c5f3ab287cdddbfdb4c9249
 
 [ru_tapsplit]
 _update_hash_filename_ = ru/tapsplit
-md5sum = 2b8b57c5771b2a2203c0e7767e629e55
+md5sum = 700aab566289619fb83ac6f3b085d983
+
+[ru_xbuildout.py]
+_update_hash_filename_ = ru/xbuildout.py
+md5sum = a51171f926edd315a52841c2e7eb9fb7
 
 [ru_capdo.c]
 _update_hash_filename_ = ru/capdo.c
@@ -84,19 +88,19 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = c8096440bfc2a1ed0e2821ef71e0bd1c
+md5sum = f54bdbb308aee424b07ede8b551cfe5b
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = f1e6e2fb8854482d570fc3eee4935f84
+md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = c807be73b9304f5a4c7483a3776bbc17
+md5sum = 9402b750221765b6b124cf5ecb3e520c
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
-md5sum = d8153dd5e0978afea018498b29f06fd5
+md5sum = 812a43458c21f7d0cdb2141515a236ae
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg
@@ -108,23 +112,23 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = a7f898b48b15992b2c4a64a925f007aa
+md5sum = 30a26b975100b1af8937dfe3a7f5f496
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg
-md5sum = 6c8bdb0ce1d2bdd846a87aa6c5204a9c
+md5sum = 01eb971e2ff580da52291138495a81ca
 
 [drb_nr.jinja2.cfg]
 filename = config/drb_nr.jinja2.cfg
-md5sum = 84d3cef8fc7f1c2aed7c348d500f5636
+md5sum = 282b11d7b72b01b8325df4632d82b84d
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
-md5sum = 0d709fafde394dc05441d110c2e41858
+md5sum = 959523597e29b048e45ebf58f7ea4c5b
 
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
-md5sum = 3d7833ddba3242cedcd74c7db52390c6
+md5sum = bee16b3b94fd57f5a19ea7b1f5955533
 
 [dnsmasq-core-network.jinja2.cfg]
 filename = config/dnsmasq-core-network.jinja2.cfg
@@ -132,7 +136,7 @@ md5sum = f167b4be5e327b276b42267e0678f577
 
 [ru_dnsmasq.jinja2.cfg]
 _update_hash_filename_ = ru/dnsmasq.jinja2.cfg
-md5sum = 9bd5b08f23640f71ad109d186d060f2d
+md5sum = 95f4f8fb85e0480eb3e9059b9db26540
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg
@@ -140,7 +144,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 1d55e896236f7ee08a10cd58182a9a76
+md5sum = 62291a11fd36a42464901cdc81338687
 
 [ru_lopcomm_CreateProcessingEle.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/CreateProcessingEle.jinja2.xml
@@ -148,7 +152,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [ru_lopcomm_cu_config.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
-md5sum = 09123ad68c6d8e7e4e201bcc2ab331c6
+md5sum = 346c911e1ac5e5001a39c8926b44c91e
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

software/ors-amarisoft/cell/common.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "Cell. Common properties",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "bandwidth",
+    "ru"
+  ],
+
+  "properties": {
+    "cell_type": {
+      "type": "string",
+      "options":  { "hidden": true }
+    },
+    "cell_kind": {
+      "type": "string",
+      "const":    "enb",
+      "template": "enb",
+      "options":  { "hidden": true }
+    },
+
+    "rf_mode": {
+      "title": "RF mode",
+      "description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
+      "type": "string",
+      "enum": ["fdd", "tdd"],
+      "propertyOrder": 101
+    },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "integer"
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string"
+    },
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number"
+    },
+    "root_sequence_index": {
+      "title": "Root Sequence Index",
+      "type": "integer"
+    },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
+    "ru": {
+      "$ref": "#/$defs/ru-of-cell",
+      "propertyOrder": 9999
+    }
+  },
+
+  "$defs": {
+    "ru-of-cell": {
+      "title": "Radio Unit",
+      "oneOf": [
+        {
+          "title": "Shared Radio Unit",
+          "description": "Use radio unit defined in separate shared instance",
+          "type": "object",
+          "required": ["ru_type", "ru_ref"],
+          "properties": {
+            "ru_type": {
+                "const":    "ru_ref",
+                "template": "ru_ref",
+                "options":  { "hidden": true }
+            },
+            "ru_ref": {
+              "title": "RU Reference",
+              "description": "Reference of shared radio unit instance",
+              "type": "string"
+            }
+          }
+        },
+        {
+          "title": "Shared Radio Unit of a Cell",
+          "description": "Use the same radio unit as referenced cell instance does",
+          "type": "object",
+          "required": ["ru_type", "ruincell_ref"],
+          "properties": {
+            "ru_type": {
+                "const":    "ruincell_ref",
+                "template": "ruincell_ref",
+                "options":  { "hidden": true }
+            },
+            "ruincell_ref": {
+              "title": "Cell Reference",
+              "description": "Reference of cell instance whose radio unit to share",
+              "type": "string"
+            }
+          }
+        },
+        { "$ref": "../ru/input-schema.json" }
+      ]
+    }
+  }
+}

software/ors-amarisoft/cell/input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "Cell",
+  "type": "object",
+  "oneOf": [
+    { "$ref": "../cell/lte/input-schema.json" },
+    { "$ref": "../cell/nr/input-schema.json" }
+  ]
+}

software/ors-amarisoft/cell/lte/input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "LTE Cell",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "bandwidth",
+    "ru",
+
+    "dl_earfcn",
+    "tac"
+  ],
+  "properties": {
+    "$ref": "../../cell/common.json#/properties",
+
+    "cell_type": {
+      "$ref": "#/properties/cell_type",
+      "const":    "lte",
+      "template": "lte"
+    },
+
+    "tdd_ul_dl_config": {
+      "title": "TDD Configuration",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "[Configuration 2] 5ms 2UL 6DL (default)",
+      "options": {
+        "dependencies": {
+          "rf_mode": "tdd"
+        }
+      }
+    },
+
+    "bandwidth": {
+      "$ref": "#/properties/bandwidth",
+      "enum": [
+        1.4,
+        3,
+        5,
+        10,
+        15,
+        20
+      ]
+    },
+
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "integer"
+    },
+    "ul_earfcn": {
+      "title": "UL EARFCN",
+      "description": "Uplink E-UTRA Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_earfcn is chosen.",
+      "type": "integer"
+    },
+    "tac": {
+      "title": "Tracking Area Code",
+      "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
+      "type": "string"
+    },
+    "root_sequence_index": {
+      "$ref": "#/properties/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.",
+      "default": 204
+    }
+  }
+}

software/ors-amarisoft/cell/nr/input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "NR Cell",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "bandwidth",
+    "ru",
+
+    "dl_nr_arfcn",
+    "nr_band"
+  ],
+  "properties": {
+    "$ref": "../../cell/common.json#/properties",
+
+    "cell_type": {
+      "$ref": "#/properties/cell_type",
+      "const":    "nr",
+      "template": "nr"
+    },
+
+    "tdd_ul_dl_config": {
+      "title": "TDD Configuration",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 1DL 2/10 (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)",
+      "options": {
+        "dependencies": {
+          "rf_mode": "tdd"
+        }
+      }
+    },
+
+    "bandwidth": {
+      "$ref": "#/properties/bandwidth"
+    },
+
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "integer"
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "integer"
+    },
+    "ul_nr_arfcn": {
+      "title": "UL NR ARFCN",
+      "description": "Uplink NR Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_nr_arfcn and nr_band is chosen.",
+      "type": "integer"
+    },
+    "ssb_nr_arfcn": {
+      "title": "SSB NR ARFCN",
+      "description": "SSB NR Absolute Radio Frequency Channel Number of the cell. If set it must be an element of global synchronization raster and be at offset from center DL frequency that aligns with SSB subcarrier spacing of selected band. By default a valid frequency nearby dl_nr_arfcn is chosen.",
+      "type": "integer"
+    },
+    "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"
+    },
+    "root_sequence_index": {
+      "$ref": "#/properties/root_sequence_index",
+      "description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
+      "default": 1
+    }
+  },
+
+  "$defs": {
+    "tac": {
+      "title": "Tracking Area Code",
+      "description": "Integer (range 0 to 16777215)",
+      "type": "number"
+    }
+  }
+}

software/ors-amarisoft/cell/schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "Values returned by Cell instantiation (stub)",
+  "type": "object",
+  "properties": {}
+}

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

-// DRB configuration for LTE cell.
+{%- set B = xbuildout.encode -%}
+// DRB configuration for LTE cell {{ B(cell_ref) }} @ {{ B(ru_ref) }}.
 // DRB configuration vary in beteen FDD and TDD modes.
 
-{%  set T_REORDERING = {'fdd': 35, 'tdd': 65} [rf_mode] %}
-// {{ rf_mode | upper }}  T_REORDERING={{ T_REORDERING }}
+{%  set T_REORDERING = {'fdd': 35, 'tdd': 65} [cell.rf_mode] %}
+// {{ cell.rf_mode | upper }}  T_REORDERING={{ T_REORDERING }}
 
 [
   {

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

-// DRB configuration for NR cell.
+{%- set B = xbuildout.encode -%}
+// DRB configuration for NR cell {{ B(cell_ref) }} @ {{ B(ru_ref) }}.
 
 [
   {

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

 {
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,ngap.level=debug,ngap.max_size=1,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/mme.log",
-  
+
 {% if slapparameter_dict.get('external_enb_gnb', '') %}
 {%   if slapparameter_dict.get('use_ipv4', False) %}
   gtp_addr: "{{ gtp_addr_v4 }}",
@@ -16,11 +16,11 @@
   mme_group_id: 32769,
   mme_code: 1,
 
-  ims_vops_eps: true, 
-  ims_vops_5gs_3gpp: true, 
-  ims_vops_5gs_n3gpp: true, 
+  ims_vops_eps: true,
+  ims_vops_5gs_3gpp: true,
+  ims_vops_5gs_n3gpp: true,
   emergency_number_list: [
-          
+
     { category: 0x1f, digits: "911" },
     { category: 0x1f, digits: "112" },
   ],
@@ -29,16 +29,16 @@
     qci: {audio: 1, video: 2},
   },
 
-  
+
   network_name: "{{ slapparameter_dict.get('network_name', 'RAPIDSPACE') }}",
   network_short_name: "{{ slapparameter_dict.get('network_short_name', 'RAPIDSPACE') }}",
-  
+
   cp_ciot_opt: true,
-  
+
   nr_support: true,
 
   eps_5gs_interworking: "with_n26",
-  
+
   fifteen_bearers: false,
 
   ims_list: [
@@ -47,7 +47,7 @@
       bind_addr: "{{  slap_configuration['configuration.ims_bind'] }}"
     }
   ],
-  
+
   pdn_list: [
     {
 
@@ -71,7 +71,7 @@
       first_ip_addr: "{{ netaddr.IPAddress(netaddr.IPNetwork(slap_configuration.get('tun-ipv4-network', '')).first) + 2 }}",
       last_ip_addr: "{{ netaddr.IPAddress(netaddr.IPNetwork(slap_configuration.get('tun-ipv4-network', '')).last) - 1 }}",
 {% endif %}
-      ip_addr_shift: 2, 
+      ip_addr_shift: 2,
       p_cscf_addr: ["{{ slap_configuration.get('tun-ipv4-addr', '') }}"],
 
       erabs: [

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

+{%- set B = xbuildout.encode -%}
+/* SIB2/SIB3 for {{ cell.cell_type | upper }} cell {{ B(cell_ref) }} @ {{ B(ru_ref) }}. */
 {
   message c1: systemInformation: {
     criticalExtensions systemInformation-r8: {
@@ -38,9 +40,9 @@
             pdsch-ConfigCommon {
 {% if ors %}
 {%- if ors['one-watt'] %}
-              referenceSignalPower {{ (tx_gain | int) - 54 }}, /* patched by eNB */
+              referenceSignalPower {{ (ru.tx_gain | int) - 54 }}, /* patched by eNB */
 {%- else %}
-              referenceSignalPower {{ (tx_gain | int) - 35 }}, /* patched by eNB */
+              referenceSignalPower {{ (ru.tx_gain | int) - 35 }}, /* patched by eNB */
 {%- endif %}
 {% else %}
               referenceSignalPower -8, /* patched by eNB */

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

-{#- do_lte/do_nr indicate whether we have LTE or NR UE/cells #}
-{%- do assert(do_lte or do_nr)  %}
-{%- do assert(not (do_lte and do_nr))  %}
+{%- import 'slaplte.jinja2' as slaplte  with context %}
+{%- set B               = slaplte.B %}
+{%- set J               = slaplte.J %}
+{%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
 
+{#- for standalone testing via slapos-render-config.py
+    NOTE: keep in sync with instance-ue.jinja2.cfg and ru/libinstance.jinja2.cfg   #}
+{%- if _standalone is defined                                                 %}
+{%-   set iru_dict   = {}                                                     %}
+{%-   set icell_dict = {}                                                     %}
+{%-   set iue_dict   = {}                                                     %}
+{%-   do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind='ue')    %}
+{%-   do slaplte.load_iue(iue_dict)                                           %}
+{%-   do slaplte.check_loaded_everything()                                    %}
+{%- endif                                                                     %}
+
+
+{#- start of the config -#}
 {
   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",
@@ -9,72 +23,98 @@
   rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
   com_addr: "{{ pub_info['com_addr'] }}",
 
-rf_driver: {
-    name: "sdr",
-    args: "dev0=/dev/sdr0",
-    rx_antenna:"tx_rx",
-},
-  tx_gain: {{ slapparameter_dict.get('tx_gain', 60) }},
-  rx_gain: {{ slapparameter_dict.get('rx_gain', 40) }},
-  cell_groups: [
-{%- if do_lte %}
-  {
-    // LTE cell
+{# instantiate radio units #}
+{{ slaplte.ru_config(iru_dict, slapparameter_dict) }}
+
+
+  cell_groups: [{
+    // LTE cells
+    group_type: "lte",
     multi_ue: true,
+
     cells: [
-      {
-        bandwidth: {{ slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) .removesuffix(' MHz') }},
-        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']) }},
-        global_timing_advance: -1,
-      }
+{%- for cell_ref, icell in icell_dict|dictsort  %}
+{%-   set cell = icell['_']                     %}
+{%-   if cell.cell_type == 'lte'                %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))     %}
+{%-     set iru = iru_dict[ru_ref]              %}
+{%-     set ru = iru['_']                       %}
+
+        // {{ B(cell_ref) }}
+        {
+          rf_port:      {{ ru._rf_port }},
+          n_antenna_dl: {{ ru.n_antenna_dl }},
+          n_antenna_ul: {{ ru.n_antenna_ul }},
+
+          dl_earfcn: {{ cell.dl_earfcn }},
+          ul_earfcn: {{ cell.ul_earfcn }},
+          bandwidth: {{ cell.bandwidth }},
+
+          global_timing_advance: -1,
+        },
+{%-   endif %}
+{%- endfor %}
     ],
     pdcch_decode_opt: false,
     pdcch_decode_opt_threshold: 0.1,
-  },
-{%- endif %}
-{%- if do_nr  %}
-  {
-    // NR cell
+
+  }, {
+    // NR cells
     group_type: "nr",
-    multi_ue: false,
-    cells: [{
-      rf_port: 0,
-      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) }},
-      subcarrier_spacing: 30,
-      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']) }},
-      }
-    ],
-  },
-{%- endif %}
-  ],
+    multi_ue: true,
+
+    cells: [
+{%- for cell_ref, icell in icell_dict|dictsort  %}
+{%-   set cell = icell['_']                     %}
+{%-   if cell.cell_type == 'nr'                 %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))     %}
+{%-     set iru = iru_dict[ru_ref]              %}
+{%-     set ru = iru['_']                       %}
+        // {{ B(cell_ref) }}
+        {
+          rf_port:      {{ ru._rf_port }},
+          n_antenna_dl: {{ ru.n_antenna_dl }},
+          n_antenna_ul: {{ ru.n_antenna_ul }},
+
+          band:         {{ cell.nr_band }},
+          dl_nr_arfcn:  {{ cell.dl_nr_arfcn }},
+          ul_nr_arfcn:  {{ cell.ul_nr_arfcn }},
+          ssb_nr_arfcn: {{ cell.ssb_nr_arfcn }},
+          bandwidth:    {{ cell.bandwidth }},
+
+          subcarrier_spacing: {{ cell.subcarrier_spacing }},
+        },
+{%-   endif %}
+{%- endfor %}
+    ]
+  }],
+
   ue_list: [
+{%- for ue_ref, iue in iue_dict|dictsort  %}
+{%-   set ue = iue['_']                   %}
+    // {{ B(ue_ref) }}
     {
-    sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",
-    opc: "{{ slapparameter_dict.get('opc', '') }}",
-    amf: {{ slapparameter_dict.get('amf', '0x9001') }},
-    sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
-    impu: "{{ slapparameter_dict.get('impu', '') }}",
-    impi: "{{ slapparameter_dict.get('impi', '') }}",
-{%- if do_lte %}
-    imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_lte_imsi']) }}",
-    K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_lte_k']) }}",
-    ue_category: 12,
-{%- endif %}
-{%- if do_nr  %}
-    imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_nr_imsi']) }}",
-    K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_nr_k']) }}",
-    as_release: 15,
-    ue_category: "nr",
-{%- endif %}
-    rue_addr: "{{ slapparameter_dict.get('rue_addr', '') }}",
-    tun_setup_script: "ue-ifup",
-    apn: "internet",
-    }
+      sim_algo: "{{ ue.sim_algo }}",
+      opc: "{{ ue.opc }}",
+      amf: {{ ue.amf }},
+      sqn: "{{ ue.sqn }}",
+      impu: "{{ ue.impu }}",
+      impi: "{{ ue.impi }}",
+      imsi: "{{ ue.imsi }}",
+      K: "{{ ue.k }}",
+      rue_addr: "{{ ue.rue_addr }}",
+{%-   if ue.ue_type == 'lte'            %}
+      as_release: 13,
+      ue_category: 13,
+{%-   elif ue.ue_type == 'nr'           %}
+      as_release: 15,
+      ue_category: "nr",
+{%-   else                              %}
+{%-     do bug('unreachable')   %}
+{%-   endif                             %}
+      tun_setup_script: "ue-ifup",
+      apn: "internet",
+    },
+{%- endfor %}
   ],
 }

software/ors-amarisoft/instance-core-network-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "description": "Values returned by Core Network instantiation (stub)",
+  "type": "object",
+  "properties": {}
+}

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -183,7 +183,7 @@ context =
   section directory directory
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
-  key gtp_addr_v6 slap-configuration:ipv6-random
+  raw gtp_addr_v6 {{ my_ipv6 }}
   raw gtp_addr_v4 {{ lan_ipv4 }}
   import  netaddr netaddr
   key ifup_empty mme-ifup-empty:wrapper-path
@@ -245,7 +245,7 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
-core-network-ipv6 = ${slap-configuration:ipv6-random}
+core-network-ipv6 = {{ my_ipv6 }}
 core-network-ipv4 = {{ lan_ipv4 }}
 amarisoft-version = {{ lte_version }}
 license-expiration = {{ lte_expiration }}

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

@@ -3,87 +3,16 @@
   "$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, 2, 4 or 8. Number of DL antennas.",
-      "type": "number",
-      "default": 2
-    },
-    "n_antenna_ul": {
-      "title": "Number of UL antennas",
-      "description": "1, 2, 4 or 8. Number of UL antennas.",
-      "type": "number",
-      "default": 2
-    },
-    "sdr_number": {
-      "title": "SDR Number",
-      "description": "SDR Number",
-      "type": "number",
-      "default": 0
-    },
-    "cpri_port": {
-      "title": "CPRI Port Number",
-      "description": "CPRI Port 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"
-            },
-            "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"
+    "user-authorized-key": {
+      "title": "User Authorized Key",
+      "description": "SSH public key in order to connect to the SSH server of this instance.",
+      "textarea": true,
+      "type": "string"
     },
     "enb_id": {
       "title": "eNB ID",
-      "description": "eNB ID",
-      "type": "string",
-      "default": "0x1A2D0"
+      "description": "eNB ID. (must be set if there are LTE cells)",
+      "type": "string"
     },
     "gtp_addr": {
       "title": "GTP Address",
@@ -93,7 +22,7 @@
     },
     "mme_list": {
       "title": "MME list",
-      "description": "Optionnal. List of MME to which the gNodeB is connected",
+      "description": "List of MME to which the eNodeB is connected. (must be set if there are LTE cells)",
       "patternProperties": {
         ".*": {
           "properties": {
@@ -106,17 +35,15 @@
           "type": "object"
         }
       },
-      "type": "object",
-      "default": {}
+      "type": "object"
     },
     "plmn_list": {
-      "title": "PLMN list",
-      "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
+      "title": "PLMN list (4G)",
+      "description": "List of PLMNs broadcasted by the eNodeB, at most 6. (must be set if there are LTE cells)",
       "patternProperties": {
         ".*": {
           "properties": {
             "plmn": {
-              "default": "00101",
               "title": "Public Land Mobile Network",
               "description": "Public Land Mobile Network",
               "type": "string"
@@ -137,64 +64,84 @@
           "type": "object"
         }
       },
-      "type": "object",
-      "default": {}
+      "type": "object"
     },
-    "lte_handover_a3_offset": {
-      "title": "A3 offset for LTE handover",
-      "description": "RSRP gain offset between gNBs which will trigger handover",
-      "type": "number",
-      "default": 6
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID. (must be set if there are NR cells)",
+      "type": "string"
     },
-    "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",
+    "gnb_id_bits": {
+      "title": "gNB ID bits",
+      "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
       "type": "number",
-      "enum": [
-        0,
-        40,
-        64,
-        80,
-        100,
-        128,
-        160,
-        256,
-        320,
-        480,
-        512,
-        640,
-        1024,
-        1280,
-        2560,
-        5120
-      ],
-      "default": 480
+      "default": 28
     },
-    "ncell_list": {
-      "title": "Neighbour Cell Info",
-      "description": "Neighbour Cell Info",
+    "amf_list": {
+      "title": "AMF list",
+      "description": "List of AMF to which the gNodeB is connected. (must be set if there are NR cells)",
       "patternProperties": {
         ".*": {
           "properties": {
-            "dl_earfcn": {
-              "title": "DL EARFCN",
-              "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
+            "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"
+    },
+    "plmn_list_5g": {
+      "title": "PLMN list (5G)",
+      "description": "List of PLMNs broadcasted by the gNodeB, at most 12. (must be set if there are NR cells)",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "plmn": {
+              "title": "Public Land Mobile Network",
+              "description": "Public Land Mobile Network",
+              "type": "string"
+            },
+            "tac": {
+              "$ref": "cell/nr/input-schema.json#/$defs/tac"
+            },
+            "ranac": {
+              "title": "Optional integer (range 0 to 255)",
+              "description": "RAN Area Code",
               "type": "number"
             },
-            "pci": {
-              "title": "Physical Cell ID",
-              "description": "Physical Cell ID of the neighbour cell",
+            "reserved": {
+              "default": false,
+              "title": "Reserved",
+              "description": "True if the cell is reserved for operator use.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "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"
             },
-            "cell_id": {
-              "title": "Cell ID",
-              "description": "Concatenation of enb_id and cell_id of the neighbour cell",
+            "sd": {
+              "default": "0x000032",
+              "title": "Slice Differentiator",
+              "description": "Optional integer (range 0 to 0xFFFFFE)",
               "type": "string"
-            },
-            "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
             }
           },
           "type": "object"
@@ -208,12 +155,6 @@
       "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",
@@ -226,12 +167,6 @@
       "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",
@@ -239,14 +174,14 @@
       "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",
+      "title": "eNB/gNB statistics fetch period (seconds)",
+      "description": "Describes how often a call to Amarisoft remote API is made to get eNB/gNB 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",
+      "title": "Enable eNB/gNB drb statistics",
+      "description": "Enable eNB/gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
       "type": "boolean",
       "default": true
     },

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

+{
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "description": "Values returned by eNB/gNB instantiation (stub)",
+  "type": "object",
+  "properties": {}
+}

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

-{#- enb_mode indicates with which mode enb is instantiated with - enb | gnb #}
-{%- set enb_mode = slap_configuration['slap-software-type'] %}
-{%- do assert(enb_mode in ('enb', 'gnb'), enb_mode) %}
+# instance-enb implements eNB/gNB service.
+
+{#- defaults for global eNB/gNB parameters.
+    TODO automatically load enb defaults from JSON schema #}
+{%- set enb_defaults = {
+  'com_ws_port':  9001,
+  'com_addr':     '127.0.1.2',
+  'use_ipv4':     False,
+  'gnb_id_bits':  28,
+  'nssai':        {'1': {'sst': 1}},
+} %}
+{%- set gtp_addr_lo = '127.0.1.1' %}
+{%- for k,v in enb_defaults|dictsort %}
+{%-   do slapparameter_dict.setdefault(k, v) %}
+{%- endfor %}
 
-{#- defaults for eNB radio parameters.
-    NOTE they are installed temporary and will go away after switch to generic multiRU. #}
-{%- do RF.setdefault('tx_gain',     slapparameter_dict.get('tx_gain',     0)) %}
-{%- do RF.setdefault('rx_gain',     slapparameter_dict.get('rx_gain',     0)) %}
-{%- do RF.setdefault('dl_earfcn',   slapparameter_dict.get('dl_earfcn',   0)) %}
-{%- do RF.setdefault('dl_nr_arfcn', slapparameter_dict.get('dl_nr_arfcn', 0)) %}
-{%- do RF.setdefault('nr_band',     slapparameter_dict.get('nr_band',     0)) %}
 
 [buildout]
 parts =
@@ -29,10 +34,23 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
+{%- set icell_kind='enb'                                        %}
 {%- import 'slaplte.jinja2'            as slaplte with context  %}
 {%- import 'ru_libinstance.jinja2.cfg' as rulib   with context  %}
+{%- set ipeer_dict = {}                                         %}
+{%- set ipeercell_dict = {}                                     %}
+{%- do slaplte.load_ipeer(ipeer_dict)                           %}
+{%- do slaplte.load_ipeercell(ipeercell_dict)                   %}
+{%- do slaplte.check_loaded_everything()                        %}
+
 {{ rulib.buildout() }}
 
+[myslap]
+# NOTE we don't query slapos.cookbook:slapconfiguration the second time because
+# slapparameter_dict is potentially modified with defaults.
+parameter_dict = {{ dumps(slapparameter_dict) }}
+configuration = {{ dumps(slap_configuration) }}
+
 
 [monitor-httpd-conf-parameter]
 httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
@@ -48,26 +66,6 @@ minimum = 8035
 maximum = 8055
 ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
 
-[slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
-computer = {{ slap_connection['computer-id'] }}
-partition = {{ slap_connection['partition-id'] }}
-url = {{ slap_connection['server-url'] }}
-key = {{ slap_connection['key-file'] }}
-cert = {{ slap_connection['cert-file'] }}
-
-configuration.com_ws_port = 9001
-configuration.com_addr = 127.0.1.2
-configuration.mme_addr = 127.0.1.100
-configuration.amf_addr = 127.0.1.100
-configuration.gtp_addr = 127.0.1.1
-configuration.default_lte_bandwidth = {{ default_lte_bandwidth }}
-configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
-configuration.default_nr_bandwidth = {{ default_nr_bandwidth }}
-configuration.default_nr_inactivity_timer = {{ default_nr_inactivity_timer }}
-configuration.default_nr_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
-configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
-configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -134,7 +132,7 @@ drb_stats_logspec =
 rotatespec = 100MB.9
 logspec = ${:stats_logspec} ${:drb_stats_logspec}
 {%- if slapparameter_dict.get("websocket_password", "") %}
-websock = ws://[${slap-configuration:ipv6-random}]:9001
+websock = ws://[{{my_ipv6}}]:9001
 {%- else %}
 websock = ws://127.0.1.2:9001
 {%- endif %}
@@ -194,44 +192,15 @@ extra-context =
 context =
   json ors false
   section directory directory
-  section slap_configuration slap-configuration
-  key slapparameter_dict slap-configuration:configuration
-  key gtp_addr_v6 slap-configuration:ipv6-random
+  key slap_configuration myslap:configuration
+  key slapparameter_dict myslap:parameter_dict
+  raw gtp_addr_v6 {{ my_ipv6 }}
   raw gtp_addr_v4 {{ lan_ipv4 }}
-  raw tx_gain {{ RF.tx_gain }}
-  raw rx_gain {{ RF.rx_gain }}
-  raw earfcn  {{ RF.dl_earfcn }}
-  raw nr_arfcn {{ RF.dl_nr_arfcn }}
-  raw nr_band {{ RF.nr_band }}
-  raw software_name {{ software_name }}
-  raw rf_mode {{ rf_mode }}
-  raw trx {{ trx }}
-  raw bbu {{ bbu }}
-  raw ru_type {{ ru }}
-{%- if enb_mode == 'enb'  %}
-  json do_lte true
-  json do_nr  false
-{%- elif enb_mode == 'gnb'  %}
-  json do_lte false
-  json do_nr  true
-{%- endif %}
+  raw gtp_addr_lo {{ gtp_addr_lo }}
+  import  xbuildout xbuildout
   import  netaddr netaddr
   ${:extra-context}
 
-[sib-config]
-<= config-base
-url = {{ sib23_template }}
-output = ${directory:etc}/sib23.cfg
-
-[drb-config]
-<= config-base
-{%- if enb_mode == 'enb'  %}
-url = {{ drb_lte_template }}
-{%- elif enb_mode == 'gnb'  %}
-url = {{ drb_nr_template }}
-{%- endif %}
-output = ${directory:etc}/drb.cfg
-
 [enb-config]
 <= config-base
 {% if slapparameter_dict.get("enb_config_link", None) %}
@@ -240,32 +209,36 @@ url = ${enb-config-dl:target}
 url = {{ enb_template }}
 {% endif %}
 output = ${directory:etc}/enb.cfg
-extra-context =
-    import json_module json
-    json cell_list {{ rulib.cell_list | tojson }}
-    key sib23_file sib-config:output
-    key drb_file   drb-config:output
 import-list =
     rawfile slaplte.jinja2 {{ slaplte_template }}
+extra-context =
+    import json_module json
+    key iru_dict       :iru_dict
+    key icell_dict     :icell_dict
+    key ipeer_dict     :ipeer_dict
+    key ipeercell_dict :ipeercell_dict
+iru_dict       = {{ dumps(rulib.iru_dict) }}
+icell_dict     = {{ dumps(rulib.icell_dict) }}
+ipeer_dict     = {{ dumps(ipeer_dict) }}
+ipeercell_dict = {{ dumps(ipeercell_dict) }}
 
 
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
 {%- if slapparameter_dict.get("websocket_password", "") %}
-websocket_url = ws://[${slap-configuration:ipv6-random}]:9001
+websocket_url = ws://[{{my_ipv6}}]:9001
 {%- endif %}
-enb-ipv6 = ${slap-configuration:ipv6-random}
+enb-ipv6 = {{ my_ipv6 }}
 enb-ipv4 = {{ lan_ipv4 }}
-{%- if enb_mode == 'enb'  %}
-current-earfcn  = {{ RF.dl_earfcn }}
-{%- elif enb_mode == 'gnb'  %}
-current-nr-arfcn = {{ RF.dl_nr_arfcn }}
-current-nr-band = {{ RF.nr_band }}
-{%- endif %}
 amarisoft-version = {{ lte_version }}
 license-expiration = {{ lte_expiration }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
+ru-list   = {{ dumps(rulib.iru_dict.keys()   | sort) }}
+cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}
+peer-list = {{ dumps(ipeer_dict.keys()       | sort) }}
+peer-cell-list = {{ dumps(ipeercell_dict.keys() | sort) }}
+
 
 [monitor-instance-parameter]
 {% if slapparameter_dict.get("name", None) %}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "nr_bandwidth": {
-      "title": "Bandwidth",
-      "description": "Downlink Bandwidth (in MHz)",
-      "type": "number",
-      "default": 40
-    },
-    "n_antenna_dl": {
-      "title": "Number of DL antennas",
-      "description": "1, 2, 4 or 8. Number of DL antennas.",
-      "type": "number",
-      "default": 2
-    },
-    "n_antenna_ul": {
-      "title": "Number of UL antennas",
-      "description": "1, 2, 4 or 8. Number of UL antennas.",
-      "type": "number",
-      "default": 2
-    },
-    "dl_nr_arfcn": {
-      "title": "DL NR ARFCN",
-      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-      "type": "number"
-    },
-    "nr_band": {
-      "title": "NR band",
-      "description": "NR band number",
-      "type": "number"
-    },
-    "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
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 500
-    },
-    "cell_id": {
-      "title": "Cell ID",
-      "description": "Cell ID",
-      "type": "string",
-      "default": "0x01"
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "type": "number"
-    },
-    "rx_gain": {
-      "title": "Rx gain",
-      "description": "Rx gain (in dB)",
-      "type": "number"
-    },
-    "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
-    },
-    "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": {}
-    },
-    "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": "0x000032",
-              "title": "Slice Differentiator",
-              "description": "Optional integer (range 0 to 0xFFFFFE)",
-              "type": "string"
-            }
-          },
-          "type": "object"
-        }
-      },
-      "type": "object",
-      "default": {}
-    },
-    "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
-    },
-    "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": {}
-    },
-    "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"
-    },
-    "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_rxtx_delay": {
-      "title": "Minimum available time for radio front end processing (ms)",
-      "description": "Baseband latency promise will fail if minimum TX/RX diff reaches threshold (lower than this value)",
-      "type": "number",
-      "default": 0
-    },
-    "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"
-    }
-  }
-}