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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
d6de7b84
Commit
d6de7b84
authored
Oct 19, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
285fede6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
6 deletions
+30
-6
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
+5
-0
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+23
-4
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
d6de7b84
...
...
@@ -28,7 +28,7 @@ md5sum = 4920b2f0972ed2e9cadf26d73ee2fcbf
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum =
ec43bbd46685c3b3e74c6206864346f8
md5sum =
72ebbf234032dd13fec6043980fadf1a
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...
...
@@ -80,7 +80,7 @@ md5sum = e5ca405581632c9ff9b435ff4a45d408
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
a8e7e21adecdc5b4f3c1381bf465142e
md5sum =
3471c7f3872ce81646da178142f8cabf
[template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
d6de7b84
...
...
@@ -389,6 +389,11 @@ current-rx-gain = {{ ors_version['current-rx-gain'] }}
current-earfcn = {{ ors_version['current-earfcn'] }}
{% endif %}
monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
ru-list = {{ rulib.iru_dict.keys() | sort | join(', ') }}
cell-list = {{ rulib.icell_dict.keys() | sort | join(', ') }}
# TODO peer-list
{% if ru == "lopcomm" %}
ssh-command = ssh ${user-info:pw-name}@${slap-configuration:ipv6-random} -p ${sshd-port:port}
ssh-url = ssh://${user-info:pw-name}@[${slap-configuration:ipv6-random}]:${sshd-port:port}
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
d6de7b84
...
...
@@ -22,6 +22,7 @@
{%- macro buildout() %}
{%- set root = slap_configuration['instance-title'] %}
{#- part emits new buildout section and registers it into buildout.parts #}
{%- set parts_list = [] %}
...
...
@@ -33,8 +34,7 @@
{#- promise emits new buildout section for a promise #}
{%- macro promise(name) %}
{#- show in monitor RU1-... instead of COMP-ENB/RU1- #}
{%- set root = slap_configuration['instance-title'] %}
{%- set pretty_name = name.removesuffix('%s.' % root) %}
{%- set pretty_name = name.removeprefix('%s.' % root) %}
{{ part('promise-'+name) }}
<= monitor-promise-base
name = {{ pretty_name }}.py
...
...
@@ -105,11 +105,30 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
{%- set rudrv = rudrv_dict[ru.ru_type] %}
{{ rudrv.buildout_iru(iru, iru_icell_list) }}
# XXX publish something for each RU
# XXX publish something for each cell
{#- publish information about RU #}
{{ part('publish-%s' % ru_ref) }}
recipe = slapos.cookbook:publish.serialised
-slave-reference = {{ ru_ref }}
enb = {{ root }}
{# cell-list = {{ iru_icell_list | map(attribute='_ref') | join(', ') }} #}
{%- 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 = {{ iru_icell_ref_list | join(', ') }}
{%- endfor %}
{#- publish information about cells #}
{%- for cell_ref, icell in icell_dict|dictsort %}
{{ part('publish-%s' % cell_ref) }}
recipe = slapos.cookbook:publish.serialised
-slave-reference = {{ cell_ref }}
enb = {{ root }}
ru = {{ J(jcell_ru_ref(icell, icell_dict)) }}
{%- endfor %}
[buildout]
parts +=
{%- for part in parts_list %}
...
...
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