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
107
Merge Requests
107
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
f8f4ed96
Commit
f8f4ed96
authored
Oct 18, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
380708b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
4 deletions
+21
-4
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
+9
-1
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
+10
-1
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
f8f4ed96
...
...
@@ -28,7 +28,7 @@ md5sum = c30fa5e9843212f94ae595d8394ac6b8
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum =
13f4f86a45f1321b4e13de93b51bccea
md5sum =
68965d542b31ac67d91aba6b3ad1f471
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...
...
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
[ru_lopcomm_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
md5sum =
1e15db240ec008ccb6025d2429bdcc51
md5sum =
066dbfbabdafa40b5bd71cd8251e772c
[ru_sunwave_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
f8f4ed96
...
...
@@ -53,6 +53,14 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
{%- for ru_ref, iru in iru_dict|dictsort %}
{%- set ru = iru['_'] %}
{#- cells that are using iru #}
{%- set iru_icell_list = [] %}
{%- for cell_ref, icell in icell_dict|dictsort %}
{%- if ru_ref == J(jcell_ru_ref(icell, icell_dict)) %}
{%- do iru_icell_list.append(icell) %}
{%- endif %}
{%- endfor %}
# {{ 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' %}
...
...
@@ -91,7 +99,7 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
{#- driver-specific part #}
{%- set rudrv = rudrv_dict[ru.ru_type] %}
{{ rudrv.buildout_iru(iru) }}
{{ rudrv.buildout_iru(iru
, iru_icell_list
) }}
# XXX publish something for each RU
# XXX publish something for each cell
...
...
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
View file @
f8f4ed96
{#- Package ru/lopcomm/libinstance provides instance code for handling Lopcomm ORAN Radio Units. #}
{%- macro buildout_iru(iru) %}
{%- macro buildout_iru(iru
, icell_list
) %}
{%- set ru_ref = J(jref_of_shared(iru)) %}
{%- set ru = iru['_'] %}
{%- if len(icell_list) != 1 %}
{%- do error('ru/lopcomm supports only 1 cell %}
{%- endif %}
{%- set icell = icell_list[0] %}
{%- set cell = icell['_'] %}
{#- indicate whether RU is listening for netconf #}
{{ promise('%s-netconf-socket' % ru_ref) }}
...
...
@@ -100,6 +106,9 @@ url = ${ {{- ru_ref}}-cu-config-dl:target}
url = {{ ru_lopcomm_cu_config_template }}
{% endif %}
output = ${directory:etc}/{{ru_ref}}-cu_config.xml
extra-context =
json ru {{ ru | tojson }}
json cell {{ cell | tojson }}
[{{ru_ref}}-config-template]
recipe = slapos.recipe.template:jinja2
...
...
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