Skip to content

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

software/ors-amarisoft: enb: Push CPRI-related properties to be per-RU 

Most were already so, but sdr_number and cpri_mult were not. We need to be able
to use different SDR boards and with different CPRI speed, so make those
parameters to be per-RU as well.

Backward compatibility: no change for ORS; For CPRI-based cases sdr_number and cpri_mult become per-RU.
parent f16af895
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 114 deletions
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @ b03acee6
...@@ -49,26 +49,6 @@ ...@@ -49,26 +49,6 @@
"default": "[Configuration 2] 5ms 2UL 6DL (default)" "default": "[Configuration 2] 5ms 2UL 6DL (default)"
}, },
{%- endif %} {%- endif %}
{%- if trx == 'cpri' %}
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
{%- endif %}
{%- if bbu == 'ors' %} {%- if bbu == 'ors' %}
"dl_earfcn": { "dl_earfcn": {
"title": "DL EARFCN", "title": "DL EARFCN",
...@@ -107,6 +87,24 @@ ...@@ -107,6 +87,24 @@
".*": { ".*": {
"properties": { "properties": {
{%- if trx == 'cpri' %} {%- if trx == 'cpri' %}
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "CPRI RX Delay", "title": "CPRI RX Delay",
"description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.", "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
......
software/ors-amarisoft/instance-fdd-lopcomm-enb-input-schema.json
View file @ b03acee6
...@@ -29,30 +29,30 @@ ...@@ -29,30 +29,30 @@
"type": "number", "type": "number",
"default": 2 "default": 2
}, },
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cell_list": { "cell_list": {
"title": "Cell List", "title": "Cell List",
"description": "Cell List", "description": "Cell List",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "CPRI RX Delay", "title": "CPRI RX Delay",
"description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.", "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
......
software/ors-amarisoft/instance-fdd-lopcomm-gnb-input-schema.json
View file @ b03acee6
...@@ -21,24 +21,6 @@ ...@@ -21,24 +21,6 @@
"type": "number", "type": "number",
"default": 2 "default": 2
}, },
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
...@@ -73,6 +55,24 @@ ...@@ -73,6 +55,24 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "CPRI RX Delay", "title": "CPRI RX Delay",
"description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.", "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
......
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @ b03acee6
...@@ -41,26 +41,6 @@ ...@@ -41,26 +41,6 @@
], ],
"default": "5ms 2UL 7DL 4/6 (default)" "default": "5ms 2UL 7DL 4/6 (default)"
}, },
{%- endif %}
{%- if trx == 'cpri' %}
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
{%- endif %} {%- endif %}
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
...@@ -98,6 +78,24 @@ ...@@ -98,6 +78,24 @@
".*": { ".*": {
"properties": { "properties": {
{%- if trx == 'cpri' %} {%- if trx == 'cpri' %}
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "CPRI RX Delay", "title": "CPRI RX Delay",
"description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.", "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
......
software/ors-amarisoft/instance-tdd-m2ru-enb-input-schema.json
View file @ b03acee6
...@@ -39,30 +39,30 @@ ...@@ -39,30 +39,30 @@
], ],
"default": "[Configuration 2] 5ms 2UL 6DL (default)" "default": "[Configuration 2] 5ms 2UL 6DL (default)"
}, },
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cell_list": { "cell_list": {
"title": "Cell List", "title": "Cell List",
"description": "Cell List", "description": "Cell List",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "CPRI RX Delay", "title": "CPRI RX Delay",
"description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.", "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
......
software/ors-amarisoft/instance-tdd-m2ru-gnb-input-schema.json
View file @ b03acee6
...@@ -32,24 +32,6 @@ ...@@ -32,24 +32,6 @@
], ],
"default": "5ms 2UL 7DL 4/6 (default)" "default": "5ms 2UL 7DL 4/6 (default)"
}, },
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
...@@ -84,6 +66,24 @@ ...@@ -84,6 +66,24 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": {
"title": "CPRI Mult",
"description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
"type": "number",
"default": 16,
"enum": [
4,
5,
8,
16
]
},
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "CPRI RX Delay", "title": "CPRI RX Delay",
"description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.", "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",
......
software/ors-amarisoft/slaplte.jinja2
View file @ b03acee6
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
'n_antenna_ul': int(default_n_antenna_ul), 'n_antenna_ul': int(default_n_antenna_ul),
}, },
'ru/cpri_link': { 'ru/cpri_link': {
'mult': 16,
'rx_delay': 0, 'rx_delay': 0,
'tx_delay': 0, 'tx_delay': 0,
'tx_dbm': 0, 'tx_dbm': 0,
...@@ -117,9 +118,8 @@ ...@@ -117,9 +118,8 @@
'rx_gain': 0, 'rx_gain': 0,
}) %} }) %}
{%- set link = { {%- set link = {
'sdr_dev': slapparameter_dict.get('sdr_number', 0), 'sdr_dev': cell.get('sdr_number', 0),
'sfp_port': cell.get('cpri_port_number', i), 'sfp_port': cell.get('cpri_port_number', i),
'mult': slapparameter_dict.get('cpri_mult', 16),
} %} } %}
{%- macro link_set(name) %} {%- macro link_set(name) %}
{%- set cname = 'cpri_'+name %} {%- set cname = 'cpri_'+name %}
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
{%- do link.update({name: cell[cname]}) %} {%- do link.update({name: cell[cname]}) %}
{%- endif %} {%- endif %}
{%- endmacro %} {%- endmacro %}
{%- do link_set('mult') %}
{%- do link_set('rx_delay') %} {%- do link_set('rx_delay') %}
{%- do link_set('tx_delay') %} {%- do link_set('tx_delay') %}
{%- do link_set('tx_dbm') %} {%- do link_set('tx_dbm') %}
......
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