Commit 2aea9ced authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent d359d62c
......@@ -24,7 +24,7 @@ md5sum = f5c76c3443b75569eb18503dce38e783
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
md5sum = 119ef29f00b94ec4019cb593d9134448
md5sum = 92b797db9b3d1fb6527096d848815869
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
......@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
md5sum = 9811b8e8b39cf8d4e53a9d894c64513f
md5sum = bac13c187395b2e6fe2e4960e0f8d5ce
[drb_lte.jinja2.cfg]
filename = config/drb_lte.jinja2.cfg
......
......@@ -2,6 +2,7 @@
{%- set B = slaplte.B %}
{%- set J = slaplte.J %}
{%- set jcell_ru_ref = slaplte.jcell_ru_ref %}
{%- set ierror = slaplte.ierror %}
{#- for standalone testing via slapos-render-config.py
NOTE: keep in sync with instance-enb.jinja2.cfg and ru/libinstance.jinja2.cfg #}
......@@ -625,7 +626,7 @@
bitmap: "110011",
cdm_type: "fd_cdm2",
{%- else %}
#error {{ B(ru_ref) }}: n_antenna_dl={{ ru.n_antenna_dl }} is unsupported
{%- do ierror(iru, 'n_antenna_dl={{ ru.n_antenna_dl }} is unsupported') %}
{%- endif %}
},
{%- if tdd_config != 3 %}
......
......@@ -13,7 +13,8 @@
- B escapes string to be safe to use in buildout code.
- J should be used around macro calls to retrieve returned objects.
- ierror reports an error about shared instance.
- error reports instantiation error.
- ierror reports instantiation error caused by shared instance configuration.
-#}
......@@ -146,13 +147,17 @@
{%- do assert(False, msg) %}
{%- endmacro %}
{#- ierror reports an error about shared instance. #}
{#- XXX ierror(ishared, msg) vvv is debug stub -#}
{%- macro ierror(ishared, msg) %}
{%- set msg = 'E: %s: %s\n' % (J(jref_of_shared(ishared)), msg) %}
{#- error reports instantiation error. #}
{%- macro error(msg) %}
{%- set msg = 'Instantiation Error: %s\n' % msg %}
{%- do assert(False, msg) %}
{%- endmacro %}
{#- ierror reports instantiation error caused by shared instance configuration. #}
{%- macro ierror(ishared, msg) %}
{%- do error('%s: %s' % (J(jref_of_shared(ishared)), msg)) %}
{%- endmacro %}
......@@ -466,7 +471,15 @@
{%- set do_sdr = len(ru_sdr_dict) > 0 %}
{%- set do_cpri = len(ru_cpri_dict) > 0 %}
{%- if do_sdr and do_cpri %}
#error Mixing SDR and CPRI is not supported and breaks subtly. See https://support.amarisoft.com/issues/26021 for details.
{%- do error('Mixing SDR + CPRI is not supported and breaks subtly.
SDR Radio Units: %r
CPRI Radio Units: %r
See https://support.amarisoft.com/issues/26021 for details' % (
iru_dict |dictsort |selectattr('1._.ru_type', '==', 'sdr') |map(attribute='0') |list,
iru_dict |dictsort |selectattr('1._.ru_link_type', '==', 'cpri') |map(attribute='0') |list
)) %}
{%- endif %}
{#- disable trx completely if all we have is only inactive sdr(s).
......
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