Skip to content

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

.

parent 8f931619
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 664 deletions
software/ors-amarisoft/cell/nr/input-schema.json
View file @ b4cf768f
......@@ -7,7 +7,8 @@
"required": [
"bandwidth",
"dl_nr_arfcn"
"dl_nr_arfcn",
"nr_band"
],
"properties": {
"cell_type": {
......
software/ors-amarisoft/config/enb.cfg
View file @ b4cf768f
......@@ -79,604 +79,19 @@
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D00x22, // -> CELL2_b
n_id_cell: 22,
dl_earfcn: 3410,
tac: 0x0001,
},
// 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,
},
{
cell_id: 0x22, // + CELL2_b
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: "eutra",
cell_id: 0x1A2D00x22, // -> CELL2_b
rat: "nr",
nr_cell_id: 0x123450x22, // -> CELL2_b
n_id_cell: 22,
dl_earfcn: 3410,
tac: 0x0001,
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
......@@ -686,17 +101,13 @@
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x01, // + CELL1_a
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x22, // + CELL2_b
cross_carrier_scheduling: false,
},
],
......@@ -1235,17 +646,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: [
......@@ -1259,17 +670,25 @@
},
{
rat: "eutra",
cell_id: 0x1A2D00x02, // -> CELL1_b
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x21, // -> CELL2_a
n_id_cell: 21,
dl_earfcn: 3350,
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D00x22, // -> CELL2_b
rat: "nr",
nr_cell_id: 0x123450x22, // -> CELL2_b
n_id_cell: 22,
dl_earfcn: 3410,
tac: 0x0001,
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
......@@ -1283,11 +702,7 @@
cross_carrier_scheduling: false,
},
{
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x22, // + CELL2_b
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
],
......@@ -1295,11 +710,13 @@
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,
},
......@@ -1312,6 +729,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,
......@@ -1323,6 +741,7 @@
srs_period: 40,
srs_hopping_bandwidth: 0,
},
manual_ref_signal_power: true,
drb_config:
[
......@@ -1351,7 +770,7 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1386,7 +805,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1419,7 +838,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1453,7 +872,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1492,7 +911,7 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1527,7 +946,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1562,7 +981,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1597,7 +1016,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1632,7 +1051,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1666,7 +1085,7 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: 35,
t_Reordering: 65,
},
},
logical_channel_config: {
......@@ -1700,7 +1119,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1738,7 +1157,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1773,7 +1192,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1808,7 +1227,7 @@
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: 35,
t_Reordering: 65,
t_StatusProhibit: 10,
},
},
......@@ -1824,17 +1243,17 @@
]
},
// CELL2_b
// CELL2_a
{
rf_port: 2,
rf_port: 1,
n_antenna_dl: 2,
n_antenna_ul: 1,
cell_id: 0x22,
cell_id: 0x21,
tac: 0x0001,
n_id_cell: 22,
dl_earfcn: 3410,
root_sequence_index: 207,
n_id_cell: 21,
dl_earfcn: 3350,
root_sequence_index: 206,
// Handover XXX same code for both LTE and NR
ncell_list: [
......@@ -1854,11 +1273,19 @@
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
......@@ -1875,10 +1302,6 @@
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
],
......@@ -2412,6 +1835,7 @@
},
]
},
],
cell_default: {
......@@ -2517,5 +1941,20 @@
// 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,
},
],
}
\ No newline at end of file
software/ors-amarisoft/slapos-render-config.py
View file @ b4cf768f
......@@ -45,7 +45,7 @@ CELL1_b = {
}
}
# another couple of cells that use CPRI-based Lopcomm radio units
# LTE + NR cells that use CPRI-based Lopcomm radio units
# here we instantiate RUs separately since embedding RU into a cell is demonstrated by CELL1_a above
RU2_a = {
'ru_type': 'lopcomm',
......@@ -74,23 +74,26 @@ CELL2_a = {
'bandwidth': '5 MHz',
'dl_earfcn': 3350, # 2680 MHz
'pci': 21,
'cell_id': "0x21",
'cell_id': '0x21',
'ru': { # CELL2_a links to RU2_a by its reference
'ru_type': 'ru_ref',
'ru_ref': 'RU2_a'
}
}
CELL2_b = copy.deepcopy(CELL2_a)
CELL2_b.update({
'dl_earfcn': 3410, # 2686 MHz
CELL2_b = {
'cell_type': 'nr',
'rf_mode': 'fdd',
'bandwidth': 5,
'dl_nr_arfcn': 537200, # 2686 MHz
'nr_band': 7,
'pci': 22,
'cell_id': "0x22"
})
CELL2_b['ru']['ru_ref'] = 'RU2_b'
# XXX CELL3 FDD NR
'cell_id': '0x22',
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'RU2_b'
}
}
jjdumps = lambda obj: json.dumps(json.dumps(obj))
jCELL1_a = jjdumps(CELL1_a)
......
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