Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
0bfca382
Commit
0bfca382
authored
Sep 29, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
1815c641
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
10 deletions
+15
-10
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+1
-1
software/ors-amarisoft/config/lte.jinja2
software/ors-amarisoft/config/lte.jinja2
+11
-6
software/ors-amarisoft/config/ue.jinja2.cfg
software/ors-amarisoft/config/ue.jinja2.cfg
+3
-3
No files found.
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
0bfca382
...
...
@@ -43,7 +43,7 @@
{%- set jcell_ru_ref = lte.jcell_ru_ref %}
{%- do lte.load_iru_and_icell() %}
{%- do lte.load_iru_and_icell(
kind='enb'
) %}
{%- do lte.load_ipeer() %}
{%- do lte.check_loaded_everything() %}
...
...
software/ors-amarisoft/config/lte.jinja2
View file @
0bfca382
...
...
@@ -61,13 +61,15 @@
iru_dict keeps RU shared instances + RU whose definition is embedded into a cell: reference -> iRU
in the kept instances _ is automatically json-decoded
use load_iru_and_icell to initialize this cell and RU registries.
use load_iru_and_icell(kind) to initialize this cell and RU registries.
kind=enb - load cells definition to serve them
kind=ue - load cells definition to connect to them
XXX defaults ?
#}
{%- set icell_dict = {} %}
{%- set iru_dict = {} %}
{%- macro load_iru_and_icell(
)
%}
{%- macro load_iru_and_icell(
kind)
%}
{%- set qother = [] %}
{%- for ishared in qshared_instance_list %}
{%- set ref = J(jref_of_shared(ishared)) %}
...
...
@@ -75,11 +77,14 @@
{%- if 'ru_type' in _ %}
{%- set iru = ishared %}
{%- do iru_dict.update({ref: iru}) %}
{%- elif 'cell_type' in _ %}
{%- elif (kind == 'enb' and 'cell_type' in _) or
(kind == 'ue' and 'ue_cell_type' in _) %}
{%- set icell = ishared %}
{%- for k, v in defaults['cell/' + _.cell_type].items() %}
{%- do _.setdefault(k, v) %}
{%- endfor %}
{%- if kind == 'enb' %}
{%- for k, v in defaults['cell/' + _.cell_type].items() %}
{%- do _.setdefault(k, v) %}
{%- endfor %}
{%- endif %}
{%- do icell_dict.update({ref: icell}) %}
{%- set ru = _['ru'] %}
{%- if ru.ru_type not in ('ru_ref', 'ruincell_ref') %}
...
...
software/ors-amarisoft/config/ue.jinja2.cfg
View file @
0bfca382
...
...
@@ -25,9 +25,9 @@
{%- set amari = lte %}{#- XXX temp #}
{%- do lte.load_iru_and_icell(
)
%}
{%- do lte.load_iue() %}
{%- do lte.check_loaded_everything() %}
{%- do lte.load_iru_and_icell(
kind='ue')
%}
{%- do lte.load_iue()
%}
{%- do lte.check_loaded_everything()
%}
{#- start of the config -#}
...
...
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