Commit aca396cf authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: Adjust check_sdr_busy promise to explicitly specify /dev/sdr0@0

In multiRU we will need to be able to check multiple devices and DMA channels,
not only /dev/sdr0@0 that was implicitly used until now.

-> As a preparatory step adjust the SR to explicitly specify which SDR resource is being verified.

This patch is necessary because in nexedi/slapos.toolbox!125
we adjust check_sdr_busy plugin to require SDR device/DMA channel to be
explicitly specified.

/cc @lu.xu, @tomo, @xavier_thompson, @Daetalus
/reviewed-by @jhuge
/reviewed-on nexedi/slapos!1458
parent 80c1fa18
...@@ -56,11 +56,11 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd ...@@ -56,11 +56,11 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd
[template-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 6be204217dd3c4ce240184ec31332cd6 md5sum = 88898ea41ee954de3f71bcf37af173fc
[template-gnb] [template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = e4d8c66c00dc5c022e9208c10e37490e md5sum = fc66088c94776fc15a6d5c21c137d686
[template-core-network] [template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
...@@ -68,11 +68,11 @@ md5sum = 919340a049d628a86838453354c9efa2 ...@@ -68,11 +68,11 @@ md5sum = 919340a049d628a86838453354c9efa2
[template-ue-lte] [template-ue-lte]
_update_hash_filename_ = instance-ue-lte.jinja2.cfg _update_hash_filename_ = instance-ue-lte.jinja2.cfg
md5sum = 587531b7a43fecbcdc2f1bffac74a363 md5sum = f6d8e97add6d11b0a5436744cb455195
[template-ue-nr] [template-ue-nr]
_update_hash_filename_ = instance-ue-nr.jinja2.cfg _update_hash_filename_ = instance-ue-nr.jinja2.cfg
md5sum = 3d6f3e864b6480a98c2699b11281182a md5sum = e57780260a1588d1dab29431c5e5ed97
[template-obsolete] [template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg _update_hash_filename_ = instance-obsolete.jinja2.cfg
......
...@@ -615,6 +615,8 @@ name = ${:_buildout_section_name_} ...@@ -615,6 +615,8 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
[check-baseband-latency.py] [check-baseband-latency.py]
<= macro.promise <= macro.promise
......
...@@ -298,6 +298,8 @@ name = ${:_buildout_section_name_} ...@@ -298,6 +298,8 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
[check-baseband-latency.py] [check-baseband-latency.py]
<= macro.promise <= macro.promise
......
...@@ -145,3 +145,5 @@ name = ${:_buildout_section_name_} ...@@ -145,3 +145,5 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
...@@ -146,3 +146,5 @@ name = ${:_buildout_section_name_} ...@@ -146,3 +146,5 @@ name = ${:_buildout_section_name_}
promise = check_sdr_busy promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }} config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }} config-sdr = {{ sdr }}
config-sdr_dev = 0
config-dma_chan = 0
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