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
4b896eeb
Commit
4b896eeb
authored
Aug 23, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
afb0a270
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+5
-2
No files found.
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
4b896eeb
...
@@ -30,7 +30,8 @@
...
@@ -30,7 +30,8 @@
{%- if ru['ru_type'] == 'ru_ref' %}
{%- if ru['ru_type'] == 'ru_ref' %}
{{- ru['ru_ref'] | tojson }}
{{- ru['ru_ref'] | tojson }}
{%- elif ru['ru_type'] == 'ruincell_ref' %}
{%- elif ru['ru_type'] == 'ruincell_ref' %}
{{- _jcell_ru_ref(ru['ruincell_ref'], seen) }}
{#- XXX first check referred cell exist ? #}
{{- _jcell_ru_ref(cell_dict[ru['ruincell_ref']], seen) }}
{%- else %}
{%- else %}
{#- ru definition is embedded into cell #}
{#- ru definition is embedded into cell #}
{{- ('_%s_ru' % J(jref_of_shared(cell))) | tojson }}
{{- ('_%s_ru' % J(jref_of_shared(cell))) | tojson }}
...
@@ -41,6 +42,7 @@
...
@@ -41,6 +42,7 @@
{#- jref_of_shared returns original reference used to request shared instance.
{#- jref_of_shared returns original reference used to request shared instance.
it is extracted from slave_reference which is composed as <partition_id>_<reference>. #}
it is extracted from slave_reference which is composed as <partition_id>_<reference>. #}
{%- macro jref_of_shared(slave) %}
{%- macro jref_of_shared(slave) %}
{%- do print('jref_of_shared %r' % (slave,)) %}
{%- set ref = slave['slave_reference'] %}
{%- set ref = slave['slave_reference'] %}
{%- set partition_id = slap_configuration['slap-computer-partition-id'] %}
{%- set partition_id = slap_configuration['slap-computer-partition-id'] %}
{%- if ref.startswith(partition_id) %}
{%- if ref.startswith(partition_id) %}
...
@@ -80,8 +82,9 @@
...
@@ -80,8 +82,9 @@
{{ print('\n----\n') }}
{{ print('\n----\n') }}
{#- verify that there is no dangling cell->ru references #}
{#- verify that there is no dangling cell->ru references #}
{#- XXX also verify that there is no dangling cell -> cell refs in ruincell_ref #}
{%- for _, cell in cell_dict|dictsort %}
{%- for _, cell in cell_dict|dictsort %}
{{ print('_:', _, 'cell:', cell) }}
{{ print('
\n\n
_:', _, 'cell:', cell) }}
{%- set ru_ref = J(jcell_ru_ref(cell)) %}
{%- set ru_ref = J(jcell_ru_ref(cell)) %}
{%- if ru_ref not in ru_dict %}
{%- if ru_ref not in ru_dict %}
{%- do error(cell, "referred RU %s does not exist" % ru_ref) %}
{%- do error(cell, "referred RU %s does not exist" % ru_ref) %}
...
...
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