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
Joanne Hugé
slapos
Commits
acd01805
Commit
acd01805
authored
Feb 13, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: enb: Cosmetics
Typos, whitespace changes, etc...
parent
9979fa63
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+7
-3
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+1
-0
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+2
-2
software/ors-amarisoft/slaplte.jinja2
software/ors-amarisoft/slaplte.jinja2
+1
-1
No files found.
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
acd01805
...
@@ -130,6 +130,8 @@
...
@@ -130,6 +130,8 @@
{{- (_.host, _.port) | tojson }}
{{- (_.host, _.port) | tojson }}
{%- endmacro -%}
{%- endmacro -%}
{#- start of the config -#}
{
{
log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,
log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,
{%- if slapparameter_dict.get('log_phy_debug', False) -%}
{%- if slapparameter_dict.get('log_phy_debug', False) -%}
...
@@ -152,7 +154,7 @@
...
@@ -152,7 +154,7 @@
com_addr: "{{ slapparameter_dict.com_addr }}:{{ slapparameter_dict.com_ws_port }}",
com_addr: "{{ slapparameter_dict.com_addr }}:{{ slapparameter_dict.com_ws_port }}",
{%- endif %}
{%- endif %}
{%
-
if do_lte %}
{%
if do_lte %}
// LTE core network
// LTE core network
mme_list: [
mme_list: [
{%- for _, mme in slapparameter_dict.mme_list |dictsort %}
{%- for _, mme in slapparameter_dict.mme_list |dictsort %}
...
@@ -163,7 +165,7 @@
...
@@ -163,7 +165,7 @@
],
],
{%- endif %}
{%- endif %}
{%
- if do_nr
%}
{%
if do_nr
%}
// NR core network
// NR core network
amf_list: [
amf_list: [
{%- for _, amf in slapparameter_dict.amf_list |dictsort %}
{%- for _, amf in slapparameter_dict.amf_list |dictsort %}
...
@@ -249,11 +251,12 @@
...
@@ -249,11 +251,12 @@
cell_id: {{ cell.cell_id }},
cell_id: {{ cell.cell_id }},
tac: {{ cell.tac }},
tac: {{ cell.tac }},
n_id_cell: {{ cell.pci }},
n_id_cell: {{ cell.pci }},
root_sequence_index: {{ cell.root_sequence_index }},
dl_earfcn: {{ cell.dl_earfcn }},
dl_earfcn: {{ cell.dl_earfcn }},
ul_earfcn: {{ cell.ul_earfcn }},
ul_earfcn: {{ cell.ul_earfcn }},
root_sequence_index: {{ cell.root_sequence_index }},
inactivity_timer: {{ cell.inactivity_timer }},
inactivity_timer: {{ cell.inactivity_timer }},
// Handover
// Handover
{{- handover_config(cell_ref) }}
{{- handover_config(cell_ref) }}
...
@@ -752,6 +755,7 @@
...
@@ -752,6 +755,7 @@
},
},
drb_config: "{{ B('%s-drb.cfg' % cell_ref) }}",
drb_config: "{{ B('%s-drb.cfg' % cell_ref) }}",
},
},
{%- endfor %}
{%- endfor %}
],
],
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
acd01805
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
{%- do slapparameter_dict.setdefault(k, v) %}
{%- do slapparameter_dict.setdefault(k, v) %}
{%- endfor %}
{%- endfor %}
[buildout]
[buildout]
parts =
parts =
directory
directory
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
acd01805
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
importing, use buildout() macro to emit instance-level code to
importing, use buildout() macro to emit instance-level code to
handle configured RUs and cells.
handle configured RUs and cells.
NOTE: before importing package slaplte.jinja2 needs to already loaded as
NOTE: before importing package slaplte.jinja2 needs to
be
already loaded as
{%- import 'slaplte.jinja2' as slaplte with context %}
{%- import 'slaplte.jinja2' as slaplte with context %}
...
@@ -61,7 +61,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
...
@@ -61,7 +61,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
{%- set rudrv_init = {} %}
{%- set rudrv_init = {} %}
{#- split slapos tap interface for each RU that needs its own tap.
{#- split slapos tap interface for each RU that needs its own tap.
fallback to non-split approach for ntap <= 1 to avoid hard-dependecy on setcap/tapsplit
fallback to non-split approach for ntap <= 1 to avoid hard-depende
n
cy on setcap/tapsplit
TODO Relying on setcap and tapsplit should be removed once SlapOS is improved to
TODO Relying on setcap and tapsplit should be removed once SlapOS is improved to
provide several TAP interfaces to instances. See discussion at
provide several TAP interfaces to instances. See discussion at
...
...
software/ors-amarisoft/slaplte.jinja2
View file @
acd01805
...
@@ -279,7 +279,7 @@
...
@@ -279,7 +279,7 @@
{%- set rf_chan.rx = rf_chan.rx + ru.n_antenna_ul %}
{%- set rf_chan.rx = rf_chan.rx + ru.n_antenna_ul %}
{%- endfor %}
{%- endfor %}
{#- assign TAP interfaces to
RUs
#}
{#- assign TAP interfaces to
cpri RUs
#}
{%- set iru_vcpri = list(iru_dict|dictsort | selectattr('1._.ru_link_type', '==', 'cpri')) %}
{%- set iru_vcpri = list(iru_dict|dictsort | selectattr('1._.ru_link_type', '==', 'cpri')) %}
{%- for i, (ru_ref, iru) in enumerate(iru_vcpri) %}
{%- for i, (ru_ref, iru) in enumerate(iru_vcpri) %}
{%- if len(iru_vcpri) > 1 %}
{%- if len(iru_vcpri) > 1 %}
...
...
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