Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
2c69944b
Commit
2c69944b
authored
Nov 02, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: remove useless ltelogs script
parent
9644a9f3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
6 additions
and
93 deletions
+6
-93
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+6
-10
software/ors-amarisoft/instance-core-network.jinja2.cfg
software/ors-amarisoft/instance-core-network.jinja2.cfg
+0
-11
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+0
-10
software/ors-amarisoft/instance-gnb.jinja2.cfg
software/ors-amarisoft/instance-gnb.jinja2.cfg
+0
-10
software/ors-amarisoft/instance-ue-lte.jinja2.cfg
software/ors-amarisoft/instance-ue-lte.jinja2.cfg
+0
-10
software/ors-amarisoft/instance-ue-nr.jinja2.cfg
software/ors-amarisoft/instance-ue-nr.jinja2.cfg
+0
-10
software/ors-amarisoft/instance.cfg
software/ors-amarisoft/instance.cfg
+0
-5
software/ors-amarisoft/ltelogs.jinja2.sh
software/ors-amarisoft/ltelogs.jinja2.sh
+0
-23
software/ors-amarisoft/software-base.cfg
software/ors-amarisoft/software-base.cfg
+0
-4
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
2c69944b
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
[template]
[template]
filename = instance.cfg
filename = instance.cfg
md5sum =
3919d261bdf366b7f7cc5149ab4c609d
md5sum =
f23909a703ac9001afec38cbac19591a
[amarisoft-stats.jinja2.py]
[amarisoft-stats.jinja2.py]
_update_hash_filename_ = amarisoft-stats.jinja2.py
_update_hash_filename_ = amarisoft-stats.jinja2.py
...
@@ -56,23 +56,23 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd
...
@@ -56,23 +56,23 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd
[template-enb]
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
d37801f7d613618d5a26605415093fd7
md5sum =
40f735514d8f4ead0d4328c58b78be93
[template-gnb]
[template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum =
9575d69d3ea61842750b44ad67e92258
md5sum =
2d7558e4799818a5546850f735fbb399
[template-core-network]
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
_update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum =
919340a049d628a86838453354c9efa2
md5sum =
aa7fcf7f68ced7e880158d0aa3307be4
[template-ue-lte]
[template-ue-lte]
_update_hash_filename_ = instance-ue-lte.jinja2.cfg
_update_hash_filename_ = instance-ue-lte.jinja2.cfg
md5sum =
f6d8e97add6d11b0a5436744cb455195
md5sum =
b444f859248778e18c5eba60f5670f6c
[template-ue-nr]
[template-ue-nr]
_update_hash_filename_ = instance-ue-nr.jinja2.cfg
_update_hash_filename_ = instance-ue-nr.jinja2.cfg
md5sum =
e57780260a1588d1dab29431c5e5ed97
md5sum =
bc65fdce1c453d92310d53928dcaaa7a
[template-obsolete]
[template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg
_update_hash_filename_ = instance-obsolete.jinja2.cfg
...
@@ -94,10 +94,6 @@ md5sum = a1973ba6e43d40e510d61d461c2d13ac
...
@@ -94,10 +94,6 @@ md5sum = a1973ba6e43d40e510d61d461c2d13ac
filename = config/gnb.jinja2.cfg
filename = config/gnb.jinja2.cfg
md5sum = 075df4848e08ef8a595b33164238a0e7
md5sum = 075df4848e08ef8a595b33164238a0e7
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
[mme.jinja2.cfg]
[mme.jinja2.cfg]
filename = config/mme.jinja2.cfg
filename = config/mme.jinja2.cfg
md5sum = 3d7833ddba3242cedcd74c7db52390c6
md5sum = 3d7833ddba3242cedcd74c7db52390c6
...
...
software/ors-amarisoft/instance-core-network.jinja2.cfg
View file @
2c69944b
...
@@ -37,7 +37,6 @@ info = DNS entry with has been attached to service ${slap-configuration:instance
...
@@ -37,7 +37,6 @@ info = DNS entry with has been attached to service ${slap-configuration:instance
[buildout]
[buildout]
parts =
parts =
directory
directory
ltelogs
mme-config
mme-config
mme-service
mme-service
monitor-base
monitor-base
...
@@ -100,14 +99,6 @@ service = ${:etc}/service
...
@@ -100,14 +99,6 @@ service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
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) %}
{% if slapparameter_dict.get("mme_config_link", None) %}
[mme-config-dl]
[mme-config-dl]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
@@ -119,7 +110,6 @@ offline = false
...
@@ -119,7 +110,6 @@ offline = false
### IMS
### IMS
[ims-service]
[ims-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/ims.log; sleep 1
command-line = {{ mme }}/lteims ${directory:etc}/ims.cfg
command-line = {{ mme }}/lteims ${directory:etc}/ims.cfg
wrapper-path = ${directory:service}/ims
wrapper-path = ${directory:service}/ims
mode = 0775
mode = 0775
...
@@ -148,7 +138,6 @@ inline =
...
@@ -148,7 +138,6 @@ inline =
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
# When the machine shutdowns abruptly, lte_ue is not cleaned up which causes
# 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
# 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}
command-line = ${mme-sh-wrapper:output}
wrapper-path = ${directory:service}/mme
wrapper-path = ${directory:service}/mme
mode = 0775
mode = 0775
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
2c69944b
[buildout]
[buildout]
parts =
parts =
directory
directory
ltelogs
enb-config
enb-config
enb-service
enb-service
xamari-xlog-service
xamari-xlog-service
...
@@ -100,14 +99,6 @@ service = ${:etc}/service
...
@@ -100,14 +99,6 @@ service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
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) %}
{% if slapparameter_dict.get("enb_config_link", None) %}
[enb-config-dl]
[enb-config-dl]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
@@ -143,7 +134,6 @@ inline =
...
@@ -143,7 +134,6 @@ inline =
[enb-service]
[enb-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
command-line = ${enb-sh-wrapper:output}
command-line = ${enb-sh-wrapper:output}
wrapper-path = ${directory:service}/enb
wrapper-path = ${directory:service}/enb
mode = 0775
mode = 0775
...
...
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @
2c69944b
[buildout]
[buildout]
parts =
parts =
directory
directory
ltelogs
gnb-config
gnb-config
enb-service
enb-service
xamari-xlog-service
xamari-xlog-service
...
@@ -70,14 +69,6 @@ service = ${:etc}/service
...
@@ -70,14 +69,6 @@ service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
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) %}
{% if slapparameter_dict.get("gnb_config_link", None) %}
[gnb-config-dl]
[gnb-config-dl]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
@@ -106,7 +97,6 @@ inline =
...
@@ -106,7 +97,6 @@ inline =
### eNodeB (enb)
### eNodeB (enb)
[enb-service]
[enb-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/enb.log; sleep 2
command-line = ${enb-sh-wrapper:output}
command-line = ${enb-sh-wrapper:output}
wrapper-path = ${directory:service}/enb
wrapper-path = ${directory:service}/enb
mode = 0775
mode = 0775
...
...
software/ors-amarisoft/instance-ue-lte.jinja2.cfg
View file @
2c69944b
[buildout]
[buildout]
parts =
parts =
directory
directory
ltelogs
lte-ue-lte-config
lte-ue-lte-config
lte-ue-service
lte-ue-service
check-sdr-busy.py
check-sdr-busy.py
...
@@ -57,14 +56,6 @@ service = ${:etc}/service
...
@@ -57,14 +56,6 @@ service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
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) %}
{% if slapparameter_dict.get("ue_lte_config_link", None) %}
[ue-lte-config-dl]
[ue-lte-config-dl]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
@@ -90,7 +81,6 @@ inline =
...
@@ -90,7 +81,6 @@ inline =
### User Equipment (UE)
### User Equipment (UE)
[lte-ue-service]
[lte-ue-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/ue.log; sleep 2
command-line = ${lte-ue-sh-wrapper:output}
command-line = ${lte-ue-sh-wrapper:output}
wrapper-path = ${directory:service}/lte-ue
wrapper-path = ${directory:service}/lte-ue
mode = 0775
mode = 0775
...
...
software/ors-amarisoft/instance-ue-nr.jinja2.cfg
View file @
2c69944b
[buildout]
[buildout]
parts =
parts =
directory
directory
ltelogs
lte-ue-nr-config
lte-ue-nr-config
lte-ue-service
lte-ue-service
check-sdr-busy.py
check-sdr-busy.py
...
@@ -57,14 +56,6 @@ service = ${:etc}/service
...
@@ -57,14 +56,6 @@ service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
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) %}
{% if slapparameter_dict.get("ue_nr_config_link", None) %}
[ue-nr-config-dl]
[ue-nr-config-dl]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
@@ -90,7 +81,6 @@ inline =
...
@@ -90,7 +81,6 @@ inline =
### User Equipment (UE)
### User Equipment (UE)
[lte-ue-service]
[lte-ue-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
init = ${ltelogs:output} ${directory:log}/ue.log; sleep 2
command-line = ${lte-ue-sh-wrapper:output}
command-line = ${lte-ue-sh-wrapper:output}
wrapper-path = ${directory:service}/lte-ue
wrapper-path = ${directory:service}/lte-ue
mode = 0775
mode = 0775
...
...
software/ors-amarisoft/instance.cfg
View file @
2c69944b
...
@@ -268,7 +268,6 @@ extra-context =
...
@@ -268,7 +268,6 @@ extra-context =
key sdr amarisoft:sdr
key sdr amarisoft:sdr
raw enb_template ${enb.jinja2.cfg:target}
raw enb_template ${enb.jinja2.cfg:target}
raw sib23_template ${sib23.jinja2.asn: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_stats_template ${amarisoft-stats.jinja2.py:target}
raw amarisoft_rf_info_template ${amarisoft-rf-info.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}
raw lopcomm_rrh_stats_template ${lopcomm-rrh-stats.jinja2.py:target}
...
@@ -305,7 +304,6 @@ extra-context =
...
@@ -305,7 +304,6 @@ extra-context =
key enb amarisoft:enb
key enb amarisoft:enb
key sdr amarisoft:sdr
key sdr amarisoft:sdr
raw gnb_template ${gnb.jinja2.cfg:target}
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_stats_template ${amarisoft-stats.jinja2.py:target}
raw amarisoft_rf_info_template ${amarisoft-rf-info.jinja2.py:target}
raw amarisoft_rf_info_template ${amarisoft-rf-info.jinja2.py:target}
raw openssl_location ${openssl:location}
raw openssl_location ${openssl:location}
...
@@ -330,7 +328,6 @@ extra-context =
...
@@ -330,7 +328,6 @@ extra-context =
raw mme_template ${mme.jinja2.cfg:target}
raw mme_template ${mme.jinja2.cfg:target}
raw dnsmasq_template ${dnsmasq.jinja2.cfg:target}
raw dnsmasq_template ${dnsmasq.jinja2.cfg:target}
raw ims_template ${ims.jinja2.cfg:target}
raw ims_template ${ims.jinja2.cfg:target}
raw ltelogs_template ${ltelogs.jinja2.sh:target}
raw openssl_location ${openssl:location}
raw openssl_location ${openssl:location}
raw nghttp2_location ${nghttp2:location}
raw nghttp2_location ${nghttp2:location}
raw iperf3_location ${iperf3:location}
raw iperf3_location ${iperf3:location}
...
@@ -349,7 +346,6 @@ extra-context =
...
@@ -349,7 +346,6 @@ extra-context =
key ue amarisoft:ue
key ue amarisoft:ue
key sdr amarisoft:sdr
key sdr amarisoft:sdr
raw ue_lte_template ${ue-lte.jinja2.cfg:target}
raw ue_lte_template ${ue-lte.jinja2.cfg:target}
raw ltelogs_template ${ltelogs.jinja2.sh:target}
raw openssl_location ${openssl:location}
raw openssl_location ${openssl:location}
raw default_lte_bandwidth ${default-params:default-lte-bandwidth}
raw default_lte_bandwidth ${default-params:default-lte-bandwidth}
raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
...
@@ -367,7 +363,6 @@ extra-context =
...
@@ -367,7 +363,6 @@ extra-context =
key ue amarisoft:ue
key ue amarisoft:ue
key sdr amarisoft:sdr
key sdr amarisoft:sdr
raw ue_nr_template ${ue-nr.jinja2.cfg:target}
raw ue_nr_template ${ue-nr.jinja2.cfg:target}
raw ltelogs_template ${ltelogs.jinja2.sh:target}
raw openssl_location ${openssl:location}
raw openssl_location ${openssl:location}
raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
...
...
software/ors-amarisoft/ltelogs.jinja2.sh
deleted
100755 → 0
View file @
9644a9f3
#!/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
View file @
2c69944b
...
@@ -19,7 +19,6 @@ extends =
...
@@ -19,7 +19,6 @@ extends =
parts +=
parts +=
template
template
slapos-cookbook
slapos-cookbook
ltelogs.jinja2.sh
ncclient_common
ncclient_common
# copy all configs by default
# copy all configs by default
mme.jinja2.cfg
mme.jinja2.cfg
...
@@ -149,9 +148,6 @@ filename = sib23.jinja2.asn
...
@@ -149,9 +148,6 @@ filename = sib23.jinja2.asn
[gnb.jinja2.cfg]
[gnb.jinja2.cfg]
<= copy-config-to-instance
<= copy-config-to-instance
filename = gnb.jinja2.cfg
filename = gnb.jinja2.cfg
[ltelogs.jinja2.sh]
<= copy-to-instance
filename = ltelogs.jinja2.sh
[ue_db.jinja2.cfg]
[ue_db.jinja2.cfg]
<= copy-config-to-instance
<= copy-config-to-instance
filename = ue_db.jinja2.cfg
filename = ue_db.jinja2.cfg
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment