Skip to content

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

X keep icell_dict LTE/NR slices in icell_dict_lte and icell_dict_nr 

We will need to analyze how many LTE/NR cells we have and it helps to
pre-build those dicts in the beginning.
parent 76870709
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1248 additions and 1249 deletions
software/ors-amarisoft/config/out/enb/iRU1_SDR1_fLTE2/enb.cfg
View file @ 11c74a0b
...@@ -33,22 +33,22 @@ ...@@ -33,22 +33,22 @@
// LTE cells // LTE cells
cell_list: [ cell_list: [
// CELL__a (__CELL__a__ru) // CELL__a (__CELL__a__ru)
{ {
rf_port: 0, rf_port: 0,
n_antenna_dl: 1, n_antenna_dl: 1,
n_antenna_ul: 1, n_antenna_ul: 1,
cell_id: 0x01, cell_id: 0x01,
tac: 0x1234, tac: 0x1234,
n_id_cell: 1, n_id_cell: 1,
dl_earfcn: 3350, dl_earfcn: 3350,
ul_earfcn: 21350, ul_earfcn: 21350,
root_sequence_index: 204, root_sequence_index: 204,
inactivity_timer: 10000, inactivity_timer: 10000,
// Handover // Handover
ncell_list: [ ncell_list: [
// Intra-ENB HO // Intra-ENB HO
{ {
...@@ -88,69 +88,69 @@ ...@@ -88,69 +88,69 @@
}, },
], ],
// Carrier Aggregation: LTE + LTE // Carrier Aggregation: LTE + LTE
scell_list: [ scell_list: [
{ {
cell_id: 0x02, // + CELL__b cell_id: 0x02, // + CELL__b
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
], ],
// tune LTE parameters for the cell // tune LTE parameters for the cell
n_rb_dl: 25, n_rb_dl: 25,
si_coderate: 0.2, si_coderate: 0.2,
pdsch_dedicated: { pdsch_dedicated: {
p_a: 0, p_a: 0,
p_b: -1, p_b: -1,
}, },
pdcch_format: 2, pdcch_format: 2,
prach_config_index: 4, prach_config_index: 4,
initial_cqi: 3, initial_cqi: 3,
pucch_dedicated: { pucch_dedicated: {
n1_pucch_sr_count: 11, n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1, cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8, n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3, n3_pucch_an_n_rb: 3,
}, },
srs_dedicated: { srs_dedicated: {
srs_bandwidth_config: 3, srs_bandwidth_config: 3,
srs_bandwidth: 1, srs_bandwidth: 1,
srs_subframe_config: 3, srs_subframe_config: 3,
srs_period: 40, srs_period: 40,
srs_hopping_bandwidth: 0, srs_hopping_bandwidth: 0,
}, },
drb_config: "CELL__a-drb.cfg", drb_config: "CELL__a-drb.cfg",
sib_sched_list: [ sib_sched_list: [
{ {
filename: "CELL__a-sib23.asn", filename: "CELL__a-sib23.asn",
si_periodicity: 16, si_periodicity: 16,
}, },
], ],
}, },
// CELL__b (__CELL__a__ru) // CELL__b (__CELL__a__ru)
{ {
rf_port: 0, rf_port: 0,
n_antenna_dl: 1, n_antenna_dl: 1,
n_antenna_ul: 1, n_antenna_ul: 1,
cell_id: 0x02, cell_id: 0x02,
tac: 0x1234, tac: 0x1234,
n_id_cell: 1, n_id_cell: 1,
dl_earfcn: 3050, dl_earfcn: 3050,
ul_earfcn: 21050, ul_earfcn: 21050,
root_sequence_index: 205, root_sequence_index: 205,
inactivity_timer: 10000, inactivity_timer: 10000,
// Handover // Handover
ncell_list: [ ncell_list: [
// Intra-ENB HO // Intra-ENB HO
{ {
...@@ -190,52 +190,52 @@ ...@@ -190,52 +190,52 @@
}, },
], ],
// Carrier Aggregation: LTE + LTE // Carrier Aggregation: LTE + LTE
scell_list: [ scell_list: [
{ {
cell_id: 0x01, // + CELL__a cell_id: 0x01, // + CELL__a
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
], ],
// tune LTE parameters for the cell // tune LTE parameters for the cell
n_rb_dl: 25, n_rb_dl: 25,
si_coderate: 0.2, si_coderate: 0.2,
pdsch_dedicated: { pdsch_dedicated: {
p_a: 0, p_a: 0,
p_b: -1, p_b: -1,
}, },
pdcch_format: 2, pdcch_format: 2,
prach_config_index: 4, prach_config_index: 4,
initial_cqi: 3, initial_cqi: 3,
pucch_dedicated: { pucch_dedicated: {
n1_pucch_sr_count: 11, n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1, cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8, n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3, n3_pucch_an_n_rb: 3,
}, },
srs_dedicated: { srs_dedicated: {
srs_bandwidth_config: 3, srs_bandwidth_config: 3,
srs_bandwidth: 1, srs_bandwidth: 1,
srs_subframe_config: 3, srs_subframe_config: 3,
srs_period: 40, srs_period: 40,
srs_hopping_bandwidth: 0, srs_hopping_bandwidth: 0,
}, },
drb_config: "CELL__b-drb.cfg", drb_config: "CELL__b-drb.cfg",
sib_sched_list: [ sib_sched_list: [
{ {
filename: "CELL__b-sib23.asn", filename: "CELL__b-sib23.asn",
si_periodicity: 16, si_periodicity: 16,
}, },
], ],
}, },
], ],
cell_default: { cell_default: {
plmn_list: [ plmn_list: [
......
software/ors-amarisoft/config/out/enb/iRU2_LOPCOMM_fLTE2/enb.cfg
View file @ 11c74a0b
...@@ -38,22 +38,22 @@ ...@@ -38,22 +38,22 @@
// LTE cells // LTE cells
cell_list: [ cell_list: [
// CELL2 (RU__0002) // CELL2 (RU__0002)
{ {
rf_port: 0, rf_port: 0,
n_antenna_dl: 1, n_antenna_dl: 1,
n_antenna_ul: 1, n_antenna_ul: 1,
cell_id: 0x21, cell_id: 0x21,
tac: 0x1234, tac: 0x1234,
n_id_cell: 21, n_id_cell: 21,
dl_earfcn: 100, dl_earfcn: 100,
ul_earfcn: 18100, ul_earfcn: 18100,
root_sequence_index: 204, root_sequence_index: 204,
inactivity_timer: 10000, inactivity_timer: 10000,
// Handover // Handover
ncell_list: [ ncell_list: [
// Intra-ENB HO // Intra-ENB HO
{ {
...@@ -93,69 +93,69 @@ ...@@ -93,69 +93,69 @@
}, },
], ],
// Carrier Aggregation: LTE + LTE // Carrier Aggregation: LTE + LTE
scell_list: [ scell_list: [
{ {
cell_id: 0x22, // + CELL4 cell_id: 0x22, // + CELL4
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
], ],
// tune LTE parameters for the cell // tune LTE parameters for the cell
n_rb_dl: 100, n_rb_dl: 100,
si_coderate: 0.2, si_coderate: 0.2,
pdsch_dedicated: { pdsch_dedicated: {
p_a: 0, p_a: 0,
p_b: -1, p_b: -1,
}, },
pdcch_format: 2, pdcch_format: 2,
prach_config_index: 4, prach_config_index: 4,
initial_cqi: 3, initial_cqi: 3,
pucch_dedicated: { pucch_dedicated: {
n1_pucch_sr_count: 11, n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1, cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8, n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3, n3_pucch_an_n_rb: 3,
}, },
srs_dedicated: { srs_dedicated: {
srs_bandwidth_config: 2, srs_bandwidth_config: 2,
srs_bandwidth: 3, srs_bandwidth: 3,
srs_subframe_config: 3, srs_subframe_config: 3,
srs_period: 40, srs_period: 40,
srs_hopping_bandwidth: 0, srs_hopping_bandwidth: 0,
}, },
drb_config: "CELL2-drb.cfg", drb_config: "CELL2-drb.cfg",
sib_sched_list: [ sib_sched_list: [
{ {
filename: "CELL2-sib23.asn", filename: "CELL2-sib23.asn",
si_periodicity: 16, si_periodicity: 16,
}, },
], ],
}, },
// CELL4 (RU__0004) // CELL4 (RU__0004)
{ {
rf_port: 1, rf_port: 1,
n_antenna_dl: 1, n_antenna_dl: 1,
n_antenna_ul: 1, n_antenna_ul: 1,
cell_id: 0x22, cell_id: 0x22,
tac: 0x1234, tac: 0x1234,
n_id_cell: 22, n_id_cell: 22,
dl_earfcn: 500, dl_earfcn: 500,
ul_earfcn: 18500, ul_earfcn: 18500,
root_sequence_index: 205, root_sequence_index: 205,
inactivity_timer: 10000, inactivity_timer: 10000,
// Handover // Handover
ncell_list: [ ncell_list: [
// Intra-ENB HO // Intra-ENB HO
{ {
...@@ -195,52 +195,52 @@ ...@@ -195,52 +195,52 @@
}, },
], ],
// Carrier Aggregation: LTE + LTE // Carrier Aggregation: LTE + LTE
scell_list: [ scell_list: [
{ {
cell_id: 0x21, // + CELL2 cell_id: 0x21, // + CELL2
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
], ],
// tune LTE parameters for the cell // tune LTE parameters for the cell
n_rb_dl: 100, n_rb_dl: 100,
si_coderate: 0.2, si_coderate: 0.2,
pdsch_dedicated: { pdsch_dedicated: {
p_a: 0, p_a: 0,
p_b: -1, p_b: -1,
}, },
pdcch_format: 2, pdcch_format: 2,
prach_config_index: 4, prach_config_index: 4,
initial_cqi: 3, initial_cqi: 3,
pucch_dedicated: { pucch_dedicated: {
n1_pucch_sr_count: 11, n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1, cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8, n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3, n3_pucch_an_n_rb: 3,
}, },
srs_dedicated: { srs_dedicated: {
srs_bandwidth_config: 2, srs_bandwidth_config: 2,
srs_bandwidth: 3, srs_bandwidth: 3,
srs_subframe_config: 3, srs_subframe_config: 3,
srs_period: 40, srs_period: 40,
srs_hopping_bandwidth: 0, srs_hopping_bandwidth: 0,
}, },
drb_config: "CELL4-drb.cfg", drb_config: "CELL4-drb.cfg",
sib_sched_list: [ sib_sched_list: [
{ {
filename: "CELL4-sib23.asn", filename: "CELL4-sib23.asn",
si_periodicity: 16, si_periodicity: 16,
}, },
], ],
}, },
], ],
cell_default: { cell_default: {
plmn_list: [ plmn_list: [
......
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