Commit bebdca2c authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 3b4dc6a7
......@@ -18,8 +18,8 @@
filename = instance.cfg
md5sum = e97c99f90b5f3aaa1c2ee9c62857851a
[amari_slap.jinja2]
_update_hash_filename_ = amari/slap.jinja2
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
md5sum = 4fae7413d143b6c9b1734ffbe5c8e94b
[ru_libinstance.jinja2.cfg]
......
......@@ -248,11 +248,11 @@
// tune LTE parameters for the cell
{%- set tdd = (cell.rf_mode == 'tdd') %}
{%- if tdd %}
uldl_config: {{ lte.cell_tdd_config(cell) }},
uldl_config: {{ cell_tdd_config(cell) }},
sp_config: 7,
{%- endif %}
{%- set n_rb_dl = lte.cell_n_rb_dl(cell) %}
{%- set n_rb_dl = cell_n_rb_dl(cell) %}
n_rb_dl: {{ n_rb_dl }},
si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }},
......@@ -496,7 +496,7 @@
{%- endif %}
{%- set tdd = (cell.rf_mode == 'tdd') %}
{%- set tdd_config = lte.nr_cell_tdd_config(cell) if tdd else None %},
{%- set tdd_config = nr_cell_tdd_config(cell) if tdd else None %},
{% if tdd_config == 1 %}
tdd_ul_dl_config: {
......
{%- import 'amari_slap.jinja2' as slaplte with context %}
{%- import 'slaplte.jinja2' as slaplte with context %}
{%- set J = slaplte.J %}
{%- set jcell_ru_ref = slaplte.jcell_ru_ref %}
......
......@@ -33,7 +33,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
{%- set icell_kind='enb' %}
{%- import 'amari_slap.jinja2' as slaplte with context %}
{%- import 'slaplte.jinja2' as slaplte with context %}
{%- import 'ru_libinstance.jinja2.cfg' as rulib with context %}
{%- set ipeercell_dict = {} %}
{%- do slaplte.load_ipeercell(ipeercell_dict) %}
......@@ -358,7 +358,7 @@ extra-context =
json ipeercell_dict {{ ipeercell_dict | tojson }}
import json_module json
import-list =
rawfile amari_slap.jinja2 {{ amari_slap_template }}
rawfile slaplte.jinja2 {{ slaplte_template }}
[publish-connection-information]
......
......@@ -13,7 +13,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
{%- set icell_kind='ue' %}
{%- import 'amari_slap.jinja2' as slaplte with context %}
{%- import 'slaplte.jinja2' as slaplte with context %}
{%- import 'ru_libinstance.jinja2.cfg' as rulib with context %}
{%- do slaplte.check_loaded_everything() %}
......
......@@ -38,7 +38,7 @@ context =
key lan_ipv4 lan-ip:ipv4
$${:extra-context}
import-list =
rawfile amari_slap.jinja2 ${amari_slap.jinja2:target}
rawfile slaplte.jinja2 ${slaplte.jinja2:target}
rawfile ru_libinstance.jinja2.cfg ${ru_libinstance.jinja2.cfg:target}
rawfile ru_sdr_libinstance.jinja2.cfg ${ru_sdr_libinstance.jinja2.cfg:target}
rawfile ru_lopcomm_libinstance.jinja2.cfg ${ru_lopcomm_libinstance.jinja2.cfg:target}
......@@ -294,7 +294,7 @@ extra-context =
key enb amarisoft:enb
key sdr amarisoft:sdr
raw enb_template ${enb.jinja2.cfg:target}
raw amari_slap_template ${amari_slap.jinja2:target}
raw slaplte_template ${slaplte.jinja2:target}
raw drb_lte_template ${drb_lte.jinja2.cfg:target}
raw drb_nr_template ${drb_nr.jinja2.cfg:target}
raw sib23_template ${sib23.jinja2.asn:target}
......
......@@ -5,9 +5,9 @@
importing, use buildout() macro to emit instance-level code to
handle configured RUs and cells.
NOTE: before importing package amari_slap.jinja2 needs to already loaded as
NOTE: before importing package slaplte.jinja2 needs to already loaded as
{%- import 'amari_slap.jinja2' as slaplte with context %}
{%- import 'slaplte.jinja2' as slaplte with context %}
NOTE: driver-specific logic is implemented in rudrv.buildout_iru() .
#}
......
......@@ -27,7 +27,7 @@ def j2render(src, out, jcfg):
'output': 'config/out/{}'.format(out),
'context': textctx,
'import-list': '''
rawfile amari_slap.jinja2 amari/slap.jinja2''',
rawfile slaplte.jinja2 slaplte.jinja2''',
})
# avoid dependency on zc.buildout.download and the need to use non-stub buildout section
......
......@@ -135,7 +135,7 @@ destination = ${buildout:directory}/gadget/${:_buildout_section_name_}
[ue.jinja2.cfg]
<= copy-config-to-instance
[amari_slap.jinja2]
[slaplte.jinja2]
<= download-base
......
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