Skip to content

slapos
slapos
Commit 334c5784 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

X cancel 5G for now

parent eba4b934
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 724 deletions
software/ors-amarisoft/config/enb.cfg
View file @ 334c5784
......@@ -6,15 +6,9 @@
rf_driver: {
name: "sdr",
args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2@0,dev3=/dev/sdr2@1",
args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
rx_antenna:"tx_rx",
tdd_tx_mod: 1,
cpri_mapping: ",,standard,standard",
cpri_mult: ",,8,8",
cpri_rx_delay: ",,10,10",
cpri_tx_delay: ",,11,11",
cpri_tx_dbm: ",,50,50",
ifname: ",,slaptap9-0,slaptap9-1",
},
......@@ -46,7 +40,7 @@
gnb_id_bits: 28,
en_dc_support: true,
// LTE cells
// LTE cells XXX ru['xxx'] -> ru.xxx
cell_list: [
// CELL1_a
......@@ -71,625 +65,6 @@
dl_earfcn: 38100,
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D00x21, // -> CELL2_a
n_id_cell: 21,
dl_earfcn: 3350,
tac: 0x0001,
},
{
rat: "nr",
nr_cell_id: 0x123450x22, // -> CELL2_b
n_id_cell: 22,
gnb_id_bits
dl_nr_arfcn
ssb_nr_arfcn
ul_nr_arfcn
tac
band
ssb_subcarrier_spacing: 30,
ssb_period: 20,
ssb_offset: 0,
ssb_duration: 1,
},
// Inter-ENB HO
],
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
],
uldl_config: 2,
sp_config: 7,
n_rb_dl: 25,
si_coderate: 0.2,
pdsch_dedicated: {
p_a: -6,
p_b: -1,
},
pdcch_format: 2,
prach_config_index: 4,
initial_cqi: 3,
pucch_dedicated: {
n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3,
tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
},
m_ri: 8,
transmission_mode: 3,
srs_dedicated: {
srs_bandwidth_config: 2,
srs_bandwidth: 3,
srs_subframe_config: 3,
srs_period: 40,
srs_hopping_bandwidth: 0,
},
manual_ref_signal_power: true,
drb_config:
[
{
qci: 1,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
pdcp_SN_Size: 7,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 5,
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 2,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 10,
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 9,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 3,
pdcp_config: {
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 10,
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 8,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 4,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 10,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 65,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
pdcp_SN_Size: 7,
},
nr_pdcp_config: {
discardTimer: 100,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 5,
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 5,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 66,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 10,
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 67,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 10,
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 5,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 6,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 12,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 7,
pdcp_config: {
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_um: {
sn_FieldLength: 10,
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 65,
},
},
logical_channel_config: {
priority: 13,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 8,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 14,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 9,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
},
en_dc_split: {
type: "scg",
ul_data_threshold: 0
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 15,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 3,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 69,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 4,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 70,
pdcp_config: {
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 11,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
]
},
// CELL1_b
{
rf_port: 0,
n_antenna_dl: 4,
n_antenna_ul: 2,
cell_id: 0x02,
tac: 0x0001,
n_id_cell: 2,
dl_earfcn: 38100,
root_sequence_index: 205,
// Handover XXX same code for both LTE and NR
ncell_list: [
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D00x01, // -> CELL1_a
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D00x21, // -> CELL2_a
n_id_cell: 21,
dl_earfcn: 3350,
tac: 0x0001,
},
{
rat: "nr",
nr_cell_id: 0x123450x22, // -> CELL2_b
n_id_cell: 22,
gnb_id_bits
dl_nr_arfcn
ssb_nr_arfcn
ul_nr_arfcn
tac
band
ssb_subcarrier_spacing: 30,
ssb_period: 20,
ssb_offset: 0,
ssb_duration: 1,
},
// Inter-ENB HO
......@@ -698,18 +73,13 @@
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x01, // + CELL1_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // + CELL2_a
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
],
// tune LTE parameters for the cell
uldl_config: 2,
sp_config: 7,
n_rb_dl: 25,
......@@ -1243,17 +613,17 @@
]
},
// CELL2_a
// CELL1_b
{
rf_port: 1,
n_antenna_dl: 2,
n_antenna_ul: 1,
rf_port: 0,
n_antenna_dl: 4,
n_antenna_ul: 2,
cell_id: 0x21,
cell_id: 0x02,
tac: 0x0001,
n_id_cell: 21,
dl_earfcn: 3350,
root_sequence_index: 206,
n_id_cell: 2,
dl_earfcn: 38100,
root_sequence_index: 205,
// Handover XXX same code for both LTE and NR
ncell_list: [
......@@ -1265,28 +635,6 @@
dl_earfcn: 38050,
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D00x02, // -> CELL1_b
n_id_cell: 2,
dl_earfcn: 38100,
tac: 0x0001,
},
{
rat: "nr",
nr_cell_id: 0x123450x22, // -> CELL2_b
n_id_cell: 22,
gnb_id_bits
dl_nr_arfcn
ssb_nr_arfcn
ul_nr_arfcn
tac
band
ssb_subcarrier_spacing: 30,
ssb_period: 20,
ssb_offset: 0,
ssb_duration: 1,
},
// Inter-ENB HO
......@@ -1298,20 +646,17 @@
cell_id: 0x01, // + CELL1_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
],
// tune LTE parameters for the cell
uldl_config: 2,
sp_config: 7,
n_rb_dl: 25,
si_coderate: 0.2,
pdsch_dedicated: {
p_a: -3,
p_a: -6,
p_b: -1,
},
......@@ -1324,6 +669,7 @@
cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3,
tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
},
m_ri: 8,
transmission_mode: 3,
......@@ -1335,6 +681,7 @@
srs_period: 40,
srs_hopping_bandwidth: 0,
},
manual_ref_signal_power: true,
drb_config:
[
......@@ -1363,7 +710,7 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1398,7 +745,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1431,7 +778,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1465,7 +812,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1504,7 +851,7 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1539,7 +886,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1574,7 +921,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1609,7 +956,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1644,7 +991,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1678,7 +1025,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1712,7 +1059,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1750,7 +1097,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1785,7 +1132,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1820,7 +1167,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1934,27 +1281,4 @@
ho_from_meas: true,
},
// NR cells (TODO)
nr_cell_list: [
// CELL2_b
{
rf_port: 2,
n_antenna_dl: 2,
n_antenna_ul: 1,
cell_id: 0x22,
n_id_cell: 22,
band: 7,
dl_nr_arfcn: 537200,
bandwidth: 5,
subcarrier_spacing: 30,
ssb_pos_bitmap: 10000000,
},
// XXX peers
// XXX CA
],
}
\ No newline at end of file
// NR cells XXX restore
software/ors-amarisoft/config/enb.jinja2.cfg
View file @ 334c5784
......@@ -4,6 +4,7 @@
{#- defaults provide default values for parameters.
it should be kept in sync with "default" in json schemas #}
{#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000" #}
{%- set defaults = {
'enb_id': '0x1A2D0',
'gnb_id': '0x12345',
......@@ -564,7 +565,8 @@
ho_from_meas: true,
},
// NR cells
// NR cells XXX restore
{#
nr_cell_list: [
{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
{%- set cell = icell['_'] %}
......@@ -585,7 +587,7 @@
dl_nr_arfcn: {{ cell['dl_nr_arfcn'] }},
bandwidth: {{ cell['bandwidth'] }},
subcarrier_spacing: 30,
subcarrier_spacing: 30, // XXX FDD -> 15
ssb_pos_bitmap: {{ cell['ssb_pos_bitmap'] }},
root_sequence_index: 1, // XXX adjust from cfg('root_sequence_index') XXX place
......@@ -723,7 +725,7 @@
sr_period: 40,
dmrs_type_a_pos: 2,
prach: {
prach_config_index: 160,
prach_config_index: 160, // XXX TDD only & TDD_CONFIG != 4
msg1_subcarrier_spacing: 30,
msg1_fdm: 1,
{% if ru.ru_type == 'sunwave' %}
......@@ -735,7 +737,7 @@
preamble_received_target_power: -110,
preamble_trans_max: 7,
power_ramping_step: 4,
ra_response_window: 20,
ra_response_window: {{ 20 if tdd else 10 }},
restricted_set_config: "unrestricted_set",
ra_contention_resolution_timer: 64,
ssb_per_prach_occasion: 1,
......@@ -1480,3 +1482,4 @@
},
},
}
#}
software/ors-amarisoft/slapos-render-config.py
View file @ 334c5784
......@@ -149,7 +149,19 @@ json_params = """{
"slave_reference": "_CELL1_b",
"slap_software_type": "enb",
"_": %(jCELL1_b)s
},
}
]
},
"directory": {
"log": "log",
"etc": "etc",
"var": "var"
},
"slapparameter_dict": {
}
}""" % globals()
"""
{
"slave_title": "Cell 1c",
"slave_reference": "_CELL1_c",
......@@ -180,16 +192,7 @@ json_params = """{
"slap_software_type": "enb",
"_": %(jRU2_b)s
}
]
},
"directory": {
"log": "log",
"etc": "etc",
"var": "var"
},
"slapparameter_dict": {
}
}""" % globals()
"""
import os
from jinja2 import Environment, StrictUndefined, \
......
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