Commit 484db550 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent da0ca529
...@@ -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
......
...@@ -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 '')) }}
...@@ -82,9 +89,9 @@ config-amarisoft-stats-log = ${amarisoft-stats-template:log-output} ...@@ -82,9 +89,9 @@ config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }} config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
{#- driver-specific part #} {#- driver-specific part #}
{%- set rudrv = rudrv_dict[ru.ru_type] %} {%- set rudrv = rudrv_dict[ru.ru_type] %}
{{ rudrv.buildout_iru(iru) }} {{ rudrv.buildout_iru(iru) }}
# XXX publish something for each RU # XXX publish something for each RU
# XXX publish something for each cell # XXX publish something for each cell
......
...@@ -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]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment