.

software/ors-amarisoft/buildout.hash.cfg

@@ -32,11 +32,11 @@ md5sum = b71776599bf20493ed6914a7f017822e
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
-md5sum = bbf7d0ed5f1c7078008bd05eb0ecb0a8
+md5sum = e27ebe0ff200a3e4492412f164ca9b73
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 18e46642ac11e507b61085992b0d4a4e
+md5sum = c9538c6b90b87544aca2e8425de4aed6
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

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

@@ -282,34 +282,6 @@ mode = 0775
 url = {{ amarisoft_rf_info_template }}
 output = ${directory:bin}/amarisoft-rf-info.py
 
-# XXX -> ru/lopcomm
-[lopcomm-rrh-stats-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/lopcomm-rrh-stats.log
-json-log-output = ${directory:var}/log/lopcomm-rrh-stats.json.log
-cfg-json-log-output = ${directory:var}/log/lopcomm-rrh-config.json.log
-supervision-json-log-output = ${directory:var}/log/lopcomm-rrh-supervision.json.log
-ncsession-json-log-output = ${directory:var}/log/lopcomm-rrh-ncsession.json.log
-software-json-log-output = ${directory:var}/log/lopcomm-rrh-software.json.log
-context =
-  section directory directory
-  section slap_configuration slap-configuration
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  key json_log_file :json-log-output
-  key cfg_json_log_file :cfg-json-log-output
-  key supervision_json_log_file :supervision-json-log-output
-  key ncsession_json_log_file :ncsession-json-log-output
-  key software_json_log_file :software-json-log-output
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-  raw buildout_directory_path {{ buildout_directory }}
-  import netaddr netaddr
-mode = 0775
-url = {{ lopcomm_rrh_stats_template }}
-output = ${directory:bin}/lopcomm-rrh-stats.py
-
 # XXX -> ru/lopcomm
 [lopcomm-cu-config]
 <= config-base
@@ -418,15 +390,6 @@ mode = 0775
 hash-files =
   ${amarisoft-rf-info-template:output}
 
-# XXX -> ru/lopcomm
-[lopcomm-rrh-stats-service]
-recipe = slapos.cookbook:wrapper
-command-line = ${lopcomm-rrh-stats-template:output}
-wrapper-path = ${directory:service}/lopcomm-rrh-stats
-mode = 0775
-hash-files =
-  ${lopcomm-rrh-stats-template:output}
-
 [lopcomm-rrh-supervision-service]
 recipe = slapos.cookbook:wrapper
 command-line = ${lopcomm-rrh-supervision-template:output}

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

+{#- Package ru/lopcomm/libinstance provides instance code for handling Lopcomm ORAN Radio Units. #}
+
 {%- macro buildout_iru(iru)  %}
+{%-  set ru_ref = J(jref_of_shared(iru))  %}
+{%-  set ru     = iru['_']  %}
+
+[{{ru_ref}}-stats-template]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+_base = ${directory:var}/log/{{ru_ref}}
+log-output = ${:_base}-stats.log
+json-log-output = ${:_base}-stats.json.log
+cfg-json-log-output = ${:_base}-config.json.log
+supervision-json-log-output = ${:_base}-supervision.json.log
+ncsession-json-log-output = ${:_base}-ncsession.json.log
+software-json-log-output = ${:_base}-software.json.log
+context =
+  section directory directory
+  section slap_configuration slap-configuration
+  key slapparameter_dict slap-configuration:configuration
+  key log_file :log-output
+  key json_log_file :json-log-output
+  key cfg_json_log_file :cfg-json-log-output
+  key supervision_json_log_file :supervision-json-log-output
+  key ncsession_json_log_file :ncsession-json-log-output
+  key software_json_log_file :software-json-log-output
+  raw testing {{ slapparameter_dict.get("testing", False) }}
+  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
+  raw buildout_directory_path {{ buildout_directory }}
+  import netaddr netaddr
+mode = 0775
+url = {{ lopcomm_rrh_stats_template }}  XXX
+output = ${directory:bin}/{{ru_ref}}-stats.py
+
+{{ part('%s-stats-service' % ru_ref) }}
+recipe = slapos.cookbook:wrapper
+command-line = ${ {{- ru_ref}}-stats-template:output}
+wrapper-path = ${directory:service}/{{ru_ref}}-stats
+mode = 0775
+hash-files =
+  ${:command-line}
+
+{{ promise('%s-check-vswr.py' % ru_ref) }}
+promise = check_lopcomm_vswr
+config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
+
 {%- endmacro  %}

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

-{%- macro buildout_iru(iru)  %}
-{%-  set ru_ref = J(jref_of_shared(iru))  %}
-{%-  set ru     = iru['_']  %}
-
-{{ promise('%s-check-vswr.py' % ru_ref) }}
-promise = check_lopcomm_vswr
-config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+{#- Package ru/sdr/libinstance provides instance code for handling SDR Radio Units. #}
 
+{%- macro buildout_iru(iru)  %}
+{#-  nothing SDR-specific #}
 {%- endmacro  %}