software/ors-amarisoft: modify RU alarms

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

@@ -13,6 +13,7 @@ parts =
   lopcomm-cu-config
   check-lopcomm-vswr.py
   check-lopcomm-pa-current.py
+  check-lopcomm-pa-output-power.py
   check-lopcomm-lof.py
   check-lopcomm-rssi.py
   check-lopcomm-sync.py
@@ -26,7 +27,9 @@ parts =
   check-sdr-busy.py
   check-baseband-latency.py
   check-amarisoft-stats-log.py
+{% if not slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
   check-rx-saturated.py
+{% endif %}
   monitor-base
   publish-connection-information
 
@@ -101,6 +104,14 @@ version = {{ slapparameter_dict.get("enb_config_version") }}
 offline = false
 {% endif %}
 
+{% if slapparameter_dict.get("cu_config_link", None) %}
+[cu-config-dl]
+recipe = slapos.recipe.build:download
+url = {{ slapparameter_dict.get("cu_config_link") }}
+version = {{ slapparameter_dict.get("cu_config_version") }}
+offline = false
+{% endif %}
+
 [enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
@@ -212,6 +223,8 @@ 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
 context =
   section directory directory
   section slap_configuration slap-configuration
@@ -219,6 +232,8 @@ context =
   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
   raw testing {{ slapparameter_dict.get("testing", False) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
   import netaddr netaddr
@@ -228,7 +243,11 @@ output = ${directory:bin}/lopcomm-rrh-stats.py
 
 [lopcomm-cu-config]
 <= config-base
+{% if slapparameter_dict.get("cu_config_link", None) %}
+url = ${enb-config-dl:target}
+{% else %}
 url = {{ cu_config_template }}
+{% endif %}
 output = ${directory:etc}/cu_config.xml
 
 [lopcomm-rrh-config-template]
@@ -375,6 +394,13 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
+[check-lopcomm-pa-output-power.py]
+<= macro.promise
+promise = check_lopcomm_pa_output_power
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 [check-lopcomm-sync.py]
 <= macro.promise
 promise = check_lopcomm_sync