Commit c144e79f authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent af86c86d
...@@ -142,7 +142,6 @@ ...@@ -142,7 +142,6 @@
| map(attribute='1.xn_addr') | map(attribute='1.xn_addr')
| list | tojson }}, | list | tojson }},
{% if slapparameter_dict.get('mme_list', '') or slapparameter_dict.get('afm_list', '') %} {% if slapparameter_dict.get('mme_list', '') or slapparameter_dict.get('afm_list', '') %}
{% if slapparameter_dict.get('use_ipv4', False) %} {% if slapparameter_dict.get('use_ipv4', False) %}
gtp_addr: "{{ gtp_addr_v4 }}", gtp_addr: "{{ gtp_addr_v4 }}",
...@@ -153,7 +152,6 @@ ...@@ -153,7 +152,6 @@
gtp_addr: "{{ slap_configuration['configuration.gtp_addr'] }}", gtp_addr: "{{ slap_configuration['configuration.gtp_addr'] }}",
{% endif %} {% endif %}
{%- if do_lte %} {%- if do_lte %}
enb_id: {{ cfg('enb_id') }}, enb_id: {{ cfg('enb_id') }},
{%- endif %} {%- endif %}
...@@ -166,11 +164,11 @@ ...@@ -166,11 +164,11 @@
// LTE cells // LTE cells
cell_list: [ cell_list: [
{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %} {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
{%- set cell = icell['_'] %} {%- set cell = icell['_'] %}
{%- if cell.cell_type == 'lte' %} {%- if cell.cell_type == 'lte' %}
{%- set ru_ref = J(jcell_ru_ref(icell, icell_dict)) %} {%- set ru_ref = J(jcell_ru_ref(icell, icell_dict)) %}
{%- set iru = iru_dict[ru_ref] %} {%- set iru = iru_dict[ru_ref] %}
{%- set ru = iru['_'] %} {%- set ru = iru['_'] %}
// {{ cell_ref }} ({{ ru_ref }}) // {{ cell_ref }} ({{ ru_ref }})
{ {
...@@ -193,7 +191,7 @@ ...@@ -193,7 +191,7 @@
// Carrier Aggregation: LTE + LTE // Carrier Aggregation: LTE + LTE
scell_list: [ scell_list: [
{%- for cell2_ref, icell2 in icell_dict|dictsort %} {%- for cell2_ref, icell2 in icell_dict|dictsort %}
{%- set cell2 = icell2['_'] %} {%- set cell2 = icell2['_'] %}
{%- if cell2_ref != cell_ref and cell2.cell_type == 'lte' %} {%- if cell2_ref != cell_ref and cell2.cell_type == 'lte' %}
{ {
cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }} cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
...@@ -207,7 +205,7 @@ ...@@ -207,7 +205,7 @@
// Carrier Aggregation: LTE + NR // Carrier Aggregation: LTE + NR
en_dc_scg_cell_list: [ en_dc_scg_cell_list: [
{%- for cell2_ref, icell2 in icell_dict|dictsort %} {%- for cell2_ref, icell2 in icell_dict|dictsort %}
{%- set cell2 = icell2['_'] %} {%- set cell2 = icell2['_'] %}
{%- if cell2_ref != cell_ref and cell2.cell_type == 'nr' %} {%- if cell2_ref != cell_ref and cell2.cell_type == 'nr' %}
{ {
cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }} cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
xn_peers: ["n_abc", "n_def"], xn_peers: ["n_abc", "n_def"],
gtp_addr: "127.0.1.1", gtp_addr: "127.0.1.1",
enb_id: 0x1A2D0, enb_id: 0x1A2D0,
......
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