Skip to content

slapos
slapos
Commit 7d6e7ebf authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

software/ors-amarisoft: Support multiple cell_list

parent c6666aaa
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 89 deletions
software/ors-amarisoft/buildout.hash.cfg
View file @ 7d6e7ebf
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = efcb5965bdf766d94b43c6ba2328275d md5sum = e2ee4d15a11b874b552532b30f809d5d
[amarisoft-stats.jinja2.py] [amarisoft-stats.jinja2.py]
_update_hash_filename_ = amarisoft-stats.jinja2.py _update_hash_filename_ = amarisoft-stats.jinja2.py
...@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149 ...@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg] [enb.jinja2.cfg]
filename = config/enb.jinja2.cfg filename = config/enb.jinja2.cfg
md5sum = 584a75944dc9aee68fafb1b63e9c1b2b md5sum = 6c4efb429c857eac1a73929af2c61153
[sib23.jinja2.asn] [sib23.jinja2.asn]
filename = config/sib23.jinja2.asn filename = config/sib23.jinja2.asn
......
software/ors-amarisoft/config/enb.jinja2.cfg
View file @ 7d6e7ebf
{%- set cell_list = slapparameter_dict.get('cell_list', '[{}]') %}
{%- set cell_count = cell_list|length %}
{%- if slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 2] 5ms 2UL 6DL (default)' %} {%- if slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 2] 5ms 2UL 6DL (default)' %}
{%- set tdd_config = 2 %} {%- set tdd_config = 2 %}
{%- elif slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 6] 5ms 5UL 3DL (maximum uplink)' %} {%- elif slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 6] 5ms 5UL 3DL (maximum uplink)' %}
...@@ -27,13 +30,53 @@ ...@@ -27,13 +30,53 @@
{%- else %} {%- else %}
name: "sdr", name: "sdr",
{%- endif %} {%- endif %}
args: "dev0=/dev/sdr0@0", args: "dev0=
{%- for i, k in enumerate(cell_list) %}
{%- set cpri_port = cell_list[k].get('cpri_port_number', i) %}
{%- if i != 0 -%}
,
{%- endif -%}
/dev/sdr{{ slapparameter_dict.get('sdr_number', 0) }}@{{ cpri_port }}
{%- endfor -%}
",
cpri_mapping: "hw", cpri_mapping: "hw",
cpri_mult: 16, {%- set cpri_mult = slapparameter_dict.get('cpri_mult', 16) %}
cpri_rx_delay: 0, cpri_mult: "
cpri_tx_delay: 0, {%- for i, k in enumerate(cell_list) %}
ifname: "{{ slap_configuration.get('tap-name', '') }}", {%- if i != 0 -%}
cpri_debug: 2, ,
{%- endif -%}
{{ cpri_mult }}
{%- endfor -%}
",
cpri_rx_delay: "
{%- for i, k in enumerate(cell_list) %}
{%- if i != 0 -%}
,
{%- endif -%}
{{ cell_list[k].get('cpri_rx_delay', 0) }}
{%- endfor -%}
",
cpri_tx_delay: "
{%- for i, k in enumerate(cell_list) %}
{%- if i != 0 -%}
,
{%- endif -%}
{{ cell_list[k].get('cpri_tx_delay', 0) }}
{%- endfor -%}
",
ifname: "
{%- if cell_count == 1 -%}
{{ slap_configuration.get('tap-name', '') }}
{%- else -%}
{%- for i, k in enumerate(cell_list) %}
{%- if i != 0 -%}
,
{%- endif -%}
{{ slap_configuration.get('tap-name', '') }}-{{ i }}
{%- endfor -%}
{%- endif -%}
",
}, },
tx_gain: 0, tx_gain: 0,
rx_gain: 0, rx_gain: 0,
...@@ -86,7 +129,41 @@ ...@@ -86,7 +129,41 @@
enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }}, enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
cell_list: [ cell_list: [
{%- for i, k in enumerate(cell_list) %}
{%- if i == 0 -%}
{ {
{%- else -%}
, {
{%- endif %}
rf_port: {{ i }},
cell_id: {{ slapparameter_dict['cell_list'][k].get('cell_id', '0x0' + i|string) }},
tac: {{ slapparameter_dict['cell_list'][k].get('tac', '0x0001') }},
n_id_cell: {{ slapparameter_dict['cell_list'][k].get('n_id_cell', i) }},
root_sequence_index: 204,
dl_earfcn: {{ slapparameter_dict['cell_list'][k].get('dl_earfcn', earfcn) }},
{%- set scell_list = [] %}
{%- for j, l in enumerate(cell_list) %}
{%- if j != i %}
{%- do scell_list.append([j, l]) %}
{%- endif %}
{%- endfor %}
scell_list: [
{%- for j, l in enumerate(scell_list) %}
{%- if j == 0 -%}
{
{%- else -%}
, {
{%- endif %}
cell_id: {{ slapparameter_dict['cell_list'][l[1]].get('cell_id', '0x0' + l[0]|string) }},
cross_carrier_scheduling: false,
}
{%- endfor %}
],
}
{%- endfor %}
],
cell_default: {
plmn_list: [ plmn_list: [
{%- if slapparameter_dict.get('plmn_list', '') %} {%- if slapparameter_dict.get('plmn_list', '') %}
{%- for i, k in enumerate(slapparameter_dict['plmn_list']) %} {%- for i, k in enumerate(slapparameter_dict['plmn_list']) %}
...@@ -104,17 +181,6 @@ ...@@ -104,17 +181,6 @@
"00101", "00101",
{% endif %} {% endif %}
], ],
dl_earfcn: {{ earfcn }},
n_id_cell: {{ slapparameter_dict.get('pci', 1) }},
cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }},
tac: {{ slapparameter_dict.get('tac', '0x0001') }},
root_sequence_index: 204,
},
],
cell_default: {
n_antenna_dl: N_ANTENNA_DL, n_antenna_dl: N_ANTENNA_DL,
n_antenna_ul: N_ANTENNA_UL, n_antenna_ul: N_ANTENNA_UL,
{% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %} {% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
......
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @ 7d6e7ebf
...@@ -14,30 +14,76 @@ ...@@ -14,30 +14,76 @@
"Lopcomm ORAN" "Lopcomm ORAN"
] ]
}, },
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": { "cpri_mult": {
"title": "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.", "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", "type": "number",
"default": 16 "default": 16,
"enum": [
4,
5,
8,
16
]
}, },
"cell_list": {
"title": "Cell List",
"description": "Cell List",
"patternProperties": {
".*": {
"properties": {
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "cpri_rx_delay", "title": "CPRI RX Delay",
"description": "Delay 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.",
"type": "number", "type": "number",
"default": 0 "default": 0
}, },
"cpri_tx_delay": { "cpri_tx_delay": {
"title": "cpri_tx_delay", "title": "CPRI TX Delay",
"description": "Advance Start of Frame relative to PPS to compensate for delays in transmit line and RRH. This should be set to T12 + T2a.", "description": "Advances Start of Frame relative to PPS to compensate for delays in transmit line and RRH. This should be set to T12 + T2a.",
"type": "number", "type": "number",
"default": 0 "default": 0
}, },
"cpri_tx_dbm": { "cpri_tx_dbm": {
"title": "cpri_tx_dbm", "title": "CPRI TX dBm",
"description": "Optional floating point value in dBm (default 0). Needed by ENB/GNB to have a notion of actual output power. Computed from maximum power output of the RRH for a 0dBFS input signal (full scale). ", "description": "Optional floating points value in dBm (default 0). Needed by ENB/GNB to have a notion of actual output power. Computed from maximum power output of the RRH for a 0dBFS input signal (full scale). ",
"type": "number", "type": "number",
"default": 0 "default": 0
}, },
"cpri_port_number": {
"title": "CPRI Port Number",
"description": "CPRI Port Number",
"type": "number",
"default": 0
},
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell IDs",
"type": "number"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell IDs",
"type": "string"
},
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"dnsmasq": { "dnsmasq": {
"default": false, "default": false,
"title": "dnsmasq", "title": "dnsmasq",
...@@ -141,11 +187,6 @@ ...@@ -141,11 +187,6 @@
"type": "number", "type": "number",
"default": {{ default_n_antenna_ul }} "default": {{ default_n_antenna_ul }}
}, },
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"n_rb_dl": { "n_rb_dl": {
"title": "DL RB", "title": "DL RB",
"description": "number of DL resource blocks", "description": "number of DL resource blocks",
...@@ -176,12 +217,6 @@ ...@@ -176,12 +217,6 @@
"type": "string", "type": "string",
"default": "0x1A2D0" "default": "0x1A2D0"
}, },
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"type": "number",
"default": 1
},
"tac": { "tac": {
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)", "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
......
software/ors-amarisoft/instance-fdd-enb-input-schema.json
View file @ 7d6e7ebf
...@@ -13,30 +13,76 @@ ...@@ -13,30 +13,76 @@
"Lopcomm ORAN" "Lopcomm ORAN"
] ]
}, },
"sdr_number": {
"title": "SDR Number",
"description": "SDR Number",
"type": "number",
"default": 0
},
"cpri_mult": { "cpri_mult": {
"title": "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.", "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", "type": "number",
"default": 16 "default": 16,
"enum": [
4,
5,
8,
16
]
}, },
"cell_list": {
"title": "Cell List",
"description": "Cell List",
"patternProperties": {
".*": {
"properties": {
"cpri_rx_delay": { "cpri_rx_delay": {
"title": "cpri_rx_delay", "title": "CPRI RX Delay",
"description": "Delay 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.",
"type": "number", "type": "number",
"default": 0 "default": 0
}, },
"cpri_tx_delay": { "cpri_tx_delay": {
"title": "cpri_tx_delay", "title": "CPRI TX Delay",
"description": "Advance Start of Frame relative to PPS to compensate for delays in transmit line and RRH. This should be set to T12 + T2a.", "description": "Advances Start of Frame relative to PPS to compensate for delays in transmit line and RRH. This should be set to T12 + T2a.",
"type": "number", "type": "number",
"default": 0 "default": 0
}, },
"cpri_tx_dbm": { "cpri_tx_dbm": {
"title": "cpri_tx_dbm", "title": "CPRI TX dBm",
"description": "Optional floating point value in dBm (default 0). Needed by ENB/GNB to have a notion of actual output power. Computed from maximum power output of the RRH for a 0dBFS input signal (full scale). ", "description": "Optional floating points value in dBm (default 0). Needed by ENB/GNB to have a notion of actual output power. Computed from maximum power output of the RRH for a 0dBFS input signal (full scale). ",
"type": "number", "type": "number",
"default": 0 "default": 0
}, },
"cpri_port_number": {
"title": "CPRI Port Number",
"description": "CPRI Port Number",
"type": "number",
"default": 0
},
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell IDs",
"type": "number"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell IDs",
"type": "string"
},
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"dnsmasq": { "dnsmasq": {
"default": false, "default": false,
"title": "dnsmasq", "title": "dnsmasq",
...@@ -139,11 +185,6 @@ ...@@ -139,11 +185,6 @@
"type": "number", "type": "number",
"default": 2 "default": 2
}, },
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"n_rb_dl": { "n_rb_dl": {
"title": "DL RB", "title": "DL RB",
"description": "number of DL resource blocks", "description": "number of DL resource blocks",
...@@ -174,12 +215,6 @@ ...@@ -174,12 +215,6 @@
"type": "string", "type": "string",
"default": "0x1A2D0" "default": "0x1A2D0"
}, },
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"type": "number",
"default": 1
},
"tac": { "tac": {
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)", "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
......
software/ors-amarisoft/instance-tdd-enb-input-schema.json
View file @ 7d6e7ebf
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
"type": "number", "type": "number",
"default": 2 "default": 2
}, },
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"n_rb_dl": { "n_rb_dl": {
"title": "DL RB", "title": "DL RB",
"description": "number of DL resource blocks", "description": "number of DL resource blocks",
...@@ -72,12 +67,6 @@ ...@@ -72,12 +67,6 @@
"type": "string", "type": "string",
"default": "0x1A2D0" "default": "0x1A2D0"
}, },
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"type": "number",
"default": 1
},
"tac": { "tac": {
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)", "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
......
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