Skip to content

S
slapos
Commit 536b892c authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

X generic bandwidth is always number; No bandwidth in peercell

parent 0bd67f3e
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 49 deletions
software/ors-amarisoft/cell/common.json
View file @ 536b892c
......@@ -9,6 +9,7 @@
"rf_mode",
"pci",
"cell_id",
"bandwidth",
"ru"
],
......@@ -41,6 +42,11 @@
"description": "Cell ID",
"type": "string"
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
},
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
......
software/ors-amarisoft/cell/lte/input-schema.json
View file @ 536b892c
......@@ -9,9 +9,9 @@
"rf_mode",
"pci",
"cell_id",
"bandwidth",
"ru",
"bandwidth",
"dl_earfcn",
"tac"
],
......@@ -39,16 +39,13 @@
}
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth",
"type": "string",
"enum": [
"1.4 MHz",
"3 MHz",
"5 MHz",
"10 MHz",
"15 MHz",
"20 MHz"
1.4,
3,
5,
10,
15,
20
]
},
......
software/ors-amarisoft/cell/nr/input-schema.json
View file @ 536b892c
......@@ -9,9 +9,9 @@
"rf_mode",
"pci",
"cell_id",
"bandwidth",
"ru",
"bandwidth",
"dl_nr_arfcn",
"nr_band"
],
......@@ -39,11 +39,6 @@
}
}
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
software/ors-amarisoft/config/enb.jinja2.cfg
View file @ 536b892c
......@@ -39,8 +39,6 @@
n_id_cell: {{ cell2.pci }},
dl_earfcn: {{ cell2.dl_earfcn }},
tac: {{ cell2.tac }},
allowed_meas_bandwidth: {{ jlte_n_rb_dl(cell2.bandwidth) }},
antenna_port_1: {{ (ru2.n_antenna_dl > 1) | tojson }},
{%- elif cell2.cell_type == 'nr' %}
rat: "nr",
cell_id: {{ cell2.cell_id }}, // -> {{ cell2_ref }}
......@@ -88,12 +86,12 @@
{#- jlte_n_rb_dl returns n_rb_dl for an LTE bandwidth. #}
{%- macro jlte_n_rb_dl(bandwidth) %}
{%- set _ = {'1.4 MHz': 6,
'3 MHz': 15,
'5 MHz': 25,
'10 MHz': 50,
'15 MHz': 75,
'20 MHz': 100} %}
{%- set _ = {1.4: 6,
3: 15,
5: 25,
10: 50,
15: 75,
20: 100} %}
{{- _[bandwidth] | tojson }}
{%- endmacro -%}
......
software/ors-amarisoft/config/out/enb.cfg
View file @ 536b892c
......@@ -271,8 +271,6 @@
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x1234,
allowed_meas_bandwidth: 25,
antenna_port_1: true,
},
// Inter-ENB HO
......
software/ors-amarisoft/config/ue.jinja2.cfg
View file @ 536b892c
......@@ -47,7 +47,7 @@
dl_earfcn: {{ cell.dl_earfcn }},
ul_earfcn: {{ cell.ul_earfcn }},
bandwidth: {{ cell.bandwidth.removesuffix(' MHz') }},
bandwidth: {{ cell.bandwidth }},
global_timing_advance: -1,
},
......
software/ors-amarisoft/instance-ors-enb-input-schema.json
View file @ 536b892c
......@@ -4,7 +4,17 @@
"title": "Input Parameters",
"properties": {
"bandwidth": {
"$ref": "cell/lte/input-schema.json#/properties/bandwidth",
"title": "Bandwidth",
"description": "Downlink Bandwidth",
"type": "string",
"enum": [
"1.4 MHz",
"3 MHz",
"5 MHz",
"10 MHz",
"15 MHz",
"20 MHz"
],
"default": "20 MHz"
},
"n_antenna_dl": {
......
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
View file @ 536b892c
......@@ -84,7 +84,7 @@
{%- set cell = {
'cell_type': 'lte',
'dl_earfcn': ors_version['current-earfcn'],
'bandwidth': slapparameter_dict.bandwidth,
'bandwidth': float(slapparameter_dict.bandwidth.removesuffix(' MHz'),
'tac': slapparameter_dict.tac,
'root_sequence_index': slapparameter_dict.root_sequence_index,
}
......@@ -135,7 +135,6 @@
{%- endmacro %}
{%- if enb_mode == 'enb' %}
{%- do peercell.update({'cell_type': 'lte'}) %}
{%- do peercell.update({'bandwidth': slapparameter_dict.bandwidth}) %}
{%- if 'cell_id' in ncell %}
{%- do peercell.update({'e_cell_id': ncell.cell_id}) %}
{%- endif %}
......
software/ors-amarisoft/instance-ors-gnb-input-schema.json
View file @ 536b892c
......@@ -4,7 +4,7 @@
"title": "Input Parameters",
"properties": {
"nr_bandwidth": {
"$ref": "cell/nr/input-schema.json#/properties/bandwidth",
"$ref": "cell/common.json#/properties/bandwidth",
"default": 40
},
"n_antenna_dl": {
......
software/ors-amarisoft/k/krequest-cb5.enb+
View file @ 536b892c
......@@ -85,7 +85,7 @@ CELL1 = {
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '20 MHz',
'bandwidth': 20',
'dl_earfcn': 100, # 2120 @ B1
'pci': 1,
'cell_id': '0x01',
......@@ -142,7 +142,7 @@ uCELL = {
'rf_mode': 'fdd',
'dl_earfcn': 300,
'bandwidth': '10 MHz',
'bandwidth': 10',
'ru': {
'ru_type': 'ru_ref',
......
software/ors-amarisoft/k/krequest-ors.enb.old
View file @ 536b892c
......@@ -66,7 +66,7 @@ CELL1_a = {
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 38050, # 2600 MHz
'pci': 1,
'cell_id': '0x01',
......@@ -80,7 +80,7 @@ CELL1_b = {
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 38100, # 2605 MHz
'pci': 2,
'cell_id': '0x02',
......@@ -125,7 +125,7 @@ kslap.iSHARED(enb1, 'CELL2_a', {
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 3350, # 2680 MHz
'pci': 21,
'cell_id': '0x21',
......
software/ors-amarisoft/ru/lopcomm/cu_config.jinja2.xml
View file @ 536b892c
......@@ -94,16 +94,15 @@
{%- set ul_arfcn = cell.ul_earfcn %}
{%- set dl_freq = int(xearfcn_module.frequency(dl_arfcn) * 1e6) %}
{%- set ul_freq = int(xearfcn_module.frequency(ul_arfcn) * 1e6) %}
{%- set bw = int(float(cell.bandwidth.removesuffix(' MHz')) * 1e6) %}
{%- elif cell.cell_type == 'nr' %}
{%- set dl_arfcn = cell.dl_nr_arfcn %}
{%- set ul_arfcn = cell.ul_nr_arfcn %}
{%- set dl_freq = int(xnrarfcn_module.frequency(dl_arfcn) * 1e6) %}
{%- set ul_freq = int(xnrarfcn_module.frequency(ul_arfcn) * 1e6) %}
{%- set bw = int(cell.bandwidth * 1e6) %}
{%- else %}
{%- do bug('unreachable') %}
{%- endif %}
{%- set bw = int(cell.bandwidth * 1e6) %}
<tx-array-carriers>
<name>{{ TxCarrier }}</name>
<absolute-frequency-center>{{ dl_arfcn }}</absolute-frequency-center>
......
software/ors-amarisoft/slapos-render-config.py
View file @ 536b892c
......@@ -95,7 +95,7 @@ def iRU1_SDR_tLTE2_tNR(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 38050, # 2600 MHz
'pci': 1,
'cell_id': '0x01',
......@@ -107,7 +107,7 @@ def iRU1_SDR_tLTE2_tNR(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 38100, # 2605 MHz
'pci': 2,
'cell_id': '0x02',
......@@ -161,7 +161,7 @@ def iRU2_SDR_tLTE_tNR(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 38050, # 2600 MHz
'pci': 1,
'cell_id': '0x01',
......@@ -223,7 +223,7 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 3350, # 2680 MHz
'pci': 21,
'cell_id': '0x21',
......@@ -269,7 +269,7 @@ def iRU1_SDR1_fLTE2(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 3350, # 2680 MHz (Band 7)
'pci': 1,
'cell_id': '0x01',
......@@ -281,7 +281,7 @@ def iRU1_SDR1_fLTE2(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 3050, # 2650 MHz (Band 7)
'pci': 1,
'cell_id': '0x02',
......@@ -324,7 +324,7 @@ def iRU2_LOPCOMM_fLTE2(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '20 MHz',
'bandwidth': 20,
'dl_earfcn': 100, # 2120 MHz @ B1
'pci': 21,
'cell_id': '0x21',
......@@ -341,7 +341,7 @@ def iRU2_LOPCOMM_fLTE2(ienb):
'cell_type': 'lte',
'cell_kind': 'enb',
'rf_mode': 'fdd',
'bandwidth': '20 MHz',
'bandwidth': 20,
'dl_earfcn': 500, # 2160 MHz @ B1
'pci': 22,
'cell_id': '0x22',
......@@ -387,7 +387,6 @@ def do_enb():
'e_cell_id': '0x12345',
'pci': 35,
'dl_earfcn': 700,
'bandwidth': '10 MHz',
'tac': 123,
})
ienb.ishared('PEERCELL2', {
......@@ -483,7 +482,7 @@ def do_ue():
'cell_type': 'lte',
'cell_kind': 'ue',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'bandwidth': 5,
'dl_earfcn': 38050, # 2600 MHz
'ru': {
'ru_type': 'sdr',
......
software/ors-amarisoft/test/test.py
View file @ 536b892c
......@@ -53,7 +53,7 @@ def LTE(dl_earfcn, bandwidth):
return {
'cell_type': 'lte',
'dl_earfcn': dl_earfcn,
'bandwidth': '%g MHz' % bandwidth,
'bandwidth': bandwidth,
}
def NR(dl_nr_arfcn, nr_band, bandwidth):
return {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7