Commit b3bb815a authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 82143f17
# instance-ors-enb translates ORS enb/gnb into generic enb with 1 SDR RU and 1 CELL. # instance-ors-enb translates ORS enb/gnb into generic enb with 1 SDR RU and 1 CELL.
{#- TODO automatically load ORS/enb and ORS/gnb defaults from JSON schema #} {#- enb_mode indicates with which mode ors' enb is instantiated with - enb | gnb #}
{%- set enb_mode = slap_configuration['slap-software-type'] %}
{%- do assert(enb_mode in ('enb', 'gnb'), enb_mode) %}
{#- defaults for ORS parameters.
TODO automatically load ORS/enb and ORS/gnb defaults from JSON schema #}
{%- set ors_enb_defaults = { {%- set ors_enb_defaults = {
"bandwidth": "20 MHz", "bandwidth": "20 MHz",
"n_antenna_dl": 2, "n_antenna_dl": 2,
...@@ -19,7 +24,6 @@ ...@@ -19,7 +24,6 @@
"inactivity_timer": 10000, "inactivity_timer": 10000,
"disable_sdr": false "disable_sdr": false
} %} } %}
{%- set ors_gnb_defaults = { {%- set ors_gnb_defaults = {
"nr_bandwidth": 40, "nr_bandwidth": 40,
"n_antenna_dl": 2, "n_antenna_dl": 2,
...@@ -37,10 +41,6 @@ ...@@ -37,10 +41,6 @@
"disable_sdr": false "disable_sdr": false
} %} } %}
{#- enb_mode indicates with which mode ors' enb is instantiated with - enb | gnb #}
{%- set enb_mode = slap_configuration['slap-software-type'] %}
{%- do assert(enb_mode in ('enb', 'gnb'), enb_mode) %}
{%- set ors_defaults = {'enb': ors_enb_defaults, 'gnb': ors_gnb_defaults} [enb_mode] %} {%- set ors_defaults = {'enb': ors_enb_defaults, 'gnb': ors_gnb_defaults} [enb_mode] %}
{%- for k,v in ors_defaults|dictsort %} {%- for k,v in ors_defaults|dictsort %}
{%- do slapparameter_dict.setdefault(k, v) %} {%- do slapparameter_dict.setdefault(k, v) %}
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{#- inject ru+cell synthesized from ORS-specific parameters
{#- inject ru+cell synthesized from ORS-specific parameters #}
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': '%s_RU' % slap_configuration['slap-computer-partition-id'], 'slave_title': '%s_RU' % slap_configuration['slap-computer-partition-id'],
'slave_reference': 'XXX', 'slave_reference': 'XXX',
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
%} %}
{#- inject peer cells synthesized from ORS-specific parameters #} {#- inject synthesized peer cells #}
{%- for k, ncell in slapparameter_dict.ncell_list|dictsort %} {%- for k, ncell in slapparameter_dict.ncell_list|dictsort %}
{%- set peercell = {'cell_kind': 'enb_peer'} %} {%- set peercell = {'cell_kind': 'enb_peer'} %}
{%- macro _(name, default) %} {%- macro _(name, default) %}
...@@ -152,7 +153,9 @@ ...@@ -152,7 +153,9 @@
{%- endfor %} {%- endfor %}
# XXX also inject peer enb nodes {#- inject synthesized peers #}
{%- for k, peer in slapparameter_dict.xn_peers|dictsort %}
{%- endfor %}
{#- backward compatibility: if ORS is running in gnb mode, and gnb_* parameters {#- backward compatibility: if ORS is running in gnb mode, and gnb_* parameters
......
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Peer eNB/gNB",
"type": "object",
"oneOf": [
{ "$ref": "../peer/lte/input-schema.json" },
{ "$ref": "../peer/nr/input-schema.json" }
]
}
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Peer eNB",
"type": "object",
"required": [
"peer_type",
"x2_addr"
],
"properties": {
"peer_type": {
"$ref": "../../peer/common.json#/properties/peer_type",
"const": "lte",
"template": "lte"
},
"x2_addr": {
"title": "X2 Address",
"description": "X2 Address of the neighbour node (eNB Address)",
"type": "string"
}
}
}
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Peer gNB",
"type": "object",
"required": [
"peer_type",
"xn_addr"
],
"properties": {
"peer_type": {
"$ref": "../../peer/common.json#/properties/peer_type",
"const": "nr",
"template": "nr"
},
"xn_addr": {
"title": "XN Address",
"description": "XN Address of the neighbour node (gNB Address)",
"type": "string"
}
}
}
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