ors-amarisoft: add timestamps in Amarisoft output logs

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 833667743c693b8d5f78a2527b275a9e
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = afd8867c4dec5c5c68a4005dec502ebb
+md5sum = 44fce5e6dca14989ee5c62f94ffc0df2
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -40,15 +40,15 @@ md5sum = 99c05a34678adb5a70aa64ecf2ee4e35
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = cd0527037b7cb0ae53f2f822fcf551ac
+md5sum = 2c12b59a4614a7b80469458ccf5bb266
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
-md5sum = 728f4d3ae248710c23e4b73eea4d628e
+md5sum = 9a26877e326bffd57e17320de0d12c6d
 
 [template-lte-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 8888be35fa6e6f3e69d9373002a0e06e
+md5sum = 691a6223e587b6abf1de279375217744
 
 [template-lte-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
@@ -76,7 +76,7 @@ md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
 
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
-md5sum = 615949ba3d30e8940a348a6a7ad0c022
+md5sum = f002f908d9af8b4089dad0c64742dde6
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg

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

@@ -80,13 +80,17 @@ offline = false
 [lte-enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
+enb-log = ${directory:log}/enb-output.log
 inline =
   #!/bin/sh
 {% if not slapparameter_dict.get("testing", False) %}
   sudo /opt/amarisoft/rm-tmp-lte;
   sudo /opt/amarisoft/init-sdr;
   sudo /opt/amarisoft/init-enb;
-  {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${directory:log}/enb-output.log 2>> ${directory:log}/enb-output.log
+  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting eNB software..." && echo) >> ${:enb-log};
+  tail -c 1M ${:enb-log} > ${:enb-log}.tmp;
+  mv ${:enb-log}.tmp ${:enb-log};
+  {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${:enb-log} 2>> ${:enb-log};
 {% endif %}
 
 ### eNodeB (enb)

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

@@ -80,13 +80,18 @@ offline = false
 [lte-enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
+gnb-log = ${directory:log}/gnb-output.log
 inline =
   #!/bin/sh
 {% if not slapparameter_dict.get("testing", False) %}
   sudo /opt/amarisoft/rm-tmp-lte;
   sudo /opt/amarisoft/init-sdr;
   sudo /opt/amarisoft/init-enb;
-  {{ enb }}/lteenb ${directory:etc}/gnb.cfg >> ${directory:log}/gnb-output.log 2>> ${directory:log}/gnb-output.log
+  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting gNB software..." && echo) >> ${:gnb-log};
+  tail -c 1M ${:gnb-log} > ${:gnb-log}.tmp;
+  mv ${:gnb-log}.tmp ${:gnb-log};
+  {{ enb }}/lteenb ${directory:etc}/gnb.cfg >> ${:gnb-log} 2>> ${:gnb-log};
+
 {% endif %}
 
 ### eNodeB (enb)

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

@@ -86,11 +86,15 @@ environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 [lte-mme-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
+mme-log = ${directory:log}/mme-output.log
 inline =
   #!/bin/sh
 {% if not slapparameter_dict.get("testing", False) %}
   rm -f ${directory:var}/lte_ue.db;
-  {{ mme }}/ltemme ${directory:etc}/mme.cfg >> ${directory:log}/mme-output.log 2>> ${directory:log}/mme-output.log
+  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting MME software..." && echo) >> ${:mme-log};
+  tail -c 1M ${:mme-log} > ${:mme-log}.tmp;
+  mv ${:mme-log}.tmp ${:mme-log};
+  {{ mme }}/ltemme ${directory:etc}/mme.cfg >> ${:mme-log} 2>> ${:mme-log};
 {% endif %}
 
 ### MME

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

@@ -66,11 +66,15 @@ offline = false
 [lte-ue-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
+ue-log = ${directory:log}/ue-output.log
 inline =
   #!/bin/sh
 {% if not slapparameter_dict.get("testing", False) %}
   sudo /opt/amarisoft/rm-tmp-lte | true;
-  {{ ue }}/lteue ${directory:etc}/ue.cfg >> ${directory:log}/ue-output.log 2>> ${directory:log}/ue-output.log
+  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting UE software..." && echo) >> ${:ue-log};
+  tail -c 1M ${:ue-log} > ${:ue-log}.tmp;
+  mv ${:ue-log}.tmp ${:ue-log};
+  {{ ue }}/lteue ${directory:etc}/ue.cfg >> ${:ue-log} 2>> ${:ue-log};
 {% endif %}
 
 ### User Equipment (UE)