software/ors-amarisoft: remove useless ltelogs script

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 3919d261bdf366b7f7cc5149ab4c609d
+md5sum = f23909a703ac9001afec38cbac19591a
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -56,23 +56,23 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = d37801f7d613618d5a26605415093fd7
+md5sum = 40f735514d8f4ead0d4328c58b78be93
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 9575d69d3ea61842750b44ad67e92258
+md5sum = 2d7558e4799818a5546850f735fbb399
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 919340a049d628a86838453354c9efa2
+md5sum = aa7fcf7f68ced7e880158d0aa3307be4
 
 [template-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = f6d8e97add6d11b0a5436744cb455195
+md5sum = b444f859248778e18c5eba60f5670f6c
 
 [template-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = e57780260a1588d1dab29431c5e5ed97
+md5sum = bc65fdce1c453d92310d53928dcaaa7a
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg
@@ -94,10 +94,6 @@ md5sum = a1973ba6e43d40e510d61d461c2d13ac
 filename = config/gnb.jinja2.cfg
 md5sum = 075df4848e08ef8a595b33164238a0e7
 
-[ltelogs.jinja2.sh]
-filename = ltelogs.jinja2.sh
-md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
-
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
 md5sum = 3d7833ddba3242cedcd74c7db52390c6

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -37,7 +37,6 @@ info = DNS entry with has been attached to service ${slap-configuration:instance
 [buildout]
 parts =
   directory
-  ltelogs
   mme-config
   mme-service
   monitor-base
@@ -100,14 +99,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[ltelogs]
-recipe = slapos.recipe.template:jinja2
-url = {{ ltelogs_template }}
-output = ${directory:home}/ltelogs.sh
-extensions = jinja2.ext.do
-context =
-  section directory directory
-
 {% if slapparameter_dict.get("mme_config_link", None) %}
 [mme-config-dl]
 recipe = slapos.recipe.build:download
@@ -119,7 +110,6 @@ offline = false
 ### IMS
 [ims-service]
 recipe = slapos.cookbook:wrapper
-init = ${ltelogs:output} ${directory:log}/ims.log; sleep 1
 command-line = {{ mme }}/lteims ${directory:etc}/ims.cfg
 wrapper-path = ${directory:service}/ims
 mode = 0775
@@ -148,7 +138,6 @@ inline =
 recipe = slapos.cookbook:wrapper
 # When the machine shutdowns abruptly, lte_ue is not cleaned up which causes
 # amarisoft ltemme to fail. TODO: find a cleaner way to handle this
-init = ${ltelogs:output} ${directory:log}/mme.log
 command-line = ${mme-sh-wrapper:output}
 wrapper-path = ${directory:service}/mme
 mode = 0775

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

 [buildout]
 parts =
   directory
-  ltelogs
   enb-config
   enb-service
   xamari-xlog-service
@@ -100,14 +99,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[ltelogs]
-recipe = slapos.recipe.template:jinja2
-url = {{ ltelogs_template }}
-output = ${directory:home}/ltelogs.sh
-extensions = jinja2.ext.do
-context =
-  section directory directory
-
 {% if slapparameter_dict.get("enb_config_link", None) %}
 [enb-config-dl]
 recipe = slapos.recipe.build:download
@@ -143,7 +134,6 @@ inline =
 
 [enb-service]
 recipe = slapos.cookbook:wrapper
-init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
 command-line = ${enb-sh-wrapper:output}
 wrapper-path = ${directory:service}/enb
 mode = 0775

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

 [buildout]
 parts =
   directory
-  ltelogs
   gnb-config
   enb-service
   xamari-xlog-service
@@ -70,14 +69,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[ltelogs]
-recipe = slapos.recipe.template:jinja2
-url = {{ ltelogs_template }}
-output = ${directory:home}/ltelogs.sh
-extensions = jinja2.ext.do
-context =
-  section directory directory
-
 {% if slapparameter_dict.get("gnb_config_link", None) %}
 [gnb-config-dl]
 recipe = slapos.recipe.build:download
@@ -106,7 +97,6 @@ inline =
 ### eNodeB (enb)
 [enb-service]
 recipe = slapos.cookbook:wrapper
-init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
 command-line = ${enb-sh-wrapper:output}
 wrapper-path = ${directory:service}/enb
 mode = 0775

software/ors-amarisoft/instance-ue-lte.jinja2.cfg

 [buildout]
 parts =
   directory
-  ltelogs
   lte-ue-lte-config
   lte-ue-service
   check-sdr-busy.py
@@ -57,14 +56,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[ltelogs]
-recipe = slapos.recipe.template:jinja2
-url = {{ ltelogs_template }}
-output = ${directory:home}/ltelogs.sh
-extensions = jinja2.ext.do
-context =
-  section directory directory
-
 {% if slapparameter_dict.get("ue_lte_config_link", None) %}
 [ue-lte-config-dl]
 recipe = slapos.recipe.build:download
@@ -90,7 +81,6 @@ inline =
 ### User Equipment (UE)
 [lte-ue-service]
 recipe = slapos.cookbook:wrapper
-init = ${ltelogs:output} ${directory:log}/ue.log; sleep 2
 command-line = ${lte-ue-sh-wrapper:output}
 wrapper-path = ${directory:service}/lte-ue
 mode = 0775

software/ors-amarisoft/instance-ue-nr.jinja2.cfg

 [buildout]
 parts =
   directory
-  ltelogs
   lte-ue-nr-config
   lte-ue-service
   check-sdr-busy.py
@@ -57,14 +56,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[ltelogs]
-recipe = slapos.recipe.template:jinja2
-url = {{ ltelogs_template }}
-output = ${directory:home}/ltelogs.sh
-extensions = jinja2.ext.do
-context =
-  section directory directory
-
 {% if slapparameter_dict.get("ue_nr_config_link", None) %}
 [ue-nr-config-dl]
 recipe = slapos.recipe.build:download
@@ -90,7 +81,6 @@ inline =
 ### User Equipment (UE)
 [lte-ue-service]
 recipe = slapos.cookbook:wrapper
-init = ${ltelogs:output} ${directory:log}/ue.log; sleep 2
 command-line = ${lte-ue-sh-wrapper:output}
 wrapper-path = ${directory:service}/lte-ue
 mode = 0775

software/ors-amarisoft/instance.cfg

@@ -268,7 +268,6 @@ extra-context =
     key sdr amarisoft:sdr
     raw enb_template   ${enb.jinja2.cfg:target}
     raw sib23_template   ${sib23.jinja2.asn:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
     raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
     raw lopcomm_rrh_stats_template   ${lopcomm-rrh-stats.jinja2.py:target}
@@ -305,7 +304,6 @@ extra-context =
     key enb amarisoft:enb
     key sdr amarisoft:sdr
     raw gnb_template   ${gnb.jinja2.cfg:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
     raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
     raw openssl_location ${openssl:location}
@@ -330,7 +328,6 @@ extra-context =
     raw mme_template   ${mme.jinja2.cfg:target}
     raw dnsmasq_template   ${dnsmasq.jinja2.cfg:target}
     raw ims_template   ${ims.jinja2.cfg:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
     raw nghttp2_location ${nghttp2:location}
     raw iperf3_location ${iperf3:location}
@@ -349,7 +346,6 @@ extra-context =
     key ue amarisoft:ue
     key sdr amarisoft:sdr
     raw ue_lte_template   ${ue-lte.jinja2.cfg:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
     raw default_lte_bandwidth ${default-params:default-lte-bandwidth}
     raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
@@ -367,7 +363,6 @@ extra-context =
     key ue amarisoft:ue
     key sdr amarisoft:sdr
     raw ue_nr_template   ${ue-nr.jinja2.cfg:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
     raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
     raw default_n_antenna_dl ${default-params:default-n-antenna-dl}

software/ors-amarisoft/ltelogs.jinja2.sh

-#!/bin/bash
-# Copyright (C) 2012-2015 Amarisoft
-# LTE system logger version 2016-10-13
-
-# Path for multi environment support
-export PATH="$PATH:/bin/:/usr/bin/:/usr/local/bin"
-
-while [ "$1" != "" ] ; do
-
-    if [ -e "$1" ] ; then
-        # Avoid storing logs with comments only
-        HAS_LOG=$(grep -v -l "#" $1)
-        if [ "$HAS_LOG" != "" ] ; then
-            DATE=$(date -u +%Y%m%d.%H:%M:%S | sed -e "s/ /-/g")
-            FILE=$(basename $1)
-            mv $1 "{{ directory['log'] }}/${FILE}.${DATE}"
-        else
-            rm -f $1
-        fi
-    fi
-    shift
-done
-

software/ors-amarisoft/software-base.cfg

@@ -19,7 +19,6 @@ extends =
 parts +=
   template
   slapos-cookbook
-  ltelogs.jinja2.sh
   ncclient_common
 # copy all configs by default
   mme.jinja2.cfg
@@ -149,9 +148,6 @@ filename = sib23.jinja2.asn
 [gnb.jinja2.cfg]
 <= copy-config-to-instance
 filename = gnb.jinja2.cfg
-[ltelogs.jinja2.sh]
-<= copy-to-instance
-filename = ltelogs.jinja2.sh
 [ue_db.jinja2.cfg]
 <= copy-config-to-instance
 filename = ue_db.jinja2.cfg