Skip to content

slapos
slapos
Commit bc349eae authored by Lu Xu's avatar Lu Xu 👀 Committed by Joanne Hugé
Browse files
Options

ors-amarisoft: add lopcomm RRH

parent 957d98b0
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 123 deletions
software/ors-amarisoft/buildout.hash.cfg
View file @ bc349eae
......@@ -60,7 +60,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
md5sum = 1c9909f691b5bb00d3fc30d41613e26a
md5sum = d6cf05433937853960006b7f1f73c04f
[sib23.asn]
filename = config/sib23.asn
......
software/ors-amarisoft/config/enb.jinja2.cfg
View file @ bc349eae
......@@ -7,6 +7,19 @@
log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
log_filename: "{{ directory['log'] }}/enb.log",
{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
rf_driver: {
name: "sdr",
args: "dev0=/dev/sdr0@0",
cpri_mapping: "hw",
cpri_mult: 16,
cpri_rx_delay: 0,
cpri_tx_delay: 0,
ifname: "cpri0",
},
tx_gain: 0,
rx_gain: 0,
{% else %}
rf_driver: {
name: "sdr",
args: "dev0=/dev/sdr0",
......@@ -14,6 +27,7 @@
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_lte_rx_gain']) }},
{% endif %}
com_addr: "127.0.1.2:9001",
mme_list: [
......@@ -77,10 +91,12 @@
cell_default: {
n_antenna_dl: N_ANTENNA_DL,
n_antenna_ul: N_ANTENNA_UL,
{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
{% pass %}
{% else %}
uldl_config: 2,
sp_config: 7,
{% endif %}
n_rb_dl: N_RB_DL,
cyclic_prefix: "normal",
......@@ -93,7 +109,7 @@
q_rx_lev_min: -70,
p_max: 10,
si_window_length: 40,
sib_sched_list: [
sib_sched_list: [
{
filename: "{{ sib23 }}",
si_periodicity: 16,
......@@ -136,7 +152,11 @@
pucch_dedicated: {
n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1,
{% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
{% pass %}
{% else %}
tdd_ack_nack_feedback_mode: "multiplexing",
{% endif %}
},
pusch_dedicated: {
......@@ -158,7 +178,7 @@
dl_256qam: true,
ul_64qam: true,
sr_period: 20,
sr_period: 20,
cqi_period: 40,
......@@ -225,24 +245,24 @@
#define T_REORDERING 65
drb_config: [
{
qci: 1,
qci: 1,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 7,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
......@@ -251,28 +271,28 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 2,
qci: 2,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -286,26 +306,26 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 9,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 3,
qci: 3,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -319,26 +339,26 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 8,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 4,
qci: 4,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -347,43 +367,43 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 10,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 65,
qci: 65,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 7,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
......@@ -392,28 +412,28 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 5,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 66,
qci: 66,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -427,28 +447,28 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 67,
qci: 67,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -462,27 +482,27 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 5,
qci: 5,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -491,33 +511,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 6,
qci: 6,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -526,33 +546,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 12,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 7,
qci: 7,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -566,26 +586,26 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 13,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 8,
qci: 8,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -594,33 +614,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 14,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 9,
qci: 9,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -632,33 +652,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 15,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 3,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 69,
qci: 69,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -667,33 +687,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 4,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 70,
qci: 70,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -702,20 +722,20 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 11,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
......
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @ bc349eae
......@@ -23,6 +23,16 @@
"type": "boolean"
},
{%- endif %}
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json
View file @ bc349eae
......@@ -21,6 +21,16 @@
"description": "Activate iperf3 UDP server",
"type": "boolean"
},
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
View file @ bc349eae
......@@ -3,6 +3,16 @@
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"properties": {
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json
View file @ bc349eae
......@@ -21,6 +21,16 @@
"description": "Activate iperf3 UDP server",
"type": "boolean"
},
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
View file @ bc349eae
......@@ -3,6 +3,16 @@
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"properties": {
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json
View file @ bc349eae
......@@ -21,6 +21,16 @@
"description": "Activate iperf3 UDP server",
"type": "boolean"
},
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
View file @ bc349eae
......@@ -3,6 +3,16 @@
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"properties": {
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json
View file @ bc349eae
......@@ -21,6 +21,16 @@
"description": "Activate iperf3 UDP server",
"type": "boolean"
},
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
View file @ bc349eae
......@@ -3,6 +3,16 @@
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"properties": {
"rrh": {
"title": "RRH",
"description": "RRH",
"type": "string",
"default": "SDR",
"enum": [
"SDR",
"Lopcomm ORAN"
]
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
......
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