Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
e74cf8f6
Commit
e74cf8f6
authored
Jan 31, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X cell.root_sequence_index needs to be also initialized at load time
parent
cee42e24
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+4
-4
software/ors-amarisoft/slaplte.jinja2
software/ors-amarisoft/slaplte.jinja2
+4
-2
No files found.
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
e74cf8f6
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
// LTE cells
// LTE cells
cell_list: [
cell_list: [
{%- if do_lte %}
{%- if do_lte %}
{%- for
i, (cell_ref, icell) in enumerate(icell_dict_lte|dictsort)
%}
{%- for
cell_ref, icell in icell_dict_lte|dictsort
%}
{%- set cell = icell['_'] %}
{%- set cell = icell['_'] %}
{%- 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] %}
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
n_id_cell: {{ cell.pci }},
n_id_cell: {{ cell.pci }},
dl_earfcn: {{ cell.dl_earfcn }},
dl_earfcn: {{ cell.dl_earfcn }},
ul_earfcn: {{ cell.ul_earfcn }},
ul_earfcn: {{ cell.ul_earfcn }},
root_sequence_index: {{ cell.
get('root_sequence_index', 204 + i)
}},
root_sequence_index: {{ cell.
root_sequence_index
}},
inactivity_timer: {{ cell.inactivity_timer }},
inactivity_timer: {{ cell.inactivity_timer }},
...
@@ -472,7 +472,7 @@
...
@@ -472,7 +472,7 @@
// NR cells
// NR cells
nr_cell_list: [
nr_cell_list: [
{%- if do_nr %}
{%- if do_nr %}
{%- for
i, (cell_ref, icell) in enumerate(icell_dict_nr|dictsort)
%}
{%- for
cell_ref, icell in icell_dict_nr|dictsort
%}
{%- set cell = icell['_'] %}
{%- set cell = icell['_'] %}
{%- 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] %}
...
@@ -495,7 +495,7 @@
...
@@ -495,7 +495,7 @@
ssb_nr_arfcn: {{ cell.ssb_nr_arfcn }},
ssb_nr_arfcn: {{ cell.ssb_nr_arfcn }},
ssb_pos_bitmap: "{{ cell.ssb_pos_bitmap }}",
ssb_pos_bitmap: "{{ cell.ssb_pos_bitmap }}",
root_sequence_index: {{ cell.
get('root_sequence_index', 1 + i)
}},
root_sequence_index: {{ cell.
root_sequence_index
}},
inactivity_timer: {{ cell.inactivity_timer }},
inactivity_timer: {{ cell.inactivity_timer }},
// Handover
// Handover
...
...
software/ors-amarisoft/slaplte.jinja2
View file @
e74cf8f6
...
@@ -226,7 +226,7 @@
...
@@ -226,7 +226,7 @@
{%- do iru_dict.update({ref: iru}) %}
{%- do iru_dict.update({ref: iru}) %}
{%- elif 'cell_type' in _ and _.get('cell_kind') == icell_kind %}
{%- elif 'cell_type' in _ and _.get('cell_kind') == icell_kind %}
{%- set icell = ishared %}
{%- set icell = ishared %}
{%- do _cell_set_defaults(_, icell_kind) %}
{%- do _cell_set_defaults(_, icell_kind
, icell_dict
) %}
{%- 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') %}
...
@@ -305,7 +305,7 @@
...
@@ -305,7 +305,7 @@
{%- endif %}
{%- endif %}
{%- endmacro %}
{%- endmacro %}
{%- macro _cell_set_defaults(cell, icell_kind) %}
{%- macro _cell_set_defaults(cell, icell_kind
, icell_dict
) %}
{%- if icell_kind == 'enb' %}
{%- if icell_kind == 'enb' %}
{%- for k, v in defaults['cell/%s' % cell.cell_type].items() %}
{%- for k, v in defaults['cell/%s' % cell.cell_type].items() %}
{%- do cell.setdefault(k, v) %}
{%- do cell.setdefault(k, v) %}
...
@@ -313,6 +313,8 @@
...
@@ -313,6 +313,8 @@
{%- for k, v in defaults['cell/%s/%s' % (cell.cell_type, cell.rf_mode)].items() %}
{%- for k, v in defaults['cell/%s/%s' % (cell.cell_type, cell.rf_mode)].items() %}
{%- do cell.setdefault(k, v) %}
{%- do cell.setdefault(k, v) %}
{%- endfor %}
{%- endfor %}
{%- set n = len(list(icell_dict|dictsort | selectattr('1._.cell_type', '==', cell.cell_type))) %}
{%- do cell.setdefault('root_sequence_index', 1 + 203*(cell.cell_type == 'lte') + n) %}
{%- endif %}
{%- endif %}
{%- if cell.cell_type == 'lte' %}
{%- if cell.cell_type == 'lte' %}
{%- do cell.setdefault('ul_earfcn', J(jdefault_ul_earfcn(cell.dl_earfcn))) %}
{%- do cell.setdefault('ul_earfcn', J(jdefault_ul_earfcn(cell.dl_earfcn))) %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment