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
87afeb19
Commit
87afeb19
authored
Apr 18, 2024
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: better naming
parent
7d6fbbc3
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
75 additions
and
98 deletions
+75
-98
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+6
-6
software/ors-amarisoft/config/drb_lte.jinja2.cfg
software/ors-amarisoft/config/drb_lte.jinja2.cfg
+15
-15
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+9
-9
software/ors-amarisoft/config/sib23.jinja2.asn
software/ors-amarisoft/config/sib23.jinja2.asn
+8
-8
software/ors-amarisoft/config/sib5.jinja2.asn
software/ors-amarisoft/config/sib5.jinja2.asn
+8
-8
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+3
-3
software/ors-amarisoft/slaplte.jinja2
software/ors-amarisoft/slaplte.jinja2
+22
-45
software/ors-amarisoft/slapos-render-config.py
software/ors-amarisoft/slapos-render-config.py
+4
-4
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
87afeb19
...
@@ -24,7 +24,7 @@ md5sum = f5c76c3443b75569eb18503dce38e783
...
@@ -24,7 +24,7 @@ md5sum = f5c76c3443b75569eb18503dce38e783
[slaplte.jinja2]
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
_update_hash_filename_ = slaplte.jinja2
md5sum =
9f93fad31cd1a31e35acfc3b3be5e4ef
md5sum =
4302b037b337fe15951b6debfd3924d9
[ru_amarisoft-stats.jinja2.py]
[ru_amarisoft-stats.jinja2.py]
_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
...
@@ -36,7 +36,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883
...
@@ -36,7 +36,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883
[ru_libinstance.jinja2.cfg]
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum =
18f94a784f28487d3d87584a97814f4
a
md5sum =
f5140a52aa95225858c67f9883169f3
a
[ru_sdr_libinstance.jinja2.cfg]
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...
@@ -112,11 +112,11 @@ md5sum = 3b901e8733e6afff8940c6c318da4493
...
@@ -112,11 +112,11 @@ md5sum = 3b901e8733e6afff8940c6c318da4493
[enb.jinja2.cfg]
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
filename = config/enb.jinja2.cfg
md5sum =
936a89fa76754f613c37400323056001
md5sum =
85557737c34e24fc8f3bb28b06d044f5
[drb_lte.jinja2.cfg]
[drb_lte.jinja2.cfg]
filename = config/drb_lte.jinja2.cfg
filename = config/drb_lte.jinja2.cfg
md5sum =
b1dd9773cc46d727cb2c8cc8103801d8
md5sum =
72019d15e2cc5d87a01874d4b35b22a7
[drb_nr.jinja2.cfg]
[drb_nr.jinja2.cfg]
filename = config/drb_nr.jinja2.cfg
filename = config/drb_nr.jinja2.cfg
...
@@ -128,7 +128,7 @@ md5sum = 6ffb3702e19194bc9d2b533e0f9899f0
...
@@ -128,7 +128,7 @@ md5sum = 6ffb3702e19194bc9d2b533e0f9899f0
[sib23.jinja2.asn]
[sib23.jinja2.asn]
filename = config/sib23.jinja2.asn
filename = config/sib23.jinja2.asn
md5sum =
5036b8c8852a96907cc6431ef1c5ead4
md5sum =
d42f8958542e2229bebb4c5f286af92d
[sib4.jinja2.asn]
[sib4.jinja2.asn]
filename = config/sib4.jinja2.asn
filename = config/sib4.jinja2.asn
...
@@ -136,7 +136,7 @@ md5sum = 07d28915a58a983ebd7d019ac8196462
...
@@ -136,7 +136,7 @@ md5sum = 07d28915a58a983ebd7d019ac8196462
[sib5.jinja2.asn]
[sib5.jinja2.asn]
filename = config/sib5.jinja2.asn
filename = config/sib5.jinja2.asn
md5sum =
d95b64b441e6ef2deaf5582c4c7e0723
md5sum =
77950f6e17c380bd9f51f639eecfc6d5
[sib6.jinja2.asn]
[sib6.jinja2.asn]
filename = config/sib6.jinja2.asn
filename = config/sib6.jinja2.asn
...
...
software/ors-amarisoft/config/drb_lte.jinja2.cfg
View file @
87afeb19
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
qci: 1,
qci: 1,
ims_dedicated_bearer: true,
ims_dedicated_bearer: true,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 300,
discardTimer: 300,
pdcp_SN_Size: 12,
pdcp_SN_Size: 12,
{%- else %}
{%- else %}
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
pdcp_SN_SizeDL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
statusReportRequired: false,
outOfOrderDelivery: false,
outOfOrderDelivery: false,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
t_Reordering: 0,
t_Reordering: 0,
{%- endif %}
{%- endif %}
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
qci: 2,
qci: 2,
ims_dedicated_bearer: true,
ims_dedicated_bearer: true,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 750,
discardTimer: 750,
{%- else %}
{%- else %}
discardTimer: 150,
discardTimer: 150,
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
{
{
qci: 3,
qci: 3,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 750,
discardTimer: 750,
{%- else %}
{%- else %}
discardTimer: 100,
discardTimer: 100,
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
pdcp_SN_Size: 12,
pdcp_SN_Size: 12,
},
},
nr_pdcp_config: {
nr_pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 300,
discardTimer: 300,
{%- else %}
{%- else %}
discardTimer: 100,
discardTimer: 100,
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
logicalChannelSR_Prohibit: false,
logicalChannelSR_Prohibit: false,
},
},
},
},
{%- if not cell.
custom
_config %}
{%- if not cell.
top
_config %}
{
{
qci: 65,
qci: 65,
ims_dedicated_bearer: true,
ims_dedicated_bearer: true,
...
@@ -315,7 +315,7 @@
...
@@ -315,7 +315,7 @@
{
{
qci: 6,
qci: 6,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 750,
discardTimer: 750,
{%- else %}
{%- else %}
discardTimer: 0,
discardTimer: 0,
...
@@ -328,7 +328,7 @@
...
@@ -328,7 +328,7 @@
pdcp_SN_SizeDL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
statusReportRequired: true,
outOfOrderDelivery: false,
outOfOrderDelivery: false,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
t_Reordering: 3000,
t_Reordering: 3000,
{%- endif %}
{%- endif %}
restrict_to_ng_enb: true,
restrict_to_ng_enb: true,
...
@@ -357,7 +357,7 @@
...
@@ -357,7 +357,7 @@
{
{
qci: 7,
qci: 7,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 750,
discardTimer: 750,
statusReportRequired: true,
statusReportRequired: true,
{%- else %}
{%- else %}
...
@@ -375,7 +375,7 @@
...
@@ -375,7 +375,7 @@
restrict_to_ng_enb: true,
restrict_to_ng_enb: true,
},
},
rlc_config: {
rlc_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
ul_am: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollPDU: 64,
...
@@ -408,7 +408,7 @@
...
@@ -408,7 +408,7 @@
{
{
qci: 8,
qci: 8,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 750,
discardTimer: 750,
{%- else %}
{%- else %}
discardTimer: 0,
discardTimer: 0,
...
@@ -421,7 +421,7 @@
...
@@ -421,7 +421,7 @@
pdcp_SN_SizeDL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
statusReportRequired: true,
outOfOrderDelivery: false,
outOfOrderDelivery: false,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
t_Reordering: 3000,
t_Reordering: 3000,
{%- endif %}
{%- endif %}
restrict_to_ng_enb: true,
restrict_to_ng_enb: true,
...
@@ -450,7 +450,7 @@
...
@@ -450,7 +450,7 @@
{
{
qci: 9,
qci: 9,
pdcp_config: {
pdcp_config: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
discardTimer: 750,
discardTimer: 750,
{%- else %}
{%- else %}
discardTimer: 0,
discardTimer: 0,
...
@@ -462,7 +462,7 @@
...
@@ -462,7 +462,7 @@
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
statusReportRequired: true,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
t_Reordering: 3000,
t_Reordering: 3000,
{%- endif %}
{%- endif %}
outOfOrderDelivery: false,
outOfOrderDelivery: false,
...
@@ -492,7 +492,7 @@
...
@@ -492,7 +492,7 @@
logicalChannelSR_Prohibit: false,
logicalChannelSR_Prohibit: false,
},
},
},
},
{%- if not cell.
custom
_config %}
{%- if not cell.
top
_config %}
{
{
qci: 69,
qci: 69,
pdcp_config: {
pdcp_config: {
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
87afeb19
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
{%- do slaplte.check_loaded_everything() %}
{%- do slaplte.check_loaded_everything() %}
{%- endif %}
{%- endif %}
{%- set
custom_config = slaplte.custom
_config %}
{%- set
top_config = slaplte.top
_config %}
{#- do_lte/do_nr indicate whether we have LTE and/or NR cells
{#- do_lte/do_nr indicate whether we have LTE and/or NR cells
icell_dict_lte/icell_dict_nr keep LTE/NR parts of icell_dict registry #}
icell_dict_lte/icell_dict_nr keep LTE/NR parts of icell_dict registry #}
...
@@ -29,10 +29,10 @@
...
@@ -29,10 +29,10 @@
{#- handover_config emits handover configuration for specified cell #}
{#- handover_config emits handover configuration for specified cell #}
{%- macro handover_config(cell_ref,
custom
_config) %}
{%- macro handover_config(cell_ref,
_top
_config) %}
ncell_list: [
ncell_list: [
// Intra-ENB HO
// Intra-ENB HO
{%- if not
custom
_config %}
{%- if not
_top
_config %}
{%- 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 %} {#- NOTE: HO to both LTE and NR #}
{%- if cell2_ref != cell_ref %} {#- NOTE: HO to both LTE and NR #}
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
{#- TODO: consider extending peer/cell/lte with
{#- TODO: consider extending peer/cell/lte with
.allowed_meas_bandwidth and .antenna_port_1 #}
.allowed_meas_bandwidth and .antenna_port_1 #}
allowed_meas_bandwidth: {{ jlte_n_rb_dl(1.4) }}, // (minimum possible bw)
allowed_meas_bandwidth: {{ jlte_n_rb_dl(1.4) }}, // (minimum possible bw)
{%- if
custom
_config %}
{%- if
top
_config %}
"neigh_cell_config": 1,
"neigh_cell_config": 1,
"individual_offset": 0,
"individual_offset": 0,
antenna_port_1: true,
antenna_port_1: true,
...
@@ -279,7 +279,7 @@
...
@@ -279,7 +279,7 @@
// Handover
// Handover
{{- handover_config(cell_ref, cell.
custom
_config) }}
{{- handover_config(cell_ref, cell.
top
_config) }}
// Carrier Aggregation: LTE + LTE
// Carrier Aggregation: LTE + LTE
scell_list: [
scell_list: [
...
@@ -289,7 +289,7 @@
...
@@ -289,7 +289,7 @@
{
{
cell_id: {{ cell2.cell_id }}, // + {{ B(cell2_ref) }}
cell_id: {{ cell2.cell_id }}, // + {{ B(cell2_ref) }}
cross_carrier_scheduling: false,
cross_carrier_scheduling: false,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
"rrc_configuration": "measurement",
"rrc_configuration": "measurement",
{%- endif %}
{%- endif %}
},
},
...
@@ -332,7 +332,7 @@
...
@@ -332,7 +332,7 @@
si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }},
si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }},
pdsch_dedicated: {
pdsch_dedicated: {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
p_a: {{ cell.pdsch_dedicated.p_a }},
p_a: {{ cell.pdsch_dedicated.p_a }},
p_b: {{ cell.pdsch_dedicated.p_b }},
p_b: {{ cell.pdsch_dedicated.p_b }},
{%- else %}
{%- else %}
...
@@ -343,7 +343,7 @@
...
@@ -343,7 +343,7 @@
pdcch_format: {{ 1 if n_rb_dl == 6 else 2 }},
pdcch_format: {{ 1 if n_rb_dl == 6 else 2 }},
prach_config_index: {{ 15 if n_rb_dl == 6 else 4 }},
prach_config_index: {{ 15 if n_rb_dl == 6 else 4 }},
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
initial_cqi: {{ cell.initial_cqi }},
initial_cqi: {{ cell.initial_cqi }},
{%- else %}
{%- else %}
initial_cqi: {{ 5 if n_rb_dl == 6 else 3 }},
initial_cqi: {{ 5 if n_rb_dl == 6 else 3 }},
...
@@ -403,7 +403,7 @@
...
@@ -403,7 +403,7 @@
filename: "{{ B('%s-sib23.asn' % cell_ref) }}",
filename: "{{ B('%s-sib23.asn' % cell_ref) }}",
si_periodicity: 16,
si_periodicity: 16,
},
},
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
{
{
filename: "{{ B('%s-sib5.asn' % cell_ref) }}",
filename: "{{ B('%s-sib5.asn' % cell_ref) }}",
si_periodicity: 32,
si_periodicity: 32,
...
...
software/ors-amarisoft/config/sib23.jinja2.asn
View file @
87afeb19
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
rach-ConfigCommon {
rach-ConfigCommon {
preambleInfo {
preambleInfo {
numberOfRA-Preambles n52,
numberOfRA-Preambles n52,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
preamblesGroupAConfig{
preamblesGroupAConfig{
sizeOfRA-PreamblesGroupA n28,
sizeOfRA-PreamblesGroupA n28,
messageSizeGroupA b56,
messageSizeGroupA b56,
...
@@ -24,21 +24,21 @@
...
@@ -24,21 +24,21 @@
ra-SupervisionInfo {
ra-SupervisionInfo {
preambleTransMax n10,
preambleTransMax n10,
ra-ResponseWindowSize sf10,
ra-ResponseWindowSize sf10,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
mac-ContentionResolutionTimer sf64
mac-ContentionResolutionTimer sf64
{%- endif %}
{%- endif %}
},
},
maxHARQ-Msg3Tx 5
maxHARQ-Msg3Tx 5
},
},
bcch-Config {
bcch-Config {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
modificationPeriodCoeff n2
modificationPeriodCoeff n2
{%- else %}
{%- else %}
modificationPeriodCoeff n4
modificationPeriodCoeff n4
{%- endif %}
{%- endif %}
},
},
pcch-Config {
pcch-Config {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
defaultPagingCycle rf64,
defaultPagingCycle rf64,
{%- else %}
{%- else %}
defaultPagingCycle rf128,
defaultPagingCycle rf128,
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
prach-Config {
prach-Config {
rootSequenceIndex 0, /* patched by eNB */
rootSequenceIndex 0, /* patched by eNB */
prach-ConfigInfo {
prach-ConfigInfo {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
prach-ConfigIndex 3, /* patched by eNB */
prach-ConfigIndex 3, /* patched by eNB */
zeroCorrelationZoneConfig 12,
zeroCorrelationZoneConfig 12,
prach-FreqOffset 17 /* patched by eNB */
prach-FreqOffset 17 /* patched by eNB */
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
ul-CyclicPrefixLength len1
ul-CyclicPrefixLength len1
},
},
ue-TimersAndConstants {
ue-TimersAndConstants {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
t300 ms600,
t300 ms600,
t301 ms600,
t301 ms600,
t310 ms2000,
t310 ms2000,
...
@@ -139,7 +139,7 @@
...
@@ -139,7 +139,7 @@
q-Hyst dB2
q-Hyst dB2
},
},
cellReselectionServingFreqInfo {
cellReselectionServingFreqInfo {
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
s-NonIntraSearch 21,
s-NonIntraSearch 21,
threshServingLow 4,
threshServingLow 4,
{%- else %}
{%- else %}
...
@@ -151,7 +151,7 @@
...
@@ -151,7 +151,7 @@
intraFreqCellReselectionInfo {
intraFreqCellReselectionInfo {
q-RxLevMin -61,
q-RxLevMin -61,
p-Max 23,
p-Max 23,
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
s-IntraSearch 26,
s-IntraSearch 26,
{%- else %}
{%- else %}
s-IntraSearch 5,
s-IntraSearch 5,
...
...
software/ors-amarisoft/config/sib5.jinja2.asn
View file @
87afeb19
{%- if cell.
custom
_config %}
{%- if cell.
top
_config %}
{
{
message c1: systemInformation: {
message c1: systemInformation: {
criticalExtensions systemInformation-r8: {
criticalExtensions systemInformation-r8: {
...
@@ -9,20 +9,20 @@
...
@@ -9,20 +9,20 @@
{%- if cell.dl_earfcn != earfcn %}
{%- if cell.dl_earfcn != earfcn %}
{
{
dl-CarrierFreq {{ earfcn }},
dl-CarrierFreq {{ earfcn }},
q-RxLevMin {{
custom
_config[earfcn]['sib5']['q-RxLevMin'] }},
q-RxLevMin {{
top
_config[earfcn]['sib5']['q-RxLevMin'] }},
p-Max 23,
p-Max 23,
t-ReselectionEUTRA {{
custom
_config[earfcn]['sib5']['t-ReselectionEUTRA'] }},
t-ReselectionEUTRA {{
top
_config[earfcn]['sib5']['t-ReselectionEUTRA'] }},
t-ReselectionEUTRA-SF {
t-ReselectionEUTRA-SF {
sf-Medium oDot25,
sf-Medium oDot25,
sf-High oDot25
sf-High oDot25
},
},
threshX-High {{
custom
_config[earfcn]['sib5']['threshX-High'] }},
threshX-High {{
top
_config[earfcn]['sib5']['threshX-High'] }},
threshX-Low {{
custom
_config[earfcn]['sib5']['threshX-Low'] }},
threshX-Low {{
top
_config[earfcn]['sib5']['threshX-Low'] }},
allowedMeasBandwidth {{
custom
_config[earfcn]['sib5']['allowedMeasBandwidth'] }},
allowedMeasBandwidth {{
top
_config[earfcn]['sib5']['allowedMeasBandwidth'] }},
presenceAntennaPort1 TRUE,
presenceAntennaPort1 TRUE,
cellReselectionPriority {{
custom
_config[earfcn]['sib5']['cellReselectionPriority'] }},
cellReselectionPriority {{
top
_config[earfcn]['sib5']['cellReselectionPriority'] }},
neighCellConfig '01'B,
neighCellConfig '01'B,
q-OffsetFreq {{
custom
_config[earfcn]['sib5']['q-OffsetFreq'] }}
q-OffsetFreq {{
top
_config[earfcn]['sib5']['q-OffsetFreq'] }}
},
},
{%- endif %}
{%- endif %}
{%- endfor %}
{%- endfor %}
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
87afeb19
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#}
#}
{%- set iru_dict = {} %}
{%- set iru_dict = {} %}
{%- set icell_dict = {} %}
{%- set icell_dict = {} %}
{%- set
custom_config = slaplte.custom_defaults
%}
{%- set
top_config = slaplte.top_config
%}
{%- do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind) %}
{%- do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind) %}
{%- macro buildout() %}
{%- macro buildout() %}
...
@@ -317,12 +317,12 @@ extra-context =
...
@@ -317,12 +317,12 @@ extra-context =
key cell :cell
key cell :cell
key ru_ref :ru_ref
key ru_ref :ru_ref
key ru :ru
key ru :ru
key
custom_config :custom
_config
key
top_config :top
_config
cell_ref = {{ dumps(cell_ref) }}
cell_ref = {{ dumps(cell_ref) }}
cell = {{ dumps(cell ) }}
cell = {{ dumps(cell ) }}
ru_ref = {{ dumps(ru_ref ) }}
ru_ref = {{ dumps(ru_ref ) }}
ru = {{ dumps(ru ) }}
ru = {{ dumps(ru ) }}
custom_config = {{ dumps(custom
_config) }}
top_config = {{ dumps(top
_config) }}
{{ part('sib6-config-%s' % cell_ref) }}
{{ part('sib6-config-%s' % cell_ref) }}
<= config-base
<= config-base
...
...
software/ors-amarisoft/slaplte.jinja2
View file @
87afeb19
...
@@ -88,8 +88,8 @@
...
@@ -88,8 +88,8 @@
}
}
%}
%}
{#- Custom configuration request
by one of our clients
#}
{#- Custom configuration request
ed for TOP project
#}
{%- set
custom_defaults
= {
{%- set
top_config
= {
3200: {
3200: {
'ru/lopcomm': {
'ru/lopcomm': {
'n_antenna_dl': 4,
'n_antenna_dl': 4,
...
@@ -103,9 +103,6 @@
...
@@ -103,9 +103,6 @@
'bandwidth': 10,
'bandwidth': 10,
'initial_cqi': 1,
'initial_cqi': 1,
},
},
'cell/lte/sib_sched_list': {
'sib5_filename': 'sib5_3200.asn',
},
'sib5': {
'sib5': {
'q-RxLevMin': -61,
'q-RxLevMin': -61,
't-ReselectionEUTRA': 1,
't-ReselectionEUTRA': 1,
...
@@ -129,9 +126,6 @@
...
@@ -129,9 +126,6 @@
'bandwidth': 5,
'bandwidth': 5,
'initial_cqi': 3,
'initial_cqi': 3,
},
},
'cell/lte/sib_sched_list': {
'sib5_filename': 'sib5_6275.asn',
},
'sib5': {
'sib5': {
'q-RxLevMin': -61,
'q-RxLevMin': -61,
't-ReselectionEUTRA': 2,
't-ReselectionEUTRA': 2,
...
@@ -157,9 +151,6 @@
...
@@ -157,9 +151,6 @@
'bandwidth': 20,
'bandwidth': 20,
'initial_cqi': 1,
'initial_cqi': 1,
},
},
'cell/lte/sib_sched_list': {
'sib5_filename': 'sib5_1802.asn',
},
'sib5': {
'sib5': {
'q-RxLevMin': -61,
'q-RxLevMin': -61,
't-ReselectionEUTRA': 1,
't-ReselectionEUTRA': 1,
...
@@ -183,9 +174,6 @@
...
@@ -183,9 +174,6 @@
'bandwidth': 0,
'bandwidth': 0,
'initial_cqi': 0,
'initial_cqi': 0,
},
},
'cell/lte/sib_sched_list': {
'sib5_filename': 'xxx',
},
'sib5': {
'sib5': {
'q-RxLevMin': -53,
'q-RxLevMin': -53,
't-ReselectionEUTRA': 1,
't-ReselectionEUTRA': 1,
...
@@ -209,9 +197,6 @@
...
@@ -209,9 +197,6 @@
'bandwidth': 0,
'bandwidth': 0,
'initial_cqi': 0,
'initial_cqi': 0,
},
},
'cell/lte/sib_sched_list': {
'sib5_filename': 'xxx',
},
'sib5': {
'sib5': {
'q-RxLevMin': -61,
'q-RxLevMin': -61,
't-ReselectionEUTRA': 1,
't-ReselectionEUTRA': 1,
...
@@ -345,10 +330,6 @@
...
@@ -345,10 +330,6 @@
{%- do ishared.update({'_': J(ishared['_'])}) %}
{%- do ishared.update({'_': J(ishared['_'])}) %}
{%- endfor %}
{%- endfor %}
{%- macro load_custom_config(cc) %}
{%- do cc.update(custom_config) %}
{%- endmacro %}
{#- load_iru_and_icell initializes RU and cell registries.
{#- load_iru_and_icell initializes RU and cell registries.
icell_dict keeps cell shared instances: reference -> icell
icell_dict keeps cell shared instances: reference -> icell
...
@@ -363,15 +344,11 @@
...
@@ -363,15 +344,11 @@
{%- for ishared in qshared_instance_list %}
{%- for ishared in qshared_instance_list %}
{%- set ref = J(jref_of_shared(ishared)) %}
{%- set ref = J(jref_of_shared(ishared)) %}
{%- set _ = ishared['_'] %}
{%- set _ = ishared['_'] %}
{%- if 'ru_type' in _ %}
{%- if 'cell_type' in _ and _.get('cell_kind') == icell_kind %}
{%- set iru = ishared %}
{%- do _ru_set_defaults(_) %}
{%- do iru_dict.update({ref: iru}) %}
{%- elif 'cell_type' in _ and _.get('cell_kind') == icell_kind %}
{%- set icell = ishared %}
{%- set icell = ishared %}
{%- do _cell_set_defaults(_, icell_kind, icell_dict) %}
{%- do _cell_set_defaults(_, icell_kind, icell_dict) %}
{%- do icell_dict.update({ref: icell}) %}
{%- do icell_dict.update({ref: icell}) %}
{%- do _cell_set_
custom_defaults
(_, icell_kind) %}
{%- do _cell_set_
top_config
(_, icell_kind) %}
{%- 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') %}
{#- embedded ru definition -> expose it as synthethic `_<cell_ref>_ru` #}
{#- embedded ru definition -> expose it as synthethic `_<cell_ref>_ru` #}
...
@@ -382,13 +359,20 @@
...
@@ -382,13 +359,20 @@
'slave_reference': False,
'slave_reference': False,
}}) %}
}}) %}
{%- endif %}
{%- endif %}
{%- endif %}
{%- endfor %}
{%- for ishared in qshared_instance_list %}
{%- set ref = J(jref_of_shared(ishared)) %}
{%- set _ = ishared['_'] %}
{%- if 'ru_type' in _ %}
{%- set iru = ishared %}
{%- do _ru_set_defaults(_) %}
{%- do iru_dict.update({ref: iru}) %}
{%- do _ru_set_top_config(ref, iru, icell_dict) %}
{%- else %}
{%- else %}
{%- do qother.append(ishared) %}
{%- do qother.append(ishared) %}
{%- endif %}
{%- endif %}
{%- endfor %}
{%- endfor %}
{%- for ref, iru in iru_dict|dictsort %}
{%- do _ru_set_custom_defaults(ref, iru, icell_dict) %}
{%- endfor %}
{%- do qshared_instance_list.clear() %}
{%- do qshared_instance_list.clear() %}
{%- do qshared_instance_list.extend(qother) %}
{%- do qshared_instance_list.extend(qother) %}
...
@@ -476,32 +460,25 @@
...
@@ -476,32 +460,25 @@
{%- endif %}
{%- endif %}
{%- endmacro %}
{%- endmacro %}
{%- macro _cell_set_
custom_defaults
(cell, icell_kind) %}
{%- macro _cell_set_
top_config
(cell, icell_kind) %}
{%- do cell.setdefault('
custom
_config', False) %}
{%- do cell.setdefault('
top
_config', False) %}
{%- if icell_kind == 'enb' %}
{%- if icell_kind == 'enb' %}
{%- if cell.custom_config %}
{%- if cell.top_config and cell.dl_earfcn in top_config %}
{%- if cell.dl_earfcn in custom_defaults %}
{%- for k, v in top_config[cell.dl_earfcn]['cell/%s' % (cell.cell_type,)].items() %}
{%- for k, v in custom_defaults[cell.dl_earfcn]['cell/%s' % (cell.cell_type,)].items() %}
{%- do cell.setdefault(k, v) %}
{%- do cell.setdefault(k, v) %}
{%- endfor %}
{%- endfor %}
{%- do cell.setdefault('sib5_filename', custom_defaults[cell.dl_earfcn]['cell/lte/sib_sched_list']['sib5_filename']) %}
{%- do cell.setdefault('sib5', {}) %}
{%- for k, v in custom_defaults[cell.dl_earfcn]['sib5'].items() %}
{%- do cell['sib5'].setdefault(k, v) %}
{%- endfor %}
{%- endif %}
{%- endif %}
{%- endif %}
{%- endif %}
{%- endif %}
{%- endmacro %}
{%- endmacro %}
{%- macro _ru_set_
custom_defaults
(ru_ref, ru, icell_dict) %}
{%- macro _ru_set_
top_config
(ru_ref, ru, icell_dict) %}
{%- set earfcn = {'_': 0} %}
{%- set earfcn = {'_': 0} %}
{%- for _, icell in icell_dict|dictsort %}
{%- for _, icell in icell_dict|dictsort %}
{%- if icell['_'].ru.ru_ref == ru_ref %}
{%- if icell['_'].ru.ru_ref == ru_ref %}
{%- do earfcn.update({'_': icell['_'].dl_earfcn}) %}
{%- do earfcn.update({'_': icell['_'].dl_earfcn}) %}
{%- endif %}
{%- endif %}
{%- endfor %}
{%- endfor %}
{%- for k, v in
custom_defaults
[earfcn['_']]['ru/lopcomm'].items() %}
{%- for k, v in
top_config
[earfcn['_']]['ru/lopcomm'].items() %}
{%- do ru['_'].update({k: v}) %}
{%- do ru['_'].update({k: v}) %}
{%- endfor %}
{%- endfor %}
{%- endmacro %}
{%- endmacro %}
...
...
software/ors-amarisoft/slapos-render-config.py
View file @
87afeb19
...
@@ -496,7 +496,7 @@ def _do_enb_with(iru_icell_func):
...
@@ -496,7 +496,7 @@ def _do_enb_with(iru_icell_func):
"etc": "etc",
"etc": "etc",
"var": "var"
"var": "var"
},
},
"
custom
_config": "False",
"
top
_config": "False",
"slapparameter_dict": {
"slapparameter_dict": {
"enb_id": "0x1A2D0",
"enb_id": "0x1A2D0",
"gnb_id": "0x12345",
"gnb_id": "0x12345",
...
@@ -519,7 +519,7 @@ def _do_enb_with(iru_icell_func):
...
@@ -519,7 +519,7 @@ def _do_enb_with(iru_icell_func):
icell_dict
=
{}
icell_dict
=
{}
ipeer_dict
=
{}
ipeer_dict
=
{}
ipeercell_dict
=
{}
ipeercell_dict
=
{}
custom
_config
=
False
top
_config
=
False
for
ishared
in
ienb
.
shared_instance_list
:
for
ishared
in
ienb
.
shared_instance_list
:
ref
=
ref_of_shared
(
ishared
)
ref
=
ref_of_shared
(
ishared
)
_
=
json
.
loads
(
ishared
[
'_'
])
_
=
json
.
loads
(
ishared
[
'_'
])
...
@@ -553,7 +553,7 @@ def _do_enb_with(iru_icell_func):
...
@@ -553,7 +553,7 @@ def _do_enb_with(iru_icell_func):
'cell'
:
cell
,
'cell'
:
cell
,
'ru_ref'
:
ru_ref
,
'ru_ref'
:
ru_ref
,
'ru'
:
ru
,
'ru'
:
ru
,
'
custom_config'
:
custom
_config
,
'
top_config'
:
top
_config
,
})
})
j2render
(
'drb_%s.jinja2.cfg'
%
cell
[
'cell_type'
],
j2render
(
'drb_%s.jinja2.cfg'
%
cell
[
'cell_type'
],
'%s/%s-drb.cfg'
%
(
out
,
B
(
cell_ref
)),
'%s/%s-drb.cfg'
%
(
out
,
B
(
cell_ref
)),
...
@@ -563,7 +563,7 @@ def _do_enb_with(iru_icell_func):
...
@@ -563,7 +563,7 @@ def _do_enb_with(iru_icell_func):
'%s/%s-sib23.asn'
%
(
out
,
B
(
cell_ref
)),
'%s/%s-sib23.asn'
%
(
out
,
B
(
cell_ref
)),
jctx
)
jctx
)
if
custom
_config
:
if
top
_config
:
j2render
(
'sib4.jinja2.asn'
,
j2render
(
'sib4.jinja2.asn'
,
'%s/%s-sib4.asn'
%
(
out
,
B
(
cell_ref
)),
'%s/%s-sib4.asn'
%
(
out
,
B
(
cell_ref
)),
jctx
)
jctx
)
...
...
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