software/ors-amarisoft: Add xamari xlog service

Add a service that runs `xamari xlog stats[samples,rf]/<period>s` in
enb/gnb instance. For now the resulting logfile enb.xlog/gnb.xlog is
placed in monitor public folder to be served by monitor http server.

Optionally the service also includes `x.drb_stats/<period>s`, which
implies 100Hz polling. This is enabled by default.

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -122,6 +122,12 @@
       "type": "number",
       "default": 60
     },
+    "enb_drb_stats_enabled": {
+      "title": "Enable eNB drb statistics",
+      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

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

@@ -4,6 +4,7 @@ parts =
   ltelogs
   enb-config
   enb-service
+  xamari-xlog-service
   amarisoft-stats-service
   amarisoft-rf-info-service
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
@@ -133,6 +134,30 @@ environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
+[xamari-xlog-script]
+recipe = slapos.recipe.template
+output = ${directory:bin}/${:_buildout_section_name_}
+period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+stats_logspec = stats[samples,rf]/${:period}s
+{%- if slapparameter_dict.get("enb_drb_stats_enabled", True) %}
+drb_stats_logspec = x.drb_stats/${:period}s
+{%- else %}
+drb_stats_logspec =
+{%- endif %}
+logspec = ${:stats_logspec} ${:drb_stats_logspec}
+websock = ws://127.0.1.2:9001
+xamari = {{ buildout_directory }}/bin/xamari
+logfile = ${monitor-directory:public}/enb.xlog
+inline =
+  #!/bin/sh
+  exec ${:xamari} xlog ${:websock} ${:logspec} > ${:logfile}
+
+[xamari-xlog-service]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:service}/${:_buildout_section_name_}
+command-line = ${xamari-xlog-script:output}
+hash-files = ${:command-line}
+
 [amarisoft-stats-template]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do

software/ors-amarisoft/instance-gnb-input-schema.json.jinja2

@@ -254,6 +254,12 @@
       "type": "number",
       "default": 60
     },
+    "gnb_drb_stats_enabled": {
+      "title": "Enable gNB drb statistics",
+      "description": "Enable gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

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

@@ -4,6 +4,7 @@ parts =
   ltelogs
   gnb-config
   enb-service
+  xamari-xlog-service
   amarisoft-stats-service
   amarisoft-rf-info-service
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
@@ -134,6 +135,30 @@ environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
+[xamari-xlog-script]
+recipe = slapos.recipe.template
+output = ${directory:bin}/${:_buildout_section_name_}
+period = {{ slapparameter_dict.get("gnb_stats_fetch_period", 60) }}
+stats_logspec = stats[samples,rf]/${:period}s
+{%- if slapparameter_dict.get("gnb_drb_stats_enabled", True) %}
+drb_stats_logspec = x.drb_stats/${:period}s
+{%- else %}
+drb_stats_logspec =
+{%- endif %}
+logspec = ${:stats_logspec} ${:drb_stats_logspec}
+websock = ws://127.0.1.2:9001
+xamari = {{ buildout_directory }}/bin/xamari
+logfile = ${monitor-directory:public}/gnb.xlog
+inline =
+  #!/bin/sh
+  exec ${:xamari} xlog ${:websock} ${:logspec} > ${:logfile}
+
+[xamari-xlog-service]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:service}/${:_buildout_section_name_}
+command-line = ${xamari-xlog-script:output}
+hash-files = ${:command-line}
+
 [amarisoft-stats-template]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do

software/ors-amarisoft/instance-tdd1900-enb-input-schema.json

@@ -122,6 +122,12 @@
       "type": "number",
       "default": 60
     },
+    "enb_drb_stats_enabled": {
+      "title": "Enable eNB drb statistics",
+      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -254,6 +254,12 @@
       "type": "number",
       "default": 60
     },
+    "gnb_drb_stats_enabled": {
+      "title": "Enable gNB drb statistics",
+      "description": "Enable gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd2600-enb-input-schema.json

@@ -122,6 +122,12 @@
       "type": "number",
       "default": 60
     },
+    "enb_drb_stats_enabled": {
+      "title": "Enable eNB drb statistics",
+      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -254,6 +254,12 @@
       "type": "number",
       "default": 60
     },
+    "gnb_drb_stats_enabled": {
+      "title": "Enable gNB drb statistics",
+      "description": "Enable gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd3500-enb-input-schema.json

@@ -122,6 +122,12 @@
       "type": "number",
       "default": 60
     },
+    "enb_drb_stats_enabled": {
+      "title": "Enable eNB drb statistics",
+      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -254,6 +254,12 @@
       "type": "number",
       "default": 60
     },
+    "gnb_drb_stats_enabled": {
+      "title": "Enable gNB drb statistics",
+      "description": "Enable gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd3700-enb-input-schema.json

@@ -122,6 +122,12 @@
       "type": "number",
       "default": 60
     },
+    "enb_drb_stats_enabled": {
+      "title": "Enable eNB drb statistics",
+      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -254,6 +254,12 @@
       "type": "number",
       "default": 60
     },
+    "gnb_drb_stats_enabled": {
+      "title": "Enable gNB drb statistics",
+      "description": "Enable gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "type": "boolean",
+      "default": true
+    },
     "max_rx_sample_db": {
       "title": "Maximum RX sample value (dB)",
       "description": "Maximum RX sample threshold above which RX saturated promise will fail",

software/ors-amarisoft/software-base.cfg

@@ -9,6 +9,10 @@ extends =
   ../../component/python3/buildout.cfg
   ../../component/python-pynacl/buildout.cfg
   ../../component/bcrypt/buildout.cfg
+  ../../component/numpy/buildout.cfg
+  ../../component/pygolang/buildout.cfg
+  ../../component/git/buildout.cfg
+
 
 parts +=
   template
@@ -34,6 +38,7 @@ parts +=
   rsvp.js
   iperf3
   eggs
+  xamari
 
 # unimplemented parts - the http monitor and better log handling using logrotate
 #  apache-php
@@ -175,6 +180,25 @@ eggs =
   ncclient
 interpreter = pythonwitheggs
 
+[xlte-repository]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/kirr/xlte.git
+revision = 58220253
+git-executable = ${git:location}/bin/git
+
+[xlte]
+recipe = zc.recipe.egg:develop
+setup = ${xlte-repository:location}
+egg = xlte
+depends =
+  ${numpy:egg}
+  ${pygolang:egg}
+
+[xamari]
+recipe = zc.recipe.egg
+eggs = ${xlte:egg}
+scripts = xamari
+
 [versions]
 websocket-client = 1.4.2
 ncclient = 0.6.13