Commit 8873f599 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 31f336e6
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
{%- endmacro %} {%- endmacro %}
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': iref('RU'), 'slave_title': iref('RU'),
'slave_reference': 'XXX', 'slave_reference': False,
'_': { '_': {
'ru_type': 'sdr', 'ru_type': 'sdr',
'ru_link_type': 'sdr', 'ru_link_type': 'sdr',
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': iref('CELL'), 'slave_title': iref('CELL'),
'slave_reference': 'XXX', 'slave_reference': False,
'_': cell | tojson '_': cell | tojson
}) })
%} %}
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
{%- endif %} {%- endif %}
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': '%s%s' % (iref('PEERCELL'), k), 'slave_title': '%s%s' % (iref('PEERCELL'), k),
'slave_reference': 'XXX', 'slave_reference': False,
'_': peercell | tojson '_': peercell | tojson
}) })
%} %}
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
{%- for k, peer in slapparameter_dict.x2_peers|dictsort %} {%- for k, peer in slapparameter_dict.x2_peers|dictsort %}
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': '%s%s' % (iref('X2_PEER'), k), 'slave_title': '%s%s' % (iref('X2_PEER'), k),
'slave_reference': 'XXX', 'slave_reference': False,
'_': { '_': {
'peer_type': 'nr', 'peer_type': 'nr',
'x2_addr': peer.x2_addr, 'x2_addr': peer.x2_addr,
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
{%- for k, peer in slapparameter_dict.xn_peers|dictsort %} {%- for k, peer in slapparameter_dict.xn_peers|dictsort %}
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': '%s%s' % (iref('XN_PEER'), k), 'slave_title': '%s%s' % (iref('XN_PEER'), k),
'slave_reference': 'XXX', 'slave_reference': False,
'_': { '_': {
'peer_type': 'nr', 'peer_type': 'nr',
'xn_addr': peer.xn_addr 'xn_addr': peer.xn_addr
......
...@@ -61,7 +61,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} ...@@ -61,7 +61,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
{%- set rudrv_init = {} %} {%- set rudrv_init = {} %}
{#- split slapos tap interface for each RU that needs its own tap. {#- split slapos tap interface for each RU that needs its own tap.
fallback to non-split approach for ntap <= 1 to avoid hard-dependecy on setcap/tapsplit fallback to non-split approach for ntap <= 1 to avoid hard-dependency on setcap/tapsplit
TODO Relying on setcap and tapsplit should be removed once SlapOS is improved to TODO Relying on setcap and tapsplit should be removed once SlapOS is improved to
provide several TAP interfaces to instances. See discussion at provide several TAP interfaces to instances. See discussion at
...@@ -235,7 +235,8 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }} ...@@ -235,7 +235,8 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
{%- endif %} {%- endif %}
{{ rudrv.buildout_iru(iru, iru_icell_list) }} {{ rudrv.buildout_iru(iru, iru_icell_list) }}
{#- publish information about RU #} {#- publish information about RU (skipping synthetic) #}
{%- if iru.slave_reference %}
{{ part('publish-%s' % ru_ref) }} {{ part('publish-%s' % ru_ref) }}
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
-slave-reference = {{ dumps(iru.slave_reference) }} -slave-reference = {{ dumps(iru.slave_reference) }}
...@@ -248,6 +249,7 @@ cell-list = {{ dumps(iru_icell_ref_list) }} ...@@ -248,6 +249,7 @@ cell-list = {{ dumps(iru_icell_ref_list) }}
{%- if ru.ru_link_type == 'cpri' %} {%- if ru.ru_link_type == 'cpri' %}
ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway} ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway}
{%- endif %} {%- endif %}
{%- endif %}
{%- endfor %} {%- endfor %}
...@@ -289,12 +291,14 @@ ru_ref = {{ dumps(ru_ref ) }} ...@@ -289,12 +291,14 @@ ru_ref = {{ dumps(ru_ref ) }}
ru = {{ dumps(ru ) }} ru = {{ dumps(ru ) }}
{%- endif %} {%- endif %}
{#- publish information about the cell #} {#- publish information about the cell (skipping synthetic) #}
{%- if icell.slave_reference %}
{{ part('publish-%s' % cell_ref) }} {{ part('publish-%s' % cell_ref) }}
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
-slave-reference = {{ dumps(icell.slave_reference) }} -slave-reference = {{ dumps(icell.slave_reference) }}
{{ slap_configuration['slap-software-type'] }} = {{ dumps(root) }} {{ slap_configuration['slap-software-type'] }} = {{ dumps(root) }}
ru = {{ dumps(ru_ref) }} ru = {{ dumps(ru_ref) }}
{%- endif %}
{%- endfor %} {%- endfor %}
......
...@@ -231,12 +231,12 @@ ...@@ -231,12 +231,12 @@
{%- do icell_dict.update({ref: icell}) %} {%- do icell_dict.update({ref: icell}) %}
{%- set ru = _['ru'] %} {%- set ru = _['ru'] %}
{%- if ru.ru_type not in ('ru_ref', 'ruincell_ref') %} {%- if ru.ru_type not in ('ru_ref', 'ruincell_ref') %}
{#- embedded ru definition -> expose it as `_<cell_ref>_ru` #} {#- embedded ru definition -> expose it as synthethic `_<cell_ref>_ru` #}
{%- do _ru_set_defaults(ru) %} {%- do _ru_set_defaults(ru) %}
{%- do iru_dict.update({'_%s_ru' % ref: { {%- do iru_dict.update({'_%s_ru' % ref: {
'_': ru, '_': ru,
'slave_title': '%s. RU' % icell.slave_title, 'slave_title': '%s. RU' % icell.slave_title,
'slave_reference': icell.slave_reference, 'slave_reference': False,
}}) %} }}) %}
{%- endif %} {%- endif %}
{%- else %} {%- else %}
......
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