software/ors-amarisoft: Push amarisoft-stats.jinja2.py and amarisoft-rf-info.jinja2.py into ru/

Because

1) those services are needed and used only by ru/ promises like check_cpri_lock
   and check_rx_saturated.
2) in general we will need to initialize and setup radio units not only in eNB -
   for example UEsim will use the same code library to initialize radio units.
   Thus the proper place to keep everything required for RU to be operational have to
   be located inside ru/ and activated by that radio-units library.

Push corresponding code from instance-enb to ru/ and do only minor adjustments
to instance-gnb trying not to break it, since gnb does not currently use rulib,
and because in the future gnb will be replaced by enb which will be serving
both lte and nr cells in the same service.

/cc @lu.xu, @tomo, @xavier_thompson, @Daetalus
/reviewed-by @jhuge
/reviewed-on !1511

software/ors-amarisoft/buildout.hash.cfg

@@ -16,23 +16,23 @@
 
 [template]
 filename = instance.cfg
-md5sum = a9e416eaa3ad7d2ea29cb90ce2c41a60
+md5sum = 46556429e86a96f4cd49084e1c96123f
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
 md5sum = c31dffa87765d93327f18ffd89ce36ca
 
-[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 = c4d5e9fcf460d88bc2b4bcfbdfe554f7
 
-[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 = ab666fdfadbfc7d8a16ace38d295c883
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 045c8dc5fb7f81b1a03f0e7f589166b4
+md5sum = d3ae8839b1a7b7a225bc69c3910c0b35
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -80,11 +80,11 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = fe76f78a7c10d4e6080f12d139a40f32
+md5sum = 78ca387cee8121771186c36c8044b536
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = e8e87a50b861d733894eb69e1aefa683
+md5sum = 2308c4cb644863ab322b91bb325d3460
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg

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

@@ -7,10 +7,7 @@ parts =
 {% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
   xlog-fluentbit-service
 {% endif %}
-  amarisoft-stats-service
-  amarisoft-rf-info-service
   check-baseband-latency.py
-  check-amarisoft-stats-log.py
   monitor-base
   publish-connection-information
 
@@ -174,52 +171,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
-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}
-
 [config-base]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
@@ -304,14 +255,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-gnb.jinja2.cfg

@@ -188,7 +188,7 @@ context =
   raw testing {{ slapparameter_dict.get("testing", False) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
 mode = 0775
-url = {{ amarisoft_stats_template }}
+url = {{ ru_amarisoft_stats_template }}
 output = ${directory:bin}/amarisoft-stats.py
 
 [amarisoft-rf-info-template]
@@ -203,7 +203,7 @@ context =
   raw testing {{ slapparameter_dict.get("testing", False) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
 mode = 0775
-url = {{ amarisoft_rf_info_template }}
+url = {{ ru_amarisoft_rf_info_template }}
 output = ${directory:bin}/amarisoft-rf-info.py
 
 [amarisoft-stats-service]

software/ors-amarisoft/instance.cfg

@@ -279,8 +279,8 @@ extra-context =
     raw slaplte_template ${slaplte.jinja2:target}
     raw drb_lte_template ${drb_lte.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}
@@ -318,8 +318,8 @@ extra-context =
     key sdr amarisoft:sdr
     raw gnb_template   ${gnb.jinja2.cfg:target}
     raw drb_nr_template  ${drb_nr.jinja2.cfg: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 openssl_location ${openssl:location}
     raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
     raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}

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

@@ -173,7 +173,7 @@ config-dma_chan = {{ cell.cpri_port_number }}
 promise = check_cpri_lock
 config-sdr_dev  = {{ slapparameter_dict.get('sdr_number', 0) }}
 config-sfp_port = {{ cell.cpri_port_number }}
-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') %}
@@ -182,7 +182,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(i*n_antenna_ul, (i+1)*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 #}
@@ -193,6 +193,59 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
 {{      rudrv.buildout_ru(ru_ref, cell) }}
 {%-   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
+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

@@ -58,12 +58,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