.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 896483b7d3602a33e9b9acfd894b689b
+md5sum = 8a4504fa1666a5e12bfb173754474b51
 
 [template-ors]
 filename = instance-ors.cfg
@@ -28,7 +28,7 @@ md5sum = 7be5ebdb7fd13c342b9c7b54c9ba346f
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 74451915f69e759ecd7bbd4c1cab8231
+md5sum = c6e0c6f8b224c4a5fff4dc2d02c7f153
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -42,12 +42,12 @@ md5sum = 3cdf26e872670b0409f4456d9f6a5ebe
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
 md5sum = e291dd9197e16f1af955a40f03d4ddb5
 
-[amarisoft-stats.jinja2.py]
-_update_hash_filename_ = amarisoft-stats.jinja2.py
+[ru_amarisoft-stats.jinja2.py]
+_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
 md5sum = 674dcc250c0b6bb43d8546624552fc5d
 
-[amarisoft-rf-info.jinja2.py]
-_update_hash_filename_ = amarisoft-rf-info.jinja2.py
+[ru_amarisoft-rf-info.jinja2.py]
+_update_hash_filename_ = ru/amarisoft-rf-info.jinja2.py
 md5sum = d2fe2fbe70c6824c514a7c4034a2ddb3
 
 [ru_lopcomm_ncclient_common.py]
@@ -84,7 +84,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = caf6fb4058cb206e3cb1eb5bbff0c8e6
+md5sum = b1bbe8fbb919a531736401fd93b2919d
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -12,8 +12,6 @@ parts =
 {% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
   xlog-fluentbit-service
 {% endif %}
-  amarisoft-stats-service
-  amarisoft-rf-info-service
 # XXX -> ru/lopcomm
 {% if ru == "lopcomm" %}
   sshd-service
@@ -190,53 +188,6 @@ wrapper-path = ${directory:service}/${:_buildout_section_name_}
 hash-files = ${:fluentbit-config}
 {% endif %}
 
-[amarisoft-stats-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/amarisoft-stats.json.log
-context =
-  section directory directory
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-  json iru_dict {{ rulib.iru_dict | tojson }}
-mode = 0775
-url = {{ amarisoft_stats_template }}
-output = ${directory:bin}/amarisoft-stats.py
-
-[amarisoft-rf-info-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/amarisoft-rf-info.json.log
-context =
-  section directory directory
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-mode = 0775
-url = {{ amarisoft_rf_info_template }}
-output = ${directory:bin}/amarisoft-rf-info.py
-
-[amarisoft-stats-service]
-recipe = slapos.cookbook:wrapper
-command-line = ${amarisoft-stats-template:output}
-wrapper-path = ${directory:service}/amarisoft-stats
-mode = 0775
-hash-files =
-  ${amarisoft-stats-template:output}
-
-[amarisoft-rf-info-service]
-recipe = slapos.cookbook:wrapper
-command-line = ${amarisoft-rf-info-template:output}
-wrapper-path = ${directory:service}/amarisoft-rf-info
-mode = 0775
-hash-files =
-  ${amarisoft-rf-info-template:output}
-
 [user-info]
 recipe = slapos.cookbook:userinfo
 
@@ -370,14 +321,6 @@ name = ${:_buildout_section_name_}
 <= macro.promise
 promise = check_baseband_latency
 config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
+config-amarisoft-stats-log = ${ru_amarisoft-stats-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 config-min-rxtx-delay = {{ slapparameter_dict.get("min_rxtx_delay", 0) }}
-
-[check-amarisoft-stats-log.py]
-<= macro.promise
-promise = check_amarisoft_stats_log
-output = ${directory:plugins}/check-amarisoft-stats-log.py
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}

software/ors-amarisoft/instance.cfg

@@ -143,8 +143,8 @@ extra-context =
     raw drb_lte_template ${drb_lte.jinja2.cfg:target}
     raw drb_nr_template  ${drb_nr.jinja2.cfg:target}
     raw sib23_template   ${sib23.jinja2.asn:target}
-    raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
-    raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
+    raw ru_amarisoft_stats_template   ${ru_amarisoft-stats.jinja2.py:target}
+    raw ru_amarisoft_rf_info_template   ${ru_amarisoft-rf-info.jinja2.py:target}
     raw ru_lopcomm_stats_template   ${ru_lopcomm_stats.jinja2.py:target}
     raw ru_lopcomm_config_template   ${ru_lopcomm_config.jinja2.py:target}
     raw ru_lopcomm_software_template   ${ru_lopcomm_software.jinja2.py:target}
@@ -196,6 +196,8 @@ extra-context =
     raw ue_template   ${ue.jinja2.cfg:target}
     raw openssl_location ${openssl:location}
 
+    raw ru_amarisoft_stats_template   ${ru_amarisoft-stats.jinja2.py:target}
+    raw ru_amarisoft_rf_info_template   ${ru_amarisoft-rf-info.jinja2.py:target}
     raw ru_lopcomm_stats_template   ${ru_lopcomm_stats.jinja2.py:target}
     raw ru_lopcomm_config_template   ${ru_lopcomm_config.jinja2.py:target}
     raw ru_lopcomm_software_template   ${ru_lopcomm_software.jinja2.py:target}

software/ors-amarisoft/ru/buildout.cfg

@@ -33,3 +33,9 @@ stop-on-error = true
 [setcap-netcapdo]
 <= setcap
 exe = ${netcapdo:exe}
+
+[ru_amarisoft-stats.jinja2.py]
+<= download-base
+
+[ru_amarisoft-rf-info.jinja2.py]
+<= download-base

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -193,7 +193,7 @@ config-dma_chan = {{ ru.cpri_link.sfp_port }}
 promise = check_cpri_lock
 config-sdr_dev  = {{ ru.cpri_link.sdr_dev }}
 config-sfp_port = {{ ru.cpri_link.sfp_port }}
-config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
+config-amarisoft-rf-info-log = ${ru_amarisoft-rf-info-template:log-output}
 
 {%-     else %}
 {%-       do bug('unreachable') %}
@@ -202,7 +202,7 @@ config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
 {{ promise('%s-rx-saturated' % ru_ref) }}
 promise = check_rx_saturated
 config-rf-rx-chan-list = {{ list(range(ru._rf_chan_rx, ru._rf_chan_rx + ru.n_antenna_ul)) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
+config-amarisoft-stats-log = ${ru_amarisoft-stats-template:log-output}
 config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
 
 {#-     driver-specific part #}
@@ -263,6 +263,59 @@ ru  = {{ ru_ref }}
 
 {%-   endfor %}
 
+{#-  retrieve rf and stats[rf,samples] data from amarisoft service for promises
+     such as check_cpri_lock and check_rx_saturated.
+#}
+[ru_amarisoft-rf-info-template]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+log-output = ${directory:var}/log/amarisoft-rf-info.json.log
+context =
+  section directory directory
+  key slapparameter_dict slap-configuration:configuration
+  key log_file :log-output
+  raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+  raw testing {{ slapparameter_dict.get("testing", False) }}
+  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
+mode = 0775
+url = {{ ru_amarisoft_rf_info_template }}
+output = ${directory:bin}/amarisoft-rf-info.py
+
+{{ part('amarisoft-rf-info-service') }}
+recipe = slapos.cookbook:wrapper
+command-line = ${ru_amarisoft-rf-info-template:output}
+wrapper-path = ${directory:service}/amarisoft-rf-info
+mode = 0775
+hash-files =
+  ${ru_amarisoft-rf-info-template:output}
+
+[ru_amarisoft-stats-template]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+log-output = ${directory:var}/log/amarisoft-stats.json.log
+context =
+  section directory directory
+  key slapparameter_dict slap-configuration:configuration
+  key log_file :log-output
+  raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+  raw testing {{ slapparameter_dict.get("testing", False) }}
+  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
+  json iru_dict {{ iru_dict | tojson }}
+mode = 0775
+url = {{ ru_amarisoft_stats_template }}
+output = ${directory:bin}/amarisoft-stats.py
+
+{{ part('amarisoft-stats-service') }}
+recipe = slapos.cookbook:wrapper
+command-line = ${ru_amarisoft-stats-template:output}
+wrapper-path = ${directory:service}/amarisoft-stats
+mode = 0775
+hash-files =
+  ${ru_amarisoft-stats-template:output}
+
+{{ promise('amarisoft-stats-log') }}
+promise = check_amarisoft_stats_log
+config-amarisoft-stats-log = ${ru_amarisoft-stats-template:log-output}
 
 [buildout]
 parts +=

software/ors-amarisoft/software-base.cfg

@@ -57,12 +57,6 @@ output = ${buildout:directory}/template.cfg
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 
-[amarisoft-stats.jinja2.py]
-<= download-base
-
-[amarisoft-rf-info.jinja2.py]
-<= download-base
-
 [template-enb]
 <= download-base