.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 65a356f616bf9681d98f810dfd006901
+md5sum = f5228bb7d7db9c25a737e11ea22ea5a1
 
 [amari_lte.jinja2]
 _update_hash_filename_ = amari/lte.jinja2
@@ -28,7 +28,7 @@ md5sum = 4fae7413d143b6c9b1734ffbe5c8e94b
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 5f7e4aeace6645b3e5cf12c263049240
+md5sum = f153b7548c73f64d37291090d5377902
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -88,19 +88,19 @@ md5sum = 4855e1b8dbc6fee88a16cefc39e96693
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 289240ac3fe76f22b903a255a643ebc5
+md5sum = c5b2c3a50f154cbc59db17b9987fe70b
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = e4d8c66c00dc5c022e9208c10e37490e
+md5sum = 2d7558e4799818a5546850f735fbb399
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 68512b0f564a6fb736ab92dd25613d47
+md5sum = 71070879a4ee4768201ca4bc4b791ded
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
-md5sum = 6abf075784e6c1d958cfc5498af5b08d
+md5sum = 16f1441204306cc11ecc2fcb7ef512a2
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg
@@ -131,10 +131,6 @@ md5sum = ffe710c9f99cf933db5f4b82d9db88b8
 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 = 44fc9ee5082dd8e0298801f8d4618b06

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

@@ -5,7 +5,6 @@
 [buildout]
 parts =
   directory
-  ltelogs
   enb-config
   enb-service
   xamari-xlog-service
@@ -86,14 +85,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
@@ -120,7 +111,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.jinja2.cfg

 [buildout]
 parts =
   directory
-  ltelogs
   lte-ue-config
   lte-ue-service
   monitor-base
@@ -58,14 +57,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_config_link", None) %}
 [ue-config-dl]
 recipe = slapos.recipe.build:download
@@ -91,7 +82,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

@@ -298,7 +298,6 @@ extra-context =
     raw drb_lte_template ${drb_lte.jinja2.cfg:target}
     raw drb_nr_template  ${drb_nr.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 ru_lopcomm_stats_template   ${ru_lopcomm_stats.jinja2.py:target}
@@ -335,7 +334,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}
@@ -356,7 +354,6 @@ extra-context =
     raw mme_template   ${mme.jinja2.cfg:target}
     raw dnsmasq_template   ${dnsmasq-core-network.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}
@@ -374,7 +371,6 @@ extra-context =
     key ue amarisoft:ue
     key sdr amarisoft:sdr
     raw ue_template   ${ue.jinja2.cfg:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
 
 [ue-db-config]

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

@@ -22,7 +22,6 @@ parts +=
   slapos.toolbox-dev
   template
   slapos-cookbook
-  ltelogs.jinja2.sh
 # copy all configs by default
   mme.jinja2.cfg
   dnsmasq-core-network.jinja2.cfg
@@ -124,8 +123,6 @@ destination =  ${buildout:directory}/gadget/${:_buildout_section_name_}
 <= copy-config-to-instance
 [gnb.jinja2.cfg]
 <= copy-config-to-instance
-[ltelogs.jinja2.sh]
-<= copy-to-instance
 [ue_db.jinja2.cfg]
 <= copy-config-to-instance
 [mme.jinja2.cfg]