Commit c4da4979 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 74d1d129
...@@ -24,7 +24,7 @@ md5sum = 8bd6d5390f33cf1d56502b49cf9da52f ...@@ -24,7 +24,7 @@ md5sum = 8bd6d5390f33cf1d56502b49cf9da52f
[slaplte.jinja2] [slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2 _update_hash_filename_ = slaplte.jinja2
md5sum = dc3bff7742d78a7831748a51659f63a4 md5sum = ac61569bcdfec494e92181e9fc465bc4
[ru_libinstance.jinja2.cfg] [ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg _update_hash_filename_ = ru/libinstance.jinja2.cfg
...@@ -32,7 +32,7 @@ md5sum = 7df061e692f506912f249b034ccc53af ...@@ -32,7 +32,7 @@ md5sum = 7df061e692f506912f249b034ccc53af
[ru_sdr_libinstance.jinja2.cfg] [ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
md5sum = 7cd5331db13a8a901cb1b55a4596cf50 md5sum = b7906ca3a6b17963f78f680fc0842b74
[ru_lopcomm_libinstance.jinja2.cfg] [ru_lopcomm_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
...@@ -40,7 +40,7 @@ md5sum = 0a64b39a24484ca5c67ff1fe91b9667a ...@@ -40,7 +40,7 @@ md5sum = 0a64b39a24484ca5c67ff1fe91b9667a
[ru_sunwave_libinstance.jinja2.cfg] [ru_sunwave_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
md5sum = e291dd9197e16f1af955a40f03d4ddb5 md5sum = bc5d82b8737b6990674b280ef2774be7
[ru_amarisoft-stats.jinja2.py] [ru_amarisoft-stats.jinja2.py]
_update_hash_filename_ = ru/amarisoft-stats.jinja2.py _update_hash_filename_ = ru/amarisoft-stats.jinja2.py
...@@ -88,7 +88,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46 ...@@ -88,7 +88,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46
[template-ors-enb] [template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg _update_hash_filename_ = instance-ors-enb.jinja2.cfg
md5sum = c253d06158c5c339327a35aa76ebdac1 md5sum = 33dd67a19c01336cfe1f3637a1bac42c
[template-core-network] [template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
'inactivity_timer': slapparameter_dict.inactivity_timer, 'inactivity_timer': slapparameter_dict.inactivity_timer,
'ru': { 'ru_type': 'ru_ref', 'ru': { 'ru_type': 'ru_ref',
'ru_ref': 'RU' } 'ru_ref': '%s.RU' % slap_configuration['slap-computer-partition-id']}
}) })
%} %}
......
...@@ -3,3 +3,7 @@ ...@@ -3,3 +3,7 @@
{%- macro buildout_iru(iru, icell_list) %} {%- macro buildout_iru(iru, icell_list) %}
{#- nothing SDR-specific #} {#- nothing SDR-specific #}
{%- endmacro %} {%- endmacro %}
{%- macro buildout() %}
{#- nothing SDR-specific #}
{%- endmacro %}
...@@ -3,3 +3,7 @@ ...@@ -3,3 +3,7 @@
{%- macro buildout_iru(iru, icell_list) %} {%- macro buildout_iru(iru, icell_list) %}
{#- nothing SunWave-specific #} {#- nothing SunWave-specific #}
{%- endmacro %} {%- endmacro %}
{%- macro buildout() %}
{#- nothing SunWave-specific #}
{%- endmacro %}
...@@ -309,10 +309,9 @@ ...@@ -309,10 +309,9 @@
{#- do print('jref_of_shared %r' % (ishared,)) #} {#- do print('jref_of_shared %r' % (ishared,)) #}
{%- set ref = ishared['slave_title'] %} {%- set ref = ishared['slave_title'] %}
{%- set partition_id = slap_configuration['slap-computer-partition-id'] %} {%- set partition_id = slap_configuration['slap-computer-partition-id'] %}
{%- if ref.startswith(partition_id) %} {%- if ref.startswith(partition_id+'_') %}
{%- set ref = ref[len(partition_id):] %} {%- set ref = ref[len(partition_id)+1:] %}
{%- endif %} {%- endif %}
{%- set ref = ref.removeprefix('_') %}
{{- ref | tojson }} {{- ref | tojson }}
{%- endmacro %} {%- endmacro %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment