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
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
c4da4979
Commit
c4da4979
authored
Dec 26, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
74d1d129
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
8 deletions
+15
-8
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+4
-4
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
+1
-1
software/ors-amarisoft/ru/sdr/libinstance.jinja2.cfg
software/ors-amarisoft/ru/sdr/libinstance.jinja2.cfg
+4
-0
software/ors-amarisoft/ru/sunwave/libinstance.jinja2.cfg
software/ors-amarisoft/ru/sunwave/libinstance.jinja2.cfg
+4
-0
software/ors-amarisoft/slaplte.jinja2
software/ors-amarisoft/slaplte.jinja2
+2
-3
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
c4da4979
...
...
@@ -24,7 +24,7 @@ md5sum = 8bd6d5390f33cf1d56502b49cf9da52f
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
md5sum =
dc3bff7742d78a7831748a51659f63a
4
md5sum =
ac61569bcdfec494e92181e9fc465bc
4
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
...
...
@@ -32,7 +32,7 @@ md5sum = 7df061e692f506912f249b034ccc53af
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
md5sum =
7cd5331db13a8a901cb1b55a4596cf50
md5sum =
b7906ca3a6b17963f78f680fc0842b74
[ru_lopcomm_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
...
...
@@ -40,7 +40,7 @@ md5sum = 0a64b39a24484ca5c67ff1fe91b9667a
[ru_sunwave_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
md5sum =
e291dd9197e16f1af955a40f03d4ddb5
md5sum =
bc5d82b8737b6990674b280ef2774be7
[ru_amarisoft-stats.jinja2.py]
_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
...
...
@@ -88,7 +88,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
md5sum =
c253d06158c5c339327a35aa76ebdac1
md5sum =
33dd67a19c01336cfe1f3637a1bac42c
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
...
...
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
View file @
c4da4979
...
...
@@ -105,7 +105,7 @@
'inactivity_timer': slapparameter_dict.inactivity_timer,
'ru': { 'ru_type': 'ru_ref',
'ru_ref': '
RU'
}
'ru_ref': '
%s.RU' % slap_configuration['slap-computer-partition-id']
}
})
%}
...
...
software/ors-amarisoft/ru/sdr/libinstance.jinja2.cfg
View file @
c4da4979
...
...
@@ -3,3 +3,7 @@
{%- macro buildout_iru(iru, icell_list) %}
{#- nothing SDR-specific #}
{%- endmacro %}
{%- macro buildout() %}
{#- nothing SDR-specific #}
{%- endmacro %}
software/ors-amarisoft/ru/sunwave/libinstance.jinja2.cfg
View file @
c4da4979
...
...
@@ -3,3 +3,7 @@
{%- macro buildout_iru(iru, icell_list) %}
{#- nothing SunWave-specific #}
{%- endmacro %}
{%- macro buildout() %}
{#- nothing SunWave-specific #}
{%- endmacro %}
software/ors-amarisoft/slaplte.jinja2
View file @
c4da4979
...
...
@@ -309,10 +309,9 @@
{#- do print('jref_of_shared %r' % (ishared,)) #}
{%- set ref = ishared['slave_title'] %}
{%- set partition_id = slap_configuration['slap-computer-partition-id'] %}
{%- if ref.startswith(partition_id
)
%}
{%- set ref = ref[len(partition_id)
:]
%}
{%- if ref.startswith(partition_id
+'_')
%}
{%- set ref = ref[len(partition_id)
+1:]
%}
{%- endif %}
{%- set ref = ref.removeprefix('_') %}
{{- ref | tojson }}
{%- endmacro %}
...
...
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