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
2f239f8b
Commit
2f239f8b
authored
Oct 09, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
13c3d284
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
12 deletions
+21
-12
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+0
-9
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+17
-1
software/ors-amarisoft/software-base.cfg
software/ors-amarisoft/software-base.cfg
+2
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
2f239f8b
...
...
@@ -28,7 +28,7 @@ md5sum = 18f1a205d55c3026cf221ef22d247695
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum = 98
f4b675f5a8c1246fce9a175f94f8a
c
md5sum = 98
30211860b6232aa6fddffc4e755ee
c
[amarisoft-stats.jinja2.py]
_update_hash_filename_ = amarisoft-stats.jinja2.py
...
...
@@ -60,7 +60,7 @@ md5sum = a2ba0343ddb7f9cf2904a4c5c751f68a
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
b3c3c4f8e801bd72dd9f6098ca99f148
md5sum =
7734e40d10bfeee167a74d84b778999e
[template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
2f239f8b
...
...
@@ -41,8 +41,6 @@ parts =
{% if slapparameter_dict.get("dnsmasq", None) %}
dnsmasq-service
{% endif %}
# XXX -> trx_sdr XXX applies to both SDR and CPRI
check-sdr-busy.py
check-baseband-latency.py
check-amarisoft-stats-log.py
...
...
@@ -581,13 +579,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
<= monitor-promise-base
name = ${:_buildout_section_name_}
# XXX -> trx_sdr ?
[check-sdr-busy.py]
<= macro.promise
promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }}
[check-baseband-latency.py]
<= macro.promise
promise = check_baseband_latency
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
2f239f8b
...
...
@@ -26,11 +26,27 @@
{%- set ru = iru['_'] %}
# {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R XXX + ru arg
{{ part('ru-%s-XXX.py' % ru_ref) }}
{%- if ru.ru_link_type == 'sdr' %}
{%- for (i, n) in enumerate(ru.sdr_dev_list) %}
{{ part('%s-check-sdr-busy%s.py' % (ru_ref, '-%d' % (i+1) if i > 0 else '')) }}
<= macro.promise
promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }}
config-sdr_dev = {{ n }}
config-dma_chan = 0
{%- endfor %}
{%- elif ru.ru_link_type == 'cpri' %}
{{ part('%s-check-sdr-busy.py' % ru_ref) }}
<= macro.promise
promise = check_sdr_busy
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-sdr = {{ sdr }}
config-sdr_dev = {{ ru.cpri_link.sdr_dev }}
config-dma_chan = {{ ru.cpri_link.sfp_port }}
{%- else %}
{%- do bug('unreachable') %}
{%- endif %}
{%- endfor %}
[buildout]
...
...
software/ors-amarisoft/software-base.cfg
View file @
2f239f8b
...
...
@@ -210,6 +210,8 @@ recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/kirr/xlte.git
revision = e716ab51
git-executable = ${git:location}/bin/git
# XXX temp (speedup build)
develop = true
[xlte]
recipe = zc.recipe.egg:develop
...
...
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