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
108
Merge Requests
108
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
91d41b1d
Commit
91d41b1d
authored
Dec 28, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
bbcca51a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
18 deletions
+16
-18
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+4
-4
software/ors-amarisoft/config/out/enb.cfg
software/ors-amarisoft/config/out/enb.cfg
+3
-3
software/ors-amarisoft/instance-enb-input-schema.json
software/ors-amarisoft/instance-enb-input-schema.json
+5
-2
software/ors-amarisoft/slaplte.jinja2
software/ors-amarisoft/slaplte.jinja2
+0
-8
software/ors-amarisoft/slapos-render-config.py
software/ors-amarisoft/slapos-render-config.py
+4
-1
No files found.
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
91d41b1d
...
...
@@ -35,7 +35,7 @@
{
{%- if cell2.cell_type == 'lte' %}
rat: "eutra",
cell_id: {{
cfg('enb_id')
}}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
cell_id: {{
slapparameter_dict.enb_id
}}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
n_id_cell: {{ cell2.pci }},
dl_earfcn: {{ cell2.dl_earfcn }},
tac: {{ cell2.tac }},
...
...
@@ -171,11 +171,11 @@
{% endif %}
{%- if do_lte %}
enb_id: {{
cfg('enb_id')
}},
enb_id: {{
slapparameter_dict.enb_id
}},
{%- endif %}
{%- if do_nr %}
gnb_id: {{
cfg('gnb_id')
}},
gnb_id_bits: {{
cfg('gnb_id_bits'
) }},
gnb_id: {{
slapparameter_dict.gnb_id
}},
gnb_id_bits: {{
slapparameter_dict.get('gnb_id_bits', 28
) }},
en_dc_support: true,
{%- endif %}
...
...
software/ors-amarisoft/config/out/enb.cfg
View file @
91d41b1d
...
...
@@ -40,8 +40,8 @@
gtp_addr: "127.0.1.1",
enb_id: 0x1
A2D0
,
gnb_id: 0x
12345
,
enb_id: 0x1
0012
,
gnb_id: 0x
54321
,
gnb_id_bits: 28,
en_dc_support: true,
...
...
@@ -269,7 +269,7 @@
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1
A2D0
01, // -> CELL_a
cell_id: 0x1
0012
01, // -> CELL_a
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x1234,
...
...
software/ors-amarisoft/instance-enb-input-schema.json
View file @
91d41b1d
...
...
@@ -2,6 +2,10 @@
"type"
:
"object"
,
"$schema"
:
"http://json-schema.org/draft-04/schema"
,
"title"
:
"Input Parameters"
,
"required"
:
[
"enb_id"
,
"gnb_id"
],
"properties"
:
{
"enb_id"
:
{
"title"
:
"eNB ID"
,
...
...
@@ -35,8 +39,7 @@
"gnb_id"
:
{
"title"
:
"gNB ID"
,
"description"
:
"gNB ID"
,
"type"
:
"string"
,
"default"
:
"0x12345"
"type"
:
"string"
},
"gnb_id_bits"
:
{
"title"
:
"gNB ID bits"
,
...
...
software/ors-amarisoft/slaplte.jinja2
View file @
91d41b1d
...
...
@@ -17,9 +17,6 @@
{#- XXX txrx_active=ACTIVE for sdr - needed ? (bwcompat for ORS) - if yes -> update ru/sdr/input-schema.json #}
{#- XXX add inactivity timer to cell schemas #}
{%- set defaults = {
'gnb_id': '0x12345',
'gnb_id_bits': 28,
'ru': {
'txrx_active': 'INACTIVE',
},
...
...
@@ -108,11 +105,6 @@
{%- endmacro %}
{#- cfg returns value of configuration parameter name #}
{%- macro cfg(name) %}
{{- slapparameter_dict.get(name, defaults.get(name)) }}
{%- endmacro %}
{#- tap indicates tap interface, that slapos told us to use,
or 'xxx-notap-xxx' if slapos provided us either nothing or empty string. #}
{%- set tap = slap_configuration.get('tap-name', '') %}
...
...
software/ors-amarisoft/slapos-render-config.py
View file @
91d41b1d
...
...
@@ -419,7 +419,10 @@ def do_enb():
"etc": "etc",
"var": "var"
},
"slapparameter_dict": {}
"slapparameter_dict": {
"enb_id": "0x10012",
"gnb_id": "0x54321"
}
}"""
%
locals
()
j2render
(
'enb.jinja2.cfg'
,
'enb.cfg'
,
json_params
)
...
...
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