Skip to content

slapos
slapos
Commit 3fa4cabb authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 8254b5dd
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
software/ors-amarisoft/config/out/enb.cfg
View file @ 3fa4cabb
......@@ -9,7 +9,7 @@
// XXX vvv <- ru.txrx_active ? XXX how to handle txrx_active for SDR ?
// (tx_gain=-1000 does not work - it still sets tx_gain to min.possible value 14)
name: "sdr",
// _CELL1_a_ru 4T2R (sdr)
// _CELL_a_ru 4T2R (sdr)
args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
rx_antenna:"tx_rx",
tdd_tx_mod: 1,
......@@ -47,7 +47,7 @@
// LTE cells
cell_list: [
// CELL1_a (_CELL1_a_ru)
// CELL_a (_CELL_a_ru)
{
rf_port: 0,
n_antenna_dl: 4,
......@@ -65,14 +65,14 @@
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D002, // -> CELL1_b
cell_id: 0x1A2D002, // -> CELL_b
n_id_cell: 2,
dl_earfcn: 38100,
tac: 0x0001,
},
{
rat: "nr",
cell_id: 0x03, // -> CELL1_c
cell_id: 0x03, // -> CELL_c
},
// Inter-ENB HO
......@@ -103,14 +103,14 @@
// Carrier Aggregation: LTE + LTE
scell_list: [
{
cell_id: 0x02, // + CELL1_b
cell_id: 0x02, // + CELL_b
cross_carrier_scheduling: false,
},
],
// Carrier Aggregation: LTE + NR
en_dc_scg_cell_list: [
{
cell_id: 0x03, // + CELL1_c
cell_id: 0x03, // + CELL_c
},
],
......@@ -149,17 +149,17 @@
},
manual_ref_signal_power: true,
drb_config: "CELL1_a-drb.cfg",
drb_config: "CELL_a-drb.cfg",
sib_sched_list: [
{
filename: "CELL1_a-sib23.asn",
filename: "CELL_a-sib23.asn",
si_periodicity: 16,
},
],
},
// CELL1_b (_CELL1_a_ru)
// CELL_b (_CELL_a_ru)
{
rf_port: 0,
n_antenna_dl: 4,
......@@ -177,14 +177,14 @@
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D001, // -> CELL1_a
cell_id: 0x1A2D001, // -> CELL_a
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x0001,
},
{
rat: "nr",
cell_id: 0x03, // -> CELL1_c
cell_id: 0x03, // -> CELL_c
},
// Inter-ENB HO
......@@ -215,14 +215,14 @@
// Carrier Aggregation: LTE + LTE
scell_list: [
{
cell_id: 0x01, // + CELL1_a
cell_id: 0x01, // + CELL_a
cross_carrier_scheduling: false,
},
],
// Carrier Aggregation: LTE + NR
en_dc_scg_cell_list: [
{
cell_id: 0x03, // + CELL1_c
cell_id: 0x03, // + CELL_c
},
],
......@@ -261,11 +261,11 @@
},
manual_ref_signal_power: true,
drb_config: "CELL1_b-drb.cfg",
drb_config: "CELL_b-drb.cfg",
sib_sched_list: [
{
filename: "CELL1_b-sib23.asn",
filename: "CELL_b-sib23.asn",
si_periodicity: 16,
},
],
......@@ -366,7 +366,7 @@
// NR cells
nr_cell_list: [
// CELL1_c (_CELL1_a_ru)
// CELL_c (_CELL_a_ru)
{
rf_port: 0,
n_antenna_dl: 4,
......@@ -390,14 +390,14 @@
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D001, // -> CELL1_a
cell_id: 0x1A2D001, // -> CELL_a
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D002, // -> CELL1_b
cell_id: 0x1A2D002, // -> CELL_b
n_id_cell: 2,
dl_earfcn: 38100,
tac: 0x0001,
......@@ -434,10 +434,10 @@
// Carrier Aggregation: NR + LTE
nr_dc_scg_cell_list: [
{
cell_id: 0x01, // + CELL1_a
cell_id: 0x01, // + CELL_a
},
{
cell_id: 0x02, // + CELL1_b
cell_id: 0x02, // + CELL_b
},
],
......@@ -582,7 +582,7 @@
},
drb_config: "CELL1_c-drb.cfg",
drb_config: "CELL_c-drb.cfg",
},
],
......
software/ors-amarisoft/slapos-render-config.py
View file @ 3fa4cabb
......@@ -78,7 +78,7 @@ def ref_of_shared(ishared):
# 3 cells sharing SDR-based RU consisting of 2 SDR boards (4tx + 4rx ports max)
# RU definition is embedded into cell for simplicity of management
def iRU1_SDR_tLTE2_tNR(ienb):
RU1 = {
RU = {
'ru_type': 'sdr',
'ru_link_type': 'sdr',
'sdr_dev_list': [0, 1],
......@@ -88,30 +88,30 @@ def iRU1_SDR_tLTE2_tNR(ienb):
'rx_gain': 52,
}
ienb.ishared('CELL1_a', {
ienb.ishared('CELL_a', {
'cell_type': 'lte',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'dl_earfcn': 38050, # 2600 MHz
'pci': 1,
'cell_id': '0x01',
'ru': RU1, # RU definition embedded into CELL
'ru': RU, # RU definition embedded into CELL
})
ienb.ishared('CELL1_b', {
ienb.ishared('CELL_b', {
'cell_type': 'lte',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'dl_earfcn': 38100, # 2605 MHz
'pci': 2,
'cell_id': '0x02',
'ru': { # CELL1_b shares RU with CELL1_a referring to it via cell
'ru': { # CELL_b shares RU with CELL_a referring to it via cell
'ru_type': 'ruincell_ref',
'ruincell_ref': 'CELL1_a'
'ruincell_ref': 'CELL_a'
}
})
ienb.ishared('CELL1_c', {
ienb.ishared('CELL_c', {
'cell_type': 'nr',
'rf_mode': 'tdd',
'bandwidth': 10,
......@@ -120,16 +120,16 @@ def iRU1_SDR_tLTE2_tNR(ienb):
'pci': 3,
'cell_id': '0x03',
'ru': {
'ru_type': 'ruincell_ref', # CELL1_c shares RU with CELL1_a and CELL1_b
'ruincell_ref': 'CELL1_b' # referring to RU via CELL1_b -> CELL1_a
'ru_type': 'ruincell_ref', # CELL_c shares RU with CELL_a and CELL_b
'ruincell_ref': 'CELL_b' # referring to RU via CELL_b -> CELL_a
}
})
# 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
# here we instantiate RUs separately since embedding RU into a cell is demonstrated by CELL_a above
def iRU2_LOPCOMM_fLTE_fNR(ienb):
RU2_a = {
RU1 = {
'ru_type': 'lopcomm',
'ru_link_type': 'cpri',
'mac_addr': 'XXX',
......@@ -148,29 +148,29 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
'rx_gain': -22,
}
RU2_b = copy.deepcopy(RU2_a)
RU2_b['mac_addr'] = 'YYY'
RU2_b['cpri_link']['sfp_port'] = 1
RU2_b['tx_gain'] += 10
RU2_b['rx_gain'] += 10
RU2 = copy.deepcopy(RU1)
RU2['mac_addr'] = 'YYY'
RU2['cpri_link']['sfp_port'] = 1
RU2['tx_gain'] += 10
RU2['rx_gain'] += 10
ienb.ishared('RU2_a', RU2_a)
ienb.ishared('RU2_b', RU2_b)
ienb.ishared('RU1', RU1)
ienb.ishared('RU2', RU2)
ienb.ishared('CELL2_a', {
ienb.ishared('CELL_a', {
'cell_type': 'lte',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
'dl_earfcn': 3350, # 2680 MHz
'pci': 21,
'cell_id': '0x21',
'ru': { # CELL2_a links to RU2_a by its reference
'ru': { # CELL_a links to RU1 by its reference
'ru_type': 'ru_ref',
'ru_ref': 'RU2_a'
'ru_ref': 'RU1'
}
})
ienb.ishared('CELL2_b', {
ienb.ishared('CELL_b', {
'cell_type': 'nr',
'rf_mode': 'fdd',
'bandwidth': 5,
......@@ -180,7 +180,7 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
'cell_id': '0x22',
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'RU2_b'
'ru_ref': 'RU2'
}
})
......@@ -199,7 +199,7 @@ def iRU3_SDR1_fLTE2(ienb):
'rx_gain': 61,
}
ienb.ishared('CELL3_a', {
ienb.ishared('CELL_a', {
'cell_type': 'lte',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
......@@ -209,7 +209,7 @@ def iRU3_SDR1_fLTE2(ienb):
'ru': RU,
})
ienb.ishared('CELL3_b', {
ienb.ishared('CELL_b', {
'cell_type': 'lte',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
......@@ -218,7 +218,7 @@ def iRU3_SDR1_fLTE2(ienb):
'cell_id': '0x02',
'ru': {
'ru_type': 'ruincell_ref',
'ruincell_ref': 'CELL3_a'
'ruincell_ref': 'CELL_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