Commit a3543668 authored by Robert Schmidt's avatar Robert Schmidt

Merge remote-tracking branch 'origin/Update_configuration_files' into integration_2022_wk35

parents a0855221 f3781c43
...@@ -2,177 +2,176 @@ Active_gNBs = ( "gNB-OAI"); ...@@ -2,177 +2,176 @@ Active_gNBs = ( "gNB-OAI");
# Asn1_verbosity, choice in: none, info, annoying # Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none"; Asn1_verbosity = "none";
gNBs = gNBs = (
( {
{ ////////// Identification parameters:
////////// Identification parameters: gNB_ID = 0xe00;
gNB_ID = 0xe00; gNB_name = "gNB-OAI";
gNB_name = "gNB-OAI";
// Tracking area code, 0x0000 and 0xfffe are reserved values
// Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1;
tracking_area_code = 1; plmn_list = (
plmn_list = ({ {
mcc = 208; mcc = 208;
mnc = 99; mnc = 99;
mnc_length = 2; mnc_length = 2;
snssaiList = ( snssaiList = ({
{ sst = 1;
sst = 1; sd = 0x1; // 0 false, else true
sd = 0x1; // 0 false, else true });
} }
); );
});
nr_cellid = 12345678L;
nr_cellid = 12345678L;
////////// Physical parameters:
////////// Physical parameters:
pdsch_AntennaPorts_XP = 2;
pdsch_AntennaPorts_XP = 1; pusch_AntennaPorts = 2;
pusch_AntennaPorts = 2; do_CSIRS = 1;
do_CSIRS = 0; do_SRS = 0;
ul_prbblacklist = "135,136,137,138" ul_prbblacklist = "135,136,137,138"
pdcch_ConfigSIB1 = ( pdcch_ConfigSIB1 = ({
{ controlResourceSetZero = 12;
controlResourceSetZero = 12; searchSpaceZero = 0;
searchSpaceZero = 10; });
}
); servingCellConfigCommon = (
{
servingCellConfigCommon = ( # spCellConfigCommon
{
#spCellConfigCommon physCellId = 0;
physCellId = 0; # downlinkConfigCommon
# frequencyInfoDL
# downlinkConfigCommon # this is 3900.60 MHz + (134 PRBs + 4 SCs)@30kHz SCS (GSCN: 8158)
#frequencyInfoDL absoluteFrequencySSB = 663264;
# this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741) dl_frequencyBand = 77;
absoluteFrequencySSB = 623232; # this is 3900.60 MHz
dl_frequencyBand = 78; dl_absoluteFrequencyPointA = 660040;
# this is 3300.24 MHz
dl_absoluteFrequencyPointA = 620016; # scs-SpecificCarrierList
#scs-SpecificCarrierList dl_offstToCarrier = 0;
dl_offstToCarrier = 0; # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# subcarrierSpacing dl_subcarrierSpacing = 1;
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 dl_carrierBandwidth = 273;
dl_subcarrierSpacing = 1;
dl_carrierBandwidth = 273; # initialDownlinkBWP
#initialDownlinkBWP # genericParameters
#genericParameters # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
# this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart)) initialDLBWPlocationAndBandwidth = 31624;
initialDLBWPlocationAndBandwidth = 31624; # subcarrierSpacing
# # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# subcarrierSpacing initialDLBWPsubcarrierSpacing = 1;
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialDLBWPsubcarrierSpacing = 1; # pdcch-ConfigCommon
#pdcch-ConfigCommon initialDLBWPcontrolResourceSetZero = 12;
initialDLBWPcontrolResourceSetZero = 12; initialDLBWPsearchSpaceZero = 0;
initialDLBWPsearchSpaceZero = 10;
# uplinkConfigCommon
#uplinkConfigCommon # frequencyInfoUL
#frequencyInfoUL ul_frequencyBand = 77;
ul_frequencyBand = 78; # scs-SpecificCarrierList
#scs-SpecificCarrierList ul_offstToCarrier = 0;
ul_offstToCarrier = 0; # subcarrierSpacing
# subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 ul_subcarrierSpacing = 1;
ul_subcarrierSpacing = 1; ul_carrierBandwidth = 273;
ul_carrierBandwidth = 273; pMax = 20;
pMax = 20;
#initialUplinkBWP # initialUplinkBWP
#genericParameters # genericParameters
initialULBWPlocationAndBandwidth = 31624; initialULBWPlocationAndBandwidth = 31624;
# subcarrierSpacing # subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialULBWPsubcarrierSpacing = 1; initialULBWPsubcarrierSpacing = 1;
#rach-ConfigCommon
#rach-ConfigGeneric # rach-ConfigCommon
prach_ConfigurationIndex = 98; # rach-ConfigGeneric
#prach_msg1_FDM prach_ConfigurationIndex = 98;
#0 = one, 1=two, 2=four, 3=eight # prach_msg1_FDM
prach_msg1_FDM = 0; # 0 = one, 1=two, 2=four, 3=eight
prach_msg1_FrequencyStart = 0; prach_msg1_FDM = 0;
zeroCorrelationZoneConfig = 12; prach_msg1_FrequencyStart = 0;
preambleReceivedTargetPower = -90; zeroCorrelationZoneConfig = 12;
#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200) preambleReceivedTargetPower = -90;
preambleTransMax = 6; # preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
#powerRampingStep preambleTransMax = 6;
# 0=dB0,1=dB2,2=dB4,3=dB6 # powerRampingStep
powerRampingStep = 1; # 0=dB0,1=dB2,2=dB4,3=dB6
#ra_ReponseWindow powerRampingStep = 1;
#1,2,4,8,10,20,40,80 # ra_ReponseWindow
ra_ResponseWindow = 4; # 1,2,4,8,10,20,40,80
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR ra_ResponseWindow = 4;
#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen # ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 3; # 1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
#oneHalf (0..15) 4,8,12,16,...60,64 ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 3;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15; # oneHalf (0..15) 4,8,12,16,...60,64
#ra_ContentionResolutionTimer ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15;
#(0..7) 8,16,24,32,40,48,56,64 # ra_ContentionResolutionTimer
ra_ContentionResolutionTimer = 7; # (0..7) 8,16,24,32,40,48,56,64
rsrp_ThresholdSSB = 19; ra_ContentionResolutionTimer = 7;
#prach-RootSequenceIndex_PR rsrp_ThresholdSSB = 19;
#1 = 839, 2 = 139 # prach-RootSequenceIndex_PR
prach_RootSequenceIndex_PR = 2; # 1 = 839, 2 = 139
prach_RootSequenceIndex = 1; prach_RootSequenceIndex_PR = 2;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex prach_RootSequenceIndex = 1;
# # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
msg1_SubcarrierSpacing = 1, msg1_SubcarrierSpacing = 1,
# restrictedSetConfig # restrictedSetConfig
# 0=unrestricted, 1=restricted type A, 2=restricted type B # 0=unrestricted, 1=restricted type A, 2=restricted type B
restrictedSetConfig = 0, restrictedSetConfig = 0,
msg3_DeltaPreamble = 1;
msg3_DeltaPreamble = 1; p0_NominalWithGrant =-90;
p0_NominalWithGrant =-90;
# pucch-ConfigCommon
# pucch-ConfigCommon setup : # pucchGroupHopping
# pucchGroupHopping # 0 = neither, 1= group hopping, 2=sequence hopping
# 0 = neither, 1= group hopping, 2=sequence hopping pucchGroupHopping = 0;
pucchGroupHopping = 0; hoppingId = 40;
hoppingId = 40; p0_nominal = -70;
p0_nominal = -70;
# ssb_PositionsInBurs_BitmapPR # dmrs_TypeA_position
# 1=short, 2=medium, 3=long # 0 = pos2, 1 = pos3
ssb_PositionsInBurst_PR = 2; dmrs_TypeA_Position = 0;
ssb_PositionsInBurst_Bitmap = 1;
# subcarrierSpacing
# ssb_periodicityServingCell # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 subcarrierSpacing = 1;
ssb_periodicityServingCell = 2;
# dmrs_TypeA_position # ssb_PositionsInBurs_BitmapPR
# 0 = pos2, 1 = pos3 # 1=short, 2=medium, 3=long
dmrs_TypeA_Position = 0; ssb_PositionsInBurst_PR = 2;
ssb_PositionsInBurst_Bitmap = 1;
# subcarrierSpacing # ssb_periodicityServingCell
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
subcarrierSpacing = 1; ssb_periodicityServingCell = 2;
#tdd-UL-DL-ConfigurationCommon
#tdd-UL-DL-ConfigurationCommon # subcarrierSpacing
# subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 referenceSubcarrierSpacing = 1;
referenceSubcarrierSpacing = 1;
# pattern1 # pattern1
# dl_UL_TransmissionPeriodicity # dl_UL_TransmissionPeriodicity
# 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10 # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
dl_UL_TransmissionPeriodicity = 6; dl_UL_TransmissionPeriodicity = 6;
nrofDownlinkSlots = 7; nrofDownlinkSlots = 7;
nrofDownlinkSymbols = 6; nrofDownlinkSymbols = 6;
nrofUplinkSlots = 2; nrofUplinkSlots = 2;
nrofUplinkSymbols = 4; nrofUplinkSymbols = 4;
ssPBCH_BlockPower = -25; ssPBCH_BlockPower = -25;
} }
); );
# Dedicated Serving Cell Configuration # Dedicated Serving Cell Configuration
servingCellConfigDedicated = ({ servingCellConfigDedicated = (
# BWP-Downlink {
# BWP 1 Configuration # BWP-Downlink
# BWP 1 Configuration
dl_bwp-Id_1 = 1; dl_bwp-Id_1 = 1;
dl_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=273 (100 MHz BW) dl_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=273 (100 MHz BW)
# subcarrierSpacing # subcarrierSpacing
...@@ -187,9 +186,9 @@ servingCellConfigDedicated = ({ ...@@ -187,9 +186,9 @@ servingCellConfigDedicated = ({
# ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8, # ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
# spare7, spare6, spare5, spare4, spare3, spare2, spare1 } # spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
# UplinkConfig # UplinkConfig
# BWP-Uplink # BWP-Uplink
# BWP 1 Configuration # BWP 1 Configuration
ul_bwp-Id_1 = 1; ul_bwp-Id_1 = 1;
ul_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=273 (100 MHz BW) ul_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=273 (100 MHz BW)
# subcarrierSpacing # subcarrierSpacing
...@@ -198,38 +197,39 @@ servingCellConfigDedicated = ({ ...@@ -198,38 +197,39 @@ servingCellConfigDedicated = ({
firstActiveUplinkBWP-Id = 1; #BWP-Id firstActiveUplinkBWP-Id = 1; #BWP-Id
} }
); );
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// AMF parameters: # ------- SCTP definitions
amf_ip_address = ( { ipv4 = "192.168.70.132"; SCTP :
ipv6 = "192:168:30::17"; {
active = "yes"; # Number of streams to use in input/output
preference = "ipv4"; SCTP_INSTREAMS = 2;
} SCTP_OUTSTREAMS = 2;
); };
NETWORK_INTERFACES : ////////// AMF parameters:
{ amf_ip_address = (
GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; {
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; ipv4 = "192.168.70.132";
GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; ipv6 = "192:168:30::17";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; active = "yes";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 preference = "ipv4";
}; }
);
NETWORK_INTERFACES :
{
GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152
} }
}
); );
MACRLCs = ( MACRLCs = (
...@@ -237,10 +237,11 @@ MACRLCs = ( ...@@ -237,10 +237,11 @@ MACRLCs = (
num_cc = 1; num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 300;
pucch_TargetSNRx10 = 200; pucch_TargetSNRx10 = 200;
pusch_FailureThres = 1000; pusch_FailureThres = 1000;
ulsch_max_frame_inactivity = 0; ulsch_max_frame_inactivity = 0;
ul_max_mcs = 28;
} }
); );
...@@ -260,7 +261,7 @@ RUs = ( ...@@ -260,7 +261,7 @@ RUs = (
nb_rx = 2; nb_rx = 2;
att_tx = 0; att_tx = 0;
att_rx = 0; att_rx = 0;
bands = [78]; bands = [77];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 75; max_rxgain = 75;
eNB_instances = [0]; eNB_instances = [0];
......
...@@ -28,7 +28,6 @@ gNBs = ...@@ -28,7 +28,6 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
min_rxtxtime = 2;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 1; do_SRS = 1;
...@@ -283,8 +282,8 @@ RUs = ( ...@@ -283,8 +282,8 @@ RUs = (
local_rf = "yes" local_rf = "yes"
nb_tx = 1 nb_tx = 1
nb_rx = 1 nb_rx = 1
att_tx = 6; att_tx = 12;
att_rx = 6; att_rx = 12;
bands = [78]; bands = [78];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 114; max_rxgain = 114;
......
...@@ -27,15 +27,14 @@ gNBs = ...@@ -27,15 +27,14 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
pdsch_AntennaPorts_XP = 1; pdsch_AntennaPorts_XP = 2;
pusch_AntennaPorts = 2; pusch_AntennaPorts = 2;
do_CSIRS = 0; do_CSIRS = 1;
ul_prbblacklist = "79,80,81,82"
pdcch_ConfigSIB1 = ( pdcch_ConfigSIB1 = (
{ {
controlResourceSetZero = 12; controlResourceSetZero = 12;
searchSpaceZero = 10; searchSpaceZero = 0;
} }
); );
...@@ -67,7 +66,7 @@ gNBs = ...@@ -67,7 +66,7 @@ gNBs =
initialDLBWPsubcarrierSpacing = 1; initialDLBWPsubcarrierSpacing = 1;
#pdcch-ConfigCommon #pdcch-ConfigCommon
initialDLBWPcontrolResourceSetZero = 12; initialDLBWPcontrolResourceSetZero = 12;
initialDLBWPsearchSpaceZero = 10; initialDLBWPsearchSpaceZero = 0;
#uplinkConfigCommon #uplinkConfigCommon
#frequencyInfoUL #frequencyInfoUL
...@@ -203,9 +202,11 @@ MACRLCs = ( ...@@ -203,9 +202,11 @@ MACRLCs = (
num_cc = 1; num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 300;
pucch_TargetSNRx10 = 200; pucch_TargetSNRx10 = 200;
pusch_FailureThres = 1000;
ulsch_max_frame_inactivity = 0; ulsch_max_frame_inactivity = 0;
ul_max_mcs = 28;
} }
); );
......
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