software/ors-amarisoft: add more radio alarms from slapos.toolbox

software/ors-amarisoft/buildout.hash.cfg

@@ -36,7 +36,7 @@ md5sum = bb4435f433e100fede09ff921d42c927
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = c408287f84382f021365985a3a524675
+md5sum = 31707b64ab531c60fc99287238130c5b
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -48,7 +48,7 @@ md5sum = acc9176fd9abe1d04c60a08cdd520eee
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 90e260fea9d6794d41a52d1c07a6bf81
+md5sum = 6695165ae0e5116073a802f10aba3d94
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg

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

@@ -9,6 +9,9 @@ parts =
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
   lopcomm-rrh-stats-service
   check-lopcomm-vswr.py
+  check-lopcomm-lof.py
+  check-lopcomm-rssi.py
+  check-cpri-lock.py
 {% endif %}
 {% if not slapparameter_dict.get("sub-instance", False) %}
   check-cpu-temperature.py
@@ -259,6 +262,27 @@ 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-rssi.py]
+<= macro.promise
+promise = check_lopcomm_rssi
+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-lof.py]
+<= macro.promise
+promise = check_lopcomm_lof
+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-cpri-lock.py]
+<= macro.promise
+promise = check_cpri_lock
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 [check-rx-saturated.py]
 <= macro.promise
 promise = check_rx_saturated

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

@@ -9,6 +9,9 @@ parts =
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
   lopcomm-rrh-stats-service
   check-lopcomm-vswr.py
+  check-lopcomm-lof.py
+  check-lopcomm-rssi.py
+  check-cpri-lock.py
 {% endif %}
 {% if not slapparameter_dict.get("sub-instance", False) %}
   check-cpu-temperature.py
@@ -237,6 +240,27 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("gnb_stats_fetch_period", 60) }}
 
+[check-lopcomm-rssi.py]
+<= macro.promise
+promise = check_lopcomm_rssi
+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-lof.py]
+<= macro.promise
+promise = check_lopcomm_lof
+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-cpri-lock.py]
+<= macro.promise
+promise = check_cpri_lock
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 [check-rx-saturated.py]
 <= macro.promise
 promise = check_rx_saturated

software/ors-amarisoft/software.cfg

@@ -7,9 +7,10 @@ extends =
   ../../component/nghttp2/buildout.cfg
   ../../component/iperf3/buildout.cfg
   ../../component/python3/buildout.cfg
+  ../../component/python-pynacl/buildout.cfg
+  ../../component/bcrypt/buildout.cfg
 
 parts +=
-# slapos.toolbox-dev
   template
   slapos-cookbook
   ltelogs.jinja2.sh
@@ -28,19 +29,6 @@ parts +=
 #  apache-php
 #  logrotate
 
-# [slapos.toolbox-repository]
-# recipe = slapos.recipe.build:gitclone
-# repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
-# branch = ors
-# git-executable = ${git:location}/bin/git
-# develop = true
-
-# [slapos.toolbox-dev]
-# recipe = zc.recipe.egg:develop
-# egg = slapos.toolbox
-# setup = ${slapos.toolbox-repository:location}
-# depends = ${slapos-toolbox-dependencies:eggs}
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
@@ -119,23 +107,11 @@ filename = ue-lte.jinja2.cfg
 <= copy-config-to-instance
 filename = ue-nr.jinja2.cfg
 
-[pynacl]
-recipe = zc.recipe.egg:custom
-egg = pynacl
-setup-eggs =
-  cffi
-
-[bcrypt]
-recipe = zc.recipe.egg:custom
-egg = bcrypt
-setup-eggs =
-  cffi
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
   websocket-client
-  ${pynacl:egg}
+  ${python-pynacl:egg}
   ${bcrypt:egg}
   xmltodict
   ncclient
@@ -145,4 +121,3 @@ interpreter = pythonwitheggs
 websocket-client = 1.4.2
 ncclient = 0.6.13
 xmltodict = 0.13.0
-# slapos.toolbox =