add vswr promise

software/ors-amarisoft/buildout.hash.cfg

@@ -32,7 +32,7 @@ md5sum = 833667743c693b8d5f78a2527b275a9e
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 61cbcd637e8661502d5b30f44a882fa3
+md5sum = 2c933e03536f570d35d01432769479df
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -121,3 +121,7 @@ md5sum = 6812310b65c2d95815afc2b034a5f90f
 [interface-up-promise]
 _update_hash_filename_ = promise/check_interface_up.py
 md5sum = 44ae5693f62b7a4dbc98f700f68d8600
+
+[vswr-promise]
+_update_hash_filename_ = promise/check_vswr.py
+md5sum = fb1d32d0753f28708742f17950c18df7

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

@@ -5,12 +5,15 @@ parts =
   lte-enb-config
   lte-enb-service
   amarisoft-stats-service
-  lopcomm-rrh-stats-service
   sdr-busy-promise
   cell-gain-saturated-promise
   rx-saturated-promise
   baseband-latency-promise
   amarisoft-stats-log-promise
+{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
+  lopcomm-rrh-stats-service
+  vswr-promise
+{% endif %}
 {% if not slapparameter_dict.get("sub-instance", False) %}
   cpu-temperature-promise
 {% endif %}
@@ -230,6 +233,16 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 config-min-txrx-delay = {{ slapparameter_dict.get("min_txrx_delay", 5) }}
 config-avg-txrx-delay = {{ slapparameter_dict.get("avg_txrx_delay", 7) }}
 
+[vswr-promise]
+recipe = slapos.cookbook:promise.plugin
+eggs =
+  slapos.core
+  python-dateutil
+file = {{ vswr_promise }}
+output = ${directory:plugins}/check-vswr.py
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-lopcomm-stats-log = ${lopcomm-rrh-stats-template:json-log-output}
+
 [amarisoft-stats-log-promise]
 recipe = slapos.cookbook:promise.plugin
 eggs =

software/ors-amarisoft/promise/check_vswr.py

+import errno
+import json
+import logging
+import os
+
+from dateutil import parser
+
+from zope.interface import implementer
+from slapos.grid.promise import interface
+from slapos.grid.promise.generic import GenericPromise
+
+# Get all data in the last "interval" seconds from JSON log
+def get_data_interval(log, interval):
+
+    log_number = 0
+    latest_timestamp = 0
+    data_list = []
+
+    while True:
+        try:
+            f = open("{}.{}".format(log, log_number) if log_number else log, "rb")
+        except OSError:
+            return data_list
+        try:
+            f.seek(0, os.SEEK_END)
+            while True:
+                try:
+                    while f.seek(-2, os.SEEK_CUR) and f.read(1) != b'\n':
+                        pass
+                except OSError:
+                    break
+                pos = f.tell()
+                l = json.loads(f.readline().decode().replace("'", '"'))
+                timestamp = parser.parse(l['time'])
+                data_list.append(l['data'])
+                if not latest_timestamp:
+                    latest_timestamp = timestamp
+                if (latest_timestamp - timestamp).total_seconds() > interval:
+                    return data_list
+                f.seek(pos, os.SEEK_SET)
+        finally:
+            f.close()
+        log_number += 1
+
+@implementer(interface.IPromise)
+class RunPromise(GenericPromise):
+
+  def __init__(self, config):
+
+    self.__name = config.get('name', None)
+    self.__log_folder = config.get('log-folder', None)
+
+    super(RunPromise, self).__init__(config)
+    self.setPeriodicity(minute=1)
+
+    self.__title = os.path.splitext(self.__name)[0]
+    self.__log_file = os.path.join(self.__log_folder, '%s.json.log' % self.__title)
+
+    self.json_logger = logging.getLogger('json_logger')
+    self.json_logger.setLevel(logging.INFO)
+    handler = logging.FileHandler(self.__log_file)
+    formatter = logging.Formatter('{"time": "%(asctime)s", "log_level": "%(levelname)s", "message": "%(message)s", "data": %(data)s}')
+    handler.setFormatter(formatter)
+    self.json_logger.addHandler(handler)
+
+  def sense(self):
+
+    testing = self.getConfig('testing') == "True"
+    if testing:
+        self.logger.info("skipping promise")
+        return
+    lopcomm_stats_log = self.getConfig('lopcomm-stats-log')
+
+    self.logger.error(lopcomm_stats_log)
+
+  def test(self):
+    """
+      Called after sense() if the instance is still converging.
+      Returns success or failure based on sense results.
+
+      In this case, fail if the previous sensor result is negative.
+    """
+    return self._test(result_count=1, failure_amount=1)
+
+
+  def anomaly(self):
+    """
+      Called after sense() if the instance has finished converging.
+      Returns success or failure based on sense results.
+      Failure signals the instance has diverged.
+
+      In this case, fail if two out of the last three results are negative.
+    """
+    return self._anomaly(result_count=1, failure_amount=1)

software/ors-amarisoft/software.cfg

@@ -138,14 +138,9 @@ eggs =
   ${bcrypt:egg}
   xmltodict
   ncclient
-# setup-eggs =
-#   setuptools_scm[toml]
 interpreter = pythonwitheggs
 
 [versions]
 websocket-client = 1.4.2
 ncclient = 0.6.13
 xmltodict = 0.13.0
-# pkgutil-resolve-name = 1.3.10
-# setuptools-scm = 3.5.0
-# importlib-resources = 5.4.0