Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
b3bb815a
Commit
b3bb815a
authored
Dec 26, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
82143f17
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
9 deletions
+75
-9
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
+12
-9
software/ors-amarisoft/peer/input-schema.json
software/ors-amarisoft/peer/input-schema.json
+11
-0
software/ors-amarisoft/peer/lte/input-schema.json
software/ors-amarisoft/peer/lte/input-schema.json
+26
-0
software/ors-amarisoft/peer/nr/input-schema.json
software/ors-amarisoft/peer/nr/input-schema.json
+26
-0
No files found.
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
View file @
b3bb815a
# 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 parameter
s #}
{#- inject
synthesized peer cell
s #}
{%- 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
...
...
software/ors-amarisoft/peer/input-schema.json
0 → 100644
View file @
b3bb815a
{
"$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"
}
]
}
software/ors-amarisoft/peer/lte/input-schema.json
0 → 100644
View file @
b3bb815a
{
"$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"
}
}
}
software/ors-amarisoft/peer/nr/input-schema.json
0 → 100644
View file @
b3bb815a
{
"$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"
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment