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
484db550
Commit
484db550
authored
Oct 13, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
da0ca529
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+10
-3
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
+0
-2
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
484db550
...
@@ -28,7 +28,7 @@ md5sum = 8b24f6cf584eb096a61750e39e376ad0
...
@@ -28,7 +28,7 @@ md5sum = 8b24f6cf584eb096a61750e39e376ad0
[ru_libinstance.jinja2.cfg]
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum =
b93771f755e684bba5d16f943a9dbf67
md5sum =
13f4f86a45f1321b4e13de93b51bccea
[ru_sdr_libinstance.jinja2.cfg]
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
...
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
[ru_lopcomm_libinstance.jinja2.cfg]
[ru_lopcomm_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
md5sum =
a141bc3956566692ad86960cf6c98248
md5sum =
0cd8f53b969eca651fcd2a79728e4d80
[ru_sunwave_libinstance.jinja2.cfg]
[ru_sunwave_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
484db550
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
NOTE: before importing package amari_slap.jinja2 needs to already loaded as
NOTE: before importing package amari_slap.jinja2 needs to already loaded as
{%- import 'amari_slap.jinja2' as slaplte with context %}
{%- import 'amari_slap.jinja2' as slaplte with context %}
NOTE: driver-specific logic is implemented in rudrv.buildout_iru(). XXX review
#}
#}
{#- iru_dict and icell_dict keep RU and cell registries
{#- iru_dict and icell_dict keep RU and cell registries
...
@@ -21,12 +23,14 @@
...
@@ -21,12 +23,14 @@
{%- macro buildout() %}
{%- macro buildout() %}
{#- part emits new buildout section and registers it into buildout.parts #}
{%- set parts_list = [] %}
{%- set parts_list = [] %}
{%- macro part(name) %}
{%- macro part(name) %}
{%- do parts_list.append(name) %}
{%- do parts_list.append(name) %}
[{{ name }}]
[{{ name }}]
{%- endmacro %}
{%- endmacro %}
{#- promise emits new buildout section for a promise #}
{%- macro promise(name) %}
{%- macro promise(name) %}
{{ part('promise-'+name) }}
{{ part('promise-'+name) }}
<= monitor-promise-base
<= monitor-promise-base
...
@@ -44,10 +48,13 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
...
@@ -44,10 +48,13 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
lopcomm=rudrv_lopcomm,
lopcomm=rudrv_lopcomm,
sunwave=rudrv_sunwave) %}
sunwave=rudrv_sunwave) %}
{#- go through all RUs and for each RU emit generic promises and invoke
RU-specific buildout handler #}
{%- for ru_ref, iru in iru_dict|dictsort %}
{%- for ru_ref, iru in iru_dict|dictsort %}
{%- set ru = iru['_'] %}
{%- set ru = iru['_'] %}
# {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R ({{ ru.ru_type }})
# {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R ({{ ru.ru_type }})
# XXX + serving which cells
{%- if ru.ru_link_type == 'sdr' %}
{%- if ru.ru_link_type == 'sdr' %}
{%- for (i, n) in enumerate(ru.sdr_dev_list) %}
{%- for (i, n) in enumerate(ru.sdr_dev_list) %}
{{ promise('%s-sdr-busy%s' % (ru_ref, '-%d' % (i+1) if i > 0 else '')) }}
{{ promise('%s-sdr-busy%s' % (ru_ref, '-%d' % (i+1) if i > 0 else '')) }}
...
...
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
View file @
484db550
...
@@ -84,8 +84,6 @@ url = {{ lopcomm_rrh_config_template }}
...
@@ -84,8 +84,6 @@ url = {{ lopcomm_rrh_config_template }}
output = ${directory:script}/{{ru_ref}}-config.py
output = ${directory:script}/{{ru_ref}}-config.py
{#- handle notifications from RU #}
{#- handle notifications from RU #}
[{{ru_ref}}-stats-template]
[{{ru_ref}}-stats-template]
...
...
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