Update Release Candidate

component/liburing/buildout.cfg

@@ -11,8 +11,6 @@ md5sum = 2e8c3c23795415475654346484f5c4b8
 # liburing 2.3 needs at least kernel 4.14 because it uses SO_ZEROCOPY
 # see https://github.com/axboe/liburing/blob/liburing-2.3/CHANGELOG#L13
 # see https://kernelnewbies.org/Linux_4.14#Zero-copy_from_user_memory_to_sockets
-[liburing:[int(q) for q in platform.release().split("-")[0].split(".")]<[4,14,0]]
-recipe = slapos.recipe.cmmi
-shared = true
+[liburing:[int(q) for q in platform.release().split(".")[:2]]<[4,14]]
 url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.2.tar.gz
 md5sum = 9075595460c86646a7239e3110ec0dd5

component/perl/buildout.cfg

@@ -31,7 +31,7 @@ configure-command =
     -Dusethreads
 environment =
   PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#943453b7d3ff8d49ed12d44a7f7076ee:post_make_hook
+post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#8a2cae20c74f93c2bab2c82564aeeaca:post_make_hook
 
 
 [perl-CPAN-package]

component/perl/perl-create-libs-symlink.py

@@ -6,7 +6,8 @@ def post_make_hook(options, buildout):
   location = options['location']
   matches = [os.path.join(root, filename)
     for root, dirnames, filenames in os.walk(location)
-    for filename in fnmatch.filter(filenames, 'libperl.a')]
+    for filename in fnmatch.filter(filenames, 'libperl.a')
+    if '.build' not in root]
   if not matches:
     raise UserError("ERROR - no libperl.* found!")
   if len(matches) > 1:

component/zlib/buildout.cfg

@@ -7,3 +7,5 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://zlib.net/fossils/zlib-1.2.12.tar.gz
 md5sum = 5fc414a9726be31427b440b434d05f78
+environment =
+  CFLAGS=-fPIC

schema.json

@@ -66,8 +66,8 @@
               "type": "string"
             },
             "shared": {
-              "description": "Define if the request will request a Slave or Software Instance.",
-              "default": "false",
+              "description": "Define if the request will request a Shared Instance or Software Instance.",
+              "default": false,
               "type": "boolean"
             },
             "index": {

software/beremiz-ide/software.cfg

@@ -97,8 +97,8 @@ eggs +=
 [beremiz]
 recipe = slapos.recipe.build:download-unpacked
 # download beremiz from github
-url = https://github.com/beremiz/beremiz/archive/a8efd2fee83733939a1fa48ea924bf7a7a5ef819.tar.gz
-md5sum = 2a141b97047896bb9206c221aa56fd55
+url = https://github.com/beremiz/beremiz/archive/d0925aa2e32b0143fde5f51eb3ddd3bbb28975ba.tar.gz
+md5sum = cec3b98faf0b2133eb7d75688802aab7
 
 [beremiz-setup]
 recipe  = zc.recipe.egg:develop

software/beremiz-runtime/software.cfg

@@ -41,7 +41,7 @@ post-install =
 [beremiz-source]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/beremiz/beremiz.git
-revision = caee3ad3b7bb2865c77328de5ffdaeec61dbf49f
+revision = d0925aa2e32b0143fde5f51eb3ddd3bbb28975ba
 git-executable = ${git:location}/bin/git
 
 [beremiz]

software/kvm/instance-kvm-cluster-input-schema.json

@@ -70,14 +70,14 @@
           "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
         },
         "slave-frontend-dict": {
-          "title": "Slave Front end definition",
-          "description": "Slave Front end definition",
+          "title": "Shared Front end definition",
+          "description": "Shared Front end definition",
           "patternProperties": {
             ".*": {
               "properties": {
                 "domain": {
                   "title": "Name of the domain to be used",
-                  "description": "Name of the domain to be used (example: mydomain.com). Subdomains of this domain will be used for the slave instances (example: instance12345.mydomain.com).",
+                  "description": "Name of the domain to be used (example: mydomain.com). Subdomains of this domain will be used for the shared instances (example: instance12345.mydomain.com).",
                   "type": "string",
                   "default": ""
                 },
@@ -89,13 +89,13 @@
                   "default": ""
                 },
                 "enable-cache": {
-                  "title": "Use cache for this slave frontend.",
-                  "description": "Specify if slave frontend should use a squid to connect to backend.",
+                  "title": "Use cache for this shared frontend.",
+                  "description": "Specify if shared frontend should use a cache to connect to backend.",
                   "type": "boolean",
                   "default": false
                 },
                 "type": {
-                  "title": "Specify if slave frontend will redirect to a zope backend.",
+                  "title": "Specify if shared frontend will redirect to a zope backend.",
                   "description": "If specified, Apache RewriteRule will use Zope's Virtual Host Daemon. Possible values: 'zope', 'default'.",
                   "type": "string",
                   "default": "default"

software/metabase/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 0e74c862401f266111552b7a3611f7bf
+md5sum = c79f0bcf9dac25060340aa829c4f291c

software/metabase/instance.cfg.in

@@ -190,12 +190,13 @@ wrapper-path = $${directory:bin}/$${:_buildout_section_name_}
 command-line =
   sh -e -c "\
     echo 'This will replace current database with latest backup. Hit Ctrl+C to cancel';
-    sleep 30;
+    sleep 5;
     $${postgresql:bin}/pg_restore \
         --exit-on-error \
+        --clean \
+        --create \
         -h $${postgresql:pgdata-directory} \
         -U $${postgresql:superuser} \
-        -d $${postgresql:dbname} \
         $${postgresql-backup:backup-file}"
 
 [cron]

software/ors-amarisoft/README.md

@@ -12,21 +12,13 @@ How to deploy from scratch
 Since there are many 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-tdd1900-enb-epc-input-schema.json
  * instance-tdd1900-enb-input-schema.json
- * instance-tdd1900-gnb-epc-input-schema.json
  * instance-tdd1900-gnb-input-schema.json
- * instance-tdd2600-enb-epc-input-schema.json
  * instance-tdd2600-enb-input-schema.json
- * instance-tdd2600-gnb-epc-input-schema.json
  * instance-tdd2600-gnb-input-schema.json
- * instance-tdd3500-enb-epc-input-schema.json
  * instance-tdd3500-enb-input-schema.json
- * instance-tdd3500-gnb-epc-input-schema.json
  * instance-tdd3500-gnb-input-schema.json
- * instance-tdd3700-enb-epc-input-schema.json
  * instance-tdd3700-enb-input-schema.json
- * instance-tdd3700-gnb-epc-input-schema.json
  * instance-tdd3700-gnb-input-schema.json
  * software-tdd1900.cfg
  * software-tdd1900.cfg.json

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 3f982f31a642ba9d6a1613f49e1c0d10
+md5sum = f1f1167970ae465cdcece47b722caf20
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -34,38 +34,30 @@ md5sum = 6339dd6c5dcbef95b58ed52a9fadc9a4
 _update_hash_filename_ = lopcomm-rrh-config.jinja2.py
 md5sum = e0b68a87238282568e0e04c792ec7288
 
-[template-lte-enb-epc]
-_update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 22c2d4f52463de898fcd7516269aed62
-
-[template-lte-enb]
+[template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = dd85f04ab2836cf459078f0adaf7b847
-
-[template-lte-gnb-epc]
-_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 12b4a6eb722d0ddd0c6edb2a48285f73
+md5sum = a7448167f7433a50938bf6d3e6903065
 
-[template-lte-epc]
-_update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = 397dccca5d9fa027dfc9ba0aab3b7544
-
-[template-lte-gnb]
+[template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = a6a57b623cf072b713954c44b55d2dbc
+md5sum = afa508e78851fe151fd25d8781aaa34a
 
-[template-lte-mme]
-_update_hash_filename_ = instance-mme.jinja2.cfg
-md5sum = e4ce3208b530e4d01fed328843ea76ca
+[template-core-network]
+_update_hash_filename_ = instance-core-network.jinja2.cfg
+md5sum = 5a46abb4310fa7fa8015fb0cde6cd87f
 
-[template-lte-ue-lte]
+[template-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
 md5sum = e201f486d31388cc2542e91bbda85711
 
-[template-lte-ue-nr]
+[template-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
 md5sum = 765fd303d6013cf4dbee108c53623412
 
+[template-obsolete]
+_update_hash_filename_ = instance-obsolete.jinja2.cfg
+md5sum = e9bd42aa4861c41b684911ad0f37ba4d
+
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
 md5sum = dcaac06553a3222b14c0013a13f4a149
@@ -88,7 +80,7 @@ md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
 
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
-md5sum = f002f908d9af8b4089dad0c64742dde6
+md5sum = 3b3ab394e5303ec39fdcdd849a749550
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg

software/ors-amarisoft/changelog.rst

@@ -11,3 +11,11 @@ Version 1.0.312 (2023-03-20)
 
 * Add promise to test if reception is saturated
 * Add IMSI in connection parameters when SIM gets attached
+
+Version 1.0.316 (2023-04-14)
+-------------
+
+* Remove enb-epc, gnb-epc and epc software types, the software types are now:
+    - enb
+    - gnb
+    - core-network (replaces epc software type)

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

@@ -12,7 +12,7 @@
   gtp_addr: "127.0.1.100",
 {% endif %}
 
-  plmn: "{{ slapparameter_dict.get('epc_plmn', "00101") }}",
+  plmn: "{{ slapparameter_dict.get('core_network_plmn', "00101") }}",
   mme_group_id: 32769,
   mme_code: 1,
 

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

+{
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Core Network Input Parameters",
+  "type": "object",
+  "properties": {
+    "core_network_plmn": {
+      "default": "00101",
+      "title": "Core Network PLMN",
+      "description": "Core Network Public Land Mobile Network",
+      "type": "string"
+    },
+    "external_enb_gnb": {
+      "default": false,
+      "title": "External eNB / gNB",
+      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
+      "type": "boolean"
+    },
+    "iperf3": {
+      "default": false,
+      "title": "iperf3 UDP server",
+      "description": "Activate iperf3 UDP server",
+      "type": "boolean"
+    },
+    "use_ipv4": {
+      "default": false,
+      "title": "Use IPv4",
+      "description": "Set to true to use IPv4 for AMF / MME addresses",
+      "type": "boolean"
+    },
+    "promise_cpu_temperature_threshold": {
+      "title": "CPU temperature promise threshold",
+      "description": "Temperature threshold above which CPU temperature promise will fail",
+      "type": "number",
+      "default": 80
+    },
+    "promise_cpu_avg_temperature_threshold": {
+      "title": "Average CPU temperature promise threshold",
+      "description": "If average temperature over specified duration reaches this threshold, promise will fail",
+      "type": "number",
+      "default": 80
+    },
+    "promise_cpu_avg_temperature_threshold_duration": {
+      "title": "Average CPU temperature promise threshold duration",
+      "description": "Duration during which average temperature should not exceed specified threshold",
+      "type": "number",
+      "default": 600
+    }
+  }
+}

software/ors-amarisoft/instance-enb-epc.jinja2.cfg → software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -13,10 +13,17 @@ info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been a
 [buildout]
 parts =
   directory
-  lte-enb-request
-  lte-mme-request
+  ltelogs
+  mme-config
+  mme-service
+  monitor-base
   check-cpu-temperature.py
+  check-interface-up.py
   publish-connection-information
+{% if slapparameter_dict.get("iperf3", None) %}
+  iperf-service
+  port-listening-promise
+{% endif %}
 {% for part in part_list -%}
 {{ '  %s' % part }}
 {% endfor %}
@@ -27,6 +34,25 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
+[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.network_name = RAPIDSPACE
+configuration.domain = rapid.space
+configuration.log_size = 50M
+configuration.mme_ws_port = 9000
+configuration.enb_ws_port = 9002
+configuration.ims_ws_port = 9003
+configuration.mme_addr = 127.0.1.100
+configuration.ims_addr = 127.0.0.1
+configuration.ims_bind = 127.0.0.2
+configuration.enb_addr = 127.0.1.1
+ue_db_path = {{ ue_db_path }}
+
 [monitor-httpd-conf-parameter]
 httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
 port = ${monitor-instance-parameter:monitor-httpd-port}
@@ -41,71 +67,20 @@ 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'] }}
-
 [directory]
 recipe = slapos.cookbook:mkdirectory
 software = {{ buildout_directory }}
 home = ${buildout:directory}
 etc = ${:home}/etc
 var = ${:home}/var
-etc = ${:home}/etc
 bin = ${:home}/bin
+tmp = ${:home}/tmp
 run = ${:var}/run
 script = ${:etc}/run
 service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[request-common-base]
-recipe = slapos.cookbook:requestoptional.serialised
-software-url = {{ slap_connection['software-release-url'] }}
-server-url = {{ slap_connection['server-url'] }}
-computer-id = {{ slap_connection['computer-id'] }}
-partition-id = {{ slap_connection['partition-id'] }}
-key-file = {{ slap_connection['key-file'] }}
-cert-file = {{ slap_connection['cert-file'] }}
-
-sla-computer_guid = {{ slap_connection['computer-id'] }}
-
-config-monitor-password = ${monitor-htpasswd:passwd}
-config-sub-instance = true
-
-[lte-mme-request]
-<= request-common-base
-name = MME
-software-type = mme
-config-name = mme
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor %}
-config-slave-list = {{ dumps(slave_instance_list) }}
-return = monitor-base-url epc-ipv6
-
-[lte-enb-request]
-<= request-common-base
-name = eNB
-software-type = enb
-config-name = enb
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor %}
-return = monitor-base-url
-
-[monitor-base-url-dict]
-lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
-lte-enb-request =  ${lte-enb-request:connection-monitor-base-url}
-
-[macro.promise]
-<= monitor-promise-base
-name = ${:_buildout_section_name_}
-
 [check-cpu-temperature.py]
 <= macro.promise
 promise = check_cpu_temperature
@@ -116,9 +91,144 @@ config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80)
 config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
 config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
 
+[ltelogs]
+recipe = slapos.recipe.template:jinja2
+url = {{ ltelogs_template }}
+output = ${directory:home}/ltelogs.sh
+extensions = jinja2.ext.do
+context =
+  section directory directory
+
+{% if slapparameter_dict.get("mme_config_link", None) %}
+[mme-config-dl]
+recipe = slapos.recipe.build:download
+url = {{ slapparameter_dict.get("mme_config_link") }}
+version = {{ slapparameter_dict.get("mme_config_version") }}
+offline = false
+{% endif %}
+
+### IMS
+[ims-service]
+recipe = slapos.cookbook:wrapper
+init = ${ltelogs:output} ${directory:log}/ims.log; sleep 1
+command-line = {{ mme }}/lteims ${directory:etc}/ims.cfg
+wrapper-path = ${directory:service}/ims
+mode = 0775
+pidfile = ${directory:run}/ims.pid
+hash-files =
+  ${ims-config:output}
+  {{ ue_db_path }}
+environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft
+
+[mme-sh-wrapper]
+recipe = slapos.recipe.template
+output = ${directory:bin}/${:_buildout_section_name_}
+mme-log = ${directory:log}/mme-output.log
+inline =
+  #!/bin/sh
+{% if not slapparameter_dict.get("testing", False) %}
+  rm -f ${directory:var}/lte_ue.db;
+  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting MME software..." && echo) >> ${:mme-log};
+  tail -c 1M ${:mme-log} > ${:mme-log}.tmp;
+  mv ${:mme-log}.tmp ${:mme-log};
+  {{ mme }}/ltemme ${directory:etc}/mme.cfg >> ${:mme-log} 2>> ${:mme-log};
+{% endif %}
+
+### MME
+[mme-service]
+recipe = slapos.cookbook:wrapper
+# When the machine shutdowns abruptly, lte_ue is not cleaned up which causes
+# amarisoft ltemme to fail. TODO: find a cleaner way to handle this
+init = ${ltelogs:output} ${directory:log}/mme.log
+command-line = ${mme-sh-wrapper:output}
+wrapper-path = ${directory:service}/mme
+mode = 0775
+pidfile = ${directory:run}/mme.pid
+hash-files =
+  ${mme-config:output}
+  {{ ue_db_path }}
+  ${mme-sh-wrapper:output}
+environment =
+  LD_LIBRARY_PATH={{ openssl_location }}/lib:{{ nghttp2_location }}/lib
+  AMARISOFT_PATH=/opt/amarisoft/.amarisoft
+
+### EMPTY mme-ifup script
+[mme-ifup-empty]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:bin}/mme-ifup-empty
+command-line = echo Using interface
+mode = 775
+
+{% if slapparameter_dict.get("iperf3", None) %}
+### iperf3
+[iperf-service]
+recipe = slapos.cookbook:wrapper
+port = 5001
+ip = ${slap-configuration:tun-ipv4-addr}
+command-line = {{ iperf3_location }}/bin/iperf3 --server --interval 1 --port ${:port} --bind ${:ip}
+wrapper-path = ${directory:service}/iperf3
+mode = 0775
+pidfile = ${directory:run}/iperf3.pid
+
+[port-listening-promise]
+<= monitor-promise-base
+promise = check_socket_listening
+name = iperf3-port-listening.py
+config-host = ${iperf-service:ip}
+config-port = ${iperf-service:port}
+{% endif %}
+
+[config-base]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+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_v4 {{ lan_ipv4 }}
+  import  netaddr netaddr
+  key ifup_empty mme-ifup-empty:wrapper-path
+
+[ims-config]
+<= config-base
+url = {{ ims_template }}
+output = ${directory:etc}/ims.cfg
+
+[mme-config]
+<= config-base
+{% if slapparameter_dict.get("mme_config_link", None) %}
+url = ${mme-config-dl:target}
+{% else %}
+url = {{ mme_template }}
+{% endif %}
+output = ${directory:etc}/mme.cfg
+
+[monitor-instance-parameter]
+{% if slapparameter_dict.get("name", None) %}
+monitor-title = {{ slapparameter_dict['name'] | string }}
+{% endif %}
+{% if slapparameter_dict.get("monitor-password", None) %}
+password = {{ slapparameter_dict['monitor-password'] | string }}
+{% endif %}
+
 [publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
 <= monitor-publish
-epc-ipv6 =  ${lte-mme-request:connection-epc-ipv6}
-epc-ipv4 =  {{ epc_ipv4 }}
+recipe = slapos.cookbook:publish.serialised
+core-network-ipv6 = ${slap-configuration:ipv6-random}
+core-network-ipv4 = {{ lan_ipv4 }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
+
+[macro.promise]
+<= monitor-promise-base
+name = ${:_buildout_section_name_}
+
+[check-interface-up.py]
+<= macro.promise
+promise = check_interface_up
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+{% if not slapparameter_dict.get("testing", False) %}
+config-ifname = ${slap-configuration:tun-name}
+{% else %}
+config-ifname =
+{% endif %}

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

@@ -3,26 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-{%- if epc %}
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-{%- endif %}
     "rrh": {
       "title": "RRH",
       "description": "RRH",

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

@@ -2,8 +2,8 @@
 parts =
   directory
   ltelogs
-  lte-enb-config
-  lte-enb-service
+  enb-config
+  enb-service
   amarisoft-stats-service
   amarisoft-rf-info-service
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
@@ -102,7 +102,7 @@ version = {{ slapparameter_dict.get("enb_config_version") }}
 offline = false
 {% endif %}
 
-[lte-enb-sh-wrapper]
+[enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 enb-log = ${directory:log}/enb-output.log
@@ -118,17 +118,17 @@ inline =
   {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${:enb-log} 2>> ${:enb-log};
 {% endif %}
 
-[lte-enb-service]
+[enb-service]
 recipe = slapos.cookbook:wrapper
 init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
-command-line = ${lte-enb-sh-wrapper:output}
-wrapper-path = ${directory:service}/lte-enb
+command-line = ${enb-sh-wrapper:output}
+wrapper-path = ${directory:service}/enb
 mode = 0775
 reserve-cpu = True
 pidfile = ${directory:run}/enb.pid
 hash-files =
-  ${lte-enb-config:output}
-  ${lte-enb-sh-wrapper:output}
+  ${enb-config:output}
+  ${enb-sh-wrapper:output}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
@@ -234,11 +234,11 @@ context =
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
   key gtp_addr_v6 slap-configuration:ipv6-random
-  raw gtp_addr_v4 {{ epc_ipv4 }}
+  raw gtp_addr_v4 {{ lan_ipv4 }}
   raw sib23 {{ sib23 }}
   import  netaddr netaddr
 
-[lte-enb-config]
+[enb-config]
 <= config-base
 {% if slapparameter_dict.get("enb_config_link", None) %}
 url = ${enb-config-dl:target}
@@ -250,6 +250,8 @@ output = ${directory:etc}/enb.cfg
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
+enb-ipv6 = ${slap-configuration:ipv6-random}
+enb-ipv4 = {{ lan_ipv4 }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 
 [monitor-instance-parameter]

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

-{% set part_list = [] -%}
-{%- for i, slave in enumerate(slave_instance_list) %}
-{%-   set slave_parameters = json_module.loads(slave['_']) %}
-{%    set slave_reference = slave.get('slave_reference', '') %}
-{%    set publish_section_title = 'publish-%s' % slave_reference %}
-{%    do part_list.append(publish_section_title) %}
-[{{ publish_section_title }}]
-recipe = slapos.cookbook:publish.serialised
--slave-reference = {{ slave_reference }}
-info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been attached to service ${slap-configuration:instance-title}.
-{%- endfor %}
-
-[buildout]
-parts =
-  directory
-  lte-mme-request
-  check-cpu-temperature.py
-  publish-connection-information
-{% for part in part_list -%}
-{{ '  %s' % part }}
-{% endfor %}
-
-extends = {{ monitor_template }}
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
-[monitor-httpd-conf-parameter]
-httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
-port = ${monitor-instance-parameter:monitor-httpd-port}
-url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
-
-[monitor-instance-parameter]
-monitor-httpd-port = ${monitor-address:port}
-
-[monitor-address]
-recipe = slapos.cookbook:free_port
-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'] }}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-software = {{ buildout_directory }}
-home = ${buildout:directory}
-etc = ${:home}/etc
-var = ${:home}/var
-etc = ${:home}/etc
-bin = ${:home}/bin
-run = ${:var}/run
-script = ${:etc}/run
-service = ${:etc}/service
-promise = ${:etc}/promise
-log = ${:var}/log
-
-[request-common-base]
-recipe = slapos.cookbook:requestoptional.serialised
-software-url = {{ slap_connection['software-release-url'] }}
-server-url = {{ slap_connection['server-url'] }}
-computer-id = {{ slap_connection['computer-id'] }}
-partition-id = {{ slap_connection['partition-id'] }}
-key-file = {{ slap_connection['key-file'] }}
-cert-file = {{ slap_connection['cert-file'] }}
-
-sla-computer_guid = {{ slap_connection['computer-id'] }}
-
-config-monitor-password = ${monitor-htpasswd:passwd}
-return = monitor-base-url epc-ipv6
-
-[lte-mme-request]
-<= request-common-base
-name = MME
-software-type = mme
-config-name = mme
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor %}
-config-slave-list = {{ dumps(slave_instance_list) }}
-
-[monitor-base-url-dict]
-lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
-
-[macro.promise]
-<= monitor-promise-base
-name = ${:_buildout_section_name_}
-
-[check-cpu-temperature.py]
-<= macro.promise
-promise = check_cpu_temperature
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
-config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
-config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
-config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
-config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
-
-[publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
-<= monitor-publish
-epc-ipv6 =  ${lte-mme-request:connection-epc-ipv6}
-epc-ipv4 =  {{ epc_ipv4 }}
-monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html

software/ors-amarisoft/instance-gnb-epc-slave-input-schema.json

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "SIM Card Parameters",
-  "required": [
-    "sim_algo",
-    "imsi",
-    "opc",
-    "amf",
-    "sqn",
-    "k",
-    "impu",
-    "impi"
-  ],
-  "properties": {
-    "sim_algo": {
-      "title": "Sim Algorithm",
-      "description": "xor, milenage or tuak. Set the USIM authentication algorithm.",
-      "type": "string",
-      "default": "milenage"
-    },
-    "imsi": {
-      "title": "IMSI",
-      "description": "IMSI",
-      "type": "string",
-      "default": ""
-    },
-    "opc": {
-      "title": "OPC",
-      "description": "Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, opc must be set.",
-      "type": "string",
-      "default": ""
-    },
-    "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). 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"
-    },
-    "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": ""
-    },
-    "impu": {
-      "title": "IMPU",
-      "description": "sip URI or a telephone number. Note that sip URI must not include hostname. If IMPU does not start by a scheme, it is assumed to be a sip URI.",
-      "type": "string",
-      "default": ""
-    },
-    "impi": {
-      "title": "IMPI",
-      "description": "Defines user IMPI. Must be fully filled with hostname if necessary.",
-      "type": "string",
-      "default": ""
-    }
-  }
-}

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

-{% set part_list = [] -%}
-{%- for i, slave in enumerate(slave_instance_list) %}
-{%-   set slave_parameters = json_module.loads(slave['_']) %}
-{%    set slave_reference = slave.get('slave_reference', '') %}
-{%    set publish_section_title = 'publish-%s' % slave_reference %}
-{%    do part_list.append(publish_section_title) %}
-[{{ publish_section_title }}]
-recipe = slapos.cookbook:publish.serialised
--slave-reference = {{ slave_reference }}
-info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been attached to service ${slap-configuration:instance-title}.
-{%- endfor %}
-
-[buildout]
-parts =
-  directory
-  lte-gnb-request
-  lte-mme-request
-  check-cpu-temperature.py
-  publish-connection-information
-{% for part in part_list -%}
-{{ '  %s' % part }}
-{% endfor %}
-
-extends = {{ monitor_template }}
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
-[monitor-httpd-conf-parameter]
-httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
-port = ${monitor-instance-parameter:monitor-httpd-port}
-url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
-
-[monitor-instance-parameter]
-monitor-httpd-port = ${monitor-address:port}
-
-[monitor-address]
-recipe = slapos.cookbook:free_port
-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'] }}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-software = {{ buildout_directory }}
-home = ${buildout:directory}
-etc = ${:home}/etc
-var = ${:home}/var
-etc = ${:home}/etc
-bin = ${:home}/bin
-run = ${:var}/run
-script = ${:etc}/run
-service = ${:etc}/service
-promise = ${:etc}/promise
-log = ${:var}/log
-
-[request-common-base]
-recipe = slapos.cookbook:requestoptional.serialised
-software-url = {{ slap_connection['software-release-url'] }}
-server-url = {{ slap_connection['server-url'] }}
-computer-id = {{ slap_connection['computer-id'] }}
-partition-id = {{ slap_connection['partition-id'] }}
-key-file = {{ slap_connection['key-file'] }}
-cert-file = {{ slap_connection['cert-file'] }}
-
-sla-computer_guid = {{ slap_connection['computer-id'] }}
-
-config-monitor-password = ${monitor-htpasswd:passwd}
-config-sub-instance = true
-
-[lte-mme-request]
-<= request-common-base
-name = MME
-software-type = mme
-config-name = mme
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor %}
-config-slave-list = {{ dumps(slave_instance_list) }}
-return = monitor-base-url epc-ipv6
-
-[lte-gnb-request]
-<= request-common-base
-name = gNB
-software-type = gnb
-config-name = gnb
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor %}
-return = monitor-base-url
-
-[monitor-base-url-dict]
-lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
-lte-gnb-request =  ${lte-gnb-request:connection-monitor-base-url}
-
-[macro.promise]
-<= monitor-promise-base
-name = ${:_buildout_section_name_}
-
-[check-cpu-temperature.py]
-<= macro.promise
-promise = check_cpu_temperature
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
-config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
-config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
-config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
-config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
-
-[publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
-<= monitor-publish
-epc-ipv6 =  ${lte-mme-request:connection-epc-ipv6}
-epc-ipv4 =  {{ epc_ipv4 }}
-monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html

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

@@ -3,26 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-{%- if epc %}
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-{%- endif %}
     "rrh": {
       "title": "RRH",
       "description": "RRH",

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

@@ -2,8 +2,8 @@
 parts =
   directory
   ltelogs
-  lte-gnb-config
-  lte-enb-service
+  gnb-config
+  enb-service
   amarisoft-stats-service
   amarisoft-rf-info-service
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
@@ -101,7 +101,7 @@ version = {{ slapparameter_dict.get("gnb_config_version") }}
 offline = false
 {% endif %}
 
-[lte-enb-sh-wrapper]
+[enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 gnb-log = ${directory:log}/gnb-output.log
@@ -119,17 +119,17 @@ inline =
 {% endif %}
 
 ### eNodeB (enb)
-[lte-enb-service]
+[enb-service]
 recipe = slapos.cookbook:wrapper
 init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
-command-line = ${lte-enb-sh-wrapper:output}
-wrapper-path = ${directory:service}/lte-enb
+command-line = ${enb-sh-wrapper:output}
+wrapper-path = ${directory:service}/enb
 mode = 0775
 reserve-cpu = True
 pidfile = ${directory:run}/enb.pid
 hash-files =
-  ${lte-gnb-config:output}
-  ${lte-enb-sh-wrapper:output}
+  ${gnb-config:output}
+  ${enb-sh-wrapper:output}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
@@ -188,10 +188,10 @@ context =
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
   key gtp_addr_v6 slap-configuration:ipv6-random
-  raw gtp_addr_v4 {{ epc_ipv4 }}
+  raw gtp_addr_v4 {{ lan_ipv4 }}
   import  netaddr netaddr
 
-[lte-gnb-config]
+[gnb-config]
 <= config-base
 {% if slapparameter_dict.get("gnb_config_link", None) %}
 url = ${gnb-config-dl:target}
@@ -203,6 +203,8 @@ output = ${directory:etc}/gnb.cfg
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
+gnb-ipv6 = ${slap-configuration:ipv6-random}
+gnb-ipv4 = {{ lan_ipv4 }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 
 [monitor-instance-parameter]

software/ors-amarisoft/instance-epc-input-schema.json → software/ors-amarisoft/instance-mme-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "EPC Input Parameters",
+  "title": "Core Network Input Parameters",
   "type": "object",
   "properties": {
     "epc_plmn": {

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

+{% set part_list = [] -%}
+{%- for i, slave in enumerate(slave_instance_list) %}
+{%-   set slave_parameters = json_module.loads(slave['_']) %}
+{%    set slave_reference = slave.get('slave_reference', '') %}
+{%    set publish_section_title = 'publish-%s' % slave_reference %}
+{%    do part_list.append(publish_section_title) %}
+[{{ publish_section_title }}]
+recipe = slapos.cookbook:publish.serialised
+-slave-reference = {{ slave_reference }}
+info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been attached to service ${slap-configuration:instance-title}.
+{%- endfor %}
+
 [buildout]
 parts =
   directory
   ltelogs
-  lte-mme-config
-  lte-mme-service
+  mme-config
+  mme-service
   monitor-base
-  publish-connection-information
+  check-cpu-temperature.py
   check-interface-up.py
+  publish-connection-information
 {% if slapparameter_dict.get("iperf3", None) %}
   iperf-service
   port-listening-promise
 {% endif %}
+{% for part in part_list -%}
+{{ '  %s' % part }}
+{% endfor %}
 
 extends = {{ monitor_template }}
 
@@ -18,20 +34,6 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
-[monitor-httpd-conf-parameter]
-httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
-port = ${monitor-instance-parameter:monitor-httpd-port}
-url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
-
-[monitor-instance-parameter]
-monitor-httpd-port = ${monitor-address:port}
-
-[monitor-address]
-recipe = slapos.cookbook:free_port
-minimum = 8035
-maximum = 8055
-ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
-
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = {{ slap_connection['computer-id'] }}
@@ -39,7 +41,6 @@ partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
 key = {{ slap_connection['key-file'] }}
 cert = {{ slap_connection['cert-file'] }}
-
 configuration.network_name = RAPIDSPACE
 configuration.domain = rapid.space
 configuration.log_size = 50M
@@ -50,16 +51,28 @@ configuration.mme_addr = 127.0.1.100
 configuration.ims_addr = 127.0.0.1
 configuration.ims_bind = 127.0.0.2
 configuration.enb_addr = 127.0.1.1
-
 ue_db_path = {{ ue_db_path }}
 
+[monitor-httpd-conf-parameter]
+httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
+port = ${monitor-instance-parameter:monitor-httpd-port}
+url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
+
+[monitor-instance-parameter]
+monitor-httpd-port = ${monitor-address:port}
+
+[monitor-address]
+recipe = slapos.cookbook:free_port
+minimum = 8035
+maximum = 8055
+ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 software = {{ buildout_directory }}
 home = ${buildout:directory}
 etc = ${:home}/etc
 var = ${:home}/var
-etc = ${:home}/etc
 bin = ${:home}/bin
 tmp = ${:home}/tmp
 run = ${:var}/run
@@ -68,6 +81,16 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
+[check-cpu-temperature.py]
+<= macro.promise
+promise = check_cpu_temperature
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
+config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
+config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
+config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
+config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
+
 [ltelogs]
 recipe = slapos.recipe.template:jinja2
 url = {{ ltelogs_template }}
@@ -97,7 +120,7 @@ hash-files =
   {{ ue_db_path }}
 environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
-[lte-mme-sh-wrapper]
+[mme-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 mme-log = ${directory:log}/mme-output.log
@@ -112,25 +135,25 @@ inline =
 {% endif %}
 
 ### MME
-[lte-mme-service]
+[mme-service]
 recipe = slapos.cookbook:wrapper
 # When the machine shutdowns abruptly, lte_ue is not cleaned up which causes
 # amarisoft ltemme to fail. TODO: find a cleaner way to handle this
 init = ${ltelogs:output} ${directory:log}/mme.log
-command-line = ${lte-mme-sh-wrapper:output}
-wrapper-path = ${directory:service}/lte-mme
+command-line = ${mme-sh-wrapper:output}
+wrapper-path = ${directory:service}/mme
 mode = 0775
 pidfile = ${directory:run}/mme.pid
 hash-files =
-  ${lte-mme-config:output}
+  ${mme-config:output}
   {{ ue_db_path }}
-  ${lte-mme-sh-wrapper:output}
+  ${mme-sh-wrapper:output}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib:{{ nghttp2_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
 ### EMPTY mme-ifup script
-[lte-mme-ifup-empty]
+[mme-ifup-empty]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/mme-ifup-empty
 command-line = echo Using interface
@@ -163,16 +186,16 @@ context =
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
   key gtp_addr_v6 slap-configuration:ipv6-random
-  raw gtp_addr_v4 {{ epc_ipv4 }}
+  raw gtp_addr_v4 {{ lan_ipv4 }}
   import  netaddr netaddr
-  key ifup_empty lte-mme-ifup-empty:wrapper-path
+  key ifup_empty mme-ifup-empty:wrapper-path
 
 [lte-ims-config]
 <= config-base
 url = {{ ims_template }}
 output = ${directory:etc}/ims.cfg
 
-[lte-mme-config]
+[mme-config]
 <= config-base
 {% if slapparameter_dict.get("mme_config_link", None) %}
 url = ${mme-config-dl:target}
@@ -193,7 +216,7 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
 epc-ipv6 = ${slap-configuration:ipv6-random}
-epc-ipv4 = {{ epc_ipv4 }}
+epc-ipv4 = {{ lan_ipv4 }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 
 [macro.promise]

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

+{% set obsolete_message = "This software type doesn't exist anymore. Please see documentation at XXXX" -%}
+
+{% set part_list = [] -%}
+{%- for i, slave in enumerate(slave_instance_list) %}
+{%    set slave_reference = slave.get('slave_reference', '') %}
+{%    set publish_section_title = 'publish-%s' % slave_reference %}
+{%    do part_list.append(publish_section_title) %}
+[{{ publish_section_title }}]
+recipe = slapos.cookbook:publish.serialised
+-slave-reference = {{ slave_reference }}
+info = {{ obsolete_message }}
+{%- endfor %}
+
+[buildout]
+parts =
+  publish-connection-information
+{% for part in part_list -%}
+{{ '  %s' % part }}
+{% endfor %}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish.serialised
+message = {{ obsolete_message }}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "Lopcomm ORAN"
-      ]
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "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": 38350
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_max_spot_temp": {
-      "title": "Maximum CPU spot temperature",
-      "description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 90
-    },
-    "promise_cpu_max_avg_temp": {
-      "title": "Maximum average CPU temperature",
-      "description": "If average temperature over specified period reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temp_period": {
-      "title": "Period of Average CPU temperature checks",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    },
-    "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"
-      ]
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "M2RU Sunwave"
-      ]
-    },
-    "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": 378000
-    },
-    "nr_band": {
-      "title": "NR band",
-      "description": "NR band number",
-      "type": "number",
-      "default": 39
-    },
-    "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": {}
-    },
-    "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
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 1
-    },
-    "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": 1000
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_temperature_threshold": {
-      "title": "CPU temperature promise threshold",
-      "description": "Temperature threshold above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold": {
-      "title": "Average CPU temperature promise threshold",
-      "description": "If average temperature over specified duration reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold_duration": {
-      "title": "Average CPU temperature promise threshold duration",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "Lopcomm ORAN"
-      ]
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "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": 38050
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_max_spot_temp": {
-      "title": "Maximum CPU spot temperature",
-      "description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 90
-    },
-    "promise_cpu_max_avg_temp": {
-      "title": "Maximum average CPU temperature",
-      "description": "If average temperature over specified period reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temp_period": {
-      "title": "Period of Average CPU temperature checks",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    },
-    "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"
-      ]
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "M2RU Sunwave"
-      ]
-    },
-    "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": 520000
-    },
-    "nr_band": {
-      "title": "NR band",
-      "description": "NR band number",
-      "type": "number",
-      "default": 38
-    },
-    "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": {}
-    },
-    "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
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 1
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_temperature_threshold": {
-      "title": "CPU temperature promise threshold",
-      "description": "Temperature threshold above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold": {
-      "title": "Average CPU temperature promise threshold",
-      "description": "If average temperature over specified duration reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold_duration": {
-      "title": "Average CPU temperature promise threshold duration",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "Lopcomm ORAN"
-      ]
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "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": 42590
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_max_spot_temp": {
-      "title": "Maximum CPU spot temperature",
-      "description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 90
-    },
-    "promise_cpu_max_avg_temp": {
-      "title": "Maximum average CPU temperature",
-      "description": "If average temperature over specified period reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temp_period": {
-      "title": "Period of Average CPU temperature checks",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    },
-    "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"
-      ]
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "M2RU Sunwave"
-      ]
-    },
-    "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": 632628
-    },
-    "nr_band": {
-      "title": "NR band",
-      "description": "NR band number",
-      "type": "number",
-      "default": 78
-    },
-    "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": {}
-    },
-    "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
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 1
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_temperature_threshold": {
-      "title": "CPU temperature promise threshold",
-      "description": "Temperature threshold above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold": {
-      "title": "Average CPU temperature promise threshold",
-      "description": "If average temperature over specified duration reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold_duration": {
-      "title": "Average CPU temperature promise threshold duration",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "Lopcomm ORAN"
-      ]
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "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": 44590
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_max_spot_temp": {
-      "title": "Maximum CPU spot temperature",
-      "description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 90
-    },
-    "promise_cpu_max_avg_temp": {
-      "title": "Maximum average CPU temperature",
-      "description": "If average temperature over specified period reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temp_period": {
-      "title": "Period of Average CPU temperature checks",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    },
-    "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"
-      ]
-    }
-  }
-}

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

-{
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": "Input Parameters",
-  "properties": {
-    "epc_plmn": {
-      "default": "00101",
-      "title": "Core Network PLMN",
-      "description": "Core Network Public Land Mobile Network",
-      "type": "string"
-    },
-    "external_enb_gnb": {
-      "default": false,
-      "title": "External eNB / gNB",
-      "description": "Set to true if external eNB / gNB will need to connect to this core network.",
-      "type": "boolean"
-    },
-    "iperf3": {
-      "default": false,
-      "title": "iperf3 UDP server",
-      "description": "Activate iperf3 UDP server",
-      "type": "boolean"
-    },
-    "rrh": {
-      "title": "RRH",
-      "description": "RRH",
-      "type": "string",
-      "default": "SDR",
-      "enum": [
-        "SDR",
-        "M2RU Sunwave"
-      ]
-    },
-    "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": 646666
-    },
-    "nr_band": {
-      "title": "NR band",
-      "description": "NR band number",
-      "type": "number",
-      "default": 78
-    },
-    "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": {}
-    },
-    "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
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 1
-    },
-    "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
-    },
-    "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
-    },
-    "promise_cpu_temperature_threshold": {
-      "title": "CPU temperature promise threshold",
-      "description": "Temperature threshold above which CPU temperature promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold": {
-      "title": "Average CPU temperature promise threshold",
-      "description": "If average temperature over specified duration reaches this threshold, promise will fail",
-      "type": "number",
-      "default": 80
-    },
-    "promise_cpu_avg_temperature_threshold_duration": {
-      "title": "Average CPU temperature promise threshold duration",
-      "description": "Duration during which average temperature should not exceed specified threshold",
-      "type": "number",
-      "default": 600
-    },
-    "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
-    }
-  }
-}

software/ors-amarisoft/instance.cfg

@@ -25,7 +25,7 @@ context =
     raw buildout_directory ${buildout:directory}
     section slap_connection slap-connection
     key slapparameter_dict slap-configuration:configuration
-    key epc_ipv4 ethernet-ip:ipv4
+    key lan_ipv4 lan-ip:ipv4
     $${:extra-context}
 
 [amarisoft]
@@ -45,7 +45,7 @@ init =
   options['ims'] = path + "/ims"
   options['ue'] = path + "/ue"
 
-[ethernet-ip]
+[lan-ip]
 recipe = slapos.recipe.build
 init =
   import netifaces
@@ -60,47 +60,30 @@ init =
 
 [switch-softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
-enb-epc = dynamic-template-lte-enb-epc:output
-gnb-epc = dynamic-template-lte-gnb-epc:output
-epc = dynamic-template-lte-epc:output
-enb = dynamic-template-lte-enb:output
-gnb = dynamic-template-lte-gnb:output
-mme = dynamic-template-lte-mme:output
-ue-lte = dynamic-template-lte-ue-lte:output
-ue-nr = dynamic-template-lte-ue-nr:output
-RootSoftwareInstance = $${:enb-epc}
+enb = dynamic-template-enb:output
+gnb = dynamic-template-gnb:output
+core-network = dynamic-template-core-network:output
+ue-lte = dynamic-template-ue-lte:output
+ue-nr = dynamic-template-ue-nr:output
+RootSoftwareInstance = $${:core-network}
+obsolete = dynamic-template-obsolete:output
+enb-epc = $${:obsolete}
+gnb-epc = $${:obsolete}
+epc = $${:obsolete}
+mme = $${:obsolete}
 
-[dynamic-template-lte-enb-epc]
+[dynamic-template-obsolete]
 < = jinja2-template-base
-url = ${template-lte-enb-epc:target}
-filename = instance-lte-enb-epc.cfg
+url = ${template-obsolete:target}
+filename = instance-obsolete.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
-    key slave_instance_list slap-configuration:slave-instance-list
-
-[dynamic-template-lte-gnb-epc]
-< = jinja2-template-base
-url = ${template-lte-gnb-epc:target}
-filename = instance-lte-gnb-epc.cfg
-extensions = jinja2.ext.do
-extra-context =
-    raw monitor_template ${monitor2-template:output}
     key slave_instance_list slap-configuration:slave-instance-list
 
-[dynamic-template-lte-epc]
+[dynamic-template-enb]
 < = jinja2-template-base
-url = ${template-lte-epc:target}
-filename = instance-lte-epc.cfg
-extensions = jinja2.ext.do
-extra-context =
-    raw monitor_template ${monitor2-template:output}
-    key slave_instance_list slap-configuration:slave-instance-list
-
-[dynamic-template-lte-enb]
-< = jinja2-template-base
-url = ${template-lte-enb:target}
-filename = instance-lte-enb.cfg
+url = ${template-enb:target}
+filename = instance-enb.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
@@ -128,10 +111,10 @@ extra-context =
     raw min_frequency ${default-params:min-frequency}
     raw max_frequency ${default-params:max-frequency}
 
-[dynamic-template-lte-gnb]
+[dynamic-template-gnb]
 < = jinja2-template-base
-url = ${template-lte-gnb:target}
-filename = instance-lte-gnb.cfg
+url = ${template-gnb:target}
+filename = instance-gnb.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
@@ -156,10 +139,10 @@ extra-context =
     raw max_frequency ${default-params:max-frequency}
     raw python_path ${python3:location}
 
-[dynamic-template-lte-mme]
+[dynamic-template-core-network]
 < = jinja2-template-base
-url = ${template-lte-mme:target}
-filename = instance-lte-mme.cfg
+url = ${template-core-network:target}
+filename = instance-core-network.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
@@ -171,11 +154,12 @@ extra-context =
     raw nghttp2_location ${nghttp2:location}
     raw iperf3_location ${iperf3:location}
     key ue_db_path ue-db-config:output
+    key slave_instance_list slap-configuration:slave-instance-list
 
-[dynamic-template-lte-ue-lte]
+[dynamic-template-ue-lte]
 < = jinja2-template-base
-url = ${template-lte-ue-lte:target}
-filename = instance-lte-ue-lte.cfg
+url = ${template-ue-lte:target}
+filename = instance-ue-lte.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
@@ -194,10 +178,10 @@ extra-context =
     raw default_lte_imsi ${default-params:default-lte-imsi}
     raw default_lte_k ${default-params:default-lte-k}
 
-[dynamic-template-lte-ue-nr]
+[dynamic-template-ue-nr]
 < = jinja2-template-base
-url = ${template-lte-ue-nr:target}
-filename = instance-lte-ue-nr.cfg
+url = ${template-ue-nr:target}
+filename = instance-ue-nr.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
@@ -225,4 +209,4 @@ extensions = jinja2.ext.do
 output = $${buildout:directory}/$${:filename}
 context =
     import json_module json
-    key slave_instance_list slap-configuration:configuration.slave-list
+    key slave_instance_list slap-configuration:slave-instance-list

software/ors-amarisoft/render-templates

@@ -95,14 +95,12 @@ for i in range (4):
 
 with open('software.cfg.json.jinja2', 'r') as f:
     software_json_template = Template(f.read())
-with open('instance-enb-input-schema.json.jinja2', 'r') as f:
-    instance_enb_json_template = Template(f.read())
-with open('instance-gnb-input-schema.json.jinja2', 'r') as f:
-    instance_gnb_json_template = Template(f.read())
-with open('instance-ue-lte-input-schema.json.jinja2', 'r') as f:
-    instance_ue_lte_json_template = Template(f.read())
-with open('instance-ue-nr-input-schema.json.jinja2', 'r') as f:
-    instance_ue_nr_json_template = Template(f.read())
+
+instance_json_template_map = {}
+for software_type in ['enb', 'gnb', 'ue-lte', 'ue-nr']:
+    with open('instance-{}-input-schema.json.jinja2'.format(software_type), 'r') as f:
+        instance_json_template_map[software_type] = Template(f.read())
+
 with open('software.jinja2.cfg', 'r') as f:
     software_template = Template(f.read())
 with open('test/test.jinja2.py', 'r') as f:
@@ -118,17 +116,9 @@ for rf_mode_context in rf_mode_context_list:
     with open('software-{}.cfg'.format(rf_mode_context['rf_mode']),
               'w+') as f:
         f.write(software_template.render(**rf_mode_context, **global_context) + '\n')
-    for software_type in ['enb', 'enb-epc', 'gnb', 'gnb-epc', 'ue-lte', 'ue-nr']:
+    for software_type in ['enb', 'gnb', 'ue-lte', 'ue-nr']:
         with open('instance-{}-{}-input-schema.json'.format(
                     rf_mode_context['rf_mode'],
                     software_type),
                   'w+') as f:
-            if software_type in ['enb', 'enb-epc']:
-                f.write(instance_enb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type) + '\n')
-            elif software_type in ['gnb', 'gnb-epc']: 
-                f.write(instance_gnb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type) + '\n')
-            elif software_type in ['ue-lte']:
-                f.write(instance_ue_lte_json_template.render(**rf_mode_context, **global_context) + '\n')
-            else: 
-                f.write(instance_ue_nr_json_template.render(**rf_mode_context, **global_context) + '\n')
-  
+            f.write(instance_json_template_map[software_type].render(**rf_mode_context, **global_context) + '\n')

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

@@ -11,64 +11,30 @@
       "response": "instance-tdd1900-enb-schema.json",
       "index": 0
     },
-    "enb-epc": {
-      "title": "eNB and EPC",
-      "software-type": "enb-epc",
-      "description": "eNodeB and EPC Configuration",
-      "request": "instance-tdd1900-enb-epc-input-schema.json",
-      "response": "instance-tdd1900-enb-epc-schema.json",
-      "index": 1
-    },
     "gnb": {
       "title": "gNB",
       "software-type": "gnb",
       "description": "gNodeB Configuration",
       "request": "instance-tdd1900-gnb-input-schema.json",
       "response": "instance-tdd1900-gnb-schema.json",
-      "index": 2
-    },
-    "gnb-epc": {
-      "title": "gNB and EPC",
-      "software-type": "gnb-epc",
-      "description": "gNodeB and EPC Configuration",
-      "request": "instance-tdd1900-gnb-epc-input-schema.json",
-      "response": "instance-tdd1900-gnb-epc-schema.json",
-      "index": 3
-    },
-    "epc": {
-      "title": "EPC",
-      "software-type": "epc",
-      "description": "EPC Configuration",
-      "request": "instance-epc-input-schema.json",
-      "response": "instance-epc-schema.json",
-      "index": 4
-    },
-    "gnb-epc-slave": {
-      "title": "gNB-EPC Sim Card",
-      "description": "gNB-EPC Sim Card Configuration",
-      "software-type": "gnb-epc",
-      "request": "instance-gnb-epc-slave-input-schema.json",
-      "response": "instance-gnb-epc-slave-schema.json",
-      "shared": true,
-      "index": 5
+      "index": 1
     },
-    "enb-epc-slave": {
-      "title": "eNB-EPC Sim Card",
-      "description": "eNB-EPC Sim Card Configuration",
-      "software-type": "enb-epc",
-      "request": "instance-enb-epc-slave-input-schema.json",
-      "response": "instance-enb-epc-slave-schema.json",
-      "shared": true,
-      "index": 6
+    "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
     },
-    "epc-slave": {
-      "title": "EPC Sim Card",
-      "description": "EPC Sim Card Configuration",
-      "software-type": "epc",
-      "request": "instance-epc-slave-input-schema.json",
-      "response": "instance-epc-slave-schema.json",
+    "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": 7
+      "index": 3
     },
     "ue-lte": {
       "title": "UE-LTE",
@@ -76,7 +42,7 @@
       "software-type": "ue-lte",
       "request": "instance-tdd1900-ue-lte-input-schema.json",
       "response": "instance-tdd1900-ue-lte-schema.json",
-      "index": 8
+      "index": 4
     },
     "ue-nr": {
       "title": "UE-NR",
@@ -84,7 +50,7 @@
       "software-type": "ue-nr",
       "request": "instance-tdd1900-ue-nr-input-schema.json",
       "response": "instance-tdd1900-ue-nr-schema.json",
-      "index": 9
+      "index": 5
     }
   }
 }

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

@@ -11,64 +11,30 @@
       "response": "instance-tdd2600-enb-schema.json",
       "index": 0
     },
-    "enb-epc": {
-      "title": "eNB and EPC",
-      "software-type": "enb-epc",
-      "description": "eNodeB and EPC Configuration",
-      "request": "instance-tdd2600-enb-epc-input-schema.json",
-      "response": "instance-tdd2600-enb-epc-schema.json",
-      "index": 1
-    },
     "gnb": {
       "title": "gNB",
       "software-type": "gnb",
       "description": "gNodeB Configuration",
       "request": "instance-tdd2600-gnb-input-schema.json",
       "response": "instance-tdd2600-gnb-schema.json",
-      "index": 2
-    },
-    "gnb-epc": {
-      "title": "gNB and EPC",
-      "software-type": "gnb-epc",
-      "description": "gNodeB and EPC Configuration",
-      "request": "instance-tdd2600-gnb-epc-input-schema.json",
-      "response": "instance-tdd2600-gnb-epc-schema.json",
-      "index": 3
-    },
-    "epc": {
-      "title": "EPC",
-      "software-type": "epc",
-      "description": "EPC Configuration",
-      "request": "instance-epc-input-schema.json",
-      "response": "instance-epc-schema.json",
-      "index": 4
-    },
-    "gnb-epc-slave": {
-      "title": "gNB-EPC Sim Card",
-      "description": "gNB-EPC Sim Card Configuration",
-      "software-type": "gnb-epc",
-      "request": "instance-gnb-epc-slave-input-schema.json",
-      "response": "instance-gnb-epc-slave-schema.json",
-      "shared": true,
-      "index": 5
+      "index": 1
     },
-    "enb-epc-slave": {
-      "title": "eNB-EPC Sim Card",
-      "description": "eNB-EPC Sim Card Configuration",
-      "software-type": "enb-epc",
-      "request": "instance-enb-epc-slave-input-schema.json",
-      "response": "instance-enb-epc-slave-schema.json",
-      "shared": true,
-      "index": 6
+    "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
     },
-    "epc-slave": {
-      "title": "EPC Sim Card",
-      "description": "EPC Sim Card Configuration",
-      "software-type": "epc",
-      "request": "instance-epc-slave-input-schema.json",
-      "response": "instance-epc-slave-schema.json",
+    "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": 7
+      "index": 3
     },
     "ue-lte": {
       "title": "UE-LTE",
@@ -76,7 +42,7 @@
       "software-type": "ue-lte",
       "request": "instance-tdd2600-ue-lte-input-schema.json",
       "response": "instance-tdd2600-ue-lte-schema.json",
-      "index": 8
+      "index": 4
     },
     "ue-nr": {
       "title": "UE-NR",
@@ -84,7 +50,7 @@
       "software-type": "ue-nr",
       "request": "instance-tdd2600-ue-nr-input-schema.json",
       "response": "instance-tdd2600-ue-nr-schema.json",
-      "index": 9
+      "index": 5
     }
   }
 }

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

@@ -11,64 +11,30 @@
       "response": "instance-tdd3500-enb-schema.json",
       "index": 0
     },
-    "enb-epc": {
-      "title": "eNB and EPC",
-      "software-type": "enb-epc",
-      "description": "eNodeB and EPC Configuration",
-      "request": "instance-tdd3500-enb-epc-input-schema.json",
-      "response": "instance-tdd3500-enb-epc-schema.json",
-      "index": 1
-    },
     "gnb": {
       "title": "gNB",
       "software-type": "gnb",
       "description": "gNodeB Configuration",
       "request": "instance-tdd3500-gnb-input-schema.json",
       "response": "instance-tdd3500-gnb-schema.json",
-      "index": 2
-    },
-    "gnb-epc": {
-      "title": "gNB and EPC",
-      "software-type": "gnb-epc",
-      "description": "gNodeB and EPC Configuration",
-      "request": "instance-tdd3500-gnb-epc-input-schema.json",
-      "response": "instance-tdd3500-gnb-epc-schema.json",
-      "index": 3
-    },
-    "epc": {
-      "title": "EPC",
-      "software-type": "epc",
-      "description": "EPC Configuration",
-      "request": "instance-epc-input-schema.json",
-      "response": "instance-epc-schema.json",
-      "index": 4
-    },
-    "gnb-epc-slave": {
-      "title": "gNB-EPC Sim Card",
-      "description": "gNB-EPC Sim Card Configuration",
-      "software-type": "gnb-epc",
-      "request": "instance-gnb-epc-slave-input-schema.json",
-      "response": "instance-gnb-epc-slave-schema.json",
-      "shared": true,
-      "index": 5
+      "index": 1
     },
-    "enb-epc-slave": {
-      "title": "eNB-EPC Sim Card",
-      "description": "eNB-EPC Sim Card Configuration",
-      "software-type": "enb-epc",
-      "request": "instance-enb-epc-slave-input-schema.json",
-      "response": "instance-enb-epc-slave-schema.json",
-      "shared": true,
-      "index": 6
+    "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
     },
-    "epc-slave": {
-      "title": "EPC Sim Card",
-      "description": "EPC Sim Card Configuration",
-      "software-type": "epc",
-      "request": "instance-epc-slave-input-schema.json",
-      "response": "instance-epc-slave-schema.json",
+    "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": 7
+      "index": 3
     },
     "ue-lte": {
       "title": "UE-LTE",
@@ -76,7 +42,7 @@
       "software-type": "ue-lte",
       "request": "instance-tdd3500-ue-lte-input-schema.json",
       "response": "instance-tdd3500-ue-lte-schema.json",
-      "index": 8
+      "index": 4
     },
     "ue-nr": {
       "title": "UE-NR",
@@ -84,7 +50,7 @@
       "software-type": "ue-nr",
       "request": "instance-tdd3500-ue-nr-input-schema.json",
       "response": "instance-tdd3500-ue-nr-schema.json",
-      "index": 9
+      "index": 5
     }
   }
 }

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

@@ -11,64 +11,30 @@
       "response": "instance-tdd3700-enb-schema.json",
       "index": 0
     },
-    "enb-epc": {
-      "title": "eNB and EPC",
-      "software-type": "enb-epc",
-      "description": "eNodeB and EPC Configuration",
-      "request": "instance-tdd3700-enb-epc-input-schema.json",
-      "response": "instance-tdd3700-enb-epc-schema.json",
-      "index": 1
-    },
     "gnb": {
       "title": "gNB",
       "software-type": "gnb",
       "description": "gNodeB Configuration",
       "request": "instance-tdd3700-gnb-input-schema.json",
       "response": "instance-tdd3700-gnb-schema.json",
-      "index": 2
-    },
-    "gnb-epc": {
-      "title": "gNB and EPC",
-      "software-type": "gnb-epc",
-      "description": "gNodeB and EPC Configuration",
-      "request": "instance-tdd3700-gnb-epc-input-schema.json",
-      "response": "instance-tdd3700-gnb-epc-schema.json",
-      "index": 3
-    },
-    "epc": {
-      "title": "EPC",
-      "software-type": "epc",
-      "description": "EPC Configuration",
-      "request": "instance-epc-input-schema.json",
-      "response": "instance-epc-schema.json",
-      "index": 4
-    },
-    "gnb-epc-slave": {
-      "title": "gNB-EPC Sim Card",
-      "description": "gNB-EPC Sim Card Configuration",
-      "software-type": "gnb-epc",
-      "request": "instance-gnb-epc-slave-input-schema.json",
-      "response": "instance-gnb-epc-slave-schema.json",
-      "shared": true,
-      "index": 5
+      "index": 1
     },
-    "enb-epc-slave": {
-      "title": "eNB-EPC Sim Card",
-      "description": "eNB-EPC Sim Card Configuration",
-      "software-type": "enb-epc",
-      "request": "instance-enb-epc-slave-input-schema.json",
-      "response": "instance-enb-epc-slave-schema.json",
-      "shared": true,
-      "index": 6
+    "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
     },
-    "epc-slave": {
-      "title": "EPC Sim Card",
-      "description": "EPC Sim Card Configuration",
-      "software-type": "epc",
-      "request": "instance-epc-slave-input-schema.json",
-      "response": "instance-epc-slave-schema.json",
+    "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": 7
+      "index": 3
     },
     "ue-lte": {
       "title": "UE-LTE",
@@ -76,7 +42,7 @@
       "software-type": "ue-lte",
       "request": "instance-tdd3700-ue-lte-input-schema.json",
       "response": "instance-tdd3700-ue-lte-schema.json",
-      "index": 8
+      "index": 4
     },
     "ue-nr": {
       "title": "UE-NR",
@@ -84,7 +50,7 @@
       "software-type": "ue-nr",
       "request": "instance-tdd3700-ue-nr-input-schema.json",
       "response": "instance-tdd3700-ue-nr-schema.json",
-      "index": 9
+      "index": 5
     }
   }
 }

software/ors-amarisoft/software.cfg

@@ -60,28 +60,22 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 [lopcomm-rrh-config.jinja2.py]
 <= download-base
 
-[template-lte-enb-epc]
+[template-enb]
 <= download-base
 
-[template-lte-gnb-epc]
+[template-gnb]
 <= download-base
 
-[template-lte-epc]
+[template-core-network]
 <= download-base
 
-[template-lte-enb]
+[template-ue-lte]
 <= download-base
 
-[template-lte-gnb]
+[template-ue-nr]
 <= download-base
 
-[template-lte-mme]
-<= download-base
-
-[template-lte-ue-lte]
-<= download-base
-
-[template-lte-ue-nr]
+[template-obsolete]
 <= download-base
 
 [copy-to-instance]

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

@@ -11,64 +11,30 @@
       "response": "instance-{{ rf_mode }}-enb-schema.json",
       "index": 0
     },
-    "enb-epc": {
-      "title": "eNB and EPC",
-      "software-type": "enb-epc",
-      "description": "eNodeB and EPC Configuration",
-      "request": "instance-{{ rf_mode }}-enb-epc-input-schema.json",
-      "response": "instance-{{ rf_mode }}-enb-epc-schema.json",
-      "index": 1
-    },
     "gnb": {
       "title": "gNB",
       "software-type": "gnb",
       "description": "gNodeB Configuration",
       "request": "instance-{{ rf_mode }}-gnb-input-schema.json",
       "response": "instance-{{ rf_mode }}-gnb-schema.json",
-      "index": 2
-    },
-    "gnb-epc": {
-      "title": "gNB and EPC",
-      "software-type": "gnb-epc",
-      "description": "gNodeB and EPC Configuration",
-      "request": "instance-{{ rf_mode }}-gnb-epc-input-schema.json",
-      "response": "instance-{{ rf_mode }}-gnb-epc-schema.json",
-      "index": 3
-    },
-    "epc": {
-      "title": "EPC",
-      "software-type": "epc",
-      "description": "EPC Configuration",
-      "request": "instance-epc-input-schema.json",
-      "response": "instance-epc-schema.json",
-      "index": 4
-    },
-    "gnb-epc-slave": {
-      "title": "gNB-EPC Sim Card",
-      "description": "gNB-EPC Sim Card Configuration",
-      "software-type": "gnb-epc",
-      "request": "instance-gnb-epc-slave-input-schema.json",
-      "response": "instance-gnb-epc-slave-schema.json",
-      "shared": true,
-      "index": 5
+      "index": 1
     },
-    "enb-epc-slave": {
-      "title": "eNB-EPC Sim Card",
-      "description": "eNB-EPC Sim Card Configuration",
-      "software-type": "enb-epc",
-      "request": "instance-enb-epc-slave-input-schema.json",
-      "response": "instance-enb-epc-slave-schema.json",
-      "shared": true,
-      "index": 6
+    "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
     },
-    "epc-slave": {
-      "title": "EPC Sim Card",
-      "description": "EPC Sim Card Configuration",
-      "software-type": "epc",
-      "request": "instance-epc-slave-input-schema.json",
-      "response": "instance-epc-slave-schema.json",
+    "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": 7
+      "index": 3
     },
     "ue-lte": {
       "title": "UE-LTE",
@@ -76,7 +42,7 @@
       "software-type": "ue-lte",
       "request": "instance-{{ rf_mode }}-ue-lte-input-schema.json",
       "response": "instance-{{ rf_mode }}-ue-lte-schema.json",
-      "index": 8
+      "index": 4
     },
     "ue-nr": {
       "title": "UE-NR",
@@ -84,7 +50,7 @@
       "software-type": "ue-nr",
       "request": "instance-{{ rf_mode }}-ue-nr-input-schema.json",
       "response": "instance-{{ rf_mode }}-ue-nr-schema.json",
-      "index": 9
+      "index": 5
     }
   }
 }

software/ors-amarisoft/test/test.jinja2.py

@@ -57,7 +57,7 @@ param_dict = {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
         '2001:db8::1': {'mme_addr': '2001:db8::1'},
     },
-    'epc_plmn': '00102',
+    'core_network_plmn': '00102',
     'dl_nr_arfcn': 325320,
     'nr_band': 99,
     'nr_bandwidth': 50,
@@ -166,7 +166,7 @@ def test_mme_conf(self):
 
     with open(conf_file, 'r') as f:
         conf = yaml.load(f)
-    self.assertEqual(conf['plmn'], param_dict['epc_plmn'])
+    self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
 
@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -232,68 +231,26 @@ class TestGNBParameters2(ORSTestCase):
     def test_gnb_conf(self):
         test_gnb_conf2(self)
 
-class TestEPCParameters(ORSTestCase):
+class TestCoreNetworkParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps(param_dict)}
     @classmethod
     def getInstanceSoftwareType(cls):
-        return "epc"
+        return "core-network"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
-class TestENBEPCParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(enb_param_dict)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "enb-epc"
-    def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_enb_conf(self)
-    def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_mme_conf(self)
-
-class TestGNBEPCParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(gnb_param_dict1)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "gnb-epc"
-    def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_gnb_conf1(self)
-    def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_mme_conf(self)
-
-def requestSlaveInstance(cls, software_type):
+def requestSlaveInstance(cls):
     software_url = cls.getSoftwareURL()
     return cls.slap.request(
         software_release=software_url,
-        partition_reference="SIM-CARD-EPC",
+        partition_reference="SIM-CARD",
         partition_parameter_kw={'_': json.dumps(param_dict)},
         shared=True,
-        software_type=software_type,
+        software_type='core-network',
     )
 
-class TestEPCMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "epc"
-
-    def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
-      test_monitor_gadget_url(self)
-
 class TestENBMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -304,33 +261,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
-      test_monitor_gadget_url(self)
-
-class TestENBEPCMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(enb_param_dict)}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "enb-epc"
-
-    def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
-      test_monitor_gadget_url(self)
-
-class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(gnb_param_dict1)}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "gnb-epc"
-
-    def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,20 +273,18 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
-class TestMMEMonitorGadgetUrl(ORSTestCase):
+class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps({'testing': True, 'slave-list': []})}
 
     @classmethod
     def getInstanceSoftwareType(cls):
-        return "mme"
+        return "core-network"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +297,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,50 +309,9 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
-class TestEPCSimCard(ORSTestCase):
-    @classmethod
-    def requestDefaultInstance(cls, state='started'):
-        default_instance = super(
-            ORSTestCase, cls).requestDefaultInstance(state=state)
-        cls.requestSlaveInstance()
-        return default_instance
-    @classmethod
-    def requestSlaveInstance(cls):
-        return requestSlaveInstance(cls, 'epc')
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "epc"
-    def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_sim_card(self)
-
-class TestENBEPCSimCard(ORSTestCase):
-    @classmethod
-    def requestDefaultInstance(cls, state='started'):
-        default_instance = super(
-            ORSTestCase, cls).requestDefaultInstance(state=state)
-        cls.requestSlaveInstance()
-        return default_instance
-    @classmethod
-    def requestSlaveInstance(cls):
-        return requestSlaveInstance(cls, 'enb-epc')
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "enb-epc"
-    def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_sim_card(self)
-
-class TestGNBEPCSimCard(ORSTestCase):
+class TestSimCard(ORSTestCase):
     @classmethod
     def requestDefaultInstance(cls, state='started'):
         default_instance = super(
@@ -434,15 +320,14 @@ class TestGNBEPCSimCard(ORSTestCase):
         return default_instance
     @classmethod
     def requestSlaveInstance(cls):
-        return requestSlaveInstance(cls, 'gnb-epc')
+        return requestSlaveInstance(cls)
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps({'testing': True})}
     @classmethod
     def getInstanceSoftwareType(cls):
-        return "gnb-epc"
+        return "core-network"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):

software/ors-amarisoft/test/testTDD1900.py

@@ -57,7 +57,7 @@ param_dict = {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
         '2001:db8::1': {'mme_addr': '2001:db8::1'},
     },
-    'epc_plmn': '00102',
+    'core_network_plmn': '00102',
     'dl_nr_arfcn': 325320,
     'nr_band': 99,
     'nr_bandwidth': 50,
@@ -166,7 +166,7 @@ def test_mme_conf(self):
 
     with open(conf_file, 'r') as f:
         conf = yaml.load(f)
-    self.assertEqual(conf['plmn'], param_dict['epc_plmn'])
+    self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
 
@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -232,68 +231,26 @@ class TestGNBParameters2(ORSTestCase):
     def test_gnb_conf(self):
         test_gnb_conf2(self)
 
-class TestEPCParameters(ORSTestCase):
+class TestCoreNetworkParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps(param_dict)}
     @classmethod
     def getInstanceSoftwareType(cls):
-        return "epc"
+        return "core-network"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
-class TestENBEPCParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(enb_param_dict)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "enb-epc"
-    def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_enb_conf(self)
-    def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_mme_conf(self)
-
-class TestGNBEPCParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(gnb_param_dict1)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "gnb-epc"
-    def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_gnb_conf1(self)
-    def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_mme_conf(self)
-
-def requestSlaveInstance(cls, software_type):
+def requestSlaveInstance(cls):
     software_url = cls.getSoftwareURL()
     return cls.slap.request(
         software_release=software_url,
-        partition_reference="SIM-CARD-EPC",
+        partition_reference="SIM-CARD",
         partition_parameter_kw={'_': json.dumps(param_dict)},
         shared=True,
-        software_type=software_type,
+        software_type='core-network',
     )
 
-class TestEPCMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "epc"
-
-    def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
-      test_monitor_gadget_url(self)
-
 class TestENBMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -304,33 +261,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
-      test_monitor_gadget_url(self)
-
-class TestENBEPCMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(enb_param_dict)}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "enb-epc"
-
-    def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
-      test_monitor_gadget_url(self)
-
-class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(gnb_param_dict1)}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "gnb-epc"
-
-    def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,20 +273,18 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
-class TestMMEMonitorGadgetUrl(ORSTestCase):
+class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps({'testing': True, 'slave-list': []})}
 
     @classmethod
     def getInstanceSoftwareType(cls):
-        return "mme"
+        return "core-network"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +297,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,50 +309,9 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
-class TestEPCSimCard(ORSTestCase):
-    @classmethod
-    def requestDefaultInstance(cls, state='started'):
-        default_instance = super(
-            ORSTestCase, cls).requestDefaultInstance(state=state)
-        cls.requestSlaveInstance()
-        return default_instance
-    @classmethod
-    def requestSlaveInstance(cls):
-        return requestSlaveInstance(cls, 'epc')
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "epc"
-    def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_sim_card(self)
-
-class TestENBEPCSimCard(ORSTestCase):
-    @classmethod
-    def requestDefaultInstance(cls, state='started'):
-        default_instance = super(
-            ORSTestCase, cls).requestDefaultInstance(state=state)
-        cls.requestSlaveInstance()
-        return default_instance
-    @classmethod
-    def requestSlaveInstance(cls):
-        return requestSlaveInstance(cls, 'enb-epc')
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "enb-epc"
-    def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
-        test_sim_card(self)
-
-class TestGNBEPCSimCard(ORSTestCase):
+class TestSimCard(ORSTestCase):
     @classmethod
     def requestDefaultInstance(cls, state='started'):
         default_instance = super(
@@ -434,15 +320,14 @@ class TestGNBEPCSimCard(ORSTestCase):
         return default_instance
     @classmethod
     def requestSlaveInstance(cls):
-        return requestSlaveInstance(cls, 'gnb-epc')
+        return requestSlaveInstance(cls)
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps({'testing': True})}
     @classmethod
     def getInstanceSoftwareType(cls):
-        return "gnb-epc"
+        return "core-network"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = a8bd56d112344ae56138e3a775fec478
+md5sum = 5f5378550470b551d280dd432878a0ba

software/slapos-testing/instance.cfg

@@ -177,19 +177,20 @@ inline =
       cwd="""$${slapos.recipe.template:location}""",
       summaryf=UnitTest.summary,
   )
-  TestCase(
-      "slapos.toolbox",
-      # ['python', '-m', 'unittest', 'discover', '-v'],
-      # XXX We can not just run unittest discover here, since slapos/lamp
-      # imports MySQLDb and we currently don't have installed
-      # slapos.toolbox[lampconfigure] and on python3 discovery make a
-      # failing test for this import error.
-      # Currently slapos/lamp is not tested, but if it it is still used,
-      # the TODO seem to also install slapos.toolbox[lampconfigure] here.
-      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
-      cwd="""$${slapos.toolbox:location}""",
-      summaryf=UnitTest.summary,
-  )
+  if six.PY3:
+    TestCase(
+        "slapos.toolbox",
+        # ['python', '-m', 'unittest', 'discover', '-v'],
+        # XXX We can not just run unittest discover here, since slapos/lamp
+        # imports MySQLDb and we currently don't have installed
+        # slapos.toolbox[lampconfigure] and on python3 discovery make a
+        # failing test for this import error.
+        # Currently slapos/lamp is not tested, but if it it is still used,
+        # the TODO seem to also install slapos.toolbox[lampconfigure] here.
+        ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
+        cwd="""$${slapos.toolbox:location}""",
+        summaryf=UnitTest.summary,
+    )
   TestCase(
       "slapos.libnetworkcache",
       ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],

stack/erp5/buildout.cfg

@@ -540,6 +540,7 @@ eggs = ${neoppod:eggs}
   ${scipy:egg}
   ${scikit-learn:egg}
   ${scikit-image:egg}
+  ${python-PyYAML:egg}
   sympy
   more-itertools
   ${h5py:egg}
@@ -603,6 +604,7 @@ eggs = ${neoppod:eggs}
   typing
   pytracemalloc
   xlrd
+  pydot
 
 # Zope
   ${zope.security:egg}
@@ -675,7 +677,6 @@ scripts =
   apachedex
   performance_tester_erp5
   runwsgi
-  runzope
   runzeo
   tidstoraged
   tidstorage_repozo
@@ -691,6 +692,8 @@ Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acqu
 Acquisition-patch-options = -p1
 Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method-2.4.1.patch#ec7bb56a9f1d37fcbf960cd1e96e6e6d
 Products.DCWorkflow-patch-options = -p1
+Products.CMFCore-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.CMFCore/portal_skins_ZMI_find.patch#19ec05c0477c50927ee1df6eb75d1e7f
+Products.CMFCore-patch-options = -p1
 PyPDF2-patches = ${:_profile_base_location_}/../../component/egg-patch/PyPDF2/0001-Custom-implementation-of-warnings.formatwarning-remo.patch#d25bb0f5dde7f3337a0a50c2f986f5c8
 PyPDF2-patch-options = -p1
 python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
@@ -798,7 +801,7 @@ parso = 0.5.1
 Pillow = 6.2.2
 polib = 1.0.8
 pprofile = 2.0.4
-Products.CMFCore = 2.7.0
+Products.CMFCore = 2.7.0+SlapOSPatched001
 Products.ExternalMethod = 4.7
 Products.GenericSetup = 2.3.0
 Products.MailHost = 4.13
@@ -816,6 +819,7 @@ pyasn1-modules = 0.0.8
 pycountry = 17.1.8
 pycrypto = 2.6.1
 pycryptodomex = 3.10.1
+pydot = 1.4.2
 pyflakes = 1.5.0
 pyjwkest = 1.4.2
 Pympler = 0.4.3

stack/slapos.cfg

@@ -360,6 +360,7 @@ pyparsing = 2.2.0
 pyrsistent = 0.16.1
 requests = 2.27.1
 selectors34 = 1.2
+slapos.toolbox = 0.128
 smmap = 0.9.0
 smmap2 = 2.0.5
 traitlets = 4.3.3