Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
7bf599a8
Commit
7bf599a8
authored
1 year ago
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
1996c3e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
4 deletions
+65
-4
software/ors-amarisoft/amari/slap.jinja2
software/ors-amarisoft/amari/slap.jinja2
+3
-1
software/ors-amarisoft/config/ue.jinja2.cfg
software/ors-amarisoft/config/ue.jinja2.cfg
+3
-2
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+3
-1
software/ors-amarisoft/slapos-render-config.py
software/ors-amarisoft/slapos-render-config.py
+56
-0
No files found.
software/ors-amarisoft/amari/slap.jinja2
View file @
7bf599a8
...
...
@@ -104,7 +104,9 @@
{%- endfor %}
{#- icell_dict keeps cell shared instances: reference -> icell
{#- load_iru_and_icell initializes RU and cell registries.
icell_dict keeps cell shared instances: reference -> icell
iru_dict keeps RU shared instances + RU whose definition is embedded into a cell: reference -> iRU
in the kept instances _ is automatically json-decoded
...
...
This diff is collapsed.
Click to expand it.
software/ors-amarisoft/config/ue.jinja2.cfg
View file @
7bf599a8
...
...
@@ -47,7 +47,7 @@
n_antenna_ul: {{ ru.n_antenna_ul }},
dl_earfcn: {{ cell.dl_earfcn }},
bandwidth: {{
lte.cell_n_rb_dl(cell
) }},
bandwidth: {{
cell.bandwidth.removesuffix(' MHz'
) }},
global_timing_advance: -1,
},
...
...
@@ -102,7 +102,8 @@
K: "{{ ue.k }}",
rue_addr: "{{ ue.rue_addr }}",
{%- if ue.ue_type == 'lte' %}
ue_category: 12,
as_release: 13,
ue_category: 13,
{%- elif ue.ue_type == 'nr' %}
as_release: 15,
ue_category: "nr",
...
...
This diff is collapsed.
Click to expand it.
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
7bf599a8
{#- XXX need to be already loaded {%- import 'amari_slap.jinja2' as lte with context %} #}
{%- do slaplte.load_iru_and_icell(kind=icell_kind) %}
{%- set icell_dict = {} %}
{%- set iru_dict = {} %}
{%- do slaplte.load_iru_and_icell(iru_dict, icell_dict, kind=icell_kind) %}
This diff is collapsed.
Click to expand it.
software/ors-amarisoft/slapos-render-config.py
View file @
7bf599a8
...
...
@@ -209,12 +209,68 @@ def iRU3_SDR1_fLTE2(ienb):
}
})
def
iRU2_LOPCOMM_fLTE2
(
ienb
):
# supports: 2110 - 2170 MHz
RU_0002
=
{
'ru_type'
:
'lopcomm'
,
'ru_link_type'
:
'cpri'
,
# 'mac_addr': 'XXX',
'cpri_link'
:
{
'sdr_dev'
:
0
,
'sfp_port'
:
0
,
'mult'
:
8
,
'mapping'
:
'hw'
,
'rx_delay'
:
25.11
,
'tx_delay'
:
14.71
,
'tx_dbm'
:
63
},
'n_antenna_dl'
:
1
,
'n_antenna_ul'
:
1
,
'tx_gain'
:
0
,
'rx_gain'
:
0
,
}
# supports: 2110 - 2170 MHz
RU_0004
=
copy
.
deepcopy
(
RU_0002
)
# RU_0004['mac_addr'] = 'YYY'
RU_0004
[
'cpri_link'
][
'sfp_port'
]
=
1
if
1
:
ienb
.
ishared
(
'Radio Unit 2a'
,
'_RU_0002'
,
RU_0002
)
ienb
.
ishared
(
'Cell 2'
,
'_CELL2'
,
{
'cell_type'
:
'lte'
,
'rf_mode'
:
'fdd'
,
'bandwidth'
:
'20 MHz'
,
'dl_earfcn'
:
100
,
# 2120 MHz @ B1
'pci'
:
21
,
'cell_id'
:
'0x21'
,
'ru'
:
{
'ru_type'
:
'ru_ref'
,
'ru_ref'
:
'RU_0002'
}
})
if
1
:
ienb
.
ishared
(
'Radio Unit 2b'
,
'_RU_0004'
,
RU_0004
)
ienb
.
ishared
(
'Cell 4'
,
'_CELL4'
,
{
'cell_type'
:
'lte'
,
'rf_mode'
:
'fdd'
,
'bandwidth'
:
'20 MHz'
,
'dl_earfcn'
:
500
,
# 2160 MHz @ B1
'pci'
:
22
,
'cell_id'
:
'0x22'
,
'ru'
:
{
'ru_type'
:
'ru_ref'
,
'ru_ref'
:
'RU_0004'
}
})
def
do_enb
():
ienb
=
Instance
(
'enb'
)
iRU1_SDR_tLTE2_tNR
(
ienb
)
#iRU2_LOPCOMM_fLTE_fNR(ienb)
#iRU3_SDR1_fLTE2(ienb)
#iRU2_LOPCOMM_fLTE2(ienb)
jshared_instance_list
=
json
.
dumps
(
ienb
.
shared_instance_list
)
json_params
=
"""{
...
...
This diff is collapsed.
Click to expand it.
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