From cfc7a70f9a205726414e83e822e2eeb42c5df6f0 Mon Sep 17 00:00:00 2001 From: francescomani Date: Mon, 26 Jun 2023 09:30:53 +0200 Subject: [PATCH 01/12] bugfix in ue msg3 scheduler --- openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c index b60e0199a2..52b5bd75dd 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c @@ -1459,7 +1459,7 @@ int nr_ue_pusch_scheduler(NR_UE_MAC_INST_t *mac, uint8_t is_Msg3, frame_t curren DURATION_RX_TO_TX); *slot_tx = (current_slot + k2 + delta) % nr_slots_per_frame[mu]; - if (current_slot + k2 + delta > nr_slots_per_frame[mu]){ + if (current_slot + k2 + delta >= nr_slots_per_frame[mu]){ *frame_tx = (current_frame + 1) % 1024; } else { *frame_tx = current_frame; From 0449ab7908c741ff5ab9517877651617492b347f Mon Sep 17 00:00:00 2001 From: francescomani Date: Fri, 9 Jun 2023 10:25:07 +0200 Subject: [PATCH 02/12] further cleanup of config files for CI --- ...gnb.band261.32PRB.rfsim.phytest-dora.conf} | 0 ...gnb.band66.106prb.rfsim.phytest-dora.conf} | 0 ...gnb.band78.106PRB.rfsim.phytest-dora.conf} | 0 ...b.band78.106PRB.usrpn300.phytest-dora.conf | 260 ++++++++++++++++++ ....band78.162PRB.usrpn300.phytest-dora.conf} | 0 ...b.band78.sa.106PRB.2x2.usrpn310.asue.conf} | 0 ...=> gnb.band78.sa.106PRB.2x2.usrpn310.conf} | 0 ....band78.sa.106PRB.ddsuu.2x2.usrpn310.conf} | 0 ...=> gnb.band78.sa.162PRB.2x2.usrpn310.conf} | 0 ...10.conf => gnb.sa.band78.24PRB.rfsim.conf} | 0 .../gnb.band78.tm1.fr1.106PRB.usrpn310.conf | 0 .../xml_files/fr1_sa_amarisoft_ue_1x.xml | 2 +- ci-scripts/xml_files/fr1_sa_oaiue_n310.xml | 2 +- ci-scripts/xml_files/fr1_sa_quectel.xml | 2 +- .../xml_files/fr1_sa_quectel_162prb.xml | 2 +- .../xml_files/fr1_sa_quectel_stages.xml | 2 +- ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml | 2 +- .../gnb_nr_ue_usrp_run_multi_thread.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run.xml | 2 +- .../xml_files/gnb_phytest_usrp_run_60.xml | 2 +- .../xml_files/gnb_phytest_usrp_run_60_2x2.xml | 2 +- .../5g_rfsimulator_24prb/docker-compose.yaml | 2 +- .../docker-compose.yaml | 2 +- .../docker-compose.yaml | 2 +- .../docker-compose.yaml | 2 +- 25 files changed, 274 insertions(+), 14 deletions(-) rename ci-scripts/conf_files/{gnb.band261.tm1.32PRB.usrpn300.conf => gnb.band261.32PRB.rfsim.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band66.tm1.106PRB.usrpn300.conf => gnb.band66.106prb.rfsim.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.tm1.106PRB.usrpn300.conf => gnb.band78.106PRB.rfsim.phytest-dora.conf} (100%) create mode 100644 ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf rename ci-scripts/conf_files/{gnb.band78.tm1.162PRB.usrpn300.conf => gnb.band78.162PRB.usrpn300.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf => gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf => gnb.band78.sa.106PRB.2x2.usrpn310.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf => gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf => gnb.band78.sa.162PRB.2x2.usrpn310.conf} (100%) rename ci-scripts/conf_files/{gnb.sa.band78.fr1.24PRB.usrpb210.conf => gnb.sa.band78.24PRB.rfsim.conf} (100%) rename ci-scripts/conf_files/{ => untested}/gnb.band78.tm1.fr1.106PRB.usrpn310.conf (100%) diff --git a/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf rename to ci-scripts/conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf rename to ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf rename to ci-scripts/conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf new file mode 100644 index 0000000000..453b03910b --- /dev/null +++ b/ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf @@ -0,0 +1,260 @@ +Active_gNBs = ( "gNB-Eurecom-5GNRBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + + cell_type = "CELL_MACRO_GNB"; + + gNB_name = "gNB-Eurecom-5GNRBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + + plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;}); + + tr_s_preference = "local_mac" + + ////////// Physical parameters: + + min_rxtxtime = 6; + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 641032; + dl_frequencyBand = 78; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 640000; + #scs-SpecificCarrierList + dl_offstToCarrier = 0; +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + dl_subcarrierSpacing = 1; + dl_carrierBandwidth = 106; + #initialDownlinkBWP + #genericParameters + # this is RBstart=41,L=24 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 6368; +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + initialDLBWPsubcarrierSpacing = 1; + #pdcch-ConfigCommon + initialDLBWPcontrolResourceSetZero = 12; + initialDLBWPsearchSpaceZero = 0; + + #uplinkConfigCommon + #frequencyInfoUL + ul_frequencyBand = 78; + #scs-SpecificCarrierList + ul_offstToCarrier = 0; +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + ul_subcarrierSpacing = 1; + ul_carrierBandwidth = 106; + pMax = 20; + #initialUplinkBWP + #genericParameters + initialULBWPlocationAndBandwidth = 6368; +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + initialULBWPsubcarrierSpacing = 1; + #rach-ConfigCommon + #rach-ConfigGeneric + prach_ConfigurationIndex = 98; +#prach_msg1_FDM +#0 = one, 1=two, 2=four, 3=eight + prach_msg1_FDM = 0; + prach_msg1_FrequencyStart = 0; + zeroCorrelationZoneConfig = 13; + preambleReceivedTargetPower = -118; +#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200) + preambleTransMax = 6; +#powerRampingStep +# 0=dB0,1=dB2,2=dB4,3=dB6 + powerRampingStep = 1; +#ra_ReponseWindow +#1,2,4,8,10,20,40,80 + ra_ResponseWindow = 4; +#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR +#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen + ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4; +#oneHalf (0..15) 4,8,12,16,...60,64 + ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15; +#ra_ContentionResolutionTimer +#(0..7) 8,16,24,32,40,48,56,64 + ra_ContentionResolutionTimer = 7; + rsrp_ThresholdSSB = 19; +#prach-RootSequenceIndex_PR +#1 = 839, 2 = 139 + prach_RootSequenceIndex_PR = 2; + 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, +# restrictedSetConfig +# 0=unrestricted, 1=restricted type A, 2=restricted type B + restrictedSetConfig = 0, + + msg3_DeltaPreamble = 1; + p0_NominalWithGrant =-90; + +# pucch-ConfigCommon setup : +# pucchGroupHopping +# 0 = neither, 1= group hopping, 2=sequence hopping + pucchGroupHopping = 0; + hoppingId = 40; + p0_nominal = -90; +# ssb_PositionsInBurs_BitmapPR +# 1=short, 2=medium, 3=long + ssb_PositionsInBurst_PR = 2; + ssb_PositionsInBurst_Bitmap = 1; + +# ssb_periodicityServingCell +# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 + ssb_periodicityServingCell = 2; + +# dmrs_TypeA_position +# 0 = pos2, 1 = pos3 + dmrs_TypeA_Position = 0; + +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + subcarrierSpacing = 1; + + + #tdd-UL-DL-ConfigurationCommon +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + referenceSubcarrierSpacing = 1; + # pattern1 + # dl_UL_TransmissionPeriodicity + # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10 + dl_UL_TransmissionPeriodicity = 6; + nrofDownlinkSlots = 7; + nrofDownlinkSymbols = 6; + nrofUplinkSlots = 2; + nrofUplinkSymbols = 4; + + ssPBCH_BlockPower = -25; + } + + ); + + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "192.168.12.26"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + NETWORK_INTERFACES : + { + + GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; + GNB_INTERFACE_NAME_FOR_S1U = "eth0"; + GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + }; + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + } +); + +L1s = ( +{ + num_cc = 1; + tr_n_preference = "local_mac"; +} +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 0 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 50; + eNB_instances = [0]; + ## beamforming 1x2 matrix: 1 layer x 2 antennas + bf_weights = [0x00007fff, 0x0000]; + ## beamforming 1x4 matrix: 1 layer x 4 antennas + #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000]; + ## beamforming 2x2 matrix: + #bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff]; + ## beamforming 4x4 matrix: + #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff]; + + sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2"; + } +); + +THREAD_STRUCT = ( + { + #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT" + parallel_config = "PARALLEL_RU_L1_TRX_SPLIT"; + #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE" + worker_config = "WORKER_ENABLE"; + } +); + +security = { + # preferred ciphering algorithms + # the first one of the list that an UE supports in chosen + # valid values: nea0, nea1, nea2, nea3 + ciphering_algorithms = ( "nea0" ); + + # preferred integrity algorithms + # the first one of the list that an UE supports in chosen + # valid values: nia0, nia1, nia2, nia3 + integrity_algorithms = ( "nia2", "nia0" ); + + # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter + # what 'ciphering_algorithms' configures; same thing for 'drb_integrity' + drb_ciphering = "yes"; + drb_integrity = "no"; +}; + + log_config : + { + global_log_level ="info"; + hw_log_level ="info"; + phy_log_level ="info"; + mac_log_level ="info"; + rlc_log_level ="info"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + }; + diff --git a/ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf rename to ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf b/ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf rename to ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf rename to ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf rename to ci-scripts/conf_files/gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.162PRB.2x2.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf rename to ci-scripts/conf_files/gnb.band78.sa.162PRB.2x2.usrpn310.conf diff --git a/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf b/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf similarity index 100% rename from ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf rename to ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf diff --git a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf rename to ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf diff --git a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml index c34fa34cf1..c00e47223a 100644 --- a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml +++ b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml @@ -87,7 +87,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml index 7105828be4..ec99cedf94 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml @@ -68,7 +68,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --gNBs.[0].min_rxtxtime 5 --sa --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --gNBs.[0].min_rxtxtime 5 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf --gNBs.[0].min_rxtxtime 5 --sa --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --gNBs.[0].min_rxtxtime 5 --log_config.global_log_options level,nocolor,time 0 0 nr diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml index b13de6f3ef..c23ae0b540 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel.xml @@ -86,7 +86,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml index d1c250862d..0544c82de2 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml @@ -70,7 +70,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.sa.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml index 94cf5d71ef..0b840b7782 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml @@ -91,7 +91,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml index dd2b15a4f2..53636de6a1 100644 --- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml @@ -33,7 +33,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test --log_config.global_log_options level,nocolor,time NR diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml index 7c9d689e44..af48f00d5a 100644 --- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml +++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml @@ -33,7 +33,7 @@ Initialize_eNB Initialize gNB USRP (Tx-Write-Threading enabled) - -O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time NR diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml index 382efbdd9e..c98796890f 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time datalog_rt_stats.default.yaml NR 192.168.20.2 diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml index 24b0854224..3d91d55dfa 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time datalog_rt_stats.1x1.60.yaml NR 192.168.20.2 diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml index 29d284886c..6231f45169 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time datalog_rt_stats.60.2x2.yaml NR 192.168.20.2 diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index f076cf2db0..600f34cbc2 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -175,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band78.24PRB.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml index b654f06d12..d93a4b1051 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band66.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml index eef67d713b..63293cf628 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml index ed2af44fbb..b3afb48e8d 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" From 8048ea485b4c406526cba965d6b3071efdefa7aa Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Fri, 9 Jun 2023 11:10:29 +0200 Subject: [PATCH 03/12] Remove old unused config file of gNB and XML for Amarisoft ue test --- ...nb.band78.sa.106PRB.2x2.usrpn310.asue.conf | 282 ------------------ .../xml_files/fr1_sa_amarisoft_ue_1x.xml | 124 -------- 2 files changed, 406 deletions(-) delete mode 100644 ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf delete mode 100644 ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml diff --git a/ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf b/ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf deleted file mode 100644 index a723e3a4b7..0000000000 --- a/ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf +++ /dev/null @@ -1,282 +0,0 @@ -Active_gNBs = ( "gNB-OAI"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -gNBs = -( - { - ////////// Identification parameters: - gNB_ID = 0xe00; - -# cell_type = "CELL_MACRO_GNB"; - - gNB_name = "gNB-OAI"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - - plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) }); - - nr_cellid = 12345678L - -# tr_s_preference = "local_mac" - - ////////// Physical parameters: - - pusch_AntennaPorts = 2; - pdsch_AntennaPorts_XP = 2; - ul_prbblacklist = "51,52,53,54" - do_SRS = 0; - do_CSIRS = 1; - - servingCellConfigCommon = ( - { - #spCellConfigCommon - - physCellId = 0; - -# downlinkConfigCommon - #frequencyInfoDL - # this is 3301.68 MHz + 22*12*30e-3 MHz = 3309.6 - #absoluteFrequencySSB = 620640; - # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68 - absoluteFrequencySSB = 621312; - # this is 3503.28 MHz + 22*12*30e-3 MHz = 3511.2 - #absoluteFrequencySSB = 634080; - # this is 3600.48 MHz - #absoluteFrequencySSB = 640032; - #dl_frequencyBand = 78; - # this is 3301.68 MHz - #dl_absoluteFrequencyPointA = 620112; - # this is 3300.60 MHz - dl_absoluteFrequencyPointA = 620040; - # this is 3502.56 MHz - #dl_absoluteFrequencyPointA = 633552; - # this is 3600.48 MHz - #dl_absoluteFrequencyPointA = 640032; - #scs-SpecificCarrierList - dl_offstToCarrier = 0; -# subcarrierSpacing -# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 - dl_subcarrierSpacing = 1; - dl_carrierBandwidth = 106; - #initialDownlinkBWP - #genericParameters - # this is RBstart=0,L=106 (275*(L-1))+RBstart - initialDLBWPlocationAndBandwidth = 28875; -# subcarrierSpacing -# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 - initialDLBWPsubcarrierSpacing = 1; - #pdcch-ConfigCommon - initialDLBWPcontrolResourceSetZero = 11; - initialDLBWPsearchSpaceZero = 0; - - #uplinkConfigCommon - #frequencyInfoUL - ul_frequencyBand = 78; - #scs-SpecificCarrierList - ul_offstToCarrier = 0; -# subcarrierSpacing -# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 - ul_subcarrierSpacing = 1; - ul_carrierBandwidth = 106; - pMax = 20; - #initialUplinkBWP - #genericParameters - initialULBWPlocationAndBandwidth = 28875; -# subcarrierSpacing -# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 - initialULBWPsubcarrierSpacing = 1; - #rach-ConfigCommon - #rach-ConfigGeneric - prach_ConfigurationIndex = 98; -#prach_msg1_FDM -#0 = one, 1=two, 2=four, 3=eight - prach_msg1_FDM = 0; - prach_msg1_FrequencyStart = 0; - zeroCorrelationZoneConfig = 12; - preambleReceivedTargetPower = -104; -#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200) - preambleTransMax = 6; -#powerRampingStep -# 0=dB0,1=dB2,2=dB4,3=dB6 - powerRampingStep = 1; -#ra_ReponseWindow -#1,2,4,8,10,20,40,80 - ra_ResponseWindow = 4; -#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR -#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen - ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 3; -#oneHalf (0..15) 4,8,12,16,...60,64 - ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15; -#ra_ContentionResolutionTimer -#(0..7) 8,16,24,32,40,48,56,64 - ra_ContentionResolutionTimer = 7; - rsrp_ThresholdSSB = 19; -#prach-RootSequenceIndex_PR -#1 = 839, 2 = 139 - prach_RootSequenceIndex_PR = 2; - 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, -# restrictedSetConfig -# 0=unrestricted, 1=restricted type A, 2=restricted type B - restrictedSetConfig = 0, - - msg3_DeltaPreamble = 1; - p0_NominalWithGrant =-90; - -# pucch-ConfigCommon setup : -# pucchGroupHopping -# 0 = neither, 1= group hopping, 2=sequence hopping - pucchGroupHopping = 0; - hoppingId = 40; - p0_nominal = -90; -# ssb_PositionsInBurs_BitmapPR -# 1=short, 2=medium, 3=long - ssb_PositionsInBurst_PR = 2; - ssb_PositionsInBurst_Bitmap = 1; - -# ssb_periodicityServingCell -# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 - ssb_periodicityServingCell = 2; - -# dmrs_TypeA_position -# 0 = pos2, 1 = pos3 - dmrs_TypeA_Position = 0; - -# subcarrierSpacing -# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 - subcarrierSpacing = 1; - - - #tdd-UL-DL-ConfigurationCommon -# subcarrierSpacing -# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 - referenceSubcarrierSpacing = 1; - # pattern1 - # dl_UL_TransmissionPeriodicity - # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10 - dl_UL_TransmissionPeriodicity = 6; - nrofDownlinkSlots = 7; - nrofDownlinkSymbols = 6; - nrofUplinkSlots = 2; - nrofUplinkSymbols = 4; - - ssPBCH_BlockPower = -25; - } - - ); - - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); - - NETWORK_INTERFACES : - { - - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; - GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; - GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; - GNB_PORT_FOR_S1U = 2152; # Spec 2152 - }; - - } -); - -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "local_RRC"; - pusch_TargetSNRx10 = 220; - pucch_TargetSNRx10 = 220; - ulsch_max_frame_inactivity = 10; - } -); - -L1s = ( -{ - num_cc = 1; - tr_n_preference = "local_mac"; - prach_dtx_threshold = 200; -# pucch0_dtx_threshold = 150; -} -); - -RUs = ( - { - local_rf = "yes" - nb_tx = 2 - nb_rx = 2 - att_tx = 0 - att_rx = 0; - bands = [78]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 75; - eNB_instances = [0]; - ##beamforming 1x2 matrix: 1 layer x 2 antennas - bf_weights = [0x00007fff, 0x0000]; - ##beamforming 1x4 matrix: 1 layer x 4 antennas - #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000]; - ## beamforming 2x2 matrix: - # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff]; - ## beamforming 4x4 matrix: - #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff]; - sf_extension = 0 - sdr_addrs = "mgmt_addr=172.21.19.14,addr=192.168.10.2,second_addr=192.168.20.2,clock_source=internal,time_source=internal" - } -); - -THREAD_STRUCT = ( - { - #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT" - parallel_config = "PARALLEL_SINGLE_THREAD"; - #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE" - worker_config = "WORKER_ENABLE"; - } -); - -security = { - # preferred ciphering algorithms - # the first one of the list that an UE supports in chosen - # valid values: nea0, nea1, nea2, nea3 - ciphering_algorithms = ( "nea2" ); - - # preferred integrity algorithms - # the first one of the list that an UE supports in chosen - # valid values: nia0, nia1, nia2, nia3 - integrity_algorithms = ( "nia1", "nia2" ); - - # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter - # what 'ciphering_algorithms' configures; same thing for 'drb_integrity' - drb_ciphering = "yes"; - drb_integrity = "yes"; -}; - - log_config : - { - global_log_level ="info"; - hw_log_level ="info"; - phy_log_level ="info"; - mac_log_level ="info"; - rlc_log_level ="info"; - pdcp_log_level ="info"; - rrc_log_level ="info"; - f1ap_log_level ="info"; - }; diff --git a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml deleted file mode 100644 index c00e47223a..0000000000 --- a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - TEST-SA-FR1-Tab1 - SA Ping DL UL with 1 AS UE - tasks - 1 - - 100000 - 010000 - 040000 - 010001 - 010002 - 050000 - 010100 - 010200 - 011111 - 080000 - 200000 - - - - - Custom_Command - Disable Sleep States - asterix - sudo cpupower idle-set -D 0 - - - Custom_Command - Enable Sleep States - asterix - sudo cpupower idle-set -E - - - - Initialize_UE - Initialize AS-UE Scenario - amarisoft_ue - - - Attach_UE - Attach UE - amarisoft_ue_1 - - - Attach_UE - Attach UE - amarisoft_ue_2 - - - Detach_UE - Detach UE - amarisoft_ue_1 - - - Detach_UE - Detach UE - amarisoft_ue_2 - - - Terminate_UE - Terminate UE - amarisoft_ue - - - - Initialize_eNB - Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time - 0 - 0 - nr - yes - yes - datalog_rt_stats.2x2.yaml - 172.21.19.14 - numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0 - - - - Ping - Ping Log Analysis - amarisoft_ue_1 amarisoft_ue_2 - 1 - - - - IdleSleep - Sleep - 5 - - - - - Terminate_eNB - Terminate gNB - 0 - 0 - nr - - - - From 0409dcf5ee84c4bd3679c842153a1b747c603311 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Fri, 9 Jun 2023 12:18:56 +0200 Subject: [PATCH 04/12] Rename sa-2x2-usrpn310 config and correct in XMLs using the same --- ....2x2.usrpn310.conf => gnb.sa.band78.106prb.usrp310.2x2.conf} | 0 ci-scripts/xml_files/fr1_sa_oaiue_n310.xml | 2 +- ci-scripts/xml_files/fr1_sa_quectel_stages.xml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename ci-scripts/conf_files/{gnb.band78.sa.106PRB.2x2.usrpn310.conf => gnb.sa.band78.106prb.usrp310.2x2.conf} (100%) diff --git a/ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf rename to ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml index ec99cedf94..73cb246391 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml @@ -68,7 +68,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf --gNBs.[0].min_rxtxtime 5 --sa --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --gNBs.[0].min_rxtxtime 5 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf --gNBs.[0].min_rxtxtime 5 --sa --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --gNBs.[0].min_rxtxtime 5 --log_config.global_log_options level,nocolor,time 0 0 nr diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml index 0b840b7782..8900462ad1 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml @@ -91,7 +91,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr From 23c1d4e63cdb34484eac0409762a4ada88131db1 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Fri, 9 Jun 2023 12:26:41 +0200 Subject: [PATCH 05/12] Rename sa-2x2-ddsuu config file and correct in XML file using the same --- ...rpn310.conf => gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf} | 0 ci-scripts/xml_files/fr1_sa_quectel.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ci-scripts/conf_files/{gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf => gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf} (100%) diff --git a/ci-scripts/conf_files/gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf rename to ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml index c23ae0b540..33a817f2e8 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel.xml @@ -86,7 +86,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.106PRB.ddsuu.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr From 8f4ccdcf3c857e940cbc3420890e3ec2dca1f324 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Fri, 9 Jun 2023 12:30:30 +0200 Subject: [PATCH 06/12] Rename sa-162prb config file and correct in XML using it --- ...2x2.usrpn310.conf => gnb.sa.band78.162prb.usrpn310.2x2.conf} | 0 ci-scripts/xml_files/fr1_sa_quectel_162prb.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ci-scripts/conf_files/{gnb.band78.sa.162PRB.2x2.usrpn310.conf => gnb.sa.band78.162prb.usrpn310.2x2.conf} (100%) diff --git a/ci-scripts/conf_files/gnb.band78.sa.162PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.162PRB.2x2.usrpn310.conf rename to ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml index 0544c82de2..0a60cb5d7a 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml @@ -70,7 +70,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr From 7e6124bb54bc580d4dde096d94321eb02dfd8026 Mon Sep 17 00:00:00 2001 From: francescomani Date: Fri, 9 Jun 2023 18:01:13 +0200 Subject: [PATCH 07/12] Cleanup in rfsim config files --- .../gnb.nsa.band78.106prb.usrpb200.conf | 2 +- .../gnb.sa.band78.106prb.rfsim.2x2.conf | 4 ++-- .../conf_files/gnb.sa.band78.106prb.rfsim.conf | 18 ------------------ .../gnb.sa.band78.106prb.usrp310.2x2.conf | 14 -------------- ...nb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf | 1 - .../gnb.sa.band78.162prb.usrpn310.2x2.conf | 3 --- .../conf_files/gnb.sa.band78.24PRB.rfsim.conf | 2 +- .../gnb.sa.band78.51prb.usrpb200.conf | 2 -- 8 files changed, 4 insertions(+), 42 deletions(-) diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf index 53b81d0ae1..46b0c4f8d4 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -29,7 +29,7 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL # this is 3600 MHz + 84 PRBs@30kHz SCS (same as initial BWP) - absoluteFrequencySSB = 641272; //641032; #641968; 641968=start of ssb at 3600MHz + 82 RBs 641032=center of SSB at center of cell + absoluteFrequencySSB = 641272; dl_frequencyBand = 78; # this is 3600 MHz dl_absoluteFrequencyPointA = 640000; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf index cc70829aae..60b1e92f9e 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf @@ -32,10 +32,10 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68 - absoluteFrequencySSB = 621312; # 641280 + absoluteFrequencySSB = 621312; dl_frequencyBand = 78; # this is 3300.60 MHz - dl_absoluteFrequencyPointA = 620040; # 640008 + dl_absoluteFrequencyPointA = 620040; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf index 9728977d21..61ec78328c 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf @@ -23,11 +23,7 @@ gNBs = ////////// Physical parameters: - #pusch_TargetSNRx10 = 200; - #pucch_TargetSNRx10 = 200; - ul_prbblacklist = "51,52,53,54" min_rxtxtime = 6; - do_SRS = 1; servingCellConfigCommon = ( { @@ -37,23 +33,10 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL - # this is 3301.68 MHz + 22*12*30e-3 MHz = 3309.6 - #absoluteFrequencySSB = 620640; # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68 absoluteFrequencySSB = 621312; - # this is 3503.28 MHz + 22*12*30e-3 MHz = 3511.2 - #absoluteFrequencySSB = 634080; - # this is 3600.48 MHz - #absoluteFrequencySSB = 640032; - #dl_frequencyBand = 78; - # this is 3301.68 MHz - #dl_absoluteFrequencyPointA = 620112; # this is 3300.60 MHz dl_absoluteFrequencyPointA = 620040; - # this is 3502.56 MHz - #dl_absoluteFrequencyPointA = 633552; - # this is 3600.48 MHz - #dl_absoluteFrequencyPointA = 640032; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -208,7 +191,6 @@ MACRLCs = ( tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; pucch_TargetSNRx10 = 200; - ulsch_max_frame_inactivity = 1; } ); diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf index f5c0e23670..480bb45637 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf @@ -25,7 +25,6 @@ gNBs = pdsch_AntennaPorts_XP = 2; pusch_AntennaPorts = 2; - do_SRS = 0; servingCellConfigCommon = ( { @@ -35,23 +34,10 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL - # this is 3301.68 MHz + 22*12*30e-3 MHz = 3309.6 - #absoluteFrequencySSB = 620640; # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68 absoluteFrequencySSB = 621312; - # this is 3503.28 MHz + 22*12*30e-3 MHz = 3511.2 - #absoluteFrequencySSB = 634080; - # this is 3600.48 MHz - #absoluteFrequencySSB = 640032; - #dl_frequencyBand = 78; - # this is 3301.68 MHz - #dl_absoluteFrequencyPointA = 620112; # this is 3300.60 MHz dl_absoluteFrequencyPointA = 620040; - # this is 3502.56 MHz - #dl_absoluteFrequencyPointA = 633552; - # this is 3600.48 MHz - #dl_absoluteFrequencyPointA = 640032; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf index e8fc796b61..c77399bbed 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf @@ -25,7 +25,6 @@ gNBs = pusch_AntennaPorts = 2; ul_prbblacklist = "51,52,53,54" - do_SRS = 0; servingCellConfigCommon = ( { diff --git a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf index ec443b174a..a24f45f024 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf @@ -25,10 +25,7 @@ gNBs = pdsch_AntennaPorts_XP = 2; pusch_AntennaPorts = 2; - #pusch_TargetSNRx10 = 200; - #pucch_TargetSNRx10 = 200; ul_prbblacklist = "79,80,81,82" - do_SRS = 0; servingCellConfigCommon = ( { diff --git a/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf index 9a6efada5b..d188c1c8a3 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf @@ -17,7 +17,7 @@ gNBs = ////////// Physical parameters: - sib1_tda = 15; + sib1_tda = 15; min_rxtxtime = 6; servingCellConfigCommon = ( diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf index 16cc70ca4b..f94ba38eb5 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf @@ -17,8 +17,6 @@ gNBs = ////////// Physical parameters: - do_CSIRS = 0; - do_SRS = 0; servingCellConfigCommon = ( { From c357f96120b511a5120414eba7e03494b90426ad Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 12 Jun 2023 08:48:49 +0200 Subject: [PATCH 08/12] Rename config file for 5g-l2sim --- ...band78.106prb.l2sim.conf => gnb.sa.band78.106prb.l2sim.conf} | 0 ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ci-scripts/conf_files/{gnb.band78.106prb.l2sim.conf => gnb.sa.band78.106prb.l2sim.conf} (100%) diff --git a/ci-scripts/conf_files/gnb.band78.106prb.l2sim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.106prb.l2sim.conf rename to ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml index db77cdae53..86c678c811 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -174,7 +174,7 @@ services: - oai-spgwu - oai-amf volumes: - - ../../conf_files/gnb.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s From 6c241ec759c4db2a6ea7d606df48373cccb28bd8 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 12 Jun 2023 08:54:43 +0200 Subject: [PATCH 09/12] Rename config file nsa-2x2 --- ...RB.usrpn310.conf => gnb.nsa.band78.106PRB.usrpn310.2x2.conf} | 0 ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml | 2 +- ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename ci-scripts/conf_files/{gnb.band78.nsa_2x2.106PRB.usrpn310.conf => gnb.nsa.band78.106PRB.usrpn310.2x2.conf} (100%) diff --git a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf rename to ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 185d637218..5b84f7e43f 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -113,7 +113,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time,line_num,function + -O ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time,line_num,function 1 1 nr diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml index d1515898ff..8e96dea441 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml @@ -118,7 +118,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time,line_num,function + -O ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time,line_num,function 1 1 nr From 12a3045bec575bd8f8b113e9f18dadecbc4ee07b Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 14 Jun 2023 16:21:27 +0200 Subject: [PATCH 10/12] Config files: make them lowercase Changes for: - phytest-dora config file - rfsim-phytest-dora-106prb - phytest-dora-106prb-usrpn300 - lte-2x2-tm1 - lte-2x2-tm2 - NSA-2x2 - 4g-rfsim-mbms-fembms - 5grfsim-fr2-32prb - nsa-2x2-quectel - 5g-rfsim-24prb - test xml --- ....usrpn310.conf => enb.band38.lte_2x2.100prb.usrpn310.conf} | 0 ...pn310.conf => enb.band38.lte_2x2_tm2.100prb.usrpn310.conf} | 0 ....usrpn310.conf => enb.band38.nsa_2x2.100prb.usrpn310.conf} | 0 ...RB.rfsim.mbms.conf => enb.band7.tm1.25prb.rfsim.mbms.conf} | 0 ....50PRB.usrpb210.conf => enb.band7.tm1.50prb.usrpb210.conf} | 0 ...st-dora.conf => gnb.band261.32prb.rfsim.phytest-dora.conf} | 0 ...st-dora.conf => gnb.band78.106prb.rfsim.phytest-dora.conf} | 0 ...dora.conf => gnb.band78.106prb.usrpn300.phytest-dora.conf} | 0 ...dora.conf => gnb.band78.162prb.usrpn300.phytest-dora.conf} | 0 ...pn310.2x2.conf => gnb.nsa.band78.106prb.usrpn310.2x2.conf} | 0 ...band78.24PRB.rfsim.conf => gnb.sa.band78.24prb.rfsim.conf} | 0 ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml | 4 ++-- ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml | 4 ++-- ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml | 2 +- ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml | 2 +- ci-scripts/xml_files/test_case_list_template.xml | 2 +- .../yaml_files/4g_rfsimulator_fembms/docker-compose.yml | 2 +- ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml | 2 +- .../yaml_files/5g_rfsimulator_24prb/docker-compose.yaml | 2 +- .../yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml | 2 +- .../yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml | 2 +- ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml | 2 +- ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml | 2 +- doc/RUNMODEM.md | 2 +- openair1/SIMULATION/TOOLS/DOC/rtusage.md | 2 +- 28 files changed, 19 insertions(+), 19 deletions(-) rename ci-scripts/conf_files/{enb.band38.lte_2x2.100PRB.usrpn310.conf => enb.band38.lte_2x2.100prb.usrpn310.conf} (100%) rename ci-scripts/conf_files/{enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf => enb.band38.lte_2x2_tm2.100prb.usrpn310.conf} (100%) rename ci-scripts/conf_files/{enb.band38.nsa_2x2.100PRB.usrpn310.conf => enb.band38.nsa_2x2.100prb.usrpn310.conf} (100%) rename ci-scripts/conf_files/{enb.band7.tm1.25PRB.rfsim.mbms.conf => enb.band7.tm1.25prb.rfsim.mbms.conf} (100%) rename ci-scripts/conf_files/{enb.band7.tm1.50PRB.usrpb210.conf => enb.band7.tm1.50prb.usrpb210.conf} (100%) rename ci-scripts/conf_files/{gnb.band261.32PRB.rfsim.phytest-dora.conf => gnb.band261.32prb.rfsim.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.106PRB.rfsim.phytest-dora.conf => gnb.band78.106prb.rfsim.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.106PRB.usrpn300.phytest-dora.conf => gnb.band78.106prb.usrpn300.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.162PRB.usrpn300.phytest-dora.conf => gnb.band78.162prb.usrpn300.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.nsa.band78.106PRB.usrpn310.2x2.conf => gnb.nsa.band78.106prb.usrpn310.2x2.conf} (100%) rename ci-scripts/conf_files/{gnb.sa.band78.24PRB.rfsim.conf => gnb.sa.band78.24prb.rfsim.conf} (100%) diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf rename to ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf rename to ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf diff --git a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf rename to ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf rename to ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf rename to ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf diff --git a/ci-scripts/conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf similarity index 100% rename from ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf rename to ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf diff --git a/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf similarity index 100% rename from ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf rename to ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 5b84f7e43f..325c5108d9 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -100,7 +100,7 @@ Initialize_eNB Initialize eNB - -O ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function + -O ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function 0 0 lte @@ -113,7 +113,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time,line_num,function + -O ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time,line_num,function 1 1 nr diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml index 8e96dea441..f5f4b1e549 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml @@ -105,7 +105,7 @@ Initialize_eNB Initialize eNB - -O ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function + -O ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function 0 0 lte @@ -118,7 +118,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time,line_num,function + -O ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time,line_num,function 1 1 nr diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml index 53636de6a1..1c4faaf99f 100644 --- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml @@ -33,7 +33,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test --log_config.global_log_options level,nocolor,time NR diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml index af48f00d5a..2122f8651c 100644 --- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml +++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml @@ -33,7 +33,7 @@ Initialize_eNB Initialize gNB USRP (Tx-Write-Threading enabled) - -O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time NR diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml index c98796890f..83e7d23f04 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time datalog_rt_stats.default.yaml NR 192.168.20.2 diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml index 3d91d55dfa..31be6e8ac4 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time datalog_rt_stats.1x1.60.yaml NR 192.168.20.2 diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml index 6231f45169..09dbbd7757 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB USRP - -O ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time datalog_rt_stats.60.2x2.yaml NR 192.168.20.2 diff --git a/ci-scripts/xml_files/test_case_list_template.xml b/ci-scripts/xml_files/test_case_list_template.xml index eecdfe80b9..fddf8ad0e4 100644 --- a/ci-scripts/xml_files/test_case_list_template.xml +++ b/ci-scripts/xml_files/test_case_list_template.xml @@ -42,7 +42,7 @@ Initialize_eNB Initialize eNB (FDD/Band1/5MHz/info) - -O enb.band7.tm1.50PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time + -O enb.band7.tm1.50prb.usrpb210.conf --log_config.global_log_options level,nocolor,time diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml index f568989f3f..47e38ba08c 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml @@ -13,7 +13,7 @@ services: RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml index 5dc9ae1a04..81a85ff246 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml @@ -13,7 +13,7 @@ services: RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 600f34cbc2..a113203d05 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -175,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band78.24PRB.rfsim.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band78.24prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml index 63293cf628..349b07f2b4 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml index b3afb48e8d..3f58340d1b 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" diff --git a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml index 9655cca180..8a7f4693ec 100644 --- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml @@ -8,7 +8,7 @@ services: TZ: Europe/Paris USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 volumes: - - ../../conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf:/opt/oai-enb/etc/enb.conf network_mode: "host" healthcheck: test: /bin/bash -c "pgrep lte-softmodem" diff --git a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml index 84711b0a3c..1f54e7e380 100644 --- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml @@ -8,7 +8,7 @@ services: TZ: Europe/Paris USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 volumes: - - ../../conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf:/opt/oai-enb/etc/enb.conf network_mode: "host" healthcheck: test: /bin/bash -c "pgrep lte-softmodem" diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md index d32758b1a2..e25400a0a6 100644 --- a/doc/RUNMODEM.md +++ b/doc/RUNMODEM.md @@ -61,7 +61,7 @@ This setup requires an EPC, an OAI eNB and gNB, and a COTS Phone. A dedicated pa ### Launch eNB ```bash -sudo ./lte-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf +sudo ./lte-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50prb.usrpb210.conf ``` ### Launch gNB diff --git a/openair1/SIMULATION/TOOLS/DOC/rtusage.md b/openair1/SIMULATION/TOOLS/DOC/rtusage.md index 059d02a307..5e1bd1b1da 100644 --- a/openair1/SIMULATION/TOOLS/DOC/rtusage.md +++ b/openair1/SIMULATION/TOOLS/DOC/rtusage.md @@ -27,7 +27,7 @@ Several model lists can be defined in the oai configuration file. One, defined b Channel simulation parameters can also be specified on the command line: ```bash -./lte-softmodem -O ../../../ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf --noS1 --rfsim --rfsimulator.options chanmod --rfsimulator.serveraddr enb --telnetsrv --channelmod.modellist modellist_rfsimu_2 --channelmod.modellist_rfsimu_2.[1].offset 120 +./lte-softmodem -O ../../../ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf --noS1 --rfsim --rfsimulator.options chanmod --rfsimulator.serveraddr enb --telnetsrv --channelmod.modellist modellist_rfsimu_2 --channelmod.modellist_rfsimu_2.[1].offset 120 ``` ### Using the telnet server to modify channel simulator parameters The telnet server includes a `channelmod` command which can be used to dynamically modify some channel model parameters. This command is only available when channel simulation is enabled (via `rfsimulator.options chanmod` option when running the rfsimulator. `channelmod` command has its own help: From c8f78a232fac3db846a097d9116f5bdd4fb4f694 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Fri, 23 Jun 2023 00:53:11 +0200 Subject: [PATCH 11/12] Move unused config to untested folder --- .../conf_files/{ => untested}/enb.band13.tm1.25PRB.usrpb210.conf | 0 .../conf_files/{ => untested}/enb.band13.tm1.50PRB.emtc.conf | 0 .../conf_files/{ => untested}/enb.band17.tm1.25PRB.usrpb210.conf | 0 .../{ => untested}/enb.band17.tm1.mbms.25PRB.usrpb210.conf | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename ci-scripts/conf_files/{ => untested}/enb.band13.tm1.25PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band13.tm1.50PRB.emtc.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band17.tm1.25PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band17.tm1.mbms.25PRB.usrpb210.conf (100%) diff --git a/ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf similarity index 100% rename from ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf rename to ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf diff --git a/ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf From ff337b02af25efb5765d57a537adc59f886f6383 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Thu, 15 Jun 2023 12:00:00 +0200 Subject: [PATCH 12/12] Remove unused UE conf, clean up documentation --- ci-scripts/conf_files/lteue.usim.conf | 153 ------------------------- ci-scripts/conf_files/nr-ue-sim.conf | 7 -- ci-scripts/conf_files/nr-ue.nfapi.conf | 37 ------ ci-scripts/conf_files/ue.nfapi.conf | 37 ------ doc/L2NFAPI.md | 2 +- doc/L2NFAPI_NOS1.md | 8 +- doc/L2NFAPI_S1.md | 8 +- docker/Dockerfile.nrUE.rhel9 | 3 - docker/Dockerfile.nrUE.rocky | 4 - docker/Dockerfile.nrUE.ubuntu20 | 3 - 10 files changed, 9 insertions(+), 253 deletions(-) delete mode 100644 ci-scripts/conf_files/lteue.usim.conf delete mode 100644 ci-scripts/conf_files/nr-ue-sim.conf delete mode 100644 ci-scripts/conf_files/nr-ue.nfapi.conf delete mode 100644 ci-scripts/conf_files/ue.nfapi.conf diff --git a/ci-scripts/conf_files/lteue.usim.conf b/ci-scripts/conf_files/lteue.usim.conf deleted file mode 100644 index e9b02e9b1f..0000000000 --- a/ci-scripts/conf_files/lteue.usim.conf +++ /dev/null @@ -1,153 +0,0 @@ -# List of known PLMNS -PLMN: { - PLMN0: { - FULLNAME="OpenAirInterface"; - SHORTNAME="OAICN"; - MNC="96"; - MCC="208"; - }; -}; - -UE0: -{ - USER: { - IMEI="356113022094149"; - MANUFACTURER="OAI"; - MODEL="LTE SoftModem"; - PIN="0000"; - }; - - SIM: { - MSIN="0100001111"; - USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; - OPC="e734f8734007d6c5ce7a0508809e7e9c"; - MSISDN="33611123456"; - }; - - # Home PLMN Selector with Access Technology - HPLMN= "20896"; - - # User controlled PLMN Selector with Access Technology - UCPLMN_LIST = (); - - # Operator PLMN List - OPLMN_LIST = ("20896"); - - # Operator controlled PLMN Selector with Access Technology - OCPLMN_LIST = (); - - # Forbidden plmns - FPLMN_LIST = (); - - # Equivalent home plmns - EHPLMN_LIST = (); - -}; - -UE1: -{ - USER: { - IMEI="356113022094149"; - MANUFACTURER="OAI"; - MODEL="LTE SoftModem"; - PIN="0000"; - }; - - SIM: { - MSIN="0100001111"; - USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; - OPC="e734f8734007d6c5ce7a0508809e7e9c"; - MSISDN="33611123456"; - }; - - # Home PLMN Selector with Access Technology - HPLMN= "20896"; - - # User controlled PLMN Selector with Access Technology - UCPLMN_LIST = (); - - # Operator PLMN List - OPLMN_LIST = ("20896"); - - # Operator controlled PLMN Selector with Access Technology - OCPLMN_LIST = (); - - # Forbidden plmns - FPLMN_LIST = (); - - # Equivalent home plmns - EHPLMN_LIST = (); - -}; - -UE2: -{ - USER: { - IMEI="356113022094149"; - MANUFACTURER="OAI"; - MODEL="LTE SoftModem"; - PIN="0000"; - }; - - SIM: { - MSIN="0100001111"; - USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; - OPC="e734f8734007d6c5ce7a0508809e7e9c"; - MSISDN="33611123456"; - }; - - # Home PLMN Selector with Access Technology - HPLMN= "20896"; - - # User controlled PLMN Selector with Access Technology - UCPLMN_LIST = (); - - # Operator PLMN List - OPLMN_LIST = ("20896"); - - # Operator controlled PLMN Selector with Access Technology - OCPLMN_LIST = (); - - # Forbidden plmns - FPLMN_LIST = (); - - # Equivalent home plmns - EHPLMN_LIST = (); - -}; - -UE3: -{ - USER: { - IMEI="356113022094149"; - MANUFACTURER="OAI"; - MODEL="LTE SoftModem"; - PIN="0000"; - }; - - SIM: { - MSIN="0100001111"; - USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; - OPC="e734f8734007d6c5ce7a0508809e7e9c"; - MSISDN="33611123456"; - }; - - # Home PLMN Selector with Access Technology - HPLMN= "20896"; - - # User controlled PLMN Selector with Access Technology - UCPLMN_LIST = (); - - # Operator PLMN List - OPLMN_LIST = ("20896"); - - # Operator controlled PLMN Selector with Access Technology - OCPLMN_LIST = (); - - # Forbidden plmns - FPLMN_LIST = (); - - # Equivalent home plmns - EHPLMN_LIST = (); - -}; diff --git a/ci-scripts/conf_files/nr-ue-sim.conf b/ci-scripts/conf_files/nr-ue-sim.conf deleted file mode 100644 index 884430bf39..0000000000 --- a/ci-scripts/conf_files/nr-ue-sim.conf +++ /dev/null @@ -1,7 +0,0 @@ -uicc0 = { - imsi = "@FULL_IMSI@"; - key = "@FULL_KEY@"; - opc= "@OPC@"; - dnn= "@DNN@"; - nssai_sst=@NSSAI_SST@; -} diff --git a/ci-scripts/conf_files/nr-ue.nfapi.conf b/ci-scripts/conf_files/nr-ue.nfapi.conf deleted file mode 100644 index 90798702cf..0000000000 --- a/ci-scripts/conf_files/nr-ue.nfapi.conf +++ /dev/null @@ -1,37 +0,0 @@ -log_config = { - global_log_level ="info"; - hw_log_level ="info"; - phy_log_level ="info"; - mac_log_level ="info"; - rlc_log_level ="info"; - pdcp_log_level ="info"; - rrc_log_level ="info"; -}; - - -L1s = ( - { - num_cc = 1; - tr_n_preference = "nfapi"; - local_n_if_name = "ens3"; - remote_n_address = "127.0.0.1"; //Proxy IP - local_n_address = "127.0.0.1"; - local_n_portc = 50600; - remote_n_portc = 50601; - local_n_portd = 50610; - remote_n_portd = 50611; - } -); - -RUs = ( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 90 - att_rx = 0; - bands = [7,38,42,43]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 125; - } -); diff --git a/ci-scripts/conf_files/ue.nfapi.conf b/ci-scripts/conf_files/ue.nfapi.conf deleted file mode 100644 index 09ad7529b1..0000000000 --- a/ci-scripts/conf_files/ue.nfapi.conf +++ /dev/null @@ -1,37 +0,0 @@ -log_config = { - global_log_level ="info"; - hw_log_level ="info"; - phy_log_level ="info"; - mac_log_level ="info"; - rlc_log_level ="info"; - pdcp_log_level ="info"; - rrc_log_level ="info"; -}; - - -L1s = ( - { - num_cc = 1; - tr_n_preference = "nfapi"; - local_n_if_name = "ens3"; - remote_n_address = "CI_ENB_IP_ADDR"; - local_n_address = "CI_UE_IP_ADDR"; - local_n_portc = 50000; - remote_n_portc = 50001; - local_n_portd = 50010; - remote_n_portd = 50011; - } -); - -RUs = ( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 90 - att_rx = 0; - bands = [7,38,42,43]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 125; - } -); diff --git a/doc/L2NFAPI.md b/doc/L2NFAPI.md index e87f9f270c..d7bba0bfeb 100644 --- a/doc/L2NFAPI.md +++ b/doc/L2NFAPI.md @@ -64,7 +64,7 @@ $ sudo -E ./nr-softmodem -O ../ci-scripts/conf_files/episci/proxy_rcc.band78.tm1 ``` ### Start UE ```bash -$ sudo -E ./nr-uesoftmodem -O ../ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 +$ sudo -E ./nr-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 ``` ### EpiSci's Documentation A more detailed tutorial is available on the [EpiSci GitHub Repository](https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy#readme). diff --git a/doc/L2NFAPI_NOS1.md b/doc/L2NFAPI_NOS1.md index 10d0c2a577..b65aaef3ba 100644 --- a/doc/L2NFAPI_NOS1.md +++ b/doc/L2NFAPI_NOS1.md @@ -191,7 +191,7 @@ Last, the S1 interface shall be properly set. ```bash $ ssh sudousername@machineB cd ue_folder -# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor +# Edit ci-scripts/conf_files/nrue.uicc.conf with your preferred editor ``` Verify the nFAPI interface setup on the loopback interface. @@ -246,9 +246,9 @@ In the second terminal (the one you used to build the UE): $ ssh sudousername@machineC cd ue_folder/cmake_targets # Test 64 UEs, 1 thread in FDD mode -sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 +sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 # Test 64 UEs, 1 thread in TDD mode -sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1 +sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1 # The "-T 1" option means TDD config ``` @@ -262,7 +262,7 @@ For example, running with 4 UEs: ```bash $ ssh sudousername@machineC cd ue_folder/cmake_targets -sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 +sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 sleep 10 ifconfig ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX diff --git a/doc/L2NFAPI_S1.md b/doc/L2NFAPI_S1.md index e7faec106f..a8b287ddf3 100644 --- a/doc/L2NFAPI_S1.md +++ b/doc/L2NFAPI_S1.md @@ -196,7 +196,7 @@ Last, the S1 interface shall be properly set. ```bash $ ssh sudousername@machineB cd ue_folder -# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor +# Edit ci-scripts/conf_files/nrue.uicc.conf with your preferred editor ``` Verify the nFAPI interface setup on the loopback interface. @@ -252,9 +252,9 @@ In the second terminal (the one you used to build the UE): $ ssh sudousername@machineC cd ue_folder/cmake_targets # Test 64 UEs, 1 thread in FDD mode -sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 +sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 # Test 64 UEs, 1 thread in TDD mode -sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1 +sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1 # The "-T 1" option means TDD config ``` @@ -268,7 +268,7 @@ For example, running with 4 UEs: ```bash $ ssh sudousername@machineC cd ue_folder/cmake_targets -sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 +sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1 sleep 10 ifconfig ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9 index 53b179a935..b142847c8e 100644 --- a/docker/Dockerfile.nrUE.rhel9 +++ b/docker/Dockerfile.nrUE.rhel9 @@ -59,9 +59,6 @@ COPY --from=nr-ue-build \ ./ COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh WORKDIR /opt/oai-nr-ue/etc -COPY --from=nr-ue-build \ - /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \ - ./ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ diff --git a/docker/Dockerfile.nrUE.rocky b/docker/Dockerfile.nrUE.rocky index f0cc4b5788..cb07b2eb6a 100644 --- a/docker/Dockerfile.nrUE.rocky +++ b/docker/Dockerfile.nrUE.rocky @@ -63,10 +63,6 @@ COPY --from=nr-ue-build \ ./ WORKDIR /opt/oai-nr-ue/etc -COPY --from=nr-ue-build \ - /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \ - /oai-ran/docker/etc/nr-ue.nfapi.conf \ - ./ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ diff --git a/docker/Dockerfile.nrUE.ubuntu20 b/docker/Dockerfile.nrUE.ubuntu20 index c298394abd..a4b63d3cef 100644 --- a/docker/Dockerfile.nrUE.ubuntu20 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -65,9 +65,6 @@ COPY --from=nr-ue-build \ COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh WORKDIR /opt/oai-nr-ue/etc -COPY --from=nr-ue-build \ - /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \ - ./ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \