software/ors-amarisoft: Add enb and mme logs to monitor private folder

software/ors-amarisoft/buildout.hash.cfg

@@ -24,7 +24,7 @@ md5sum = 762d55291e75e8b61e35f9f28d29915a
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = ad6520b01eefdd4fa76c10f7ffa01d48
+md5sum = 4dc82af266a63b7045279fbf4f1e25e1
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -32,11 +32,11 @@ md5sum = e43a726dd3023a4bbaa474bb2d7a6ebe
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 02af36a5c2f4123a73c8ce4ba6cbf5c2
+md5sum = d04961535968b1b3e59d18663ec45eae
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = ead0846454d61121c0635c5a657c194c
+md5sum = 26d89fc96609ac088da9fa03c9dd7f7f
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg

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

@@ -60,17 +60,26 @@ extensions = jinja2.ext.do
 context =
   section directory directory
 
+[lte-enb-sh-wrapper]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:bin}/${:_buildout_section_name_}
+mode = 0700
+template =
+  inline:#!/bin/sh
+  {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${directory:log}/enb-output.cfg 2>> ${directory:log}/enb-output.cfg
+
 ### eNodeB (enb)
 [lte-enb-service]
 recipe = slapos.cookbook:wrapper
 init = ${ltelogs:rendered} ${directory:log}/enb.log; sleep 2
-command-line = {{ enb }}/lteenb ${directory:etc}/enb.cfg
+command-line = ${lte-enb-sh-wrapper:rendered}
 wrapper-path = ${directory:service}/lte-enb
 mode = 0775
 reserve-cpu = True
 pidfile = ${directory:run}/enb.pid
 hash-files =
   ${lte-enb-config:rendered}
+  ${lte-enb-sh-wrapper:rendered}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft

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

@@ -71,19 +71,29 @@ hash-files =
   {{ ue_db_path }}
 environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
+[lte-mme-sh-wrapper]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:bin}/${:_buildout_section_name_}
+mode = 0700
+template =
+  inline:#!/bin/sh
+  rm -f ${directory:var}/lte_ue.db;
+  {{ mme }}/ltemme ${directory:etc}/mme.cfg >> ${directory:log}/mme-output.cfg 2>> ${directory:log}/mme-output.cfg
+
 ### MME
 [lte-mme-service]
 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:rendered} ${directory:log}/mme.log; rm -f ${directory:var}/lte_ue.db
-command-line = {{ mme }}/ltemme ${directory:etc}/mme.cfg
+init = ${ltelogs:rendered} ${directory:log}/mme.log
+command-line = ${lte-mme-sh-wrapper:rendered}
 wrapper-path = ${directory:service}/lte-mme
 mode = 0775
 pidfile = ${directory:run}/mme.pid
 hash-files =
   ${lte-mme-config:rendered}
   {{ ue_db_path }}
+  ${lte-mme-sh-wrapper:rendered}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib:{{ nghttp2_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft

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

@@ -60,17 +60,26 @@ extensions = jinja2.ext.do
 context =
   section directory directory
 
+[lte-enb-sh-wrapper]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:bin}/${:_buildout_section_name_}
+mode = 0700
+template =
+  inline:#!/bin/sh
+  {{ enb }}/lteenb ${directory:etc}/gnb.cfg >> ${directory:log}/gnb-output.cfg 2>> ${directory:log}/gnb-output.cfg
+
 ### eNodeB (enb)
 [lte-enb-service]
 recipe = slapos.cookbook:wrapper
 init = ${ltelogs:rendered} ${directory:log}/enb.log; sleep 2
-command-line = {{ enb }}/lteenb ${directory:etc}/gnb.cfg
+command-line = ${lte-enb-sh-wrapper:rendered}
 wrapper-path = ${directory:service}/lte-enb
 mode = 0775
 reserve-cpu = True
 pidfile = ${directory:run}/enb.pid
 hash-files =
   ${lte-gnb-config:rendered}
+  ${lte-enb-sh-wrapper:rendered}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft