Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
c3bb7475
Commit
c3bb7475
authored
Jan 09, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
6bca7aa8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
50 deletions
+47
-50
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+5
-5
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+6
-9
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+17
-17
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
+16
-16
software/ors-amarisoft/test/test.sh
software/ors-amarisoft/test/test.sh
+3
-3
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
c3bb7475
...
...
@@ -24,11 +24,11 @@ md5sum = f5c76c3443b75569eb18503dce38e783
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
md5sum =
dfef691a80951423d2ea11b3e91d7fa5
md5sum =
fa841e105d78aab36b9ea205a69608fb
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum =
fa300bb3415c95c8ab5e88b4e24750ba
md5sum =
7461116aa62dfa8f69d995465ce469a4
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...
...
@@ -36,7 +36,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
[ru_lopcomm_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
md5sum =
409ab889d75ec260aa0e52548463a38f
md5sum =
d15b5bff1adc646357a267fec1252402
[ru_sunwave_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
...
...
@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
132c70c88c5297765d300be0c53bdb2
6
md5sum =
98f9c9ac4298ba76281c3daa585b9f9
6
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
...
...
@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
md5sum =
96ac9a0cbd0aa5d94129e7d85e52af9d
md5sum =
7edbafa743dc17749ff910aca775abbf
[drb_lte.jinja2.cfg]
filename = config/drb_lte.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
c3bb7475
# instance-enb implements eNB/gNB service.
{#- set Q = xbuildout.quote #}
{%- set Q = dumps %}
[buildout]
parts =
directory
...
...
@@ -212,10 +209,10 @@ extra-context =
key icell_dict :icell_dict
key ipeer_dict :ipeer_dict
key ipeercell_dict :ipeercell_dict
iru_dict = {{
Q
(rulib.iru_dict) }}
icell_dict = {{
Q
(rulib.icell_dict) }}
ipeer_dict = {{
Q
(ipeer_dict) }}
ipeercell_dict = {{
Q
(ipeercell_dict) }}
iru_dict = {{
dumps
(rulib.iru_dict) }}
icell_dict = {{
dumps
(rulib.icell_dict) }}
ipeer_dict = {{
dumps
(ipeer_dict) }}
ipeercell_dict = {{
dumps
(ipeercell_dict) }}
[publish-connection-information]
...
...
@@ -229,8 +226,8 @@ enb-ipv4 = {{ lan_ipv4 }}
amarisoft-version = {{ lte_version }}
license-expiration = {{ lte_expiration }}
monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
ru-list = {{
Q
(rulib.iru_dict.keys() | sort) }}
cell-list = {{
Q
(rulib.icell_dict.keys() | sort) }}
ru-list = {{
dumps
(rulib.iru_dict.keys() | sort) }}
cell-list = {{
dumps
(rulib.icell_dict.keys() | sort) }}
# TODO peer-list peer-cell-list
peer-list = XXX
peer-cell-list = XXX
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
c3bb7475
...
...
@@ -154,7 +154,7 @@ context =
section directory directory
section vtap_jdict vtap_jdict
key iru_dict :iru_dict
iru_dict = {{
Q
(iru_dict) }}
iru_dict = {{
dumps
(iru_dict) }}
{{ part('dnsmasq-service') }}
recipe = slapos.cookbook:wrapper
...
...
@@ -186,7 +186,7 @@ hash-files =
{%- endif %}
{%- endfor %}
# {{
Q
(ru_ref) }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R ({{ ru.ru_type }})
# {{
dumps
(ru_ref) }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R ({{ ru.ru_type }})
{%- if ru.ru_link_type == 'sdr' %}
{%- for (i, n) in enumerate(ru.sdr_dev_list) %}
{{ promise('%s-sdr-busy%s' % (ru_ref, '-%d' % (i+1) if i > 0 else '')) }}
...
...
@@ -230,13 +230,13 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
{#- publish information about RU #}
{{ part('publish-%s' % ru_ref) }}
recipe = slapos.cookbook:publish.serialised
-slave-reference = {{
Q
(iru.slave_reference) }}
{{ slap_configuration['slap-software-type'] }} = {{
Q
(root) }}
-slave-reference = {{
dumps
(iru.slave_reference) }}
{{ slap_configuration['slap-software-type'] }} = {{
dumps
(root) }}
{%- set iru_icell_ref_list = [] %}
{%- for icell in iru_icell_list %}
{%- do iru_icell_ref_list.append(J(jref_of_shared(icell))) %}
{%- endfor %}
cell-list = {{
Q
(iru_icell_ref_list) }}
cell-list = {{
dumps
(iru_icell_ref_list) }}
{%- if ru.ru_link_type == 'cpri' %}
ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway}
{%- endif %}
...
...
@@ -262,10 +262,10 @@ extra-context =
key cell :cell
key ru_ref :ru_ref
key ru :ru
cell_ref = {{
Q
(cell_ref) }}
cell = {{
Q
(cell ) }}
ru_ref = {{
Q
(ru_ref ) }}
ru = {{
Q
(ru ) }}
cell_ref = {{
dumps
(cell_ref) }}
cell = {{
dumps
(cell ) }}
ru_ref = {{
dumps
(ru_ref ) }}
ru = {{
dumps
(ru ) }}
{{ part('sib23-config-%s' % cell_ref) }}
<= config-base
...
...
@@ -276,18 +276,18 @@ extra-context =
key cell :cell
key ru_ref :ru_ref
key ru :ru
cell_ref = {{
Q
(cell_ref) }}
cell = {{
Q
(cell ) }}
ru_ref = {{
Q
(ru_ref ) }}
ru = {{
Q
(ru ) }}
cell_ref = {{
dumps
(cell_ref) }}
cell = {{
dumps
(cell ) }}
ru_ref = {{
dumps
(ru_ref ) }}
ru = {{
dumps
(ru ) }}
{%- endif %}
{#- publish information about the cell #}
{{ part('publish-%s' % cell_ref) }}
recipe = slapos.cookbook:publish.serialised
-slave-reference = {{
Q
(icell.slave_reference) }}
{{ slap_configuration['slap-software-type'] }} = {{
Q
(root) }}
ru = {{
Q
(ru_ref) }}
-slave-reference = {{
dumps
(icell.slave_reference) }}
{{ slap_configuration['slap-software-type'] }} = {{
dumps
(root) }}
ru = {{
dumps
(ru_ref) }}
# XXX enb -> ue in case of uesim
# XXX +error
...
...
@@ -331,7 +331,7 @@ context =
raw testing {{ testing }}
raw python_path {{ buildout_directory}}/bin/pythonwitheggs
key iru_dict :iru_dict
iru_dict = {{
Q
(iru_dict) }}
iru_dict = {{
dumps
(iru_dict) }}
mode = 0775
url = {{ ru_amarisoft_stats_template }}
output = ${directory:bin}/amarisoft-stats.py
...
...
software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
View file @
c3bb7475
...
...
@@ -23,11 +23,11 @@ config-port = 830
[{{ B('%s-software-template' % ru_ref) }}]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
_logbase = ${directory:var}/log/{{
ru_ref}}-software
_logbase = ${directory:var}/log/{{
B('%s-software' % ru_ref)}}
log-output = ${:_logbase}.log
software-reply-json-log-output = ${:_logbase}-reply.json.log
remote-file-path = sftp://${user-info:pw-name}@[${sshd-service:ipv6}]:${sshd-service:port}{{ru_lopcomm_firmware_path}}
is_firmware_updated = ${directory:etc}/{{
ru_ref}}.is_firmware_updated
is_firmware_updated = ${directory:etc}/{{
B('%s.is_firmware_updated' % ru_ref)}}
context =
section directory directory
section vtap vtap.{{ ru.cpri_link._tap }}
...
...
@@ -43,7 +43,7 @@ context =
import netaddr netaddr
mode = 0775
url = {{ ru_lopcomm_software_template }}
output = ${directory:script}/{{
ru_ref}}-software.py
output = ${directory:script}/{{
B('%s-software.py' % ru_ref)}}
{{ promise('%s-firmware' % ru_ref) }}
promise = check_command_execute
...
...
@@ -67,7 +67,7 @@ url = ${ {{-B('%s-cu-config-dl' % ru_ref)}}:target}
{% else %}
url = {{ ru_lopcomm_cu_config_template }}
{% endif %}
output = ${directory:etc}/{{
ru_ref}}-cu_config.xml
output = ${directory:etc}/{{
B('%s-cu_config.xml' % ru_ref)}}
extra-context =
import xearfcn_module xlte.earfcn
import xnrarfcn_module xlte.nrarfcn
...
...
@@ -77,7 +77,7 @@ extra-context =
[{{ B('%s-config-template' % ru_ref) }}]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
log-output = ${directory:var}/log/{{
ru_ref}}-config.log
log-output = ${directory:var}/log/{{
B('%s-config.log' % ru_ref)}}
context =
section directory directory
section vtap vtap.{{ ru.cpri_link._tap }}
...
...
@@ -90,7 +90,7 @@ context =
import netaddr netaddr
mode = 0775
url = {{ ru_lopcomm_config_template }}
output = ${directory:script}/{{
ru_ref}}-config.py
output = ${directory:script}/{{
B('%s-config.py' % ru_ref)}}
{{ promise('%s-config-log' % ru_ref) }}
promise = check_lopcomm_config_log
...
...
@@ -102,7 +102,7 @@ config-config-log = ${ {{-B('%s-config-template' % ru_ref)}}:log-output}
[{{ B('%s-stats-template' % ru_ref) }}]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
_logbase = ${directory:var}/log/{{
ru_ref
}}
_logbase = ${directory:var}/log/{{
B('%s' % ru_ref)
}}
log-output = ${:_logbase}-stats.log
json-log-output = ${:_logbase}-stats.json.log
cfg-json-log-output = ${:_logbase}-config.json.log
...
...
@@ -110,7 +110,7 @@ supervision-json-log-output = ${:_logbase}-supervision.json.log
ncsession-json-log-output = ${:_logbase}-ncsession.json.log
software-json-log-output = ${:_logbase}-software.json.log
supervision-reply-json-log-output = ${:_logbase}-supervision-reply.json.log
is_netconf_connected = ${directory:etc}/{{
ru_ref}}.is_netconf_connected
is_netconf_connected = ${directory:etc}/{{
B('%s.is_netconf_connected' % ru_ref)}}
context =
section directory directory
section vtap vtap.{{ ru.cpri_link._tap }}
...
...
@@ -129,12 +129,12 @@ context =
import netaddr netaddr
mode = 0775
url = {{ ru_lopcomm_stats_template }}
output = ${directory:bin}/{{
ru_ref}}-stats.py
output = ${directory:bin}/{{
B('%s-stats.py' % ru_ref)}}
{{ part('%s-stats-service' % ru_ref) }}
recipe = slapos.cookbook:wrapper
command-line = ${ {{-B('%s-stats-template' % ru_ref)}}:output}
wrapper-path = ${directory:service}/{{
ru_ref}}-stats
wrapper-path = ${directory:service}/{{
B('%s-stats' % ru_ref)}}
mode = 0775
hash-files =
${:command-line}
...
...
@@ -179,7 +179,7 @@ config-stats-log = ${ {{-B('%s-stats-template' % ru_ref)}}:log-output}
[{{ B('%s-reset-info-template' % ru_ref) }}]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
_logbase = ${directory:var}/log/{{
ru_ref}}-reset-info
_logbase = ${directory:var}/log/{{
B('%s-reset-info' % ru_ref)}}
log-output = ${:_logbase}.log
json-log-output = ${:_logbase}.json.log
context =
...
...
@@ -191,12 +191,12 @@ context =
import netaddr netaddr
mode = 0775
url = {{ ru_lopcomm_reset_info_template }}
output = ${directory:bin}/{{
ru_ref}}-reset-info.py
output = ${directory:bin}/{{
B('%s-reset-info.py' % ru_ref)}}
[{{ B('%s-reset-template' % ru_ref) }}]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
_logbase = ${directory:var}/log/{{
ru_ref}}-reset
_logbase = ${directory:var}/log/{{
B('%s-reset' % ru_ref)}}
log-output = ${:_logbase}.log
json-log-output = ${:_logbase}.json.log
context =
...
...
@@ -207,19 +207,19 @@ context =
import netaddr netaddr
mode = 0775
url = {{ ru_lopcomm_reset_template }}
output = ${directory:etc}/{{
ru_ref}}-reset.py
output = ${directory:etc}/{{
B('%s-reset.py' % ru_ref)}}
{{ part('%s-reset-cron' % ru_ref) }}
recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries}
name = {{
ru_ref}}-reset
name = {{
B('%s-reset' % ru_ref)}}
frequency = {{ ru.reset_schedule }}
command = {{ buildout_directory}}/bin/pythonwitheggs ${ {{-B('%s-reset-template' % ru_ref)}}:output}
{{ part('%s-reset-info-service' % ru_ref) }}
recipe = slapos.cookbook:wrapper
command-line = ${ {{- ru_ref}}-reset-info-template:output}
wrapper-path = ${directory:service}/{{
ru_ref}}-reset-info
wrapper-path = ${directory:service}/{{
B('%s-reset-info' % ru_ref)}}
mode = 0775
hash-files =
${:command-line}
...
...
software/ors-amarisoft/test/test.sh
View file @
c3bb7475
...
...
@@ -5,7 +5,7 @@
export
SLAPOS_TEST_DEBUG
=
1
export
SLAPOS_TEST_VERBOSE
=
1
export
SLAPOS_TEST_SKIP_SOFTWARE_CHECK
=
1
export
SLAPOS_TEST_SKIP_SOFTWARE_REBUILD
=
0
export
SLAPOS_TEST_SKIP_SOFTWARE_REBUILD
=
1
rm
-rf
snapshot
mkdir
snapshot
...
...
@@ -18,5 +18,5 @@ export SLAPOS_TEST_LOG_DIRECTORY=`pwd`/snapshot
#time ../k/kpython_for_test -m unittest discover -vf -k SimCard
#time ../k/kpython_for_test -m unittest discover -vf
#time ../k/kpython_for_test -m unittest discover -vf -k TestENB_CPRI
time
../k/kpython_for_test
-m
unittest discover
-vf
-k
TestENB_SDR
#
time ../k/kpython_for_test -m unittest discover -vf -k TestENB_Lopcomm
#
time ../k/kpython_for_test -m unittest discover -vf -k TestENB_SDR
time
../k/kpython_for_test
-m
unittest discover
-vf
-k
TestENB_Lopcomm
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