Commit de62042f authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 59a12fab
...@@ -43,10 +43,6 @@ ...@@ -43,10 +43,6 @@
{%- elif ru.ru_link_type == 'cpri' %} {%- elif ru.ru_link_type == 'cpri' %}
{%- do ru_cpri_dict.update({len(dev_argv): ru}) %} {%- do ru_cpri_dict.update({len(dev_argv): ru}) %}
{%- set link = ru.cpri_link %} {%- set link = ru.cpri_link %}
{#- set cpri_link parameters to default #}
{%- for k, v in defaults['cpri_link'].items() %}
{%- do link.setdefault(k, v) %}
{%- endfor %}
{%- do dev_argv.append("dev%d=/dev/sdr%d@%d" % (len(dev_argv), link.sdr_dev, link.sfp_port)) %} {%- do dev_argv.append("dev%d=/dev/sdr%d@%d" % (len(dev_argv), link.sdr_dev, link.sfp_port)) %}
{%- else %} {%- else %}
{%- do bug('unreachable') %} {%- do bug('unreachable') %}
......
...@@ -117,6 +117,12 @@ ...@@ -117,6 +117,12 @@
{%- set _ = ishared['_'] %} {%- set _ = ishared['_'] %}
{%- if 'ru_type' in _ %} {%- if 'ru_type' in _ %}
{%- set iru = ishared %} {%- set iru = ishared %}
{%- if _.ru_link_type == 'cpri' %}
{%- set link = _.cpri_link %}
{%- for k, v in defaults['cpri_link'].items() %}
{%- do link.setdefault(k, v) %}
{%- endfor %}
{%- endif %}
{%- do iru_dict.update({ref: iru}) %} {%- do iru_dict.update({ref: iru}) %}
{%- elif (kind == 'enb' and 'cell_type' in _) or {%- elif (kind == 'enb' and 'cell_type' in _) or
(kind == 'ue' and 'ue_cell_type' in _) %} (kind == 'ue' and 'ue_cell_type' in _) %}
......
...@@ -20,11 +20,11 @@ md5sum = 739cd223f6959fde38d658127cab51ed ...@@ -20,11 +20,11 @@ md5sum = 739cd223f6959fde38d658127cab51ed
[amari_lte.jinja2] [amari_lte.jinja2]
_update_hash_filename_ = amari/lte.jinja2 _update_hash_filename_ = amari/lte.jinja2
md5sum = ddee326ec6f0612c48b301f9b0913f44 md5sum = 60bb7b7f3fd9a16cf7fb9c9c0f88bb06
[amari_slap.jinja2] [amari_slap.jinja2]
_update_hash_filename_ = amari/slap.jinja2 _update_hash_filename_ = amari/slap.jinja2
md5sum = 1334a974be7a3fb143bc88d42de80616 md5sum = 7bdd47558fb6e80c4a62938ab915fd7a
[ru_libinstance.jinja2.cfg] [ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg _update_hash_filename_ = ru/libinstance.jinja2.cfg
......
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