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
da4b8716
Commit
da4b8716
authored
Aug 21, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
9389fad5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
3 deletions
+31
-3
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+30
-3
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+1
-0
No files found.
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
da4b8716
...
...
@@ -2,7 +2,36 @@
{%- import 'lte.jinja2' as lte %}
{# cell_list keeps cell slave instances #}
{# XXX error(slave, msg) #}
{# cell_dict keeps cell slave instances: reference -> cell #}
{# ru_dict keeps RU slave instances: reference -> ru #}
{% set cell_dict = {} %}
{% set ru_dict = {} %}
{%- for slave in slave_instance_list %}
{# ref is original reference used to request shared instance.
it is extracted from slave_reference who is composed as `partition_id`+'_'+`reference` #}
{%- set ref = slave['slave_reference'] %}
{%- set partition_id %}{{partition_id}}{%- endset %}
{%- if ref.startswith(partition_id) %}
{%- set ref = ref[len(partition_id):] %}
{%- endif %}
{%- if ref.startswith('_') %}
{%- set ref = ref[1:] %}
{%- endif %}
{# #}
{%- set _ = json_module.loads(slave['_']) %}
{%- if 'cell_type' in _ %}
{%- do cell_dict[ref] = slave %}
{%- elif 'ru_type' in _ %}
{% do ru_dict[ref] = slave %}
{% else %}
{% do error(slave, "unknown shared instance type") %}
{%- endif %}
{%- endfor %}
{# verify that there is no dangling ru_ref and ruincell_ref #}
{%- set cell_list = [] %}
{%- for slave in slave_instance_list %}
{%- set slave_parameters = json_module.loads(slave['_']) %}
...
...
@@ -11,8 +40,6 @@
{%- endif %}
{%- endfor %}
{# XXX rrh_list ? #}
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
da4b8716
...
...
@@ -337,6 +337,7 @@ url = {{ enb_template }}
output = ${directory:etc}/enb.cfg
extra-context =
key sib23_file sib-config:output
key partition_id slap-configuration:partition
[publish-connection-information]
<= monitor-publish
...
...
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