Skip to content

S
slapos
Commit a7393c0e authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

.

parent 87c58de2
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
software/ors-amarisoft/config/enb.cfg
View file @ a7393c0e
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
// Radio Units // Radio Units
rf_driver: { rf_driver: {
name: "sdr", name: "sdr",
// RU_0002 1T1R (lopcomm) // RU1 1T1R (lopcomm)
// RU_0004 1T1R (lopcomm) // RU2 1T1R (lopcomm)
// RU_0007 1T1R (lopcomm) // RU3 1T1R (lopcomm)
args: "dev0=/dev/sdr0@0,dev1=/dev/sdr0@1,dev2=/dev/sdr0@2", args: "dev0=/dev/sdr0@0,dev1=/dev/sdr0@1,dev2=/dev/sdr0@2",
cpri_mapping: "hw,hw,hw", cpri_mapping: "hw,hw,hw",
cpri_mult: "4,4,4", cpri_mult: "4,4,4",
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
// LTE cells // LTE cells
cell_list: [ cell_list: [
// CELL2 (RU_0002) // CELL1 (RU1)
{ {
rf_port: 0, rf_port: 0,
n_antenna_dl: 1, n_antenna_dl: 1,
...@@ -67,16 +67,16 @@ ...@@ -67,16 +67,16 @@
// Intra-ENB HO // Intra-ENB HO
{ {
rat: "eutra", rat: "eutra",
cell_id: 0x1A2D022, // -> CELL4 cell_id: 0x1A2D022, // -> CELL2
n_id_cell: 22, n_id_cell: 22,
dl_earfcn: 500, dl_earfcn: 300,
tac: 0x0001, tac: 0x0001,
}, },
{ {
rat: "eutra", rat: "eutra",
cell_id: 0x1A2D023, // -> CELL7 cell_id: 0x1A2D023, // -> CELL3
n_id_cell: 23, n_id_cell: 23,
dl_earfcn: 300, dl_earfcn: 500,
tac: 0x0001, tac: 0x0001,
}, },
...@@ -87,11 +87,11 @@ ...@@ -87,11 +87,11 @@
// Carrier Aggregation // XXX + CA LTE-NR // Carrier Aggregation // XXX + CA LTE-NR
scell_list: [ scell_list: [
{ {
cell_id: 0x22, // + CELL4 cell_id: 0x22, // + CELL2
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
{ {
cell_id: 0x23, // + CELL7 cell_id: 0x23, // + CELL3
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
], ],
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
] ]
}, },
// CELL4 (RU_0004) // CELL2 (RU2)
{ {
rf_port: 1, rf_port: 1,
n_antenna_dl: 1, n_antenna_dl: 1,
...@@ -634,7 +634,7 @@ ...@@ -634,7 +634,7 @@
cell_id: 0x22, cell_id: 0x22,
tac: 0x0001, tac: 0x0001,
n_id_cell: 22, n_id_cell: 22,
dl_earfcn: 500, dl_earfcn: 300,
root_sequence_index: 205, root_sequence_index: 205,
// Handover XXX same code for both LTE and NR // Handover XXX same code for both LTE and NR
...@@ -642,16 +642,16 @@ ...@@ -642,16 +642,16 @@
// Intra-ENB HO // Intra-ENB HO
{ {
rat: "eutra", rat: "eutra",
cell_id: 0x1A2D021, // -> CELL2 cell_id: 0x1A2D021, // -> CELL1
n_id_cell: 21, n_id_cell: 21,
dl_earfcn: 100, dl_earfcn: 100,
tac: 0x0001, tac: 0x0001,
}, },
{ {
rat: "eutra", rat: "eutra",
cell_id: 0x1A2D023, // -> CELL7 cell_id: 0x1A2D023, // -> CELL3
n_id_cell: 23, n_id_cell: 23,
dl_earfcn: 300, dl_earfcn: 500,
tac: 0x0001, tac: 0x0001,
}, },
...@@ -662,18 +662,18 @@ ...@@ -662,18 +662,18 @@
// Carrier Aggregation // XXX + CA LTE-NR // Carrier Aggregation // XXX + CA LTE-NR
scell_list: [ scell_list: [
{ {
cell_id: 0x21, // + CELL2 cell_id: 0x21, // + CELL1
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
{ {
cell_id: 0x23, // + CELL7 cell_id: 0x23, // + CELL3
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: 75,
si_coderate: 0.2, si_coderate: 0.2,
pdsch_dedicated: { pdsch_dedicated: {
...@@ -1200,7 +1200,7 @@ ...@@ -1200,7 +1200,7 @@
] ]
}, },
// CELL7 (RU_0007) // CELL3 (RU3)
{ {
rf_port: 2, rf_port: 2,
n_antenna_dl: 1, n_antenna_dl: 1,
...@@ -1209,7 +1209,7 @@ ...@@ -1209,7 +1209,7 @@
cell_id: 0x23, cell_id: 0x23,
tac: 0x0001, tac: 0x0001,
n_id_cell: 23, n_id_cell: 23,
dl_earfcn: 300, dl_earfcn: 500,
root_sequence_index: 206, root_sequence_index: 206,
// Handover XXX same code for both LTE and NR // Handover XXX same code for both LTE and NR
...@@ -1217,16 +1217,16 @@ ...@@ -1217,16 +1217,16 @@
// Intra-ENB HO // Intra-ENB HO
{ {
rat: "eutra", rat: "eutra",
cell_id: 0x1A2D021, // -> CELL2 cell_id: 0x1A2D021, // -> CELL1
n_id_cell: 21, n_id_cell: 21,
dl_earfcn: 100, dl_earfcn: 100,
tac: 0x0001, tac: 0x0001,
}, },
{ {
rat: "eutra", rat: "eutra",
cell_id: 0x1A2D022, // -> CELL4 cell_id: 0x1A2D022, // -> CELL2
n_id_cell: 22, n_id_cell: 22,
dl_earfcn: 500, dl_earfcn: 300,
tac: 0x0001, tac: 0x0001,
}, },
...@@ -1237,18 +1237,18 @@ ...@@ -1237,18 +1237,18 @@
// Carrier Aggregation // XXX + CA LTE-NR // Carrier Aggregation // XXX + CA LTE-NR
scell_list: [ scell_list: [
{ {
cell_id: 0x21, // + CELL2 cell_id: 0x21, // + CELL1
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
{ {
cell_id: 0x22, // + CELL4 cell_id: 0x22, // + CELL2
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
}, },
], ],
// tune LTE parameters for the cell // tune LTE parameters for the cell
n_rb_dl: 75, n_rb_dl: 100,
si_coderate: 0.2, si_coderate: 0.2,
pdsch_dedicated: { pdsch_dedicated: {
......
software/ors-amarisoft/slapos-render-config.py
View file @ a7393c0e
...@@ -245,47 +245,47 @@ def iRU2_LOPCOMM_fLTE3(ienb): ...@@ -245,47 +245,47 @@ def iRU2_LOPCOMM_fLTE3(ienb):
RU_0007['cpri_link']['sfp_port'] = 2 RU_0007['cpri_link']['sfp_port'] = 2
if 1: if 1:
ienb.ishared('Radio Unit 2a', '_RU_0002', RU_0002) ienb.ishared('Radio Unit 1', '_RU1', RU_0002)
ienb.ishared('Cell 2', '_CELL2', { ienb.ishared('Cell 1', '_CELL1', {
'cell_type': 'lte', 'cell_type': 'lte',
'rf_mode': 'fdd', 'rf_mode': 'fdd',
'bandwidth': '20 MHz',
'dl_earfcn': 100, # 2120 MHz @ B1 'dl_earfcn': 100, # 2120 MHz @ B1
'bandwidth': '20 MHz',
'pci': 21, 'pci': 21,
'cell_id': '0x21', 'cell_id': '0x21',
'ru': { 'ru': {
'ru_type': 'ru_ref', 'ru_type': 'ru_ref',
'ru_ref': 'RU_0002' 'ru_ref': 'RU1'
} }
}) })
if 1: if 1:
ienb.ishared('Radio Unit 2b', '_RU_0004', RU_0004) ienb.ishared('Radio Unit 2', '_RU2', RU_0004)
ienb.ishared('Cell 4', '_CELL4', { ienb.ishared('Cell 2', '_CELL2', {
'cell_type': 'lte', 'cell_type': 'lte',
'rf_mode': 'fdd', 'rf_mode': 'fdd',
'bandwidth': '20 MHz', 'dl_earfcn': 300, # 2140 MHz @ B1
'dl_earfcn': 500, # 2160 MHz @ B1 'bandwidth': '15 MHz',
'pci': 22, 'pci': 22,
'cell_id': '0x22', 'cell_id': '0x22',
'ru': { 'ru': {
'ru_type': 'ru_ref', 'ru_type': 'ru_ref',
'ru_ref': 'RU_0004' 'ru_ref': 'RU2'
} }
}) })
if 1: if 1:
ienb.ishared('Radio Unit 2c', '_RU_0007', RU_0007) ienb.ishared('Radio Unit 3', '_RU3', RU_0007)
ienb.ishared('Cell 7', '_CELL7', { ienb.ishared('Cell 3', '_CELL3', {
'cell_type': 'lte', 'cell_type': 'lte',
'rf_mode': 'fdd', 'rf_mode': 'fdd',
'bandwidth': '15 MHz', 'dl_earfcn': 500, # 2160 MHz @ B1
'dl_earfcn': 300, # 2140 MHz @ B1 'bandwidth': '20 MHz',
'pci': 23, 'pci': 23,
'cell_id': '0x23', 'cell_id': '0x23',
'ru': { 'ru': {
'ru_type': 'ru_ref', 'ru_type': 'ru_ref',
'ru_ref': 'RU_0007' 'ru_ref': 'RU3'
} }
}) })
......
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