Commit ea2536db authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb: Factor sdr-busy promise to generic ru library and to be per-RU

If we have several radio units, we want each of them to have its own sdr-busy promise.

See slapos.toolbox!125 for
corresponding part in slapos.toolbox that makes check_sdr_busy per-RU
configurable.

Not touching gnb.jinja2.cfg as currently gnb does not support multicell at all,
and in the future it will be sole enb.cfg to handle both LTE and NR
simultaneously.

/cc @xavier_thompson, @Daetalus
/reviewed-by @jhuge, @lu.xu
/reviewed-on !1485
parent f2888c7c
...@@ -32,7 +32,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883 ...@@ -32,7 +32,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883
[ru_libinstance.jinja2.cfg] [ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg _update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum = 5706b618cb26b3541bd9f5571d61db89 md5sum = 4d29c7d06109cc9ecda37f60045336e8
[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
...@@ -80,7 +80,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e ...@@ -80,7 +80,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 05c6562ec081f8d36e43f6ed2fd56092 md5sum = 6074adea3c4b30c7b726981e9e40b8a7
[template-gnb] [template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
......
...@@ -14,7 +14,6 @@ parts = ...@@ -14,7 +14,6 @@ parts =
sshd-add-authorized-key sshd-add-authorized-key
sshd-promise sshd-promise
{% endif %} {% endif %}
check-sdr-busy.py
check-baseband-latency.py check-baseband-latency.py
check-amarisoft-stats-log.py check-amarisoft-stats-log.py
check-rx-saturated.py check-rx-saturated.py
...@@ -372,14 +371,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }} ...@@ -372,14 +371,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
<= monitor-promise-base <= monitor-promise-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
[check-sdr-busy.py]
<= macro.promise
promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
[check-baseband-latency.py] [check-baseband-latency.py]
<= macro.promise <= macro.promise
promise = check_baseband_latency promise = check_baseband_latency
......
...@@ -153,12 +153,28 @@ hash-files = ...@@ -153,12 +153,28 @@ hash-files =
{%- set ru_ref = cell_ref if cell_ref != 'default' else 'RU' %} {%- set ru_ref = cell_ref if cell_ref != 'default' else 'RU' %}
# {{ ru_ref }} ({{ ru_type}}) # {{ ru_ref }} ({{ ru_type}})
{%- if trx == 'cpri' %} {%- if trx == 'sdr' %}
{{ promise('%s-sdr-busy' % ru_ref) }}
promise = check_sdr_busy
config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
{%- elif trx == 'cpri' %}
{{ promise('%s-sdr-busy' % ru_ref) }}
promise = check_sdr_busy
config-sdr = {{ sdr }}
config-sdr_dev = {{ slapparameter_dict.get('sdr_number', 0) }}
config-dma_chan = {{ cell.cpri_port_number }}
{{ promise('%s-cpri-lock' % ru_ref) }} {{ promise('%s-cpri-lock' % ru_ref) }}
promise = check_cpri_lock promise = check_cpri_lock
config-sdr_dev = {{ slapparameter_dict.get('sdr_number', 0) }} config-sdr_dev = {{ slapparameter_dict.get('sdr_number', 0) }}
config-sfp_port = {{ cell.cpri_port_number }} config-sfp_port = {{ cell.cpri_port_number }}
config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output} config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
{%- else %}
{%- do bug('unreachable') %}
{%- endif %} {%- endif %}
{#- driver-specific part #} {#- driver-specific part #}
......
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