Commit 76045cfa authored by Joanne Hugé's avatar Joanne Hugé

ors-amarisoft: remove confusing 4G terminology

* Rename mme software type to core-network since mme is a 4G terminology
* Rename template-lte-XXX to template-XXX since lte is a 4G terminology
parent 82e347c4
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 80ff1c894d8950d87362b2b177126a1b md5sum = f1f1167970ae465cdcece47b722caf20
[amarisoft-stats.jinja2.py] [amarisoft-stats.jinja2.py]
_update_hash_filename_ = amarisoft-stats.jinja2.py _update_hash_filename_ = amarisoft-stats.jinja2.py
...@@ -34,23 +34,23 @@ md5sum = 6339dd6c5dcbef95b58ed52a9fadc9a4 ...@@ -34,23 +34,23 @@ md5sum = 6339dd6c5dcbef95b58ed52a9fadc9a4
_update_hash_filename_ = lopcomm-rrh-config.jinja2.py _update_hash_filename_ = lopcomm-rrh-config.jinja2.py
md5sum = e0b68a87238282568e0e04c792ec7288 md5sum = e0b68a87238282568e0e04c792ec7288
[template-lte-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 64f7518e80c5f43f7f40ae103cd4e782 md5sum = a7448167f7433a50938bf6d3e6903065
[template-lte-gnb] [template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = d534aafd05ea065b69329c91f530eda3 md5sum = afa508e78851fe151fd25d8781aaa34a
[template-lte-mme] [template-core-network]
_update_hash_filename_ = instance-mme.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum = eab17f2796019ca9d46a11e64612031f md5sum = 5a46abb4310fa7fa8015fb0cde6cd87f
[template-lte-ue-lte] [template-ue-lte]
_update_hash_filename_ = instance-ue-lte.jinja2.cfg _update_hash_filename_ = instance-ue-lte.jinja2.cfg
md5sum = e201f486d31388cc2542e91bbda85711 md5sum = e201f486d31388cc2542e91bbda85711
[template-lte-ue-nr] [template-ue-nr]
_update_hash_filename_ = instance-ue-nr.jinja2.cfg _update_hash_filename_ = instance-ue-nr.jinja2.cfg
md5sum = 765fd303d6013cf4dbee108c53623412 md5sum = 765fd303d6013cf4dbee108c53623412
...@@ -80,7 +80,7 @@ md5sum = 1ba2e065bdf14a6411e95e80db17dcfd ...@@ -80,7 +80,7 @@ md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
[mme.jinja2.cfg] [mme.jinja2.cfg]
filename = config/mme.jinja2.cfg filename = config/mme.jinja2.cfg
md5sum = f002f908d9af8b4089dad0c64742dde6 md5sum = 3b3ab394e5303ec39fdcdd849a749550
[ims.jinja2.cfg] [ims.jinja2.cfg]
filename = config/ims.jinja2.cfg filename = config/ims.jinja2.cfg
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
gtp_addr: "127.0.1.100", gtp_addr: "127.0.1.100",
{% endif %} {% endif %}
plmn: "{{ slapparameter_dict.get('epc_plmn', "00101") }}", plmn: "{{ slapparameter_dict.get('core_network_plmn', "00101") }}",
mme_group_id: 32769, mme_group_id: 32769,
mme_code: 1, mme_code: 1,
......
{
"$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
}
}
}
{
"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": ""
}
}
}
{% 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
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 %}
extends = {{ monitor_template }}
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}
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
bin = ${:home}/bin
tmp = ${:home}/tmp
run = ${:var}/run
script = ${:etc}/run
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 }}
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]
<= monitor-publish
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 %}
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
parts = parts =
directory directory
ltelogs ltelogs
lte-enb-config enb-config
lte-enb-service enb-service
amarisoft-stats-service amarisoft-stats-service
amarisoft-rf-info-service amarisoft-rf-info-service
{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %} {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
...@@ -102,7 +102,7 @@ version = {{ slapparameter_dict.get("enb_config_version") }} ...@@ -102,7 +102,7 @@ version = {{ slapparameter_dict.get("enb_config_version") }}
offline = false offline = false
{% endif %} {% endif %}
[lte-enb-sh-wrapper] [enb-sh-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${directory:bin}/${:_buildout_section_name_} output = ${directory:bin}/${:_buildout_section_name_}
enb-log = ${directory:log}/enb-output.log enb-log = ${directory:log}/enb-output.log
...@@ -118,17 +118,17 @@ inline = ...@@ -118,17 +118,17 @@ inline =
{{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${:enb-log} 2>> ${:enb-log}; {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${:enb-log} 2>> ${:enb-log};
{% endif %} {% endif %}
[lte-enb-service] [enb-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2 init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
command-line = ${lte-enb-sh-wrapper:output} command-line = ${enb-sh-wrapper:output}
wrapper-path = ${directory:service}/lte-enb wrapper-path = ${directory:service}/enb
mode = 0775 mode = 0775
reserve-cpu = True reserve-cpu = True
pidfile = ${directory:run}/enb.pid pidfile = ${directory:run}/enb.pid
hash-files = hash-files =
${lte-enb-config:output} ${enb-config:output}
${lte-enb-sh-wrapper:output} ${enb-sh-wrapper:output}
environment = environment =
LD_LIBRARY_PATH={{ openssl_location }}/lib LD_LIBRARY_PATH={{ openssl_location }}/lib
AMARISOFT_PATH=/opt/amarisoft/.amarisoft AMARISOFT_PATH=/opt/amarisoft/.amarisoft
...@@ -238,7 +238,7 @@ context = ...@@ -238,7 +238,7 @@ context =
raw sib23 {{ sib23 }} raw sib23 {{ sib23 }}
import netaddr netaddr import netaddr netaddr
[lte-enb-config] [enb-config]
<= config-base <= config-base
{% if slapparameter_dict.get("enb_config_link", None) %} {% if slapparameter_dict.get("enb_config_link", None) %}
url = ${enb-config-dl:target} url = ${enb-config-dl:target}
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
parts = parts =
directory directory
ltelogs ltelogs
lte-gnb-config gnb-config
lte-enb-service enb-service
amarisoft-stats-service amarisoft-stats-service
amarisoft-rf-info-service amarisoft-rf-info-service
{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %} {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
...@@ -101,7 +101,7 @@ version = {{ slapparameter_dict.get("gnb_config_version") }} ...@@ -101,7 +101,7 @@ version = {{ slapparameter_dict.get("gnb_config_version") }}
offline = false offline = false
{% endif %} {% endif %}
[lte-enb-sh-wrapper] [enb-sh-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${directory:bin}/${:_buildout_section_name_} output = ${directory:bin}/${:_buildout_section_name_}
gnb-log = ${directory:log}/gnb-output.log gnb-log = ${directory:log}/gnb-output.log
...@@ -119,17 +119,17 @@ inline = ...@@ -119,17 +119,17 @@ inline =
{% endif %} {% endif %}
### eNodeB (enb) ### eNodeB (enb)
[lte-enb-service] [enb-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2 init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
command-line = ${lte-enb-sh-wrapper:output} command-line = ${enb-sh-wrapper:output}
wrapper-path = ${directory:service}/lte-enb wrapper-path = ${directory:service}/enb
mode = 0775 mode = 0775
reserve-cpu = True reserve-cpu = True
pidfile = ${directory:run}/enb.pid pidfile = ${directory:run}/enb.pid
hash-files = hash-files =
${lte-gnb-config:output} ${gnb-config:output}
${lte-enb-sh-wrapper:output} ${enb-sh-wrapper:output}
environment = environment =
LD_LIBRARY_PATH={{ openssl_location }}/lib LD_LIBRARY_PATH={{ openssl_location }}/lib
AMARISOFT_PATH=/opt/amarisoft/.amarisoft AMARISOFT_PATH=/opt/amarisoft/.amarisoft
...@@ -191,7 +191,7 @@ context = ...@@ -191,7 +191,7 @@ context =
raw gtp_addr_v4 {{ lan_ipv4 }} raw gtp_addr_v4 {{ lan_ipv4 }}
import netaddr netaddr import netaddr netaddr
[lte-gnb-config] [gnb-config]
<= config-base <= config-base
{% if slapparameter_dict.get("gnb_config_link", None) %} {% if slapparameter_dict.get("gnb_config_link", None) %}
url = ${gnb-config-dl:target} url = ${gnb-config-dl:target}
......
{ {
"$schema": "http://json-schema.org/draft-04/schema", "$schema": "http://json-schema.org/draft-04/schema",
"title": "EPC Input Parameters", "title": "Core Network Input Parameters",
"type": "object", "type": "object",
"properties": { "properties": {
"epc_plmn": { "epc_plmn": {
......
...@@ -14,8 +14,8 @@ info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been a ...@@ -14,8 +14,8 @@ info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been a
parts = parts =
directory directory
ltelogs ltelogs
lte-mme-config mme-config
lte-mme-service mme-service
monitor-base monitor-base
check-cpu-temperature.py check-cpu-temperature.py
check-interface-up.py check-interface-up.py
...@@ -120,7 +120,7 @@ hash-files = ...@@ -120,7 +120,7 @@ hash-files =
{{ ue_db_path }} {{ ue_db_path }}
environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft
[lte-mme-sh-wrapper] [mme-sh-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${directory:bin}/${:_buildout_section_name_} output = ${directory:bin}/${:_buildout_section_name_}
mme-log = ${directory:log}/mme-output.log mme-log = ${directory:log}/mme-output.log
...@@ -135,25 +135,25 @@ inline = ...@@ -135,25 +135,25 @@ inline =
{% endif %} {% endif %}
### MME ### MME
[lte-mme-service] [mme-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
# When the machine shutdowns abruptly, lte_ue is not cleaned up which causes # 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 # amarisoft ltemme to fail. TODO: find a cleaner way to handle this
init = ${ltelogs:output} ${directory:log}/mme.log init = ${ltelogs:output} ${directory:log}/mme.log
command-line = ${lte-mme-sh-wrapper:output} command-line = ${mme-sh-wrapper:output}
wrapper-path = ${directory:service}/lte-mme wrapper-path = ${directory:service}/mme
mode = 0775 mode = 0775
pidfile = ${directory:run}/mme.pid pidfile = ${directory:run}/mme.pid
hash-files = hash-files =
${lte-mme-config:output} ${mme-config:output}
{{ ue_db_path }} {{ ue_db_path }}
${lte-mme-sh-wrapper:output} ${mme-sh-wrapper:output}
environment = environment =
LD_LIBRARY_PATH={{ openssl_location }}/lib:{{ nghttp2_location }}/lib LD_LIBRARY_PATH={{ openssl_location }}/lib:{{ nghttp2_location }}/lib
AMARISOFT_PATH=/opt/amarisoft/.amarisoft AMARISOFT_PATH=/opt/amarisoft/.amarisoft
### EMPTY mme-ifup script ### EMPTY mme-ifup script
[lte-mme-ifup-empty] [mme-ifup-empty]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/mme-ifup-empty wrapper-path = ${directory:bin}/mme-ifup-empty
command-line = echo Using interface command-line = echo Using interface
...@@ -188,14 +188,14 @@ context = ...@@ -188,14 +188,14 @@ context =
key gtp_addr_v6 slap-configuration:ipv6-random key gtp_addr_v6 slap-configuration:ipv6-random
raw gtp_addr_v4 {{ lan_ipv4 }} raw gtp_addr_v4 {{ lan_ipv4 }}
import netaddr netaddr import netaddr netaddr
key ifup_empty lte-mme-ifup-empty:wrapper-path key ifup_empty mme-ifup-empty:wrapper-path
[lte-ims-config] [lte-ims-config]
<= config-base <= config-base
url = {{ ims_template }} url = {{ ims_template }}
output = ${directory:etc}/ims.cfg output = ${directory:etc}/ims.cfg
[lte-mme-config] [mme-config]
<= config-base <= config-base
{% if slapparameter_dict.get("mme_config_link", None) %} {% if slapparameter_dict.get("mme_config_link", None) %}
url = ${mme-config-dl:target} url = ${mme-config-dl:target}
......
...@@ -60,12 +60,12 @@ init = ...@@ -60,12 +60,12 @@ init =
[switch-softwaretype] [switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype recipe = slapos.cookbook:switch-softwaretype
enb = dynamic-template-lte-enb:output enb = dynamic-template-enb:output
gnb = dynamic-template-lte-gnb:output gnb = dynamic-template-gnb:output
mme = dynamic-template-lte-mme:output core-network = dynamic-template-core-network:output
ue-lte = dynamic-template-lte-ue-lte:output ue-lte = dynamic-template-ue-lte:output
ue-nr = dynamic-template-lte-ue-nr:output ue-nr = dynamic-template-ue-nr:output
RootSoftwareInstance = $${:mme} RootSoftwareInstance = $${:core-network}
obsolete = dynamic-template-obsolete:output obsolete = dynamic-template-obsolete:output
enb-epc = $${:obsolete} enb-epc = $${:obsolete}
gnb-epc = $${:obsolete} gnb-epc = $${:obsolete}
...@@ -80,10 +80,10 @@ extensions = jinja2.ext.do ...@@ -80,10 +80,10 @@ extensions = jinja2.ext.do
extra-context = extra-context =
key slave_instance_list slap-configuration:slave-instance-list key slave_instance_list slap-configuration:slave-instance-list
[dynamic-template-lte-enb] [dynamic-template-enb]
< = jinja2-template-base < = jinja2-template-base
url = ${template-lte-enb:target} url = ${template-enb:target}
filename = instance-lte-enb.cfg filename = instance-enb.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
...@@ -111,10 +111,10 @@ extra-context = ...@@ -111,10 +111,10 @@ extra-context =
raw min_frequency ${default-params:min-frequency} raw min_frequency ${default-params:min-frequency}
raw max_frequency ${default-params:max-frequency} raw max_frequency ${default-params:max-frequency}
[dynamic-template-lte-gnb] [dynamic-template-gnb]
< = jinja2-template-base < = jinja2-template-base
url = ${template-lte-gnb:target} url = ${template-gnb:target}
filename = instance-lte-gnb.cfg filename = instance-gnb.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
...@@ -139,10 +139,10 @@ extra-context = ...@@ -139,10 +139,10 @@ extra-context =
raw max_frequency ${default-params:max-frequency} raw max_frequency ${default-params:max-frequency}
raw python_path ${python3:location} raw python_path ${python3:location}
[dynamic-template-lte-mme] [dynamic-template-core-network]
< = jinja2-template-base < = jinja2-template-base
url = ${template-lte-mme:target} url = ${template-core-network:target}
filename = instance-lte-mme.cfg filename = instance-core-network.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
...@@ -156,10 +156,10 @@ extra-context = ...@@ -156,10 +156,10 @@ extra-context =
key ue_db_path ue-db-config:output key ue_db_path ue-db-config:output
key slave_instance_list slap-configuration:slave-instance-list key slave_instance_list slap-configuration:slave-instance-list
[dynamic-template-lte-ue-lte] [dynamic-template-ue-lte]
< = jinja2-template-base < = jinja2-template-base
url = ${template-lte-ue-lte:target} url = ${template-ue-lte:target}
filename = instance-lte-ue-lte.cfg filename = instance-ue-lte.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
...@@ -178,10 +178,10 @@ extra-context = ...@@ -178,10 +178,10 @@ extra-context =
raw default_lte_imsi ${default-params:default-lte-imsi} raw default_lte_imsi ${default-params:default-lte-imsi}
raw default_lte_k ${default-params:default-lte-k} raw default_lte_k ${default-params:default-lte-k}
[dynamic-template-lte-ue-nr] [dynamic-template-ue-nr]
< = jinja2-template-base < = jinja2-template-base
url = ${template-lte-ue-nr:target} url = ${template-ue-nr:target}
filename = instance-lte-ue-nr.cfg filename = instance-ue-nr.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
......
...@@ -19,20 +19,20 @@ ...@@ -19,20 +19,20 @@
"response": "instance-tdd1900-gnb-schema.json", "response": "instance-tdd1900-gnb-schema.json",
"index": 1 "index": 1
}, },
"mme": { "core-network": {
"title": "EPC", "title": "Core Network",
"software-type": "mme", "software-type": "core-network",
"description": "EPC Configuration", "description": "Core Network Configuration",
"request": "instance-mme-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-mme-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 2
}, },
"mme-slave": { "core-network-slave": {
"title": "EPC Sim Card", "title": "Core Network Sim Card",
"description": "EPC Sim Card Configuration", "description": "Core Network Sim Card Configuration",
"software-type": "mme", "software-type": "core-network",
"request": "instance-mme-slave-input-schema.json", "request": "instance-core-network-slave-input-schema.json",
"response": "instance-mme-slave-schema.json", "response": "instance-core-network-slave-schema.json",
"shared": true, "shared": true,
"index": 3 "index": 3
}, },
......
...@@ -19,20 +19,20 @@ ...@@ -19,20 +19,20 @@
"response": "instance-tdd2600-gnb-schema.json", "response": "instance-tdd2600-gnb-schema.json",
"index": 1 "index": 1
}, },
"mme": { "core-network": {
"title": "EPC", "title": "Core Network",
"software-type": "mme", "software-type": "core-network",
"description": "EPC Configuration", "description": "Core Network Configuration",
"request": "instance-mme-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-mme-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 2
}, },
"mme-slave": { "core-network-slave": {
"title": "EPC Sim Card", "title": "Core Network Sim Card",
"description": "EPC Sim Card Configuration", "description": "Core Network Sim Card Configuration",
"software-type": "mme", "software-type": "core-network",
"request": "instance-mme-slave-input-schema.json", "request": "instance-core-network-slave-input-schema.json",
"response": "instance-mme-slave-schema.json", "response": "instance-core-network-slave-schema.json",
"shared": true, "shared": true,
"index": 3 "index": 3
}, },
......
...@@ -19,20 +19,20 @@ ...@@ -19,20 +19,20 @@
"response": "instance-tdd3500-gnb-schema.json", "response": "instance-tdd3500-gnb-schema.json",
"index": 1 "index": 1
}, },
"mme": { "core-network": {
"title": "EPC", "title": "Core Network",
"software-type": "mme", "software-type": "core-network",
"description": "EPC Configuration", "description": "Core Network Configuration",
"request": "instance-mme-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-mme-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 2
}, },
"mme-slave": { "core-network-slave": {
"title": "EPC Sim Card", "title": "Core Network Sim Card",
"description": "EPC Sim Card Configuration", "description": "Core Network Sim Card Configuration",
"software-type": "mme", "software-type": "core-network",
"request": "instance-mme-slave-input-schema.json", "request": "instance-core-network-slave-input-schema.json",
"response": "instance-mme-slave-schema.json", "response": "instance-core-network-slave-schema.json",
"shared": true, "shared": true,
"index": 3 "index": 3
}, },
......
...@@ -19,20 +19,20 @@ ...@@ -19,20 +19,20 @@
"response": "instance-tdd3700-gnb-schema.json", "response": "instance-tdd3700-gnb-schema.json",
"index": 1 "index": 1
}, },
"mme": { "core-network": {
"title": "EPC", "title": "Core Network",
"software-type": "mme", "software-type": "core-network",
"description": "EPC Configuration", "description": "Core Network Configuration",
"request": "instance-mme-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-mme-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 2
}, },
"mme-slave": { "core-network-slave": {
"title": "EPC Sim Card", "title": "Core Network Sim Card",
"description": "EPC Sim Card Configuration", "description": "Core Network Sim Card Configuration",
"software-type": "mme", "software-type": "core-network",
"request": "instance-mme-slave-input-schema.json", "request": "instance-core-network-slave-input-schema.json",
"response": "instance-mme-slave-schema.json", "response": "instance-core-network-slave-schema.json",
"shared": true, "shared": true,
"index": 3 "index": 3
}, },
......
...@@ -60,19 +60,19 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_} ...@@ -60,19 +60,19 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
[lopcomm-rrh-config.jinja2.py] [lopcomm-rrh-config.jinja2.py]
<= download-base <= download-base
[template-lte-enb] [template-enb]
<= download-base <= download-base
[template-lte-gnb] [template-gnb]
<= download-base <= download-base
[template-lte-mme] [template-core-network]
<= download-base <= download-base
[template-lte-ue-lte] [template-ue-lte]
<= download-base <= download-base
[template-lte-ue-nr] [template-ue-nr]
<= download-base <= download-base
[template-obsolete] [template-obsolete]
......
...@@ -19,20 +19,20 @@ ...@@ -19,20 +19,20 @@
"response": "instance-{{ rf_mode }}-gnb-schema.json", "response": "instance-{{ rf_mode }}-gnb-schema.json",
"index": 1 "index": 1
}, },
"mme": { "core-network": {
"title": "EPC", "title": "Core Network",
"software-type": "mme", "software-type": "core-network",
"description": "EPC Configuration", "description": "Core Network Configuration",
"request": "instance-mme-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-mme-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 2
}, },
"mme-slave": { "core-network-slave": {
"title": "EPC Sim Card", "title": "Core Network Sim Card",
"description": "EPC Sim Card Configuration", "description": "Core Network Sim Card Configuration",
"software-type": "mme", "software-type": "core-network",
"request": "instance-mme-slave-input-schema.json", "request": "instance-core-network-slave-input-schema.json",
"response": "instance-mme-slave-schema.json", "response": "instance-core-network-slave-schema.json",
"shared": true, "shared": true,
"index": 3 "index": 3
}, },
......
...@@ -57,7 +57,7 @@ param_dict = { ...@@ -57,7 +57,7 @@ param_dict = {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
}, },
'epc_plmn': '00102', 'core_network_plmn': '00102',
'dl_nr_arfcn': 325320, 'dl_nr_arfcn': 325320,
'nr_band': 99, 'nr_band': 99,
'nr_bandwidth': 50, 'nr_bandwidth': 50,
...@@ -166,7 +166,7 @@ def test_mme_conf(self): ...@@ -166,7 +166,7 @@ def test_mme_conf(self):
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(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): def test_sim_card(self):
...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase): ...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase):
return {'_': json.dumps(param_dict)} return {'_': json.dumps(param_dict)}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_mme_conf(self): def test_mme_conf(self):
test_mme_conf(self) test_mme_conf(self)
...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls): ...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls):
partition_reference="SIM-CARD", partition_reference="SIM-CARD",
partition_parameter_kw={'_': json.dumps(param_dict)}, partition_parameter_kw={'_': json.dumps(param_dict)},
shared=True, shared=True,
software_type='mme', software_type='core-network',
) )
class TestENBMonitorGadgetUrl(ORSTestCase): class TestENBMonitorGadgetUrl(ORSTestCase):
...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase): ...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_monitor_gadget_url(self): def test_monitor_gadget_url(self):
test_monitor_gadget_url(self) test_monitor_gadget_url(self)
...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase): ...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase):
return {'_': json.dumps({'testing': True})} return {'_': json.dumps({'testing': True})}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_sim_card(self): def test_sim_card(self):
test_sim_card(self) test_sim_card(self)
......
...@@ -57,7 +57,7 @@ param_dict = { ...@@ -57,7 +57,7 @@ param_dict = {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
}, },
'epc_plmn': '00102', 'core_network_plmn': '00102',
'dl_nr_arfcn': 325320, 'dl_nr_arfcn': 325320,
'nr_band': 99, 'nr_band': 99,
'nr_bandwidth': 50, 'nr_bandwidth': 50,
...@@ -166,7 +166,7 @@ def test_mme_conf(self): ...@@ -166,7 +166,7 @@ def test_mme_conf(self):
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(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): def test_sim_card(self):
...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase): ...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase):
return {'_': json.dumps(param_dict)} return {'_': json.dumps(param_dict)}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_mme_conf(self): def test_mme_conf(self):
test_mme_conf(self) test_mme_conf(self)
...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls): ...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls):
partition_reference="SIM-CARD", partition_reference="SIM-CARD",
partition_parameter_kw={'_': json.dumps(param_dict)}, partition_parameter_kw={'_': json.dumps(param_dict)},
shared=True, shared=True,
software_type='mme', software_type='core-network',
) )
class TestENBMonitorGadgetUrl(ORSTestCase): class TestENBMonitorGadgetUrl(ORSTestCase):
...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase): ...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_monitor_gadget_url(self): def test_monitor_gadget_url(self):
test_monitor_gadget_url(self) test_monitor_gadget_url(self)
...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase): ...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase):
return {'_': json.dumps({'testing': True})} return {'_': json.dumps({'testing': True})}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_sim_card(self): def test_sim_card(self):
test_sim_card(self) test_sim_card(self)
......
...@@ -57,7 +57,7 @@ param_dict = { ...@@ -57,7 +57,7 @@ param_dict = {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
}, },
'epc_plmn': '00102', 'core_network_plmn': '00102',
'dl_nr_arfcn': 325320, 'dl_nr_arfcn': 325320,
'nr_band': 99, 'nr_band': 99,
'nr_bandwidth': 50, 'nr_bandwidth': 50,
...@@ -166,7 +166,7 @@ def test_mme_conf(self): ...@@ -166,7 +166,7 @@ def test_mme_conf(self):
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(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): def test_sim_card(self):
...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase): ...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase):
return {'_': json.dumps(param_dict)} return {'_': json.dumps(param_dict)}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_mme_conf(self): def test_mme_conf(self):
test_mme_conf(self) test_mme_conf(self)
...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls): ...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls):
partition_reference="SIM-CARD", partition_reference="SIM-CARD",
partition_parameter_kw={'_': json.dumps(param_dict)}, partition_parameter_kw={'_': json.dumps(param_dict)},
shared=True, shared=True,
software_type='mme', software_type='core-network',
) )
class TestENBMonitorGadgetUrl(ORSTestCase): class TestENBMonitorGadgetUrl(ORSTestCase):
...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase): ...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_monitor_gadget_url(self): def test_monitor_gadget_url(self):
test_monitor_gadget_url(self) test_monitor_gadget_url(self)
...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase): ...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase):
return {'_': json.dumps({'testing': True})} return {'_': json.dumps({'testing': True})}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_sim_card(self): def test_sim_card(self):
test_sim_card(self) test_sim_card(self)
......
...@@ -57,7 +57,7 @@ param_dict = { ...@@ -57,7 +57,7 @@ param_dict = {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
}, },
'epc_plmn': '00102', 'core_network_plmn': '00102',
'dl_nr_arfcn': 325320, 'dl_nr_arfcn': 325320,
'nr_band': 99, 'nr_band': 99,
'nr_bandwidth': 50, 'nr_bandwidth': 50,
...@@ -166,7 +166,7 @@ def test_mme_conf(self): ...@@ -166,7 +166,7 @@ def test_mme_conf(self):
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(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): def test_sim_card(self):
...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase): ...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase):
return {'_': json.dumps(param_dict)} return {'_': json.dumps(param_dict)}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_mme_conf(self): def test_mme_conf(self):
test_mme_conf(self) test_mme_conf(self)
...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls): ...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls):
partition_reference="SIM-CARD", partition_reference="SIM-CARD",
partition_parameter_kw={'_': json.dumps(param_dict)}, partition_parameter_kw={'_': json.dumps(param_dict)},
shared=True, shared=True,
software_type='mme', software_type='core-network',
) )
class TestENBMonitorGadgetUrl(ORSTestCase): class TestENBMonitorGadgetUrl(ORSTestCase):
...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase): ...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_monitor_gadget_url(self): def test_monitor_gadget_url(self):
test_monitor_gadget_url(self) test_monitor_gadget_url(self)
...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase): ...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase):
return {'_': json.dumps({'testing': True})} return {'_': json.dumps({'testing': True})}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_sim_card(self): def test_sim_card(self):
test_sim_card(self) test_sim_card(self)
......
...@@ -57,7 +57,7 @@ param_dict = { ...@@ -57,7 +57,7 @@ param_dict = {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
}, },
'epc_plmn': '00102', 'core_network_plmn': '00102',
'dl_nr_arfcn': 325320, 'dl_nr_arfcn': 325320,
'nr_band': 99, 'nr_band': 99,
'nr_bandwidth': 50, 'nr_bandwidth': 50,
...@@ -166,7 +166,7 @@ def test_mme_conf(self): ...@@ -166,7 +166,7 @@ def test_mme_conf(self):
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(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): def test_sim_card(self):
...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase): ...@@ -237,7 +237,7 @@ class TestCoreNetworkParameters(ORSTestCase):
return {'_': json.dumps(param_dict)} return {'_': json.dumps(param_dict)}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_mme_conf(self): def test_mme_conf(self):
test_mme_conf(self) test_mme_conf(self)
...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls): ...@@ -248,7 +248,7 @@ def requestSlaveInstance(cls):
partition_reference="SIM-CARD", partition_reference="SIM-CARD",
partition_parameter_kw={'_': json.dumps(param_dict)}, partition_parameter_kw={'_': json.dumps(param_dict)},
shared=True, shared=True,
software_type='mme', software_type='core-network',
) )
class TestENBMonitorGadgetUrl(ORSTestCase): class TestENBMonitorGadgetUrl(ORSTestCase):
...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase): ...@@ -282,7 +282,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_monitor_gadget_url(self): def test_monitor_gadget_url(self):
test_monitor_gadget_url(self) test_monitor_gadget_url(self)
...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase): ...@@ -326,7 +326,7 @@ class TestSimCard(ORSTestCase):
return {'_': json.dumps({'testing': True})} return {'_': json.dumps({'testing': True})}
@classmethod @classmethod
def getInstanceSoftwareType(cls): def getInstanceSoftwareType(cls):
return "mme" return "core-network"
def test_sim_card(self): def test_sim_card(self):
test_sim_card(self) test_sim_card(self)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment