From bd626cc1ce4b1a9848db0e5276856851a3163675 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 11:45:45 +0100 Subject: [PATCH 01/58] Updates in 4g-l2sim: 1. Docker compose yaml 2. UE config and eNB config 3. Renamed config file for l2sim 4. Renamed USIM file for l2sim --- .../conf_files/enb.band7.25prb.l2sim.conf | 240 ++++++++++++++++++ ci-scripts/conf_files/lte-ue.usim.conf | 153 +++++++++++ .../conf_files/lteue.band7.25prb.l2sim.conf | 37 +++ .../4g_l2sim_fdd/docker-compose.yml | 47 +--- 4 files changed, 437 insertions(+), 40 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.l2sim.conf create mode 100644 ci-scripts/conf_files/lte-ue.usim.conf create mode 100644 ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf new file mode 100644 index 0000000000..f4ed527153 --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf @@ -0,0 +1,240 @@ +Active_eNBs = ( "enb-l2sim-vnf"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "enb-l2sim-vnf"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 10; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower = -27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -104; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- 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.61.3"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "yes"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.1"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.1"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.1"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + + }; + } +); + +MACRLCs = ( + { + num_cc = 1; + local_s_if_name = "lo"; + remote_s_address = "127.0.0.1"; + local_s_address = "127.0.0.1"; + local_s_portc = 50001; + remote_s_portc = 50000; + local_s_portd = 50011; + remote_s_portd = 50010; + tr_s_preference = "nfapi"; + tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; + } +); + +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_SPLIT"; + #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE" + worker_config = "WORKER_ENABLE"; + } +); + +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/lte-ue.usim.conf b/ci-scripts/conf_files/lte-ue.usim.conf new file mode 100644 index 0000000000..cc159de360 --- /dev/null +++ b/ci-scripts/conf_files/lte-ue.usim.conf @@ -0,0 +1,153 @@ +# 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="0100000002"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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="0100000002"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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="0100000002"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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="0100000002"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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/lteue.band7.25prb.l2sim.conf b/ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf new file mode 100644 index 0000000000..0d4ceb18b4 --- /dev/null +++ b/ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf @@ -0,0 +1,37 @@ +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 = "eno1"; + remote_n_address = "127.0.0.1"; + local_n_address = "127.0.0.1"; + 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/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml index f5292f77da..7df2b5c183 100644 --- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml @@ -186,27 +186,10 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_NFAPI_VNF: 'yes' - ENB_NAME: enb-l2sim-vnf - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 10 - NB_PRB: 25 - MME_S1C_IP_ADDRESS: 192.168.61.3 - ENB_INTERFACE_NAME_FOR_S1_MME: eth0 - ENB_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.1 - ENB_INTERFACE_NAME_FOR_S1U: eth0 - ENB_IPV4_ADDRESS_FOR_S1U: 192.168.61.1 - ENB_IPV4_ADDRESS_FOR_X2C: 192.168.61.1 - LOCAL_S_IF_NAME: 'lo:' - REMOTE_S_ADDRESS: 127.0.0.1 - LOCAL_S_ADDRESS: 127.0.0.2 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --MACRLCs.[0].scheduler_mode "default" --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/enb.band7.25prb.l2sim.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -238,18 +221,10 @@ services: TZ: Europe/Paris USE_NFAPI: 'yes' OPENAIR_DIR: /opt/oai-nr-ue - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 - UE_NFAPI_IF_NAME: eno1 - ENB_IP_ADDRESS: 127.0.0.1 - LTE_UE_IP_ADDRESS: 127.0.0.1 USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 2 --log_config.global_log_options level,nocolor,time volumes: + - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/mounted.conf + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" @@ -266,18 +241,10 @@ services: TZ: Europe/Paris USE_NFAPI: 'yes' OPENAIR_DIR: /opt/oai-nr-ue - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000002' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 - UE_NFAPI_IF_NAME: eno1 - ENB_IP_ADDRESS: 127.0.0.1 - LTE_UE_IP_ADDRESS: 127.0.0.1 USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 3 --log_config.global_log_options level,nocolor,time volumes: + - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/mounted.conf + - ../../conf_files/lte-ue.usim.conf:/opt/oai-lte-ue/etc/ue_usim.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" From f58e2ea508898879a85198e40dcfae891ceccb66 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 11:50:55 +0100 Subject: [PATCH 02/58] Updates in 4g-rfsim-fdd-05mhz: 1. Docker compose yaml 2. UE config name -> lteue.usim-ci.conf eNB config name -> enb.band7.25prb.rfsim.conf 3. Removed unwanted UE config file for 4g-rfsim-fdd-05Mhz --- .../conf_files/enb.band7.25prb.rfsim.conf | 263 ++++++++++++++++++ .../docker-compose.yml | 31 +-- 2 files changed, 269 insertions(+), 25 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.rfsim.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf new file mode 100644 index 0000000000..71e9029c4b --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-Eurecom-LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-Eurecom-LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 10; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "192.168.61.3"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml index f36ea4ea7e..32a56d8319 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml @@ -188,25 +188,11 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_FDD_MONO: 'yes' RFSIMULATOR: enb - ENB_NAME: eNB-rf-sim - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 10 - NB_PRB: 25 - MME_S1C_IP_ADDRESS: 192.168.61.3 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 192.168.61.20 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 192.168.61.20 - ENB_X2_IP_ADDRESS: 192.168.61.20 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -224,16 +210,11 @@ services: - "10000" environment: TZ: Europe/Paris - HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From 1fcbb47731c627340410d77ece209e08f6f2fe58 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 11:53:27 +0100 Subject: [PATCH 03/58] Updates in 4g-rfsim-fdd-05mhz-noS1: 1. Docker compose yaml 2. UE config name : lte.usim-ci.conf 3. enb config name : enb.band7.25prb.rfsim-nos1.conf 4. Removed unwanted UE config file for 4g-rfsim-fdd-05Mhz-noS1 --- .../enb.band7.25prb.rfsim-nos1.conf | 263 ++++++++++++++++++ .../docker-compose.yml | 31 +-- 2 files changed, 269 insertions(+), 25 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf new file mode 100644 index 0000000000..71e9029c4b --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-Eurecom-LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-Eurecom-LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 10; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "192.168.61.3"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml index 411e49a7dd..e9e858e161 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml @@ -10,25 +10,11 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_FDD_MONO: 'yes' RFSIMULATOR: enb - ENB_NAME: eNB-rf-sim - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 10 - NB_PRB: 25 - MME_S1C_IP_ADDRESS: 192.168.61.3 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 192.168.61.20 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 192.168.61.20 - ENB_X2_IP_ADDRESS: 192.168.61.20 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1 + volumes: + - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -46,16 +32,11 @@ services: - "10000" environment: TZ: Europe/Paris - HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time --noS1 + volumes: + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From b9b0b8ae93e77e15cfc69cb9095b5792376a0773 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 11:55:04 +0100 Subject: [PATCH 04/58] Updates in 4g-rfsim-fdd-10Mhz: 1. Docker compose yaml 2. UE config name : lteue.usim-ci.conf 3. eNB config name : enb.band7.50prb.rfsim.conf 4. Removing unwanted UE config file for 4g-rfsim-fdd-10Mhz --- .../conf_files/enb.band7.50prb.rfsim.conf | 263 ++++++++++++++++++ .../docker-compose.yml | 31 +-- 2 files changed, 269 insertions(+), 25 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.50prb.rfsim.conf diff --git a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf new file mode 100644 index 0000000000..4e037ab3da --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-Eurecom-LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-Eurecom-LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 10; + N_RB_DL = 50; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "192.168.61.3"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml index 9cb546fdf1..18640a3670 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml @@ -188,25 +188,11 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_FDD_MONO: 'yes' + USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb - ENB_NAME: eNB-rf-sim - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 10 - NB_PRB: 50 - MME_S1C_IP_ADDRESS: 192.168.61.3 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 192.168.61.20 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 192.168.61.20 - ENB_X2_IP_ADDRESS: 192.168.61.20 USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/enb.band7.50prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -224,16 +210,11 @@ services: - "10000" environment: TZ: Europe/Paris - HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From 50b407362cd465753ea2ebfd093367ec76948353 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 12:04:27 +0100 Subject: [PATCH 05/58] Updates in 4g_rfsimulator_fdd_20MHz: 1. Docker compose 2. UE config name : lteue.usim-ci.conf 3. eNB config name : enb.band7.100prb.rfsim.conf 4. Removed unwanted UE config for 4g-rfsim-fdd-20Mhz --- .../conf_files/enb.band7.100prb.rfsim.conf | 263 ++++++++++++++++++ .../docker-compose.yml | 31 +-- 2 files changed, 269 insertions(+), 25 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.100prb.rfsim.conf diff --git a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf new file mode 100644 index 0000000000..71fbc663fe --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-Eurecom-LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-Eurecom-LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 10; + N_RB_DL = 100; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "192.168.61.3"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml index 97ad211fab..ef21c87559 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml @@ -188,25 +188,11 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_FDD_MONO: 'yes' + USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb - ENB_NAME: eNB-rf-sim - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 10 - NB_PRB: 100 - MME_S1C_IP_ADDRESS: 192.168.61.3 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 192.168.61.20 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 192.168.61.20 - ENB_X2_IP_ADDRESS: 192.168.61.20 USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/enb.band7.100prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -224,16 +210,11 @@ services: - "10000" environment: TZ: Europe/Paris - HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From 88431bac331ef4e16834d71083865911fe25d98c Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 12:07:59 +0100 Subject: [PATCH 06/58] Updates in 4g-rfsim-tdd-05mhz: 1. Docker compose 2. UE config file : lteue.usim-ci.conf 3. eNB config file : enb.band38.25prb.rfsim.conf 4. Removed unwanted UE config for 4g-rfsim-tdd-05Mhz --- .../conf_files/enb.band38.25prb.rfsim.conf | 218 ++++++++++++++++++ .../docker-compose.yml | 30 +-- 2 files changed, 224 insertions(+), 24 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band38.25prb.rfsim.conf diff --git a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf new file mode 100644 index 0000000000..79f4fce746 --- /dev/null +++ b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf @@ -0,0 +1,218 @@ +Active_eNBs = ( "eNB_Eurecom_LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB_Eurecom_LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "eNodeB_3GPP"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "TDD"; + tdd_config = 1; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 38; + downlink_frequency = 2605000000L; + uplink_frequency_offset = 0000000; + Nid_cell = 10; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 1; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower =-27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -106; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + + ue_TransmissionMode = 1; + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- 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.61.3"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + + log_config : + { + global_log_level ="debug"; + hw_log_level ="info"; + phy_log_level ="info"; + mac_log_level ="info"; + rlc_log_level ="info"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + }; + + } +); +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; + puSch10xSnr = 150; + puCch10xSnr = 150; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 6 + att_rx = 6; + bands = [38]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 125; + eNB_instances = [0]; + + } +); + +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"; + } +); diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml index f7de67ee2b..c0f9fd7403 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml @@ -188,24 +188,11 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_TDD_MONO: 'yes' + USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb - ENB_NAME: eNB-rf-sim - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 38 - DL_FREQUENCY_IN_MHZ: 2605 - UL_FREQUENCY_OFFSET_IN_MHZ: 0 - NID_CELL: 10 - NB_PRB: 25 - MME_S1C_IP_ADDRESS: 192.168.61.3 - S1C_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 192.168.61.20 - S1U_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 192.168.61.20 USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/enb.band38.25prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -223,16 +210,11 @@ services: - "10000" environment: TZ: Europe/Paris - HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time + volumes: + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From 4f0a8925b4174293c9f49de56cb9c696b848636d Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 12:20:15 +0100 Subject: [PATCH 07/58] Updates in 5g-f1-rfsim 1. Docker compose yaml 2. UE config file: nrue.usimconf 3. gNB config file: gnb-cu.sa.band78.106prb.conf gnb-du.sa.band78.106prb.rfsim.conf 4. Deleting unwanted UE config file --- .../conf_files/gnb-cu.sa.band78.106prb.conf | 219 ++++++++++++++++ .../gnb-du.sa.band78.106prb.rfsim.conf | 237 ++++++++++++++++++ ci-scripts/conf_files/nrue.uicc.conf | 7 + .../5g_f1_rfsimulator/docker-compose.yaml | 50 +--- 4 files changed, 473 insertions(+), 40 deletions(-) create mode 100644 ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf create mode 100644 ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf create mode 100644 ci-scripts/conf_files/nrue.uicc.conf diff --git a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf new file mode 100644 index 0000000000..f9040f2ce6 --- /dev/null +++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf @@ -0,0 +1,219 @@ +Active_gNBs = ( "cu-rfsim"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; +Num_Threads_PUSCH = 8; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + +# cell_type = "CELL_MACRO_GNB"; + + gNB_name = "cu-rfsim"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + + nr_cellid = 12345678L; + force_256qam_off = 1; + + tr_s_preference = "f1"; + + local_s_if_name = "eth0"; + local_s_address = "192.168.71.140"; + remote_s_address = "192.168.71.142"; + local_s_portc = 501; + local_s_portd = 2153; + remote_s_portc = 500; + remote_s_portd = 2153; + min_rxtxtime = 6; + + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 641280; + dl_frequencyBand = 78; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 640008; + #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=27,L=48 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 +# 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 = 13; + preambleReceivedTargetPower = -96; +#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 = 14; +#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 = "192.168.71.132"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + NETWORK_INTERFACES : + { + + GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140"; + GNB_INTERFACE_NAME_FOR_NGU = "eth0"; + GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + }; + } +); + +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 ="debug"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + f1ap_log_level ="debug"; + ngap_log_level ="debug"; + }; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf new file mode 100644 index 0000000000..5c674b3f6f --- /dev/null +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf @@ -0,0 +1,237 @@ +Active_gNBs = ( "du-rfsim"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + +# cell_type = "CELL_MACRO_GNB"; + + gNB_name = "du-rfsim"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + + nr_cellid = 12345678L; + + ////////// Physical parameters: + + min_rxtxtime = 6; + force_256qam_off = 1; + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 641280; + dl_frequencyBand = 78; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 640008; + #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=27,L=48 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 +# 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 = 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 = 13; + preambleReceivedTargetPower = -96; +#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 = 14; +#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; + }; + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "f1"; + local_n_if_name = "eth0"; + local_n_address = "192.168.71.142"; + remote_n_address = "192.168.71.140"; + local_n_portc = 500; + local_n_portd = 2153; + remote_n_portc = 501; + remote_n_portd = 2153; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 200; + } +); + +L1s = ( +{ + num_cc = 1; + tr_n_preference = "local_mac"; + prach_dtx_threshold = 200; + pucch0_dtx_threshold = 150; + ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 +} +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 0 + att_rx = 0; + bands = [78]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 114; + eNB_instances = [0]; + #beamforming 1x4 matrix: + bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; + clock_src = "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"; + } +); +rfsimulator: { +serveraddr = "server"; + serverport = "4043"; + options = (); #("saviq"); or/and "chanmod" + modelname = "AWGN"; + IQfile = "/tmp/rfsimulator.iqs" +} + + 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 ="debug"; + ngap_log_level ="debug"; + }; diff --git a/ci-scripts/conf_files/nrue.uicc.conf b/ci-scripts/conf_files/nrue.uicc.conf new file mode 100644 index 0000000000..ce6094c71c --- /dev/null +++ b/ci-scripts/conf_files/nrue.uicc.conf @@ -0,0 +1,7 @@ +uicc0 = { + imsi = "208990100001100"; + key = "fec86ba6eb707ed08905757b1bb44b8f"; + opc= "C42449363BBAD02B66D16BC975D77CC1"; + dnn= "oai"; + nssai_sst=1; +} diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index b940794425..602f0bdff8 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -168,29 +168,15 @@ services: container_name: rfsim5g-oai-cu environment: RFSIMULATOR: server - USE_SA_CU: 'yes' - GNB_NAME: cu-rfsim - TAC: 1 - MCC: '208' - MNC: '99' - MNC_LENGTH: 2 - NSSAI_SST: 1 - AMF_IP_ADDRESS: 192.168.71.132 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.71.140 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.71.140 - F1_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 192.168.71.140 - F1_DU_IP_ADDRESS: 192.168.71.142 - F1_CU_D_PORT: 2153 - F1_DU_D_PORT: 2153 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn networks: public_net: ipv4_address: 192.168.71.140 + volumes: + - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -202,29 +188,15 @@ services: container_name: rfsim5g-oai-du environment: RFSIMULATOR: server - USE_SA_TDD_DU: 'yes' - GNB_NAME: du-rfsim - TAC: 1 - MCC: '208' - MNC: '99' - MNC_LENGTH: 2 - NSSAI_SST: 1 - AMF_IP_ADDRESS: 192.168.71.132 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.71.142 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.71.142 - F1_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 192.168.71.140 - F1_DU_IP_ADDRESS: 192.168.71.142 - F1_CU_D_PORT: 2153 - F1_DU_D_PORT: 2153 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-cu networks: public_net: ipv4_address: 192.168.71.142 + volumes: + - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -236,17 +208,15 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.142 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-du networks: public_net: ipv4_address: 192.168.71.150 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From 94f7313d84d32be84b53f22b22066fd501b64b4c Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 12:22:18 +0100 Subject: [PATCH 08/58] Updates in 5g-fdd-rfsim: 1. Docker compose 2. UE config file: nrue.uicc.conf 3. gNB config file: gnb.sa.band66.106prb.rfsim.conf --- .../gnb.sa.band66.106prb.rfsim.conf | 273 ++++++++++++++++++ .../5g_fdd_rfsimulator/docker-compose.yaml | 25 +- 2 files changed, 280 insertions(+), 18 deletions(-) create mode 100644 ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf diff --git a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf new file mode 100644 index 0000000000..7b1464c403 --- /dev/null +++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf @@ -0,0 +1,273 @@ +Active_gNBs = ( "gnb-rfsim"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + gNB_name = "gnb-rfsim"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + nr_cellid = 12345678L; + + ////////// Physical parameters: + + min_rxtxtime = 6; + enable_sdap = 1; + + pdcch_ConfigSIB1 = ( + { + controlResourceSetZero = 12; + searchSpaceZero = 0; + } + ); + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 433096; + dl_frequencyBand = 66; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 430000; + #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 = 12; + initialDLBWPsearchSpaceZero = 0; + + #uplinkConfigCommon + #frequencyInfoUL + ul_frequencyBand = 66; + ul_absoluteFrequencyPointA = 350000; + #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 = 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: + amf_ip_address = ( { ipv4 = "192.168.71.132"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + + NETWORK_INTERFACES : + { + GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140"; + GNB_INTERFACE_NAME_FOR_NGU = "eth0"; + GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + }; + + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + ulsch_max_slots_inactivity = 100; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 200; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + pusch_proc_threads = 8; + prach_dtx_threshold = 200; + ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 + } +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 0 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 75; + eNB_instances = [0]; + #beamforming 1x4 matrix: + bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; + clock_src = "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"; + } +); + +rfsimulator : +{ + serveraddr = "server"; + serverport = "4043"; + options = (); #("saviq"); or/and "chanmod" + modelname = "AWGN"; + IQfile = "/tmp/rfsimulator.iqs"; +}; + +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"; + ngap_log_level ="debug"; + }; diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index 404860d390..94f6e40dda 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -168,24 +168,15 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_SA_FDD_MONO: 'yes' - GNB_NAME: gnb-rfsim - TAC: 1 - MCC: '208' - MNC: '99' - MNC_LENGTH: 2 - NSSAI_SST: 1 - AMF_IP_ADDRESS: 192.168.71.132 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.71.140 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.71.140 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn networks: public_net: ipv4_address: 192.168.71.140 + volumes: + - ../../conf_files/gnb.sa.band66.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -197,17 +188,15 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: public_net: ipv4_address: 192.168.71.150 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From df689a42e9d016a22fe81b264a9a39635dd98a26 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 12:23:36 +0100 Subject: [PATCH 09/58] Updates for 5g_l2sim_tdd: 1. Docker compose yaml 2. UE config : nrue.band78.106prb.l2sim.conf 3. gNB config: gnb.band78.106prb.l2sim.conf --- .../conf_files/gnb.band78.106prb.l2sim.conf | 223 ++++++++++++++++++ .../conf_files/nrue.band78.106prb.l2sim.conf | 32 +++ .../5g_l2sim_tdd/docker-compose.yaml | 30 +-- 3 files changed, 260 insertions(+), 25 deletions(-) create mode 100644 ci-scripts/conf_files/gnb.band78.106prb.l2sim.conf create mode 100644 ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf diff --git a/ci-scripts/conf_files/gnb.band78.106prb.l2sim.conf b/ci-scripts/conf_files/gnb.band78.106prb.l2sim.conf new file mode 100644 index 0000000000..a3a830f8f9 --- /dev/null +++ b/ci-scripts/conf_files/gnb.band78.106prb.l2sim.conf @@ -0,0 +1,223 @@ +Active_gNBs = ( "gnb-l2sim-vnf"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + gNB_name = "gnb-l2sim-vnf"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + nr_cellid = 12345678L; + + ////////// Physical parameters: + + min_rxtxtime = 6; + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 641280; + dl_frequencyBand = 78; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 640008; + #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=27,L=48 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 12952; # 6366 12925 12956 28875 12952 +# 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 = 12952; +# 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 = -96; +#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 = 14; +#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 = "192.168.71.132"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + + NETWORK_INTERFACES : + { + GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.128"; + GNB_INTERFACE_NAME_FOR_NGU = "eno1"; + GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.128"; + GNB_PORT_FOR_NGU = 2152; # Spec 2152 + }; + + } +); + +MACRLCs = ( + { + num_cc = 1; + local_s_if_name = "lo:"; + remote_s_address = "127.0.0.1"; // pnf addr [!] + local_s_address = "127.0.0.2"; // vnf addr + local_s_portc = 50601; // vnf p5 port + remote_s_portc = 50600; // pnf p5 port [!] + local_s_portd = 50611; // vnf p7 port [!] + remote_s_portd = 50610; // pnf p7 port [!] + tr_s_preference = "nfapi"; + tr_n_preference = "local_RRC"; + } +); + +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"; + ngap_log_level ="debug"; + }; diff --git a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf new file mode 100644 index 0000000000..a25a91b502 --- /dev/null +++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf @@ -0,0 +1,32 @@ +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"; +}; + +uicc0 = { +imsi = "208990100001100"; +key = "fec86ba6eb707ed08905757b1bb44b8f"; +opc= "C42449363BBAD02B66D16BC975D77CC1"; +dnn= "oai"; +nssai_sst=1; +nssai_sd=16777215; +} + +MACRLCs = ( + { + num_cc = 1; + tr_n_preference = "nfapi"; + local_n_if_name = "eno1"; + 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; + } +); 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 978f204058..e666e44eac 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -169,25 +169,13 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_SA_NFAPI_VNF: 'yes' - GNB_NAME: gnb-l2sim-vnf - TAC: 1 - MCC: '208' - MNC: '99' - MNC_LENGTH: 2 - NSSAI_SST: 1 - AMF_IP_ADDRESS: 192.168.71.132 - GNB_NGA_IF_NAME: eno1 - GNB_NGA_IP_ADDRESS: 172.21.16.128 - GNB_NGU_IF_NAME: eno1 - GNB_NGU_IP_ADDRESS: 172.21.16.128 - LOCAL_S_IF_NAME: 'lo:' - REMOTE_S_ADDRESS: 127.0.0.1 - LOCAL_S_ADDRESS: 127.0.0.2 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor depends_on: - oai-spgwu - oai-amf + volumes: + - ../../conf_files/gnb.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -217,19 +205,11 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_NFAPI: 'yes' + USE_VOLUMED_CONF: 'yes' OPENAIR_DIR: /opt/oai-nr-ue - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - NSSAI_SD: 0xffffff - NR_UE_NFAPI_IF_NAME: eno1 - GNB_IP_ADDRESS: 127.0.0.1 - NR_UE_IP_ADDRESS: 127.0.0.1 USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor volumes: + - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/mounted.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results depends_on: - oai-gnb From 5c93817d6008f3ed30ec453be817d2d4afb46d1d Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 12:24:49 +0100 Subject: [PATCH 10/58] Updates 5g-rfsimulator: 1. Docker compose yaml 2. UE config file: nrue.uicc.conf 3. gNB config file: gnb.sa.band78.106prb.rfsim.conf 4. Removing unwanted UE config for 5g-rfsimulator --- .../gnb.sa.band78.106prb.rfsim.conf | 284 ++++++++++++++++++ .../5g_rfsimulator/docker-compose.yaml | 36 +-- 2 files changed, 295 insertions(+), 25 deletions(-) create mode 100644 ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf new file mode 100644 index 0000000000..9728977d21 --- /dev/null +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf @@ -0,0 +1,284 @@ +Active_gNBs = ( "gnb-rfsim"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + +# cell_type = "CELL_MACRO_GNB"; + + gNB_name = "gnb-rfsim"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + nr_cellid = 12345678L + +# tr_s_preference = "local_mac" + + ////////// Physical parameters: + + #pusch_TargetSNRx10 = 200; + #pucch_TargetSNRx10 = 200; + ul_prbblacklist = "51,52,53,54" + min_rxtxtime = 6; + do_SRS = 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 = "192.168.71.132"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + NETWORK_INTERFACES : + { + + GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140"; + GNB_INTERFACE_NAME_FOR_NGU = "eth0"; + GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + }; + + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 200; + ulsch_max_frame_inactivity = 1; + } +); + +L1s = ( +{ + num_cc = 1; + tr_n_preference = "local_mac"; + prach_dtx_threshold = 200; +# pucch0_dtx_threshold = 150; +} +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + 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 = "serial=XXXXXXX" + } +); + +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 = ( "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"; + f1ap_log_level ="debug"; + }; diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index f1bf2e0b54..37b0fca691 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -168,25 +168,15 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_SA_TDD_MONO: 'yes' - GNB_NAME: gnb-rfsim - TAC: 1 - MCC: '208' - MNC: '99' - MNC_LENGTH: 2 - NSSAI_SST: 1 - AMF_IP_ADDRESS: 192.168.71.132 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.71.140 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.71.140 - SDR_ADDRS: serial=XXXXXXX + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn networks: public_net: ipv4_address: 192.168.71.140 + volumes: + - ../../conf_files/gnb.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -198,17 +188,15 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: public_net: ipv4_address: 192.168.71.150 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s @@ -221,17 +209,15 @@ services: container_name: rfsim5g-oai-nr-ue2 environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208990100001101' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: public_net: ipv4_address: 192.168.71.151 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From 928e913fd72cec48eb69324507a7837d9e4fd91d Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:08:47 +0100 Subject: [PATCH 11/58] Updates in fr1_enb_mono_fdd_tim changes 1. Docker compose yaml 2. eNB config file: enb.band7.25prb.usrpb200.conf --- .../conf_files/enb.band7.25prb.usrpb200.conf | 263 ++++++++++++++++++ .../fr1_enb_mono_fdd_tim/docker-compose.yml | 20 +- 2 files changed, 265 insertions(+), 18 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf new file mode 100644 index 0000000000..7724fb9f1d --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 222; mnc = 01; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 10; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.30"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.30"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.30"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml index be4ccbf0aa..9b27fb41c0 100644 --- a/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml +++ b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml @@ -6,27 +6,11 @@ services: privileged: true container_name: prod-enb-mono-fdd environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '222' - MNC: '01' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 10 - NB_PRB: 25 - MME_S1C_IP_ADDRESS: CI_MME_IP_ADDR - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 192.168.61.30 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 192.168.61.30 - ENB_X2_IP_ADDRESS: 192.168.61.30 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].max_pdschReferenceSignalPower -27 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --log_config.global_log_options level,nocolor,time volumes: - - /dev:/dev + - ../../conf_files/enb.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/mounted.conf networks: public_net: ipv4_address: 192.168.61.30 From edd9092fba34fbfa8f55b3b639deb272546583cc Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:12:13 +0100 Subject: [PATCH 12/58] Updates in lte_b200_fdd_05Mhz_tm1 changes 1. Docker compose 2. eNB config : enb.band7.25prb.usrpb200-tm1.conf --- .../enb.band7.25prb.usrpb200-tm1.conf | 263 ++++++++++++++++++ .../lte_b200_fdd_05Mhz_tm1/docker-compose.yml | 23 +- 2 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf new file mode 100644 index 0000000000..3e5088baad --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml index 7ed56bffe4..47ee5798a9 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml @@ -6,30 +6,11 @@ services: privileged: true container_name: lte-b200-enb-fdd-05Mhz-tm1 environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 0 - NB_PRB: 25 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 172.21.18.46 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 172.21.18.46 - ENB_X2_IP_ADDRESS: 172.21.18.46 - RRC_INACTIVITY_THRESHOLD: 0 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From 58cabaa6b3704787ed8214adc55a768075dea3d0 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:14:36 +0100 Subject: [PATCH 13/58] Updates in lte_b200_fdd_05Mhz_tm1_no_rrc_activity 1. Docker compose yaml 2. eNB config file : enb.band7.25prb.usrpb200-tm1-norrc.conf --- .../enb.band7.25prb.usrpb200-tm1-norrc.conf | 263 ++++++++++++++++++ .../docker-compose.yml | 23 +- 2 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf new file mode 100644 index 0000000000..348c5f7ccd --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 30; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml index 804b9c758b..63abc5bd28 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml @@ -6,30 +6,11 @@ services: privileged: true container_name: lte-b200-enb-fdd-05Mhz-tm1 environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 0 - NB_PRB: 25 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 172.21.18.46 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 172.21.18.46 - ENB_X2_IP_ADDRESS: 172.21.18.46 - RRC_INACTIVITY_THRESHOLD: 30 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From f13a4557aadb1d8fa1850ec8802b677af79be5b2 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:17:14 +0100 Subject: [PATCH 14/58] Updates in lte_b200_fdd_10Mhz_tm1 1. Docker compose yaml 2. eNB config : enb.band7.50prb.usrpb200-tm1.conf --- .../enb.band7.50prb.usrpb200-tm1.conf | 263 ++++++++++++++++++ .../lte_b200_fdd_10Mhz_tm1/docker-compose.yml | 23 +- 2 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf new file mode 100644 index 0000000000..41c2e3a668 --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 50; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml index d428549f2b..f6cb2feb3e 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml @@ -6,30 +6,11 @@ services: privileged: true container_name: lte-b200-enb-fdd-10Mhz-tm1 environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 0 - NB_PRB: 50 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 172.21.18.46 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 172.21.18.46 - ENB_X2_IP_ADDRESS: 172.21.18.46 - RRC_INACTIVITY_THRESHOLD: 0 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From cd3f8c66eb4123c2949fb17b5ac66d020d0cc3b3 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:18:48 +0100 Subject: [PATCH 15/58] Updates in lte_b200_fdd_10Mhz_tm1_cdrx 1. Docker compose yaml 2. eNB config : enb.band7.50prb.usrpb200-tm1-cdrx.conf --- .../enb.band7.50prb.usrpb200-tm1-cdrx.conf | 263 ++++++++++++++++++ .../docker-compose.yml | 23 +- 2 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf new file mode 100644 index 0000000000..41c2e3a668 --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 50; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml index 6a8dcaf746..a4f30aba44 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml @@ -6,30 +6,11 @@ services: privileged: true container_name: lte-b200-enb-fdd-10Mhz-tm1 environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 0 - NB_PRB: 50 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 172.21.18.46 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 172.21.18.46 - ENB_X2_IP_ADDRESS: 172.21.18.46 - RRC_INACTIVITY_THRESHOLD: 0 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From fd17c4eda7ecc4ca7cd91c3c540f19229e778d40 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:21:02 +0100 Subject: [PATCH 16/58] Updates in lte_b200_fdd_20Mhz_tm1: 1. Docker compose yaml 2. eNB config : enb.band7.100prb.usrpb200-tm1.conf --- .../enb.band7.100prb.usrpb200-tm1.conf | 263 ++++++++++++++++++ .../lte_b200_fdd_20Mhz_tm1/docker-compose.yml | 23 +- 2 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf new file mode 100644 index 0000000000..30d2549a48 --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 100; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml index 1f21fd9152..4d31745e7b 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml @@ -6,30 +6,11 @@ services: privileged: true container_name: lte-b200-enb-fdd-20Mhz-tm1 environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 0 - NB_PRB: 100 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 172.21.18.46 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 172.21.18.46 - ENB_X2_IP_ADDRESS: 172.21.18.46 - RRC_INACTIVITY_THRESHOLD: 0 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From b5b0498ae7af1e6b1620dbff3ddd63c2bfd31930 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:23:09 +0100 Subject: [PATCH 17/58] Updates in lte_b200_tdd_05Mhz_tm1 1. Docker compose yaml 2. eNB config : enb.band40.25prb.usrpb200-tm1.conf --- .../enb.band40.25prb.usrpb200-tm1.conf | 218 ++++++++++++++++++ .../lte_b200_tdd_05Mhz_tm1/docker-compose.yml | 21 +- 2 files changed, 220 insertions(+), 19 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf new file mode 100644 index 0000000000..9b812aa755 --- /dev/null +++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf @@ -0,0 +1,218 @@ +Active_eNBs = ( "eNB-Eurecom_LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB-Eurecom_LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "eNodeB_3GPP"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "TDD"; + tdd_config = 1; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 40; + downlink_frequency = 2350000000L; + uplink_frequency_offset = 0; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 1; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower =-27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -106; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + + ue_TransmissionMode = 1; + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + + log_config : + { + global_log_level ="debug"; + hw_log_level ="info"; + phy_log_level ="info"; + mac_log_level ="info"; + rlc_log_level ="info"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + }; + + } +); +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; + puSch10xSnr = 150; + puCch10xSnr = 150; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 6 + att_rx = 6; + bands = [38]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 125; + eNB_instances = [0]; + + } +); + +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"; + } +); diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml index 43d3ba5b3b..2a221ebe82 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml @@ -6,28 +6,11 @@ services: privileged: true container_name: lte-b200-enb-tdd-05Mhz-tm1 environment: - USE_TDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 40 - DL_FREQUENCY_IN_MHZ: 2350 - UL_FREQUENCY_OFFSET_IN_MHZ: 0 - NID_CELL: 0 - NB_PRB: 25 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - S1C_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 172.21.18.45 - S1U_IF_NAME: eth0 - ENB_X2_IP_ADDRESS: 172.21.18.45 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From a1c85efa6bb4f7ad6de28ab1683c4f96e07ec932 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:24:02 +0100 Subject: [PATCH 18/58] Updates in lte_b200_tdd_05Mhz_tm2 1. Docker compose yaml 2. eNB config : enb.band40.25prb.usrpb200-tm2.conf --- .../enb.band40.25prb.usrpb200-tm2.conf | 218 ++++++++++++++++++ .../lte_b200_tdd_05Mhz_tm2/docker-compose.yml | 21 +- 2 files changed, 220 insertions(+), 19 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf new file mode 100644 index 0000000000..96912e4577 --- /dev/null +++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf @@ -0,0 +1,218 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "eNodeB_3GPP"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "TDD"; + tdd_config = 1; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 40; + downlink_frequency = 2350000000L; + uplink_frequency_offset = 0000000; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 1; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower =-27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -106; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + + ue_TransmissionMode = 1; + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + + log_config : + { + global_log_level ="debug"; + hw_log_level ="info"; + phy_log_level ="info"; + mac_log_level ="info"; + rlc_log_level ="info"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + }; + + } +); +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; + puSch10xSnr = 150; + puCch10xSnr = 150; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 6 + att_rx = 6; + bands = [38]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 125; + eNB_instances = [0]; + + } +); + +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"; + } +); diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml index 9a32803a99..49e13b3817 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml @@ -6,29 +6,12 @@ services: privileged: true container_name: lte-b200-enb-tdd-05Mhz-tm2 environment: - USE_TDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 40 - DL_FREQUENCY_IN_MHZ: 2350 - UL_FREQUENCY_OFFSET_IN_MHZ: 0 - NID_CELL: 0 - NB_PRB: 25 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - S1C_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 172.21.18.45 - S1U_IF_NAME: eth0 - ENB_X2_IP_ADDRESS: 172.21.18.45 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --log_config.global_log_options level,nocolor,time,line_num,function #USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --eNBs.[0].component_carriers.[0].nb_antennas_tx 2 --eNBs.[0].component_carriers.[0].nb_antennas_rx 2 --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band40.25prb.usrpb200-tm2.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From f5fd9d551dcfecbc4b6c369986c886c9ea604517 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:25:11 +0100 Subject: [PATCH 19/58] Updates in lte_b200_tdd_10Mhz_tm1 1. Docker compose yaml 3. Added PRB in additional options --- .../lte_b200_tdd_10Mhz_tm1/docker-compose.yml | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml index 4a746db6b4..9f00ec4737 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml @@ -6,28 +6,11 @@ services: privileged: true container_name: lte-b200-enb-tdd-10Mhz-tm1 environment: - USE_TDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 40 - DL_FREQUENCY_IN_MHZ: 2350 - UL_FREQUENCY_OFFSET_IN_MHZ: 0 - NID_CELL: 0 - NB_PRB: 50 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - S1C_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 172.21.18.45 - S1U_IF_NAME: eth0 - ENB_X2_IP_ADDRESS: 172.21.18.45 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD - USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].N_RB_DL 50 --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From 3d9333f677926e24fc287bb1fafa133c41990106 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 1 Jun 2023 12:31:15 +0200 Subject: [PATCH 20/58] Updates in lte_b200_tdd_20Mhz_tm1 1. Docker compose yaml 2. Added PRB in additional options --- .../lte_b200_tdd_20Mhz_tm1/docker-compose.yml | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml index 3f7062ea3e..c891b9ab2c 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml @@ -6,28 +6,11 @@ services: privileged: true container_name: lte-b200-enb-tdd-20Mhz-tm1 environment: - USE_TDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 40 - DL_FREQUENCY_IN_MHZ: 2350 - UL_FREQUENCY_OFFSET_IN_MHZ: 0 - NID_CELL: 0 - NB_PRB: 100 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - S1C_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 172.21.18.45 - S1U_IF_NAME: eth0 - ENB_X2_IP_ADDRESS: 172.21.18.45 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD - USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --log_config.global_log_options level,nocolor,time,line_num,function + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --eNBs.[0].component_carriers.[0].N_RB_DL 100 --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From b537602f82de8528d6516f5182f341c156281a8b Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:27:05 +0100 Subject: [PATCH 21/58] Updates in lte_b200_tdd_20Mhz_tm1_default_scheduler 1. Docker compose yaml 2. eNB config : enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf --- ....100prb.usrpb200-tm1-defaultscheduler.conf | 218 ++++++++++++++++++ .../docker-compose.yml | 21 +- 2 files changed, 220 insertions(+), 19 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf diff --git a/ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf b/ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf new file mode 100644 index 0000000000..56ded888c8 --- /dev/null +++ b/ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf @@ -0,0 +1,218 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "eNodeB_3GPP"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "TDD"; + tdd_config = 1; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 40; + downlink_frequency = 2350000000L; + uplink_frequency_offset = 0000000; + Nid_cell = 0; + N_RB_DL = 100; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 1; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower =-27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -106; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + + ue_TransmissionMode = 1; + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + + log_config : + { + global_log_level ="debug"; + hw_log_level ="info"; + phy_log_level ="info"; + mac_log_level ="info"; + rlc_log_level ="info"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + }; + + } +); +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; + puSch10xSnr = 150; + puCch10xSnr = 150; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 6 + att_rx = 6; + bands = [38]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 125; + eNB_instances = [0]; + + } +); + +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"; + } +); diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml index 9c7fc35af6..5d53e8ca83 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml @@ -6,28 +6,11 @@ services: privileged: true container_name: lte-b200-enb-tdd-20Mhz-tm1 environment: - USE_TDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '208' - MNC: '92' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 40 - DL_FREQUENCY_IN_MHZ: 2350 - UL_FREQUENCY_OFFSET_IN_MHZ: 0 - NID_CELL: 0 - NB_PRB: 100 - ENABLE_MEASUREMENT_REPORTS: 'no' - ENABLE_X2: 'no' - MME_S1C_IP_ADDRESS: 172.21.18.48 - S1C_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 172.21.18.45 - S1U_IF_NAME: eth0 - ENB_X2_IP_ADDRESS: 172.21.18.45 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev network_mode: "host" healthcheck: From 298e1a75faf4943d7c18ad414ae571d3b895610d Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:28:20 +0100 Subject: [PATCH 22/58] Updates in nsa_b200_enb 1. Docker compose 2. eNB config : enb.nsa.band7.25prb.usrpb200.conf --- .../enb.nsa.band7.25prb.usrpb200.conf | 263 ++++++++++++++++++ .../nsa_b200_enb/docker-compose.yml | 23 +- 2 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf diff --git a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf new file mode 100644 index 0000000000..fb4e2f58b5 --- /dev/null +++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf @@ -0,0 +1,263 @@ +Active_eNBs = ( "eNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe01; + cell_type = "CELL_MACRO_ENB"; + eNB_name = "eNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 222; mnc = 01; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + // In seconds + rrc_inactivity_threshold = 0; + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 115; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower= -29; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; +/* + srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =; +*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -96; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; +/* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; +*/ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* + rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + //SSB central frequency of NR secondary cell group (for ENDC NSA) + nr_scg_ssb_freq = 641272; + } + ); + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "yes"; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.16.137"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + ///X2 + enable_x2 = "yes"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.68.130"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.68.130"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "192.168.68.130"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + } +); + +MACRLCs = +( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 160; + puCch10xSnr = 160; + } +); + +L1s = +( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = +( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 3 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 115; + eNB_instances = [0]; +# clock_src = "external"; + } +); + +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"; + } +); + +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/yaml_files/nsa_b200_enb/docker-compose.yml b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml index 706a22b0da..8c2171c0f2 100644 --- a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml +++ b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml @@ -6,30 +6,11 @@ services: privileged: true container_name: nsa-b200-enb environment: - USE_FDD_MONO: 'yes' USE_B2XX: 'yes' - ENB_NAME: eNB-in-docker - MCC: '222' - MNC: '01' - MNC_LENGTH: 2 - TAC: 1 - UTRA_BAND_ID: 7 - DL_FREQUENCY_IN_MHZ: 2680 - UL_FREQUENCY_OFFSET_IN_MHZ: 120 - NID_CELL: 0 - NB_PRB: 25 - ENABLE_MEASUREMENT_REPORTS: 'yes' - ENABLE_X2: 'yes' - MME_S1C_IP_ADDRESS: 172.21.16.137 - ENB_S1C_IF_NAME: eth0 - ENB_S1C_IP_ADDRESS: 192.168.68.130 - ENB_S1U_IF_NAME: eth0 - ENB_S1U_IP_ADDRESS: 192.168.68.130 - ENB_X2_IP_ADDRESS: 192.168.68.130 - RRC_INACTIVITY_THRESHOLD: 0 - THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/enb.nsa.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/mounted.conf - /dev:/dev networks: public_net: From 069963e383abaf2c9fd44a8e03bda77b73e23aeb Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:29:23 +0100 Subject: [PATCH 23/58] Updates in nsa_b200_gnb 1. Docker compose yaml 2. eNB config : gnb.nsa.band78.106prb.usrpb200.conf --- .../gnb.nsa.band78.106prb.usrpb200.conf | 272 ++++++++++++++++++ .../nsa_b200_gnb/docker-compose.yml | 18 +- 2 files changed, 274 insertions(+), 16 deletions(-) create mode 100644 ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf new file mode 100644 index 0000000000..48196df57f --- /dev/null +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -0,0 +1,272 @@ +Active_gNBs = ( "gNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + cell_type = "CELL_MACRO_GNB"; + gNB_name = "gNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({mcc = 222; mnc = 01; mnc_length = 2;}); + + tr_s_preference = "local_mac" + + ////////// Physical parameters: + + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# 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 + 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=84,L=13 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 6368; +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + initialDLBWPsubcarrierSpacing = 1; + #pdcch-ConfigCommon + initialDLBWPcontrolResourceSetZero = 0; + 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 = -100; +#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 = 5; +#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 = 14; //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; #0x80; + +# 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; //8; //7; + nrofDownlinkSymbols = 6; //0; //6; + nrofUplinkSlots = 2; + nrofUplinkSymbols = 4; //0; //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.68.130"; +# ipv6 = "192:168:30::17"; +# port = 36412 ; +# active = "yes"; +# preference = "ipv4"; +# } +# ); + + ///X2 + enable_x2 = "yes"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + target_enb_x2_ip_address = ( { ipv4 = "192.168.68.130"; + ipv6 = "192:168:30::17"; + preference = "ipv4"; + } + ); + + NETWORK_INTERFACES : + { + GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.68.194"; + GNB_INTERFACE_NAME_FOR_S1U = "eth0"; + GNB_IPV4_ADDRESS_FOR_S1U = "192.168.68.194"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + GNB_IPV4_ADDRESS_FOR_X2C = "192.168.68.194"; + GNB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 200; + ulsch_max_frame_inactivity = 0; + } +); + +L1s = ( +{ + num_cc = 1; + tr_n_preference = "local_mac"; + ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 +} +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 12 + att_rx = 12; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 114; + eNB_instances = [0]; +# sdr_addrs = "serial=30C51D4"; +# clock_src = "external"; + } +); + +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"; +}; + +uicc: { + opc = "testopc"; +}; diff --git a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml index 529aa2a2b7..50d1c70399 100644 --- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml @@ -6,25 +6,11 @@ services: privileged: true container_name: nsa-b200-gnb environment: - USE_NSA_TDD_MONO: 'yes' USE_B2XX: 'yes' - GNB_NAME: gNB-in-docker - MCC: '222' - MNC: '01' - MNC_LENGTH: 2 - TAC: 1 - ENABLE_X2: 'yes' - ENB_X2_IP_ADDRESS: 192.168.68.130 - MME_S1C_IP_ADDRESS: 172.21.16.137 - GNB_S1C_IF_NAME: eth0 - GNB_S1C_IP_ADDRESS: 192.168.68.194 - GNB_S1U_IF_NAME: eth0 - GNB_S1U_IP_ADDRESS: 192.168.68.194 - GNB_X2_IP_ADDRESS: 192.168.68.194 - RRC_INACTIVITY_THRESHOLD: 0 - THREAD_PARALLEL_CONFIG: PARALLEL_RU_L1_TRX_SPLIT + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf - /dev:/dev networks: public_net: From 0e6ed55a3fe87b2ec490d5c23a2489b43e68ff5b Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:30:10 +0100 Subject: [PATCH 24/58] Updates in sa_b200_gnb 1. Docker compose yaml 2. gNB config : gnb.sa.band78.51prb.usrpb200.conf --- .../gnb.sa.band78.51prb.usrpb200.conf | 266 ++++++++++++++++++ .../yaml_files/sa_b200_gnb/docker-compose.yml | 15 +- 2 files changed, 268 insertions(+), 13 deletions(-) create mode 100644 ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf new file mode 100644 index 0000000000..16cc70ca4b --- /dev/null +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf @@ -0,0 +1,266 @@ +Active_gNBs = ( "gNB-in-docker"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + gNB_name = "gNB-in-docker"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + nr_cellid = 12345678L; + + ////////// Physical parameters: + + do_CSIRS = 0; + do_SRS = 0; + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3300.30 MHz + (19 PRBs + 10 SCs)@30kHz SCS (GSCN: 7715) + absoluteFrequencySSB = 620736; + dl_frequencyBand = 78; + # this is 3300.30 MHz + dl_absoluteFrequencyPointA = 620020; + #scs-SpecificCarrierList + dl_offstToCarrier = 0; +# subcarrierSpacing +# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 + dl_subcarrierSpacing = 1; + dl_carrierBandwidth = 51; + #initialDownlinkBWP + #genericParameters + # this is RBstart=27,L=48 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 13750; +# 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 = 51; + pMax = 20; + #initialUplinkBWP + #genericParameters + initialULBWPlocationAndBandwidth = 13750; +# 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 = -96; +#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 = 14; +#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 = "172.21.16.137"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + + NETWORK_INTERFACES : + { + GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.194"; + GNB_INTERFACE_NAME_FOR_NGU = "eth0"; + GNB_IPV4_ADDRESS_FOR_NGU = "192.168.68.194"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + }; + + } +); + +MACRLCs = ( +{ + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 200; + ul_prbblack_SNR_threshold = 10; + ulsch_max_frame_inactivity = 0; +} +); + +L1s = ( +{ + num_cc = 1; + tr_n_preference = "local_mac"; + prach_dtx_threshold = 120; + pucch0_dtx_threshold = 100; + ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 +} +); + +RUs = ( +{ + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 14; + att_rx = 14; + bands = [78]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 114; + eNB_instances = [0]; + #beamforming 1x4 matrix: + bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; + clock_src = "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"; +} +); + +rfsimulator : +{ + serveraddr = "server"; + serverport = "4043"; + options = (); #("saviq"); or/and "chanmod" + modelname = "AWGN"; + IQfile = "/tmp/rfsimulator.iqs"; +}; + +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"; + ngap_log_level ="debug"; + f1ap_log_level ="debug"; +}; diff --git a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml index 965ab652bd..1cad790816 100644 --- a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml @@ -6,22 +6,11 @@ services: privileged: true container_name: sa-b200-gnb environment: - USE_SA_TDD_MONO_B2XX: 'yes' USE_B2XX: 'yes' - GNB_NAME: gNB-in-docker - MCC: '222' - MNC: '01' - MNC_LENGTH: 2 - TAC: 1 - NSSAI_SST: 1 - NSSAI_SD0: 1 - AMF_IP_ADDRESS: 172.21.16.137 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.68.194 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.68.194 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf - /dev:/dev networks: public_net: From 0ebfa8b74f8695f414fd202cdba42ef01e4b8118 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 13 Feb 2023 14:30:58 +0100 Subject: [PATCH 25/58] Updates in sa_f1_b200_gnb 1. Docker compose yaml 2. gNB config : gnb-cu.sa.band78.106prb.usrpb200.conf gnb-du.sa.band78.106prb.usrpb200.conf --- .../gnb-cu.sa.band78.106prb.usrpb200.conf | 218 ++++++++++++++++ .../gnb-du.sa.band78.106prb.usrpb200.conf | 239 ++++++++++++++++++ .../sa_f1_b200_gnb/docker-compose.yml | 42 +-- 3 files changed, 461 insertions(+), 38 deletions(-) create mode 100644 ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf create mode 100644 ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf diff --git a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf new file mode 100644 index 0000000000..8e8eacb9e6 --- /dev/null +++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf @@ -0,0 +1,218 @@ +Active_gNBs = ( "gNB-Eurecom-CU"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; +Num_Threads_PUSCH = 8; + +gNBs = +( + { + ////////// Identification parameters: + gNB_ID = 0xe00; + +# cell_type = "CELL_MACRO_GNB"; + + gNB_name = "gNB-Eurecom-CU"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + + nr_cellid = 12345678L; + force_256qam_off = 1; + + tr_s_preference = "f1"; + + local_s_if_name = "eth0"; + local_s_address = "192.168.68.194"; + remote_s_address = "192.168.68.195"; + local_s_portc = 501; + local_s_portd = 2153; + remote_s_portc = 500; + remote_s_portd = 2153; + min_rxtxtime = 6; + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 641280; + dl_frequencyBand = 78; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 640008; + #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=27,L=48 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 +# 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 = 13; + preambleReceivedTargetPower = -96; +#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 = 14; +#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 = "172.21.16.137"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + NETWORK_INTERFACES : + { + + GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.194"; + GNB_INTERFACE_NAME_FOR_NGU = "eth0"; + GNB_IPV4_ADDRESS_FOR_NGU = "192.168.68.194"; + GNB_PORT_FOR_S1U = 2152; # Spec 2152 + }; + } +); + +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 ="debug"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + f1ap_log_level ="debug"; + ngap_log_level ="debug"; + }; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf new file mode 100644 index 0000000000..8234a17020 --- /dev/null +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf @@ -0,0 +1,239 @@ +Active_gNBs = ( "gNB-Eurecom-DU"); +# 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-DU"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + + + nr_cellid = 12345678L; + + ////////// Physical parameters: + + min_rxtxtime = 6; + force_256qam_off = 1; + + + servingCellConfigCommon = ( + { + #spCellConfigCommon + + physCellId = 0; + +# downlinkConfigCommon + #frequencyInfoDL + # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) + absoluteFrequencySSB = 641280; + dl_frequencyBand = 78; + # this is 3600 MHz + dl_absoluteFrequencyPointA = 640008; + #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=27,L=48 (275*(L-1))+RBstart + initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 +# 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 = 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 = 13; + preambleReceivedTargetPower = -96; +#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 = 14; +#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; + }; + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "f1"; + local_n_if_name = "eth0"; + local_n_address = "192.168.68.195"; + remote_n_address = "192.168.68.194"; + local_n_portc = 500; + local_n_portd = 2153; + remote_n_portc = 501; + remote_n_portd = 2153; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 200; + ulsch_max_frame_inactivity = 1; + } +); + +L1s = ( +{ + num_cc = 1; + tr_n_preference = "local_mac"; + prach_dtx_threshold = 200; + pucch0_dtx_threshold = 150; + ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 +} +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 0 + att_rx = 0; + bands = [78]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 114; + eNB_instances = [0]; + #beamforming 1x4 matrix: + bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; + clock_src = "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"; + } +); +rfsimulator: { +serveraddr = "server"; + serverport = "4043"; + options = (); #("saviq"); or/and "chanmod" + modelname = "AWGN"; + IQfile = "/tmp/rfsimulator.iqs" +} + + 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 ="debug"; + ngap_log_level ="debug"; + }; diff --git a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml index 05112c2104..e868faedd8 100644 --- a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml @@ -6,28 +6,11 @@ services: privileged: true container_name: sa-cu-gnb environment: - USE_SA_CU: 'yes' USE_B2XX: 'yes' - GNB_NAME: gNB-CU-in-docker - MCC: '222' - MNC: '01' - MNC_LENGTH: 2 - TAC: 1 - NSSAI_SST: 1 - NSSAI_SD0: 1 - NSSAI_SD1: 2 - AMF_IP_ADDRESS: 172.21.16.137 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.68.194 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.68.194 - F1_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 192.168.68.194 - F1_DU_IP_ADDRESS: 192.168.68.195 - F1_CU_D_PORT: 2153 - F1_DU_D_PORT: 2153 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf - /dev:/dev networks: public_net: @@ -45,28 +28,11 @@ services: privileged: true container_name: sa-du-b200-gnb environment: - USE_SA_TDD_DU: 'yes' USE_B2XX: 'yes' - GNB_NAME: gNB-DU-in-docker - MCC: '222' - MNC: '01' - MNC_LENGTH: 2 - TAC: 1 - NSSAI_SST: 1 - NSSAI_SD0: 1 - NSSAI_SD1: 2 - AMF_IP_ADDRESS: 172.21.16.136 - GNB_NGA_IF_NAME: eth0 - GNB_NGA_IP_ADDRESS: 192.168.68.194 - GNB_NGU_IF_NAME: eth0 - GNB_NGU_IP_ADDRESS: 192.168.68.194 - F1_IF_NAME: eth0 - F1_CU_IP_ADDRESS: 192.168.68.194 - F1_DU_IP_ADDRESS: 192.168.68.195 - F1_CU_D_PORT: 2153 - F1_DU_D_PORT: 2153 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 14 --RUs.[0].att_tx 14 volumes: + - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf - /dev:/dev networks: public_net: From 7a0c906414e3235e567734cb38a8d7bdae27aa71 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 21 Feb 2023 17:38:07 +0100 Subject: [PATCH 26/58] Updates for 5g-rfsim-fdd-phytest --- .../5g_rfsimulator_fdd_phytest/docker-compose.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 034ae6f7b8..78f42babc7 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 @@ -26,14 +26,11 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208930100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time volumes: - - rrc.config:/opt/oai-nr-ue/etc/rrc/ + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - rrc.config:/opt/oai-nr-ue/etc/rrc/ depends_on: - oai-gnb networks: From 155db29e9ba74a9435ec90cf9cf95849dd826bf4 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 2 Jun 2023 14:55:19 +0200 Subject: [PATCH 27/58] Updates in 4g-rfsim-fembms --- .../conf_files/enb.band7.25prb.rfsim-tm1.conf | 398 ++++++++++++++++++ .../4g_rfsimulator_fembms/docker-compose.yml | 13 +- 2 files changed, 402 insertions(+), 9 deletions(-) create mode 100644 ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf new file mode 100644 index 0000000000..e98896ac5d --- /dev/null +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf @@ -0,0 +1,398 @@ +Active_eNBs = ( "eNB-Eurecom-LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB-Eurecom-LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } ); + + tr_s_preference = "local_mac" + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "3GPP_eNODEB"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "FDD"; + tdd_config = 3; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + pbch_repetition = "FALSE"; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 0; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower = -27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -104; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + ue_TransmissionMode = 1; + mbms_dedicated_serving_cell = "DISABLE" + + //Parameters for SIB18 + rxPool_sc_CP_Len = "normal"; + rxPool_sc_Period = "sf40"; + rxPool_data_CP_Len = "normal"; + rxPool_ResourceConfig_prb_Num = 20; + rxPool_ResourceConfig_prb_Start = 5; + rxPool_ResourceConfig_prb_End = 44; + rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + rxPool_ResourceConfig_offsetIndicator_choice = 0; + rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; + rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; +/* rxPool_dataHoppingConfig_hoppingParameter = 0; + rxPool_dataHoppingConfig_numSubbands = "ns1"; + rxPool_dataHoppingConfig_rbOffset = 0; + rxPool_commTxResourceUC-ReqAllowed = "TRUE"; +*/ + // Parameters for SIB19 + discRxPool_cp_Len = "normal" + discRxPool_discPeriod = "rf32" + discRxPool_numRetx = 1; + discRxPool_numRepetition = 2; + discRxPool_ResourceConfig_prb_Num = 5; + discRxPool_ResourceConfig_prb_Start = 3; + discRxPool_ResourceConfig_prb_End = 21; + discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; + discRxPool_ResourceConfig_offsetIndicator_choice = 0; + discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; + discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; + + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + ////////// MCE parameters: + target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + ///M2 + enable_enb_m2 = "yes"; + + + mbms_configuration_data_list = ( + { + mbsfn_sync_area = 0x0001; + mbms_service_area_list=( + { + mbms_service_area=0x0001; + } + ); + } + + ); + + + + NETWORK_INTERFACES : + { + + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + + ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24"; + ENB_PORT_FOR_M2C = 36443; # Spec 36443 + }; + } +); + +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + phy_test_mode = 0; + puSch10xSnr = 200; + puCch10xSnr = 200; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +MCEs = ( + { + MCE_ID = 0xe00; + + MCE_name = "MCE-Vicomtech-LTEBox"; + + //M2 + enable_mce_m2 = "yes"; + + //M3 + enable_mce_m3 = "yes"; + + target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + + + NETWORK_INTERFACES : + { + MCE_INTERFACE_NAME_FOR_M2_ENB = "lo"; + MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24"; + MCE_PORT_FOR_M2C = 36443; # Spec 36443 + + MCE_INTERFACE_NAME_FOR_M3_MME = "lo"; + MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24"; + MCE_PORT_FOR_M3C = 36444; # Spec 36444 + }; + + plnm: + { + mcc = 208; + mnc = 93; + mnc_length = 2; + }; + + mbms_sched_info : + { + mcch_update_time = 10; + mbms_area_config_list = ( + { + common_sf_allocation_period = 1; #rf4(0) rf8(1) rf16(2) rf32(3) rf64(4) rf128(5) rf256(6) + mbms_area_id = 0; + pmch_config_list = ( + { + allocated_sf_end=32; + data_mcs=15; + mch_scheduling_period = 0; #rf8(0) rf16(1) rf32(2) rf64(3) rf128(4) rf256(5) rf512(6) rf1024(7) + mbms_session_list = ( + { + #plnm + service_id ->tmgi + plnm: + { + mcc = 208; + mnc = 93; + mnc_length = 2; + } + service_id=0; #keep this allways as 0 (workaround for TUN if) + lcid=5; #this must be properly defined lcid:6+service:0 -> rab_id:5 //with new RLC set lcid either 4 or 5 + } + ); + } + ); + + mbms_sf_config_list = ( + { + radioframe_allocation_period=0; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5) + radioframe_alloocation_offset=0; + num_frame="oneFrame"; + subframe_allocation=57; #xx111001 + //num_frame="fourFrame"; + //subframe_allocation=14548987; # + } + ); + + } + ); + }; + + + mcch_config_per_mbsfn_area = ( + { + mbsfn_area = 0; + pdcch_length = 1; #s1(0), s2(1) + repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3) + offset = 0; + modification_period = 0; #rf512(0; rf1024(1) + subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000 + mcs = 0; #n2(0), n7(1), n13(2), n19(3) + } + ); + + #); #end mbms_scheduling_info + + } +); + +MMEs = ( + { + MME_ID = 0xe00; + + MME_name = "MME-MBMS-Vicomtech-LTEBox"; + + //M3 + enable_mme_m3 = "yes"; + NETWORK_INTERFACES : + { + MME_INTERFACE_NAME_FOR_M3_MCE = "lo"; + MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24"; + MME_PORT_FOR_M3C = 36444; # Spec 36444 + + }; + } +); + + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 0 + att_rx = 0; + bands = [7]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 125; + eNB_instances = [0]; + + } +); + +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"; + } +); + +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"; + m3ap_log_level = "debug"; + m2ap_log_level = "debug"; + mce_app_log_level = "debug"; + mme_app_log_level = "debug"; +}; 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 a39f39f9b1..c3b3a9b187 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml @@ -14,7 +14,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/mounted.conf + - ../../conf_files/enb.band7.25prb.rfsim-tm1.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -30,16 +30,11 @@ services: ipv4_address: 192.168.61.30 environment: TZ: Europe/Paris - HOSTNAME: oai_ue0 + USE_VOLUMED_CONF: 'yes' RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '93' - SHORT_IMSI: '100001111' - LTE_KEY: '8baf473f2f8fd09487cccbd7097c6862' - OPC: 'e734f8734007d6c5ce7a0508809e7e9c' - MSISDN: '33611123456' - HPLMN: 20893 USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1 + volumes: + - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From 44e5779d362aac392db722442c4df5d882054b19 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 22 Feb 2023 14:10:34 +0100 Subject: [PATCH 28/58] Updates in 4g-rfsim mbms: Naming change for enb config file --- ...mbms.conf => enb.band7.25prb.rfsim-tm1-mbms.conf} | 0 .../4g_rfsimulator_mbms/docker-compose.yml | 12 ++++-------- 2 files changed, 4 insertions(+), 8 deletions(-) rename ci-scripts/conf_files/{enb.band7.tm1.25PRB.rfsim.mbms.conf => enb.band7.25prb.rfsim-tm1-mbms.conf} (100%) diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1-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.25prb.rfsim-tm1-mbms.conf 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 6677ed4cdc..fddacbe7cc 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml @@ -14,7 +14,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/mounted.conf + - ../../conf_files/enb.band7.25prb.rfsim-tm1-mbms.conf:/opt/oai-enb/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -36,14 +36,10 @@ services: TZ: Europe/Paris HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - MCC: '208' - MNC: '93' - SHORT_IMSI: '100001111' - LTE_KEY: '8baf473f2f8fd09487cccbd7097c6862' - OPC: 'e734f8734007d6c5ce7a0508809e7e9c' - MSISDN: '33611123456' - HPLMN: 20893 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1 + volumes: + - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf healthcheck: test: /bin/bash -c "pgrep lte-uesoftmodem" interval: 10s From a930ab30b9433064b88dae7dbc4c412b9d4486c8 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 22 Feb 2023 14:36:37 +0100 Subject: [PATCH 29/58] Updates in 5g-rfsim-24prb: --- .../5g_rfsimulator_24prb/docker-compose.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 32f769ec3a..9c987000be 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -188,17 +188,15 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: public_net: ipv4_address: 192.168.71.150 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From a410d1578fa0d4a2fd07a4e349dda32a54c4eca1 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 2 Jun 2023 14:56:25 +0200 Subject: [PATCH 30/58] Updates in 5g-rfsim-2x2 1. gNB config file: gnb.sa.band78.106prb.rfsim-2x2.conf --- .../yaml_files/5g_rfsimulator_2x2/docker-compose.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index 5a62f8ba5c..2f63ffe9d5 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -189,12 +189,8 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: @@ -202,6 +198,7 @@ services: ipv4_address: 192.168.71.150 volumes: - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From 64bc83bd64ab4daf1e8700cb3087bbdab5516295 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 22 Feb 2023 14:43:28 +0100 Subject: [PATCH 31/58] Updates in 5g-rfsim-fr2-32prb --- .../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf | 2 +- .../5g_rfsimulator_fr2_32prb/docker-compose.yaml | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf index eeb562b4a4..e460fb0a4d 100644 --- a/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf +++ b/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf @@ -15,7 +15,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({mcc = 311; mnc = 480; mnc_length = 3;}); + plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;}); tr_s_preference = "local_mac" 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 b51cecc1df..019c9cf794 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 @@ -26,14 +26,11 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '311480100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time volumes: - - rrc.config:/opt/oai-nr-ue/etc/rrc/ + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - rrc.config:/opt/oai-nr-ue/etc/rrc/ depends_on: - oai-gnb networks: From 05920bcd29e67f5b815ceaef1cf253b952682cac Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 22 Feb 2023 14:49:55 +0100 Subject: [PATCH 32/58] Updates in 5g-rfsim-tdd-dora 1. Docker compose yaml --- .../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf | 2 +- .../5g_rfsimulator_tdd_dora/docker-compose.yaml | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf index 61bb39329e..453b03910b 100644 --- a/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf +++ b/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf @@ -15,7 +15,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;}); + plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;}); tr_s_preference = "local_mac" 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 befcb54e3f..8e5398529f 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 @@ -26,14 +26,11 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208930100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 + USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time volumes: - - rrc.config:/opt/oai-nr-ue/etc/rrc/ + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - rrc.config:/opt/oai-nr-ue/etc/rrc/ depends_on: - oai-gnb networks: From dcbcf9ba1726c0f450989db8ab18b2d52c00461b Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 22 Feb 2023 14:51:06 +0100 Subject: [PATCH 33/58] Updates in 5g-rfsim-u0-25prb --- .../5g_rfsimulator_u0_25prb/docker-compose.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index 1282edc470..f6c945aafa 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -189,17 +189,15 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --log_config.global_log_options level,nocolor,time + USE_VOLUMED_CONF: 'yes' + USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: public_net: ipv4_address: 192.168.71.150 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From 9b01e8785bca1e76e1658f4251aef3c1e5c54acd Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 2 Jun 2023 14:47:11 +0200 Subject: [PATCH 34/58] Update config --- ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf index ab0e9c2a8d..bd325afce4 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf @@ -20,13 +20,6 @@ gNBs = sib1_tda = 5; min_rxtxtime = 6; - pdcch_ConfigSIB1 = ( - { - controlResourceSetZero = 2; - searchSpaceZero = 0; - } - ); - servingCellConfigCommon = ( { #spCellConfigCommon From bb9e77b00e7dfa6ea3ad9ebe91f245681163cd3a Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 22 Mar 2023 23:03:09 +0100 Subject: [PATCH 35/58] Added UE config for 5g-rfsim-e1 --- .../yaml_files/5g_rfsimulator_e1/docker-compose.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index f29f9e1ac6..2f09bb4a9a 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -234,17 +234,14 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.72.142 - FULL_IMSI: '208990100001100' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-du networks: ran_net: ipv4_address: 192.168.72.150 + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From 3c9bfd664bc2a09861747cd5e16a41603fd290e6 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 1 Jun 2023 13:03:55 +0200 Subject: [PATCH 36/58] Mount UE config file for Accelleran test --- .../5g_rfsimulator_accelleran/docker-compose.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml index 3551cc27c6..a56efa89d8 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml @@ -23,14 +23,11 @@ services: network_mode: "host" environment: RFSIMULATOR: 127.0.0.1 - FULL_IMSI: '208990100001140' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time + USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 208990100001140 --log_config.global_log_options level,nocolor,time depends_on: - oai-du + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s From db087b3532c06a635a6eab0325d24476bfe52ec0 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 21 Feb 2023 17:38:54 +0100 Subject: [PATCH 37/58] USIM conf for lteue 1. Rename ue_sim_ci.conf to lteue.usim.conf 2. Adding generic usim conf for lteue 3. Changed the location of ue_sim_ci config --- ci-scripts/conf_files/lteue.usim-ci.conf | 153 ++++++++++++++++++ ci-scripts/conf_files/lteue.usim-mbs.conf | 153 ++++++++++++++++++ .../conf_files/lteue.usim.conf | 0 3 files changed, 306 insertions(+) create mode 100644 ci-scripts/conf_files/lteue.usim-ci.conf create mode 100644 ci-scripts/conf_files/lteue.usim-mbs.conf rename openair3/NAS/TOOLS/ue_sim_ci.conf => ci-scripts/conf_files/lteue.usim.conf (100%) diff --git a/ci-scripts/conf_files/lteue.usim-ci.conf b/ci-scripts/conf_files/lteue.usim-ci.conf new file mode 100644 index 0000000000..e81b53aff6 --- /dev/null +++ b/ci-scripts/conf_files/lteue.usim-ci.conf @@ -0,0 +1,153 @@ +# 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="0100000001"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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="0100000001"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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="0100000001"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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="0100000001"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; + + # 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/lteue.usim-mbs.conf b/ci-scripts/conf_files/lteue.usim-mbs.conf new file mode 100644 index 0000000000..0413bbb0ee --- /dev/null +++ b/ci-scripts/conf_files/lteue.usim-mbs.conf @@ -0,0 +1,153 @@ +# List of known PLMNS +PLMN: { + PLMN0: { + FULLNAME="OpenAirInterface"; + SHORTNAME="OAICN"; + MNC="93"; + MCC="208"; + }; +}; + +UE0: +{ + USER: { + IMEI="356113022094149"; + MANUFACTURER="OAI"; + MODEL="LTE SoftModem"; + PIN="0000"; + }; + + SIM: { + MSIN="100001111"; + USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; + OPC="e734f8734007d6c5ce7a0508809e7e9c"; + MSISDN="33611123456"; + }; + + # Home PLMN Selector with Access Technology + HPLMN= "20893"; + + # User controlled PLMN Selector with Access Technology + UCPLMN_LIST = (); + + # Operator PLMN List + OPLMN_LIST = ("20893"); + + # 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="100001111"; + USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; + OPC="e734f8734007d6c5ce7a0508809e7e9c"; + MSISDN="33611123456"; + }; + + # Home PLMN Selector with Access Technology + HPLMN= "20893"; + + # User controlled PLMN Selector with Access Technology + UCPLMN_LIST = (); + + # Operator PLMN List + OPLMN_LIST = ("20893"); + + # 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="100001111"; + USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; + OPC="e734f8734007d6c5ce7a0508809e7e9c"; + MSISDN="33611123456"; + }; + + # Home PLMN Selector with Access Technology + HPLMN= "20893"; + + # User controlled PLMN Selector with Access Technology + UCPLMN_LIST = (); + + # Operator PLMN List + OPLMN_LIST = ("20893"); + + # 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="100001111"; + USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; + OPC="e734f8734007d6c5ce7a0508809e7e9c"; + MSISDN="33611123456"; + }; + + # Home PLMN Selector with Access Technology + HPLMN= "20893"; + + # User controlled PLMN Selector with Access Technology + UCPLMN_LIST = (); + + # Operator PLMN List + OPLMN_LIST = ("20893"); + + # Operator controlled PLMN Selector with Access Technology + OCPLMN_LIST = (); + + # Forbidden plmns + FPLMN_LIST = (); + + # Equivalent home plmns + EHPLMN_LIST = (); + +}; diff --git a/openair3/NAS/TOOLS/ue_sim_ci.conf b/ci-scripts/conf_files/lteue.usim.conf similarity index 100% rename from openair3/NAS/TOOLS/ue_sim_ci.conf rename to ci-scripts/conf_files/lteue.usim.conf From dd532554ffcb3beaae892099e1102d537a04a0e8 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 13 Feb 2023 15:46:38 +0100 Subject: [PATCH 38/58] Do not generate config in docker containers --- docker/Dockerfile.eNB.rhel8.2 | 11 +++-------- docker/Dockerfile.eNB.ubuntu20 | 10 ++-------- docker/Dockerfile.gNB.rhel8.2 | 11 ++--------- docker/Dockerfile.gNB.ubuntu20 | 11 ++--------- docker/Dockerfile.lteRU.rhel8.2 | 11 ++--------- docker/Dockerfile.lteRU.ubuntu20 | 11 ++--------- docker/Dockerfile.lteUE.rhel8.2 | 9 +-------- docker/Dockerfile.lteUE.ubuntu20 | 9 +-------- docker/Dockerfile.nr-cuup.ubuntu20 | 4 +--- docker/Dockerfile.nrUE.rhel8.2 | 9 +-------- docker/Dockerfile.nrUE.ubuntu20 | 5 +---- 11 files changed, 18 insertions(+), 83 deletions(-) diff --git a/docker/Dockerfile.eNB.rhel8.2 b/docker/Dockerfile.eNB.rhel8.2 index f52f6d9566..8fa954aca3 100644 --- a/docker/Dockerfile.eNB.rhel8.2 +++ b/docker/Dockerfile.eNB.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS enb-base FROM ran-build:latest AS enb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \ - cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-enb @@ -55,9 +53,9 @@ RUN yum update -y && \ WORKDIR /opt/oai-enb/bin COPY --from=enb-build \ - /oai-ran/cmake_targets/ran_build/build/lte-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/lte-softmodem ./ + +COPY ./docker/scripts/enb_entrypoint.sh ./entrypoint.sh COPY --from=enb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -104,9 +102,6 @@ COPY --from=enb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for eNB -WORKDIR /opt/oai-enb/etc -COPY --from=enb-build /oai-ran/docker/etc . WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.eNB.ubuntu20 b/docker/Dockerfile.eNB.ubuntu20 index 86f9569a30..e3b4261526 100644 --- a/docker/Dockerfile.eNB.ubuntu20 +++ b/docker/Dockerfile.eNB.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest as enb-base FROM ran-build:latest AS enb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \ - cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-enb @@ -63,9 +61,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-enb/bin COPY --from=enb-build \ - /oai-ran/cmake_targets/ran_build/build/lte-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/lte-softmodem ./ +COPY ./docker/scripts/enb_entrypoint.sh ./entrypoint.sh COPY --from=enb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -97,9 +94,6 @@ COPY --from=enb-base \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for eNB -WORKDIR /opt/oai-enb/etc -COPY --from=enb-build /oai-ran/docker/etc . WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.gNB.rhel8.2 b/docker/Dockerfile.gNB.rhel8.2 index 187de03e37..04baef36a5 100644 --- a/docker/Dockerfile.gNB.rhel8.2 +++ b/docker/Dockerfile.gNB.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS gnb-base FROM ran-build:latest AS gnb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \ - cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-gnb @@ -57,9 +55,8 @@ RUN yum repolist --disablerepo=* && \ WORKDIR /opt/oai-gnb/bin COPY --from=gnb-build \ - /oai-ran/cmake_targets/ran_build/build/nr-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./ +COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -109,10 +106,6 @@ COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for gNB -WORKDIR /opt/oai-gnb/etc -COPY --from=gnb-build /oai-ran/docker/etc . - WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 22100/tcp # ? diff --git a/docker/Dockerfile.gNB.ubuntu20 b/docker/Dockerfile.gNB.ubuntu20 index 07d1413093..fe2d65dc85 100644 --- a/docker/Dockerfile.gNB.ubuntu20 +++ b/docker/Dockerfile.gNB.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest as gnb-base FROM ran-build:latest AS gnb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \ - cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-gnb @@ -62,9 +60,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-gnb/bin COPY --from=gnb-build \ - /oai-ran/cmake_targets/ran_build/build/nr-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./ +COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -99,10 +96,6 @@ COPY --from=gnb-base \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for gNB -WORKDIR /opt/oai-gnb/etc -COPY --from=gnb-build /oai-ran/docker/etc . - WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 22100/tcp # ? diff --git a/docker/Dockerfile.lteRU.rhel8.2 b/docker/Dockerfile.lteRU.rhel8.2 index b4d53f367b..e8661812bc 100644 --- a/docker/Dockerfile.lteRU.rhel8.2 +++ b/docker/Dockerfile.lteRU.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS ru-base FROM ran-build:latest AS ru-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \ - cp /oai-ran/docker/scripts/lte_ru_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ru @@ -54,9 +52,8 @@ RUN yum update -y && \ WORKDIR /opt/oai-lte-ru/bin COPY --from=ru-build \ - /oai-ran/cmake_targets/ran_build/build/oairu \ - /oai-ran/docker/scripts/entrypoint.sh \ - . + /oai-ran/cmake_targets/ran_build/build/oairu ./ +COPY ./docker/scripts/lte_ru_entrypoint.sh ./entrypoint.sh COPY --from=ru-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -95,10 +92,6 @@ COPY --from=ru-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for RRU -WORKDIR /opt/oai-lte-ru/etc -COPY --from=ru-build /oai-ran/docker/etc/rru* ./ - WORKDIR /opt/oai-lte-ru ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.lteRU.ubuntu20 b/docker/Dockerfile.lteRU.ubuntu20 index 51eac941f7..1a476c5733 100644 --- a/docker/Dockerfile.lteRU.ubuntu20 +++ b/docker/Dockerfile.lteRU.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest as ru-base FROM ran-build:latest AS ru-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \ - cp /oai-ran/docker/scripts/lte_ru_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-lte-ru @@ -59,9 +57,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-lte-ru/bin COPY --from=ru-build \ - /oai-ran/cmake_targets/ran_build/build/oairu \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/oairu ./ +COPY ./docker/scripts/lte_ru_entrypoint.sh ./entrypoint.sh COPY --from=ru-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -89,10 +86,6 @@ COPY --from=ru-base \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for RRU -WORKDIR /opt/oai-lte-ru/etc -COPY --from=ru-build /oai-ran/docker/etc/rru* ./ - WORKDIR /opt/oai-lte-ru ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.lteUE.rhel8.2 b/docker/Dockerfile.lteUE.rhel8.2 index 3bbcbb5d4b..fe9cb2e6fc 100644 --- a/docker/Dockerfile.lteUE.rhel8.2 +++ b/docker/Dockerfile.lteUE.rhel8.2 @@ -29,9 +29,6 @@ FROM ran-base:latest AS lte-ue-base FROM ran-build:latest AS lte-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \ - python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \ - cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ue @@ -57,12 +54,12 @@ RUN yum update -y && \ WORKDIR /opt/oai-lte-ue/bin COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \ /oai-ran/cmake_targets/nas_sim_tools/build/nvram \ /oai-ran/cmake_targets/nas_sim_tools/build/usim \ ./ +COPY ./docker/scripts/lte_ue_entrypoint.sh ./entrypoint.sh COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ @@ -105,10 +102,6 @@ COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for UE -WORKDIR /opt/oai-lte-ue/etc -COPY --from=lte-ue-build /oai-ran/docker/etc . - WORKDIR /opt/oai-lte-ue CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"] ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.lteUE.ubuntu20 b/docker/Dockerfile.lteUE.ubuntu20 index 06e2d0c669..7b09b45b3e 100644 --- a/docker/Dockerfile.lteUE.ubuntu20 +++ b/docker/Dockerfile.lteUE.ubuntu20 @@ -29,9 +29,6 @@ FROM ran-base:latest AS lte-ue-base FROM ran-build:latest AS lte-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \ - python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \ - cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-lte-ue @@ -63,12 +60,12 @@ RUN apt-get update && \ WORKDIR /opt/oai-lte-ue/bin COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \ /oai-ran/cmake_targets/nas_sim_tools/build/nvram \ /oai-ran/cmake_targets/nas_sim_tools/build/usim \ ./ +COPY ./docker/scripts/lte_ue_entrypoint.sh ./entrypoint.sh COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ @@ -98,10 +95,6 @@ COPY --from=lte-ue-base \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for UE -WORKDIR /opt/oai-lte-ue/etc -COPY --from=lte-ue-build /oai-ran/docker/etc . - WORKDIR /opt/oai-lte-ue CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"] ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.nr-cuup.ubuntu20 b/docker/Dockerfile.nr-cuup.ubuntu20 index e836d87fef..408728093f 100644 --- a/docker/Dockerfile.nr-cuup.ubuntu20 +++ b/docker/Dockerfile.nr-cuup.ubuntu20 @@ -29,7 +29,6 @@ FROM ran-base:latest as gnb-base FROM ran-build:latest AS gnb-build -RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh FROM ubuntu:focal as oai-nr-cuup ENV DEBIAN_FRONTEND=noninteractive @@ -46,9 +45,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-gnb/bin COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/nr-cuup \ - /oai-ran/docker/scripts/entrypoint.sh \ ./ - +COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ diff --git a/docker/Dockerfile.nrUE.rhel8.2 b/docker/Dockerfile.nrUE.rhel8.2 index 6242eb4c91..d1e8db5c25 100644 --- a/docker/Dockerfile.nrUE.rhel8.2 +++ b/docker/Dockerfile.nrUE.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS nr-ue-base FROM ran-build:latest AS nr-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \ - cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-nr-ue @@ -58,13 +56,11 @@ RUN yum update -y && \ WORKDIR /opt/oai-nr-ue/bin COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ ./ - +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 \ - /oai-ran/docker/etc/nr-ue.nfapi.conf \ ./ COPY --from=nr-ue-build \ @@ -115,9 +111,6 @@ COPY --from=nr-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig -# Copy the relevant configuration files for eNB -WORKDIR /opt/oai-nr-ue/etc -COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/ue.* . WORKDIR /opt/oai-nr-ue CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"] diff --git a/docker/Dockerfile.nrUE.ubuntu20 b/docker/Dockerfile.nrUE.ubuntu20 index f462fa9632..0eb22c818f 100644 --- a/docker/Dockerfile.nrUE.ubuntu20 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest AS nr-ue-base FROM ran-build:latest AS nr-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \ - cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-nr-ue @@ -63,13 +61,12 @@ RUN apt-get update && \ WORKDIR /opt/oai-nr-ue/bin COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ ./ +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 \ - /oai-ran/docker/etc/nr-ue.nfapi.conf \ ./ COPY --from=nr-ue-build \ From fd4c9227ff90bda3f6f1ac4a1f7761320202da97 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 13 Feb 2023 15:59:02 +0100 Subject: [PATCH 39/58] Entry point scripts: do not generate configuration files --- docker/scripts/enb_entrypoint.sh | 65 +--- docker/scripts/enb_parameters.yaml | 400 ---------------------- docker/scripts/generateTemplate.py | 116 ------- docker/scripts/gnb-aw2s_entrypoint.sh | 8 +- docker/scripts/gnb_entrypoint.sh | 66 +--- docker/scripts/gnb_parameters.yaml | 309 ----------------- docker/scripts/lte_ru_entrypoint.sh | 44 +-- docker/scripts/lte_ue_entrypoint.sh | 12 +- docker/scripts/lte_ue_parameters.yaml | 37 -- docker/scripts/lte_ue_sim_parameters.yaml | 47 --- docker/scripts/nr_ue_entrypoint.sh | 56 +-- docker/scripts/nr_ue_parameters.yaml | 49 --- 12 files changed, 74 insertions(+), 1135 deletions(-) delete mode 100644 docker/scripts/enb_parameters.yaml delete mode 100644 docker/scripts/generateTemplate.py delete mode 100644 docker/scripts/gnb_parameters.yaml delete mode 100644 docker/scripts/lte_ue_parameters.yaml delete mode 100644 docker/scripts/lte_ue_sim_parameters.yaml delete mode 100644 docker/scripts/nr_ue_parameters.yaml diff --git a/docker/scripts/enb_entrypoint.sh b/docker/scripts/enb_entrypoint.sh index e58f7d6269..28038ab36d 100755 --- a/docker/scripts/enb_entrypoint.sh +++ b/docker/scripts/enb_entrypoint.sh @@ -3,59 +3,24 @@ set -uo pipefail PREFIX=/opt/oai-enb -RRC_INACTIVITY_THRESHOLD=${RRC_INACTIVITY_THRESHOLD:-0} -ENABLE_MEASUREMENT_REPORTS=${ENABLE_MEASUREMENT_REPORTS:-no} -ENABLE_X2=${ENABLE_X2:-no} -THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD} +CONFIGFILE=$PREFIX/etc/enb.conf -# Based another env var, pick one template to use -if [[ -v USE_FDD_CU ]]; then cp $PREFIX/etc/cu.fdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_FDD_DU ]]; then cp $PREFIX/etc/du.fdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_FDD_MONO ]]; then cp $PREFIX/etc/enb.fdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_TDD_MONO ]]; then cp $PREFIX/etc/enb.tdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_FDD_FAPI_RCC ]]; then cp $PREFIX/etc/rcc.nfapi.fdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_FDD_IF4P5_RCC ]]; then cp $PREFIX/etc/rcc.if4p5.fdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_TDD_IF4P5_RCC ]]; then cp $PREFIX/etc/rcc.if4p5.tdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_FDD_RRU ]]; then cp $PREFIX/etc/rru.fdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_TDD_RRU ]]; then cp $PREFIX/etc/rru.tdd.conf $PREFIX/etc/enb.conf; fi -if [[ -v USE_NFAPI_VNF ]]; then cp $PREFIX/etc/enb.nfapi.vnf.conf $PREFIX/etc/enb.conf; fi -# Sometimes, the templates are not enough. We mount a conf file on $PREFIX/etc. It can be a template itself. -if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/enb.conf; fi +if [[ -v USE_VOLUMED_CONF ]]; then + cp $PREFIX/etc/mounted.conf $PREFIX/etc/enb.conf +else + echo "ERROR: No configuration file provided." + echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf" + exit 1 +fi -# Only this template will be manipulated -CONFIG_FILES=`ls $PREFIX/etc/enb.conf || true` +if [ ! -f $CONFIGFILE ]; then + echo "No configuration file found: please mount at $CONFIGFILE" + exit 255 +fi -for c in ${CONFIG_FILES}; do - # Sometimes templates have no pattern to be replaced. - if ! grep -oP '@[a-zA-Z0-9_]+@' ${c}; then - echo "Configuration is already set" - break - fi - - # grep variable names (format: ${VAR}) from template to be rendered - VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs) - - # create sed expressions for substituting each occurrence of ${VAR} - # with the value of the environment variable "VAR" - EXPRESSIONS="" - for v in ${VARS}; do - NEW_VAR=`echo $v | sed -e "s#@##g"` - if [[ "${!NEW_VAR}x" == "x" ]]; then - echo "Error: Environment variable '${NEW_VAR}' is not set." \ - "Config file '$(basename $c)' requires all of $VARS." - exit 1 - fi - EXPRESSIONS="${EXPRESSIONS};s|${v}|${!NEW_VAR}|g" - done - EXPRESSIONS="${EXPRESSIONS#';'}" - - # render template and inline replace config file - sed -i "${EXPRESSIONS}" ${c} - - echo "==================================" - echo "== Configuration file: ${c}" - cat ${c} -done +echo "==================================" +echo "== Configuration file:" +cat $CONFIGFILE # Load the USRP binaries echo "==================================" diff --git a/docker/scripts/enb_parameters.yaml b/docker/scripts/enb_parameters.yaml deleted file mode 100644 index 701911299a..0000000000 --- a/docker/scripts/enb_parameters.yaml +++ /dev/null @@ -1,400 +0,0 @@ -#/* -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ - ---- -- paths: - source_dir: "ci-scripts/conf_files/" - dest_dir: docker/etc - -- configurations: - - filePrefix: cu.band7.tm1.25PRB - outputfilename: "cu.fdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: local_s_if_name - env: "@F1_IF_NAME@" - - key: remote_s_address - env: "@F1_DU_IP_ADDRESS@" - - key: local_s_address - env: "@F1_CU_IP_ADDRESS@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@S1C_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@F1_CU_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@S1U_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@F1_CU_IP_ADDRESS@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@F1_CU_IP_ADDRESS@" - - - filePrefix: du.band7.tm1.25PRB - outputfilename: "du.fdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: local_n_if_name - env: "@F1_IF_NAME@" - - key: remote_n_address - env: "@F1_DU_IP_ADDRESS@" - - key: local_n_address - env: "@F1_CU_IP_ADDRESS@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: rru.fdd - outputfilename: "rru.fdd.conf" - config: - - key: local_if_name - env: "@RRU_IF4P5_IF_NAME@" - - key: remote_address - env: "@RCC_REMOTE_IP_ADDRESS@" - - key: local_address - env: "@RRU_LOCAL_IP_ADDRESS@" - - key: bands - env: "@UTRA_BAND_ID@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: rru.tdd - outputfilename: "rru.tdd.conf" - config: - - key: local_if_name - env: "@RRU_IF4P5_IF_NAME@" - - key: remote_address - env: "@RCC_REMOTE_IP_ADDRESS@" - - key: local_address - env: "@RRU_LOCAL_IP_ADDRESS@" - - key: bands - env: "@UTRA_BAND_ID@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: enb.band7.tm1.fr1.25PRB.usrpb210.conf - outputfilename: "enb.fdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: enable_measurement_reports - env: "@ENABLE_MEASUREMENT_REPORTS@" - - key: enable_x2 - env: "@ENABLE_X2@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@ENB_S1C_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@ENB_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@ENB_S1U_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@ENB_S1U_IP_ADDRESS@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@ENB_X2_IP_ADDRESS@" - - key: rrc_inactivity_threshold - env: "@RRC_INACTIVITY_THRESHOLD@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: enb.band40.tm1.25PRB.FairScheduler.usrpb210 - outputfilename: "enb.tdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@S1C_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@F1_CU_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@S1U_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@F1_CU_IP_ADDRESS@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@F1_CU_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: "rcc.band7.tm1.nfapi" - outputfilename: "rcc.nfapi.fdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: local_s_if_name - env: "@F1_IF_NAME@" - - key: remote_s_address - env: "@F1_DU_IP_ADDRESS@" - - key: local_s_address - env: "@F1_CU_IP_ADDRESS@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@S1C_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@F1_CU_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@S1U_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@F1_CU_IP_ADDRESS@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@F1_CU_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: "rcc.band7.tm1.if4p5.lo.25PRB" - outputfilename: "rcc.if4p5.fdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@RCC_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@RCC_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@RCC_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@RCC_IP_ADDRESS@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@RCC_IP_ADDRESS@" - - key: local_if_name - env: "@IF4P5_IF_NAME@" - - key: remote_address - env: "@IF4P5_RRU_IP_ADDRESS@" - - key: local_address - env: "@IF4P5_RCC_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: "rcc.band40.tm1.25PRB" - outputfilename: "rcc.if4p5.tdd.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@RCC_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@RCC_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@RCC_IF_NAME@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@RCC_IP_ADDRESS@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@RCC_IP_ADDRESS@" - - key: local_if_name - env: "@IF4P5_IF_NAME@" - - key: remote_address - env: "@IF4P5_RRU_IP_ADDRESS@" - - key: local_address - env: "@IF4P5_RCC_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: "proxy_rcc.band7.tm1.nfapi.conf" - outputfilename: "enb.nfapi.vnf.conf" - config: - - key: Active_eNBs - env: "@ENB_NAME@" - - key: eNB_name - env: "@ENB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: eutra_band - env: "@UTRA_BAND_ID@" - - key: downlink_frequency - env: "@DL_FREQUENCY_IN_MHZ@000000" - - key: uplink_frequency_offset - env: "@UL_FREQUENCY_OFFSET_IN_MHZ@000000" - - key: Nid_cell - env: "@NID_CELL@" - - key: N_RB_DL - env: "@NB_PRB@" - - key: ipv4 - env: "@MME_S1C_IP_ADDRESS@" - - key: ENB_INTERFACE_NAME_FOR_S1_MME - env: "@ENB_INTERFACE_NAME_FOR_S1_MME@" - - key: ENB_IPV4_ADDRESS_FOR_S1_MME - env: "@ENB_IPV4_ADDRESS_FOR_S1_MME@" - - key: ENB_INTERFACE_NAME_FOR_S1U - env: "@ENB_INTERFACE_NAME_FOR_S1U@" - - key: ENB_IPV4_ADDRESS_FOR_S1U - env: "@ENB_IPV4_ADDRESS_FOR_S1U@" - - key: ENB_IPV4_ADDRESS_FOR_X2C - env: "@ENB_IPV4_ADDRESS_FOR_X2C@" - - key: LOCAL_S_IF_NAME - env: "@LOCAL_S_IF_NAME@" - - key: REMOTE_S_ADDRESS - env: "@REMOTE_S_ADDRESS@" - - key: LOCAL_S_ADDRESS - env: "@LOCAL_S_ADDRESS@" diff --git a/docker/scripts/generateTemplate.py b/docker/scripts/generateTemplate.py deleted file mode 100644 index 9ad4f3c5e6..0000000000 --- a/docker/scripts/generateTemplate.py +++ /dev/null @@ -1,116 +0,0 @@ -#/* -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ -#--------------------------------------------------------------------- - -#----------------------------------------------------------- -# Import -#----------------------------------------------------------- -import glob -import re -import yaml -import os -import sys - - -def main(): - #read yaml input parameters - f = open(f'{sys.argv[1]}',) - data = yaml.full_load(f) - initial_path = f'{data[0]["paths"]["source_dir"]}' - dir = glob.glob(initial_path + '/**/*.conf', recursive=True) - - #identify configs, read and replace corresponding values - for config in data[1]["configurations"]: - filePrefix = config["filePrefix"] - outputfilename = config["outputfilename"] - print('================================================') - print('filePrefix = ' + filePrefix) - print('outputfilename = ' + outputfilename) - found = False - for inputfile in dir: - if found: - continue - if inputfile.find(filePrefix) >=0: - prefix_outputfile = {"cu.band7.tm1.25PRB": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "du.band7.tm1.25PRB": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "rru.fdd": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "rru.tdd": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "enb.band7.tm1.fr1.25PRB.usrpb210.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "enb.band40.tm1.25PRB.FairScheduler.usrpb210": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "rcc.band7.tm1.nfapi": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "rcc.band7.tm1.if4p5.lo.25PRB": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "rcc.band40.tm1.25PRB": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "gnb.band78.tm1.fr1.106PRB.usrpb210.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "gnb.band78.sa.fr1.106PRB.usrpn310.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "gnb.sa.band78.fr1.51PRB.usrpb210.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "gnb.sa.band66.fr1.106PRB.usrpn300.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "gNB_SA_CU.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "gNB_SA_DU.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "proxy_rcc.band7.tm1.nfapi.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "proxy_nr-ue.nfapi.conf": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "ue.nfapi": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}', - "ue_sim_ci": f'{data[0]["paths"]["dest_dir"]}/{outputfilename}' - } - print('inputfile = ' + inputfile) - found = True - if filePrefix in prefix_outputfile: - outputfile1 = prefix_outputfile[filePrefix] - - directory = f'{data[0]["paths"]["dest_dir"]}' - if not os.path.exists(directory): - os.makedirs(directory, exist_ok=True) - - with open(f'{inputfile}', mode='r') as inputfile, \ - open(outputfile1, mode='w') as outputfile: - for line in inputfile: - if re.search(r'EHPLMN_LIST', line): - outputfile.write(line) - continue - templine = line - for key in config["config"]: - if templine.find(key["key"]) >= 0: - if re.search(r'preference', templine): # false positive - continue - if key["key"] != 'sdr_addrs' and re.search(r'sdr_addrs', templine): # false positive - continue - elif re.search('downlink_frequency', line): - templine = re.sub(r'[0-9]+', key["env"], line) - elif re.search('uplink_frequency_offset', line): - templine = re.sub(r'[0-9]+', key["env"], line) - # next: matches key = ( "SOMETHING" ) or key = [ "SOMETHING" ] - elif re.search(key["key"] + "\s*=\s*[\(\[]\s*\"[0-9.a-zA-Z:_-]+\"\s*[\)\]]", templine): - templine = re.sub("(" + key["key"] + "\s*=\s*[\(\[]\s*\")[0-9.a-zA-Z:_-]+(\"[\)\]])", - r'\1' + key["env"] + r"\2", templine) - # next: matches key = "SOMETHING" or key = [SOMETHING], - elif re.search(key["key"] + "\s*=\s*[\"\[][0-9.a-zA-Z:_/-]+[\"\]]", templine): - templine = re.sub("(" + key["key"] + "\s*=\s*[\"\[])[0-9.a-zA-Z:_/-]+([\"\]])", - r'\1' + key["env"] + r"\2", templine) - # next: matches key = NUMBER - elif re.search(key["key"] + "\s*=\s*[x0-9]+", templine): # x for "0x" hex start - templine = re.sub("(" + key["key"] + "\s*=\s*(?:0x)?)[x0-9a-fA-F]+", r"\1" + key["env"], templine) - # next: special case for sdr_addrs - elif key["key"] == 'sdr_addrs' and re.search(key["key"] + "\s*=\s*", templine): - templine = re.sub("(" + key["key"] + "\s*=\s*.*$)", key["key"] + " = \"" + key["env"] + "\"", templine) - outputfile.write(templine) - -if __name__ == "__main__": - main() diff --git a/docker/scripts/gnb-aw2s_entrypoint.sh b/docker/scripts/gnb-aw2s_entrypoint.sh index 3b2a6a37d7..5318a1e6a3 100755 --- a/docker/scripts/gnb-aw2s_entrypoint.sh +++ b/docker/scripts/gnb-aw2s_entrypoint.sh @@ -3,6 +3,7 @@ set -uo pipefail PREFIX=/opt/oai-gnb-aw2s +CONFIGFILE=$PREFIX/etc/gnb.conf if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf @@ -12,9 +13,14 @@ else exit 1 fi +if [ ! -f $CONFIGFILE ]; then + echo "No configuration file found: please mount at $CONFIGFILE" + exit 255 +fi + echo "==================================" echo "== Configuration file:" -cat $PREFIX/etc/enb.conf +cat $CONFIGFILE # enable printing of stack traces on assert export gdbStacks=1 diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh index bb1bd50555..fdef130db7 100755 --- a/docker/scripts/gnb_entrypoint.sh +++ b/docker/scripts/gnb_entrypoint.sh @@ -3,62 +3,22 @@ set -uo pipefail PREFIX=/opt/oai-gnb -ENABLE_X2=${ENABLE_X2:-yes} -THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD} +CONFIGFILE=$PREFIX/etc/gnb.conf -# Based another env var, pick one template to use +if [[ -v USE_VOLUMED_CONF ]]; then + cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf +else + echo "Using default configuration" +fi -if [[ -v USE_NSA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.nsa.tdd.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_TDD_MONO_B2XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.b2xx.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_FDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.fdd.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_CU ]]; then cp $PREFIX/etc/gnb.sa.cu.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_TDD_DU ]]; then cp $PREFIX/etc/gnb.sa.du.tdd.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_NFAPI_VNF ]]; then cp $PREFIX/etc/gnb.sa.nfapi.vnf.conf $PREFIX/etc/gnb.conf; fi -# Sometimes, the templates are not enough. We mount a conf file on $PREFIX/etc. It can be a template itself. -if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf; fi +if [ ! -f $CONFIGFILE ]; then + echo "No configuration file found: please mount at $CONFIGFILE" + exit 255 +fi -# Defualt Parameters -GNB_ID=${GNB_ID:-e00} -NSSAI_SD=${NSSAI_SD:-ffffff} -# AMF_IP_ADDRESS can be amf ip address of amf fqdn -if [[ -v AMF_IP_ADDRESS ]] && [[ "${AMF_IP_ADDRESS}" =~ [a-zA-Z] ]] && [[ -z `getent hosts $AMF_IP_ADDRESS | awk '{print $1}'` ]]; then echo "not able to resolve AMF FQDN" && exit 1 ; fi -[[ -v AMF_IP_ADDRESS ]] && [[ "${AMF_IP_ADDRESS}" =~ [a-zA-Z] ]] && AMF_IP_ADDRESS=$(getent hosts $AMF_IP_ADDRESS | awk '{print $1}') - -# Only this template will be manipulated -CONFIG_FILES=`ls $PREFIX/etc/gnb.conf || true` - -for c in ${CONFIG_FILES}; do - # Sometimes templates have no pattern to be replaced. - if ! grep -oP '@[a-zA-Z0-9_]+@' ${c}; then - echo "Configuration is already set" - break - fi - - # grep variable names (format: ${VAR}) from template to be rendered - VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs) - - # create sed expressions for substituting each occurrence of ${VAR} - # with the value of the environment variable "VAR" - EXPRESSIONS="" - for v in ${VARS}; do - NEW_VAR=`echo $v | sed -e "s#@##g"` - if [[ "${!NEW_VAR}x" == "x" ]]; then - echo "Error: Environment variable '${NEW_VAR}' is not set." \ - "Config file '$(basename $c)' requires all of $VARS." - exit 1 - fi - EXPRESSIONS="${EXPRESSIONS};s|${v}|${!NEW_VAR}|g" - done - EXPRESSIONS="${EXPRESSIONS#';'}" - - # render template and inline replace config file - sed -i "${EXPRESSIONS}" ${c} - - echo "==================================" - echo "== Configuration file: ${c}" - cat ${c} -done +echo "==================================" +echo "== Configuration file:" +cat $CONFIGFILE # Load the USRP binaries echo "==================================" diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml deleted file mode 100644 index 8ee23dd035..0000000000 --- a/docker/scripts/gnb_parameters.yaml +++ /dev/null @@ -1,309 +0,0 @@ -#/* -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ - ---- -- paths: - source_dir: "ci-scripts/conf_files/" - dest_dir: docker/etc - -- configurations: - - filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf - outputfilename: "gnb.nsa.tdd.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: enable_x2 - env: "@ENABLE_X2@" - - key: ipv4 - env: "@ENB_X2_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_S1_MME - env: "@GNB_S1C_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_S1_MME - env: "@GNB_S1C_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_S1U - env: "@GNB_S1U_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_S1U - env: "@GNB_S1U_IP_ADDRESS@" - - key: GNB_IPV4_ADDRESS_FOR_X2C - env: "@GNB_X2_IP_ADDRESS@" - - key: rrc_inactivity_threshold - env: "@RRC_INACTIVITY_THRESHOLD@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf - outputfilename: "gnb.sa.tdd.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: ipv4 - env: "@AMF_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NG_AMF - env: "@GNB_NGA_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NG_AMF - env: "@GNB_NGA_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NGU - env: "@GNB_NGU_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NGU - env: "@GNB_NGU_IP_ADDRESS@" - - key: sdr_addrs - env: "@SDR_ADDRS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: gnb.sa.band78.fr1.51PRB.usrpb210.conf - outputfilename: "gnb.sa.tdd.b2xx.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: ipv4 - env: "@AMF_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NG_AMF - env: "@GNB_NGA_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NG_AMF - env: "@GNB_NGA_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NGU - env: "@GNB_NGU_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NGU - env: "@GNB_NGU_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf - outputfilename: "gnb.sa.fdd.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: ipv4 - env: "@AMF_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NG_AMF - env: "@GNB_NGA_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NG_AMF - env: "@GNB_NGA_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NGU - env: "@GNB_NGU_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NGU - env: "@GNB_NGU_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - - filePrefix: gNB_SA_CU.conf - outputfilename: "gnb.sa.cu.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: ipv4 - env: "@AMF_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NG_AMF - env: "@GNB_NGA_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NG_AMF - env: "@GNB_NGA_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NGU - env: "@GNB_NGU_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NGU - env: "@GNB_NGU_IP_ADDRESS@" - - key: local_s_if_name - env: "@F1_IF_NAME@" - - key: local_s_address - env: "@F1_CU_IP_ADDRESS@" - - key: local_s_portd - env: "@F1_CU_D_PORT@" - - key: remote_s_address - env: "@F1_DU_IP_ADDRESS@" - - key: remote_s_portd - env: "@F1_DU_D_PORT@" - - - filePrefix: gNB_SA_DU.conf - outputfilename: "gnb.sa.du.tdd.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: ipv4 - env: "@AMF_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NG_AMF - env: "@GNB_NGA_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NG_AMF - env: "@GNB_NGA_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NGU - env: "@GNB_NGU_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NGU - env: "@GNB_NGU_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - key: local_n_if_name - env: "@F1_IF_NAME@" - - key: local_n_address - env: "@F1_DU_IP_ADDRESS@" - - key: local_n_portd - env: "@F1_DU_D_PORT@" - - key: remote_n_address - env: "@F1_CU_IP_ADDRESS@" - - key: remote_n_portd - env: "@F1_CU_D_PORT@" - - - filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf - outputfilename: "gnb.sa.nfapi.vnf.conf" - config: - - key: gNB_ID - env: "@GNB_ID@" - - key: Active_gNBs - env: "@GNB_NAME@" - - key: gNB_name - env: "@GNB_NAME@" - - key: mcc - env: "@MCC@" - - key: mnc - env: "@MNC@" - - key: mnc_length - env: "@MNC_LENGTH@" - - key: tracking_area_code - env: "@TAC@" - - key: sst - env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - - key: tracking_area_code - env: "@TAC@" - - key: ipv4 - env: "@AMF_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NG_AMF - env: "@GNB_NGA_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NG_AMF - env: "@GNB_NGA_IP_ADDRESS@" - - key: GNB_INTERFACE_NAME_FOR_NGU - env: "@GNB_NGU_IF_NAME@" - - key: GNB_IPV4_ADDRESS_FOR_NGU - env: "@GNB_NGU_IP_ADDRESS@" - - key: parallel_config - env: "@THREAD_PARALLEL_CONFIG@" - - key: local_s_if_name - env: "@LOCAL_S_IF_NAME@" - - key: remote_s_address - env: "@REMOTE_S_ADDRESS@" - - key: local_s_address - env: "@LOCAL_S_ADDRESS@" - diff --git a/docker/scripts/lte_ru_entrypoint.sh b/docker/scripts/lte_ru_entrypoint.sh index 19cf482831..ae3d411409 100755 --- a/docker/scripts/lte_ru_entrypoint.sh +++ b/docker/scripts/lte_ru_entrypoint.sh @@ -3,39 +3,25 @@ set -uo pipefail PREFIX=/opt/oai-lte-ru +CONFIGFILE=$PREFIX/etc/rru.conf # Based another env var, pick one template to use -if [[ -v USE_FDD_RRU ]]; then cp $PREFIX/etc/rru.fdd.conf $PREFIX/etc/rru.conf; fi -if [[ -v USE_TDD_RRU ]]; then cp $PREFIX/etc/rru.tdd.conf $PREFIX/etc/rru.conf; fi +if [[ -v USE_VOLUMED_CONF ]]; then + cp $PREFIX/etc/rru.fdd.conf $PREFIX/etc/rru.conf +else + echo "ERROR: No configuration file provided." + echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf" + exit 1 +fi -# Only this template will be manipulated -CONFIG_FILES=`ls $PREFIX/etc/rru.conf || true` +if [ ! -f $CONFIGFILE ]; then + echo "No configuration file found: please mount at $CONFIGFILE" + exit 255 +fi -for c in ${CONFIG_FILES}; do - # grep variable names (format: ${VAR}) from template to be rendered - VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs) - - # create sed expressions for substituting each occurrence of ${VAR} - # with the value of the environment variable "VAR" - EXPRESSIONS="" - for v in ${VARS}; do - NEW_VAR=`echo $v | sed -e "s#@##g"` - if [[ "${!NEW_VAR}x" == "x" ]]; then - echo "Error: Environment variable '${NEW_VAR}' is not set." \ - "Config file '$(basename $c)' requires all of $VARS." - exit 1 - fi - EXPRESSIONS="${EXPRESSIONS};s|${v}|${!NEW_VAR}|g" - done - EXPRESSIONS="${EXPRESSIONS#';'}" - - # render template and inline replace config file - sed -i "${EXPRESSIONS}" ${c} - - echo "==================================" - echo "== Configuration file: ${c}" - cat ${c} -done +echo "==================================" +echo "== Configuration file:" +cat $CONFIGFILE # Load the USRP binaries echo "==================================" diff --git a/docker/scripts/lte_ue_entrypoint.sh b/docker/scripts/lte_ue_entrypoint.sh index 55ec2ac2e3..7b271a2437 100755 --- a/docker/scripts/lte_ue_entrypoint.sh +++ b/docker/scripts/lte_ue_entrypoint.sh @@ -3,6 +3,16 @@ set -uo pipefail PREFIX=/opt/oai-lte-ue +CONFIGFILE=$PREFIX/etc/ue_usim.conf + +if [ ! -f $CONFIGFILE ]; then + echo "No configuration file found: please mount at $CONFIGFILE" + exit 255 +fi + +echo "==================================" +echo "== Configuration file:" +cat $CONFIGFILE # Based another env var, pick one template to use if [[ -v USE_NFAPI ]]; then cp $PREFIX/etc/ue.nfapi.conf $PREFIX/etc/ue.conf; fi @@ -39,7 +49,7 @@ done #now generate USIM files # At this point all operations will be run from $PREFIX! cd $PREFIX -$PREFIX/bin/conf2uedata -c $PREFIX/etc/ue_usim.conf -o $PREFIX +$PREFIX/bin/conf2uedata -c $CONFIGFILE -o $PREFIX # Load the USRP binaries echo "==================================" diff --git a/docker/scripts/lte_ue_parameters.yaml b/docker/scripts/lte_ue_parameters.yaml deleted file mode 100644 index 977659bb54..0000000000 --- a/docker/scripts/lte_ue_parameters.yaml +++ /dev/null @@ -1,37 +0,0 @@ -#/* -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ - ---- -- paths: - source_dir: "ci-scripts/conf_files/" - dest_dir: docker/etc - -- configurations: - - filePrefix: ue.nfapi - outputfilename: "ue.nfapi.conf" - config: - - key: remote_n_address - env: "@ENB_IP_ADDRESS@" - - key: local_n_address - env: "@LTE_UE_IP_ADDRESS@" - - key: local_n_if_name - env: "@UE_NFAPI_IF_NAME@" - diff --git a/docker/scripts/lte_ue_sim_parameters.yaml b/docker/scripts/lte_ue_sim_parameters.yaml deleted file mode 100644 index a339ed7504..0000000000 --- a/docker/scripts/lte_ue_sim_parameters.yaml +++ /dev/null @@ -1,47 +0,0 @@ -#/* -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ - ---- -- paths: - source_dir: "openair3/NAS/TOOLS/" - dest_dir: docker/etc - -- configurations: - - filePrefix: ue_sim_ci - outputfilename: "ue_usim.conf" - config: - - key: MNC - env: "@MNC@" - - key: MCC - env: "@MCC@" - - key: MSIN - env: "@SHORT_IMSI@" - - key: USIM_API_K - env: "@LTE_KEY@" - - key: OPC - env: "@OPC@" - - key: MSISDN - env: "@MSISDN@" - - key: HPLMN - env: "@HPLMN@" - - key: OPLMN_LIST - env: "@HPLMN@" - diff --git a/docker/scripts/nr_ue_entrypoint.sh b/docker/scripts/nr_ue_entrypoint.sh index 4a5899f8b6..11bc7f907e 100755 --- a/docker/scripts/nr_ue_entrypoint.sh +++ b/docker/scripts/nr_ue_entrypoint.sh @@ -3,52 +3,22 @@ set -uo pipefail PREFIX=/opt/oai-nr-ue +CONFIGFILE=$PREFIX/etc/nr-ue.conf -# Based another env var, pick one template to use -if [[ -v USE_NFAPI ]]; then cp $PREFIX/etc/nr-ue.nfapi.conf $PREFIX/etc/nr-ue.conf; fi -# Sometimes, the templates are not enough. We mount a conf file on $PREFIX/etc. It can be a template itself. -if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/nr-ue.conf; fi -# if none, pick the default -if [ ! -f $PREFIX/etc/nr-ue.conf ]; then cp $PREFIX/etc/nr-ue-sim.conf $PREFIX/etc/nr-ue.conf; fi +if [[ -v USE_VOLUMED_CONF ]]; then + cp $PREFIX/etc/mounted.conf $PREFIX/etc/nr-ue.conf +else + echo "Using default configuration" +fi -# RFSIMULATOR can have ip-address or service name -if [[ -v RFSIMULATOR ]] && [[ "${RFSIMULATOR}" =~ [a-zA-Z] ]] && [[ -z `getent hosts $RFSIMULATOR | awk '{print $1}'` ]]; then echo "not able to resolve RFSIMULATOR FQDN" && exit 1 ; fi -[[ -v RFSIMULATOR ]] && [[ "${RFSIMULATOR}" =~ [a-zA-Z] ]] && RFSIMULATOR=$(getent hosts $RFSIMULATOR | awk '{print $1}') +if [ ! -f $CONFIGFILE ]; then + echo "No configuration file found: please mount at $CONFIGFILE" + exit 255 +fi -# Only this template will be manipulated -CONFIG_FILES=`ls $PREFIX/etc/nr-ue.conf || true` - -for c in ${CONFIG_FILES}; do - # Sometimes templates have no pattern to be replaced. - if ! grep -oP '@[a-zA-Z0-9_]+@' ${c}; then - echo "Configuration is already set" - break - fi - - # grep variable names (format: ${VAR}) from template to be rendered - VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs) - - # create sed expressions for substituting each occurrence of ${VAR} - # with the value of the environment variable "VAR" - EXPRESSIONS="" - for v in ${VARS}; do - NEW_VAR=`echo $v | sed -e "s#@##g"` - if [[ "${!NEW_VAR}x" == "x" ]]; then - echo "Error: Environment variable '${NEW_VAR}' is not set." \ - "Config file '$(basename $c)' requires all of $VARS." - exit 1 - fi - EXPRESSIONS="${EXPRESSIONS};s|${v}|${!NEW_VAR}|g" - done - EXPRESSIONS="${EXPRESSIONS#';'}" - - # render template and inline replace config file - sed -i "${EXPRESSIONS}" ${c} - - echo "==================================" - echo "== Configuration file: ${c}" - cat ${c} -done +echo "==================================" +echo "== Configuration file:" +cat $CONFIGFILE # Load the USRP binaries echo "==================================" diff --git a/docker/scripts/nr_ue_parameters.yaml b/docker/scripts/nr_ue_parameters.yaml deleted file mode 100644 index afdba880e1..0000000000 --- a/docker/scripts/nr_ue_parameters.yaml +++ /dev/null @@ -1,49 +0,0 @@ -#/* -# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more -# * contributor license agreements. See the NOTICE file distributed with -# * this work for additional information regarding copyright ownership. -# * The OpenAirInterface Software Alliance licenses this file to You under -# * the OAI Public License, Version 1.1 (the "License"); you may not use this file -# * except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.openairinterface.org/?page_id=698 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# *------------------------------------------------------------------------------- -# * For more information about the OpenAirInterface (OAI) Software Alliance: -# * contact@openairinterface.org -# */ - ---- -- paths: - source_dir: "ci-scripts/conf_files/" - dest_dir: docker/etc - -- configurations: - - filePrefix: proxy_nr-ue.nfapi.conf - outputfilename: "nr-ue.nfapi.conf" - config: - - key: imsi - env: "@FULL_IMSI@" - - key: key - env: "@FULL_KEY@" - - key: opc - env: "@OPC@" - - key: dnn - env: "@DNN@" - - key: nssai_sst - env: "@NSSAI_SST@" - - key: nssai_sd - env: "@NSSAI_SD@" - - key: remote_n_address - env: "@GNB_IP_ADDRESS@" - - key: local_n_address - env: "@NR_UE_IP_ADDRESS@" - - key: local_n_if_name - env: "@NR_UE_NFAPI_IF_NAME@" - From 0f0ce9fb02c5dcb56a4ab6edfa9438c9c3450a9d Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Wed, 15 Mar 2023 17:55:45 +0100 Subject: [PATCH 40/58] Remove USE_VOLUMED_CONF: all configuration files have to be mounted --- .../4g_l2sim_fdd/docker-compose.yml | 9 ++--- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../4g_rfsimulator_fembms/docker-compose.yml | 4 +-- .../4g_rfsimulator_mbms/docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../5g_f1_rfsimulator/docker-compose.yaml | 9 ++--- .../5g_fdd_rfsimulator/docker-compose.yaml | 6 ++-- .../5g_l2sim_tdd/docker-compose.yaml | 6 ++-- .../5g_rfsimulator/docker-compose.yaml | 9 ++--- .../5g_rfsimulator_24prb/docker-compose.yaml | 6 ++-- .../5g_rfsimulator_2x2/docker-compose.yaml | 6 ++-- .../docker-compose.yaml | 3 +- .../5g_rfsimulator_e1/docker-compose.yaml | 9 ++--- .../docker-compose.yaml | 6 ++-- .../docker-compose.yaml | 6 ++-- .../docker-compose.yaml | 6 ++-- .../docker-compose.yaml | 6 ++-- .../fr1_enb_mono_fdd_tim/docker-compose.yml | 3 +- .../lte_b200_fdd_05Mhz_tm1/docker-compose.yml | 3 +- .../docker-compose.yml | 3 +- .../lte_b200_fdd_10Mhz_tm1/docker-compose.yml | 3 +- .../docker-compose.yml | 3 +- .../lte_b200_fdd_20Mhz_tm1/docker-compose.yml | 3 +- .../lte_b200_tdd_05Mhz_tm1/docker-compose.yml | 3 +- .../lte_b200_tdd_05Mhz_tm2/docker-compose.yml | 3 +- .../lte_b200_tdd_10Mhz_tm1/docker-compose.yml | 3 +- .../lte_b200_tdd_20Mhz_tm1/docker-compose.yml | 3 +- .../docker-compose.yml | 3 +- .../lte_n3xx_tdd_2x2_tm1/docker-compose.yml | 3 +- .../lte_n3xx_tdd_2x2_tm2/docker-compose.yml | 3 +- .../nsa_b200_enb/docker-compose.yml | 3 +- .../nsa_b200_gnb/docker-compose.yml | 3 +- .../yaml_files/sa_aw2s_gnb/docker-compose.yml | 3 +- .../yaml_files/sa_b200_gnb/docker-compose.yml | 3 +- .../sa_f1_b200_gnb/docker-compose.yml | 6 ++-- docker/README.md | 3 +- docker/scripts/enb_entrypoint.sh | 8 ----- docker/scripts/gnb-aw2s_entrypoint.sh | 8 ----- docker/scripts/gnb_entrypoint.sh | 5 --- docker/scripts/lte_ru_entrypoint.sh | 9 ----- docker/scripts/lte_ue_entrypoint.sh | 35 ++----------------- docker/scripts/nr_ue_entrypoint.sh | 6 ---- 45 files changed, 58 insertions(+), 188 deletions(-) diff --git a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml index 7df2b5c183..9d3dd113e4 100644 --- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml @@ -186,10 +186,9 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --MACRLCs.[0].scheduler_mode "default" --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.25prb.l2sim.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.l2sim.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -219,11 +218,10 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_NFAPI: 'yes' OPENAIR_DIR: /opt/oai-nr-ue USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 2 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/mounted.conf + - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/ue.conf - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results healthcheck: @@ -239,11 +237,10 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_NFAPI: 'yes' OPENAIR_DIR: /opt/oai-nr-ue USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 3 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/mounted.conf + - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/ue.conf - ../../conf_files/lte-ue.usim.conf:/opt/oai-lte-ue/etc/ue_usim.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results healthcheck: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml index 32a56d8319..ca005e9568 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml @@ -189,10 +189,9 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: enb - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -211,7 +210,6 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: 192.168.61.20 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time volumes: - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml index e9e858e161..4361409488 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml @@ -11,10 +11,9 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: enb - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1 volumes: - - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -33,7 +32,6 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: 192.168.61.20 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time --noS1 volumes: - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml index 18640a3670..1ba0178949 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml @@ -188,11 +188,10 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.50prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.50prb.rfsim.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -211,7 +210,6 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: 192.168.61.20 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time volumes: - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml index ef21c87559..edde78480e 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml @@ -188,11 +188,10 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.100prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.100prb.rfsim.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -211,7 +210,6 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: 192.168.61.20 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time volumes: - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf 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 c3b3a9b187..3efc61505f 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml @@ -10,11 +10,10 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' 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.25prb.rfsim-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.rfsim-tm1.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -30,7 +29,6 @@ services: ipv4_address: 192.168.61.30 environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' RFSIMULATOR: 192.168.61.20 USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1 volumes: 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 fddacbe7cc..66ae5877e1 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml @@ -10,11 +10,10 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.25prb.rfsim-tm1-mbms.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.rfsim-tm1-mbms.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -36,7 +35,6 @@ services: TZ: Europe/Paris HOSTNAME: oai_ue0 RFSIMULATOR: 192.168.61.20 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1 volumes: - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml index c0f9fd7403..18ab587731 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml @@ -188,11 +188,10 @@ services: ipv4_address: 192.168.61.20 environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band38.25prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band38.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s @@ -211,7 +210,6 @@ services: environment: TZ: Europe/Paris RFSIMULATOR: 192.168.61.20 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time volumes: - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index 602f0bdff8..dd2a1b2cdd 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -168,7 +168,6 @@ services: container_name: rfsim5g-oai-cu environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -176,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -188,7 +187,6 @@ services: container_name: rfsim5g-oai-du environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-cu @@ -196,7 +194,7 @@ services: public_net: ipv4_address: 192.168.71.142 volumes: - - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -208,7 +206,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.142 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-du @@ -216,7 +213,7 @@ services: public_net: ipv4_address: 192.168.71.150 volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index 94f6e40dda..e3fb278b33 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -168,7 +168,6 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -176,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band66.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.sa.band66.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -188,7 +187,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb @@ -196,7 +194,7 @@ services: public_net: ipv4_address: 192.168.71.150 volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s 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 e666e44eac..db77cdae53 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -169,13 +169,12 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor depends_on: - oai-spgwu - oai-amf volumes: - - ../../conf_files/gnb.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -205,11 +204,10 @@ services: network_mode: "host" environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' OPENAIR_DIR: /opt/oai-nr-ue USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor volumes: - - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results depends_on: - oai-gnb diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index 37b0fca691..e4129adee2 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -168,7 +168,6 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -176,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -188,7 +187,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb @@ -196,7 +194,7 @@ services: public_net: ipv4_address: 192.168.71.150 volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s @@ -209,7 +207,6 @@ services: container_name: rfsim5g-oai-nr-ue2 environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb @@ -217,7 +214,7 @@ services: public_net: ipv4_address: 192.168.71.151 volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" 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 9c987000be..3b62c00ab5 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -168,7 +168,6 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -176,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/mounted.conf + - ../../conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -188,7 +187,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb @@ -196,7 +194,7 @@ services: public_net: ipv4_address: 192.168.71.150 volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index 2f63ffe9d5..4d3e8b7dde 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -168,7 +168,6 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -176,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -189,7 +188,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb @@ -198,7 +196,7 @@ services: ipv4_address: 192.168.71.150 volumes: - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml index a56efa89d8..e43bc0e0d9 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml @@ -7,10 +7,9 @@ services: network_mode: "host" environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --MACRLCs.[0].local_n_address 172.21.16.109 --MACRLCs.[0].remote_n_address 172.21.6.22 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-du.band78.106prb.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_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 2f09bb4a9a..b44822b3e8 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -169,7 +169,6 @@ services: privileged: true container_name: rfsim5g-oai-cucp environment: - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -179,7 +178,7 @@ services: ran_net: ipv4_address: 192.168.72.140 volumes: - - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -191,7 +190,6 @@ services: privileged: true container_name: rfsim5g-oai-cuup environment: - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim #--log_config.global_log_options level,nocolor,time depends_on: @@ -202,7 +200,7 @@ services: ran_net: ipv4_address: 192.168.72.141 volumes: - - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-cuup" interval: 10s @@ -215,13 +213,12 @@ services: container_name: rfsim5g-oai-du environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time networks: ran_net: ipv4_address: 192.168.72.142 volumes: - - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-du.band78.106prb.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 78f42babc7..b654f06d12 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 @@ -6,13 +6,12 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time networks: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band66.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.band66.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" @@ -26,10 +25,9 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - rrc.config:/opt/oai-nr-ue/etc/rrc/ depends_on: - oai-gnb 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 019c9cf794..eef67d713b 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 @@ -6,13 +6,12 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time networks: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" @@ -26,10 +25,9 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - rrc.config:/opt/oai-nr-ue/etc/rrc/ depends_on: - oai-gnb 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 8e5398529f..ed2af44fbb 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 @@ -6,13 +6,12 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time networks: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" @@ -26,10 +25,9 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - rrc.config:/opt/oai-nr-ue/etc/rrc/ depends_on: - oai-gnb diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index f6c945aafa..89c737ba06 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -168,7 +168,6 @@ services: container_name: rfsim5g-oai-gnb environment: RFSIMULATOR: server - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn @@ -176,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band66.u0.25prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.sa.band66.u0.25prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s @@ -189,7 +188,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: RFSIMULATOR: 192.168.71.140 - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb @@ -197,7 +195,7 @@ services: public_net: ipv4_address: 192.168.71.150 volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s diff --git a/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml index 9b27fb41c0..3656f6b00f 100644 --- a/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml +++ b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: prod-enb-mono-fdd environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].max_pdschReferenceSignalPower -27 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf networks: public_net: ipv4_address: 192.168.61.30 diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml index 47ee5798a9..8307ec4f34 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-fdd-05Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml index 63abc5bd28..b306920833 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-fdd-05Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml index f6cb2feb3e..7e2bdfbe8b 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-fdd-10Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml index a4f30aba44..0613025571 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-fdd-10Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml index 4d31745e7b..58dc034d1e 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-fdd-20Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml index 2a221ebe82..7d0a1a87af 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-tdd-05Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml index 49e13b3817..44c61d8787 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml @@ -7,11 +7,10 @@ services: container_name: lte-b200-enb-tdd-05Mhz-tm2 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --log_config.global_log_options level,nocolor,time,line_num,function #USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --eNBs.[0].component_carriers.[0].nb_antennas_tx 2 --eNBs.[0].component_carriers.[0].nb_antennas_rx 2 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm2.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band40.25prb.usrpb200-tm2.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml index 9f00ec4737..0a103b8c21 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-tdd-10Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].N_RB_DL 50 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml index c891b9ab2c..9e0ed337a0 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-tdd-20Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --eNBs.[0].component_carriers.[0].N_RB_DL 100 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml index 5d53e8ca83..138f2088d9 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: lte-b200-enb-tdd-20Mhz-tm1 environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: 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 abd2c7d40e..9655cca180 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 @@ -6,10 +6,9 @@ services: container_name: oai-enb environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' 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/mounted.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 1679b632b6..84711b0a3c 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 @@ -6,10 +6,9 @@ services: container_name: oai-enb environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' 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/mounted.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/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml index 8c2171c0f2..f6e7214659 100644 --- a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml +++ b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: nsa-b200-enb environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.nsa.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/mounted.conf + - ../../conf_files/enb.nsa.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev networks: public_net: diff --git a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml index 50d1c70399..67d240d796 100644 --- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: nsa-b200-gnb environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf - /dev:/dev networks: public_net: diff --git a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml index 7468df5e62..d3875aa5bc 100644 --- a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: oai-gnb-aw2s environment: TZ: Europe/Paris - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa volumes: - - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf:/opt/oai-gnb-aw2s/etc/mounted.conf + - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf:/opt/oai-gnb-aw2s/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml index 1cad790816..f46d7b1b0a 100644 --- a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: sa-b200-gnb environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf - /dev:/dev networks: public_net: diff --git a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml index e868faedd8..d5396e4933 100644 --- a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml @@ -7,10 +7,9 @@ services: container_name: sa-cu-gnb environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf - /dev:/dev networks: public_net: @@ -29,10 +28,9 @@ services: container_name: sa-du-b200-gnb environment: USE_B2XX: 'yes' - USE_VOLUMED_CONF: 'yes' USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 14 --RUs.[0].att_tx 14 volumes: - - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf + - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf - /dev:/dev networks: public_net: diff --git a/docker/README.md b/docker/README.md index 18f955b760..5e71332d4a 100644 --- a/docker/README.md +++ b/docker/README.md @@ -174,12 +174,11 @@ services: privileged: true container_name: sa-b200-gnb environment: - USE_VOLUMED_CONF: 'yes' USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --sa -E --continuous-tx volumes: - /dev:/dev - - /tmp/gnb.conf:/opt/oai-gnb/etc/mounted.conf + - /tmp/gnb.conf:/opt/oai-gnb/etc/gnb.conf networks: public_net: ipv4_address: 192.168.68.194 diff --git a/docker/scripts/enb_entrypoint.sh b/docker/scripts/enb_entrypoint.sh index 28038ab36d..aadd8b71d1 100755 --- a/docker/scripts/enb_entrypoint.sh +++ b/docker/scripts/enb_entrypoint.sh @@ -5,14 +5,6 @@ set -uo pipefail PREFIX=/opt/oai-enb CONFIGFILE=$PREFIX/etc/enb.conf -if [[ -v USE_VOLUMED_CONF ]]; then - cp $PREFIX/etc/mounted.conf $PREFIX/etc/enb.conf -else - echo "ERROR: No configuration file provided." - echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf" - exit 1 -fi - if [ ! -f $CONFIGFILE ]; then echo "No configuration file found: please mount at $CONFIGFILE" exit 255 diff --git a/docker/scripts/gnb-aw2s_entrypoint.sh b/docker/scripts/gnb-aw2s_entrypoint.sh index 5318a1e6a3..b03e214ce1 100755 --- a/docker/scripts/gnb-aw2s_entrypoint.sh +++ b/docker/scripts/gnb-aw2s_entrypoint.sh @@ -5,14 +5,6 @@ set -uo pipefail PREFIX=/opt/oai-gnb-aw2s CONFIGFILE=$PREFIX/etc/gnb.conf -if [[ -v USE_VOLUMED_CONF ]]; then - cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf -else - echo "ERROR: No configuration file provided." - echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf" - exit 1 -fi - if [ ! -f $CONFIGFILE ]; then echo "No configuration file found: please mount at $CONFIGFILE" exit 255 diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh index fdef130db7..ef268b1143 100755 --- a/docker/scripts/gnb_entrypoint.sh +++ b/docker/scripts/gnb_entrypoint.sh @@ -5,11 +5,6 @@ set -uo pipefail PREFIX=/opt/oai-gnb CONFIGFILE=$PREFIX/etc/gnb.conf -if [[ -v USE_VOLUMED_CONF ]]; then - cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf -else - echo "Using default configuration" -fi if [ ! -f $CONFIGFILE ]; then echo "No configuration file found: please mount at $CONFIGFILE" diff --git a/docker/scripts/lte_ru_entrypoint.sh b/docker/scripts/lte_ru_entrypoint.sh index ae3d411409..4ce5615482 100755 --- a/docker/scripts/lte_ru_entrypoint.sh +++ b/docker/scripts/lte_ru_entrypoint.sh @@ -5,15 +5,6 @@ set -uo pipefail PREFIX=/opt/oai-lte-ru CONFIGFILE=$PREFIX/etc/rru.conf -# Based another env var, pick one template to use -if [[ -v USE_VOLUMED_CONF ]]; then - cp $PREFIX/etc/rru.fdd.conf $PREFIX/etc/rru.conf -else - echo "ERROR: No configuration file provided." - echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf" - exit 1 -fi - if [ ! -f $CONFIGFILE ]; then echo "No configuration file found: please mount at $CONFIGFILE" exit 255 diff --git a/docker/scripts/lte_ue_entrypoint.sh b/docker/scripts/lte_ue_entrypoint.sh index 7b271a2437..74c76ed5ac 100755 --- a/docker/scripts/lte_ue_entrypoint.sh +++ b/docker/scripts/lte_ue_entrypoint.sh @@ -14,38 +14,6 @@ echo "==================================" echo "== Configuration file:" cat $CONFIGFILE -# Based another env var, pick one template to use -if [[ -v USE_NFAPI ]]; then cp $PREFIX/etc/ue.nfapi.conf $PREFIX/etc/ue.conf; fi - -# Only this template will be manipulated and the USIM one! -CONFIG_FILES=`ls $PREFIX/etc/ue.conf $PREFIX/etc/ue_usim.conf || true` - -for c in ${CONFIG_FILES}; do - # grep variable names (format: ${VAR}) from template to be rendered - VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs) - - # create sed expressions for substituting each occurrence of ${VAR} - # with the value of the environment variable "VAR" - EXPRESSIONS="" - for v in ${VARS}; do - NEW_VAR=`echo $v | sed -e "s#@##g"` - if [[ "${!NEW_VAR}x" == "x" ]]; then - echo "Error: Environment variable '${NEW_VAR}' is not set." \ - "Config file '$(basename $c)' requires all of $VARS." - exit 1 - fi - EXPRESSIONS="${EXPRESSIONS};s|${v}|${!NEW_VAR}|g" - done - EXPRESSIONS="${EXPRESSIONS#';'}" - - # render template and inline replace config file - sed -i "${EXPRESSIONS}" ${c} - - echo "==================================" - echo "== Configuration file: ${c}" - cat ${c} -done - #now generate USIM files # At this point all operations will be run from $PREFIX! cd $PREFIX @@ -68,7 +36,8 @@ while [[ $# -gt 0 ]]; do new_args+=("$1") shift done -if [[ -v USE_NFAPI ]]; then +FILE=$PREFIX/etc/ue.conf +if [[ -f "$FILE" ]]; then new_args+=("-O") new_args+=("$PREFIX/etc/ue.conf") fi diff --git a/docker/scripts/nr_ue_entrypoint.sh b/docker/scripts/nr_ue_entrypoint.sh index 11bc7f907e..840a8ae729 100755 --- a/docker/scripts/nr_ue_entrypoint.sh +++ b/docker/scripts/nr_ue_entrypoint.sh @@ -5,12 +5,6 @@ set -uo pipefail PREFIX=/opt/oai-nr-ue CONFIGFILE=$PREFIX/etc/nr-ue.conf -if [[ -v USE_VOLUMED_CONF ]]; then - cp $PREFIX/etc/mounted.conf $PREFIX/etc/nr-ue.conf -else - echo "Using default configuration" -fi - if [ ! -f $CONFIGFILE ]; then echo "No configuration file found: please mount at $CONFIGFILE" exit 255 From 685379c29240d7822a550bd9adb2270fdb0ec6a5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 1 Jun 2023 14:01:52 +0200 Subject: [PATCH 41/58] Remove unused files --- .../conf_files/cu.band7.tm1.100PRB.conf | 207 --------------- ci-scripts/conf_files/cu.band7.tm1.25PRB.conf | 207 --------------- ci-scripts/conf_files/cu.band7.tm1.50PRB.conf | 207 --------------- .../du.band7.tm1.100PRB.usrpb210.conf | 112 -------- .../du.band7.tm1.25PRB.usrpb210.conf | 112 -------- .../du.band7.tm1.50PRB.usrpb210.conf | 112 -------- ci-scripts/conf_files/gNB_SA_CU.conf | 218 ---------------- ci-scripts/conf_files/gNB_SA_DU.conf | 239 ------------------ 8 files changed, 1414 deletions(-) delete mode 100644 ci-scripts/conf_files/cu.band7.tm1.100PRB.conf delete mode 100644 ci-scripts/conf_files/cu.band7.tm1.25PRB.conf delete mode 100644 ci-scripts/conf_files/cu.band7.tm1.50PRB.conf delete mode 100644 ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf delete mode 100644 ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf delete mode 100644 ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf delete mode 100644 ci-scripts/conf_files/gNB_SA_CU.conf delete mode 100644 ci-scripts/conf_files/gNB_SA_DU.conf diff --git a/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf b/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf deleted file mode 100644 index e47d52d492..0000000000 --- a/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf +++ /dev/null @@ -1,207 +0,0 @@ -Active_eNBs = ( "eNB-CU-Eurecom-LTEBox"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = ( - { - ////////// Identification parameters: - eNB_ID = 0xe00; - - cell_type = "CELL_MACRO_ENB"; - - eNB_name = "eNB-CU-Eurecom-LTEBox"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ) - - nr_cellid = 12345678L - - tr_s_preference = "f1" - - local_s_if_name = "lo"; - remote_s_address = "127.0.0.3"; - local_s_address = "127.0.0.4"; - local_s_portc = 501; - remote_s_portc = 500; - local_s_portd = 601; - remote_s_portd = 600; - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNodeB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 100; - pbch_repetition = "FALSE"; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 0; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower = -29; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnable = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; - /* - srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =; - */ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -104; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; - /* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; - */ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff= 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - ue_TransmissionMode = 1; - - //Parameters for SIB18 - rxPool_sc_CP_Len = "normal"; - rxPool_sc_Period = "sf40"; - rxPool_data_CP_Len = "normal"; - rxPool_ResourceConfig_prb_Num = 20; - rxPool_ResourceConfig_prb_Start = 5; - rxPool_ResourceConfig_prb_End = 44; - rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - rxPool_ResourceConfig_offsetIndicator_choice = 0; - rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - /* - rxPool_dataHoppingConfig_hoppingParameter = 0; - rxPool_dataHoppingConfig_numSubbands = "ns1"; - rxPool_dataHoppingConfig_rbOffset = 0; - rxPool_commTxResourceUC-ReqAllowed = "TRUE"; - */ - - // Parameters for SIB19 - discRxPool_cp_Len = "normal" - discRxPool_discPeriod = "rf32" - discRxPool_numRetx = 1; - discRxPool_numRepetition = 2; - discRxPool_ResourceConfig_prb_Num = 5; - discRxPool_ResourceConfig_prb_Start = 3; - discRxPool_ResourceConfig_prb_End = 21; - discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - discRxPool_ResourceConfig_offsetIndicator_choice = 0; - discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - } - ); - - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - - ////////// MME parameters: - mme_ip_address = ( - { - ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); - - NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - }; - } -); - -log_config = { - global_log_level = "info"; - pdcp_log_level = "info"; - rrc_log_level = "info"; - gtp_log_level = "info"; -}; diff --git a/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf b/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf deleted file mode 100644 index ff3870a3c5..0000000000 --- a/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf +++ /dev/null @@ -1,207 +0,0 @@ -Active_eNBs = ( "eNB-CU-Eurecom-LTEBox"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = ( - { - ////////// Identification parameters: - eNB_ID = 0xe00; - - cell_type = "CELL_MACRO_ENB"; - - eNB_name = "eNB-CU-Eurecom-LTEBox"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ) - - nr_cellid = 12345678L - - tr_s_preference = "f1" - - local_s_if_name = "lo"; - remote_s_address = "127.0.0.3"; - local_s_address = "127.0.0.4"; - local_s_portc = 501; - remote_s_portc = 500; - local_s_portd = 601; - remote_s_portd = 600; - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNodeB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 25; - pbch_repetition = "FALSE"; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 0; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower = -25; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnable = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; - /* - srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =; - */ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -104; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; - /* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; - */ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff= 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - ue_TransmissionMode = 1; - - //Parameters for SIB18 - rxPool_sc_CP_Len = "normal"; - rxPool_sc_Period = "sf40"; - rxPool_data_CP_Len = "normal"; - rxPool_ResourceConfig_prb_Num = 20; - rxPool_ResourceConfig_prb_Start = 5; - rxPool_ResourceConfig_prb_End = 44; - rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - rxPool_ResourceConfig_offsetIndicator_choice = 0; - rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - /* - rxPool_dataHoppingConfig_hoppingParameter = 0; - rxPool_dataHoppingConfig_numSubbands = "ns1"; - rxPool_dataHoppingConfig_rbOffset = 0; - rxPool_commTxResourceUC-ReqAllowed = "TRUE"; - */ - - // Parameters for SIB19 - discRxPool_cp_Len = "normal" - discRxPool_discPeriod = "rf32" - discRxPool_numRetx = 1; - discRxPool_numRepetition = 2; - discRxPool_ResourceConfig_prb_Num = 5; - discRxPool_ResourceConfig_prb_Start = 3; - discRxPool_ResourceConfig_prb_End = 21; - discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - discRxPool_ResourceConfig_offsetIndicator_choice = 0; - discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - } - ); - - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - - ////////// MME parameters: - mme_ip_address = ( - { - ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); - - NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - }; - } -); - -log_config = { - global_log_level = "info"; - pdcp_log_level = "info"; - rrc_log_level = "info"; - gtp_log_level = "info"; -}; diff --git a/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf b/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf deleted file mode 100644 index ab5661d826..0000000000 --- a/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf +++ /dev/null @@ -1,207 +0,0 @@ -Active_eNBs = ( "eNB-CU-Eurecom-LTEBox"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = ( - { - ////////// Identification parameters: - eNB_ID = 0xe00; - - cell_type = "CELL_MACRO_ENB"; - - eNB_name = "eNB-CU-Eurecom-LTEBox"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ) - - nr_cellid = 12345678L - - tr_s_preference = "f1" - - local_s_if_name = "lo"; - remote_s_address = "127.0.0.3"; - local_s_address = "127.0.0.4"; - local_s_portc = 501; - remote_s_portc = 500; - local_s_portd = 601; - remote_s_portd = 600; - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNodeB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 50; - pbch_repetition = "FALSE"; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 0; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower = -27; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnable = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; - /* - srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =; - */ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -104; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; - /* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; - */ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff= 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - ue_TransmissionMode = 1; - - //Parameters for SIB18 - rxPool_sc_CP_Len = "normal"; - rxPool_sc_Period = "sf40"; - rxPool_data_CP_Len = "normal"; - rxPool_ResourceConfig_prb_Num = 20; - rxPool_ResourceConfig_prb_Start = 5; - rxPool_ResourceConfig_prb_End = 44; - rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - rxPool_ResourceConfig_offsetIndicator_choice = 0; - rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - /* - rxPool_dataHoppingConfig_hoppingParameter = 0; - rxPool_dataHoppingConfig_numSubbands = "ns1"; - rxPool_dataHoppingConfig_rbOffset = 0; - rxPool_commTxResourceUC-ReqAllowed = "TRUE"; - */ - - // Parameters for SIB19 - discRxPool_cp_Len = "normal" - discRxPool_discPeriod = "rf32" - discRxPool_numRetx = 1; - discRxPool_numRepetition = 2; - discRxPool_ResourceConfig_prb_Num = 5; - discRxPool_ResourceConfig_prb_Start = 3; - discRxPool_ResourceConfig_prb_End = 21; - discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - discRxPool_ResourceConfig_offsetIndicator_choice = 0; - discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - } - ); - - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - - ////////// MME parameters: - mme_ip_address = ( - { - ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); - - NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - }; - } -); - -log_config = { - global_log_level = "info"; - pdcp_log_level = "info"; - rrc_log_level = "info"; - gtp_log_level = "info"; -}; diff --git a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf deleted file mode 100644 index 7a97a1c2c1..0000000000 --- a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf +++ /dev/null @@ -1,112 +0,0 @@ -Active_eNBs = ( "eNB-Eurecom-DU"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_CU_ID = 0xe00; - - eNB_name = "eNB-Eurecom-DU"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ) - - nr_cellid = 12345678L - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNODEB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 100; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 115; - - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - } - ); - - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - } -); - -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "f1"; - local_n_if_name = "lo"; - remote_n_address = "127.0.0.4"; - local_n_address = "127.0.0.3"; - local_n_portc = 500; - remote_n_portc = 501; - local_n_portd = 600; - remote_n_portd = 601; - } -); - -L1s = ( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -RUs = ( - { - local_rf = "yes"; - nb_tx = 1; - nb_rx = 1; - att_tx = 10; - att_rx = 10; - bands = [7]; - max_pdschReferenceSignalPower = -29; - max_rxgain = 115; - eNB_instances = [0]; - } -); - -log_config = { - global_log_level = "info"; - hw_log_level = "info"; - phy_log_level = "info"; - mac_log_level = "info"; - rlc_log_level = "info"; -}; - -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"; - } -); diff --git a/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf deleted file mode 100644 index dd5d4a662d..0000000000 --- a/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf +++ /dev/null @@ -1,112 +0,0 @@ -Active_eNBs = ( "eNB-Eurecom-DU"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_CU_ID = 0xe00; - - eNB_name = "eNB-Eurecom-DU"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ) - - nr_cellid = 12345678L - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNODEB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 25; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 125; - - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - } - ); - - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - } -); - -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "f1"; - local_n_if_name = "lo"; - remote_n_address = "127.0.0.4"; - local_n_address = "127.0.0.3"; - local_n_portc = 500; - remote_n_portc = 501; - local_n_portd = 600; - remote_n_portd = 601; - } -); - -L1s = ( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -RUs = ( - { - local_rf = "yes"; - nb_tx = 1; - nb_rx = 1; - att_tx = 10; - att_rx = 10; - bands = [7]; - max_pdschReferenceSignalPower = -25; - max_rxgain = 125; - eNB_instances = [0]; - } -); - -log_config = { - global_log_level = "info"; - hw_log_level = "info"; - phy_log_level = "info"; - mac_log_level = "info"; - rlc_log_level = "info"; -}; - -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"; - } -); diff --git a/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf deleted file mode 100644 index f518dcfc12..0000000000 --- a/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf +++ /dev/null @@ -1,112 +0,0 @@ -Active_eNBs = ( "eNB-Eurecom-DU"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_CU_ID = 0xe00; - - eNB_name = "eNB-Eurecom-DU"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ) - - nr_cellid = 12345678L - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNODEB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 50; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 120; - - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - } - ); - - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - } -); - -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "f1"; - local_n_if_name = "lo"; - remote_n_address = "127.0.0.4"; - local_n_address = "127.0.0.3"; - local_n_portc = 500; - remote_n_portc = 501; - local_n_portd = 600; - remote_n_portd = 601; - } -); - -L1s = ( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -RUs = ( - { - local_rf = "yes"; - nb_tx = 1; - nb_rx = 1; - att_tx = 10; - att_rx = 10; - bands = [7]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 120; - eNB_instances = [0]; - } -); - -log_config = { - global_log_level = "info"; - hw_log_level = "info"; - phy_log_level = "info"; - mac_log_level = "info"; - rlc_log_level = "info"; -}; - -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"; - } -); diff --git a/ci-scripts/conf_files/gNB_SA_CU.conf b/ci-scripts/conf_files/gNB_SA_CU.conf deleted file mode 100644 index d619c8311b..0000000000 --- a/ci-scripts/conf_files/gNB_SA_CU.conf +++ /dev/null @@ -1,218 +0,0 @@ -Active_gNBs = ( "gNB-Eurecom-CU"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; -Num_Threads_PUSCH = 8; - -gNBs = -( - { - ////////// Identification parameters: - gNB_ID = 0xe00; - -# cell_type = "CELL_MACRO_GNB"; - - gNB_name = "gNB-Eurecom-CU"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); - - - nr_cellid = 12345678L; - force_256qam_off = 1; - - tr_s_preference = "f1"; - - local_s_if_name = "lo"; - local_s_address = "127.0.0.4"; - remote_s_address = "127.0.0.3"; - local_s_portc = 501; - local_s_portd = 2152; - remote_s_portc = 500; - remote_s_portd = 2152; - min_rxtxtime = 6; - - servingCellConfigCommon = ( - { - #spCellConfigCommon - - physCellId = 0; - -# downlinkConfigCommon - #frequencyInfoDL - # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) - absoluteFrequencySSB = 641280; - dl_frequencyBand = 78; - # this is 3600 MHz - dl_absoluteFrequencyPointA = 640008; - #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=27,L=48 (275*(L-1))+RBstart - initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 -# 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 = 13; - preambleReceivedTargetPower = -96; -#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 = 14; -#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 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - 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 - }; - } -); - -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 ="debug"; - pdcp_log_level ="info"; - rrc_log_level ="info"; - f1ap_log_level ="info"; - ngap_log_level ="debug"; - }; - diff --git a/ci-scripts/conf_files/gNB_SA_DU.conf b/ci-scripts/conf_files/gNB_SA_DU.conf deleted file mode 100644 index 4013c0d475..0000000000 --- a/ci-scripts/conf_files/gNB_SA_DU.conf +++ /dev/null @@ -1,239 +0,0 @@ -Active_gNBs = ( "gNB-Eurecom-DU"); -# 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-DU"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); - - - nr_cellid = 12345678L; - - ////////// Physical parameters: - - min_rxtxtime = 6; - force_256qam_off = 1; - - servingCellConfigCommon = ( - { - #spCellConfigCommon - - physCellId = 0; - -# downlinkConfigCommon - #frequencyInfoDL - # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) - absoluteFrequencySSB = 641280; - dl_frequencyBand = 78; - # this is 3600 MHz - dl_absoluteFrequencyPointA = 640008; - #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=27,L=48 (275*(L-1))+RBstart - initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 -# 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 = 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 = 13; - preambleReceivedTargetPower = -96; -#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 = 14; -#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; - }; - } -); - -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "f1"; - local_n_if_name = "lo"; - local_n_address = "127.0.0.3"; - remote_n_address = "127.0.0.4"; - local_n_portc = 500; - local_n_portd = 2152; - remote_n_portc = 501; - remote_n_portd = 2152; - pusch_TargetSNRx10 = 200; - pucch_TargetSNRx10 = 200; - ulsch_max_frame_inactivity = 1; - } -); - -L1s = ( -{ - num_cc = 1; - tr_n_preference = "local_mac"; - prach_dtx_threshold = 200; - pucch0_dtx_threshold = 150; - ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 -} -); - -RUs = ( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 0 - att_rx = 0; - bands = [78]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 114; - eNB_instances = [0]; - #beamforming 1x4 matrix: - bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; - clock_src = "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"; - } -); -rfsimulator: { -serveraddr = "server"; - serverport = "4043"; - options = (); #("saviq"); or/and "chanmod" - modelname = "AWGN"; - IQfile = "/tmp/rfsimulator.iqs" -} - - 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"; - ngap_log_level ="debug"; - }; - From 5f9904b130652f459cf3bbe1c78d33c39f56d02e Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 1 Jun 2023 14:03:10 +0200 Subject: [PATCH 42/58] Remove files not tested in CI to ci-scripts/conf_files/untested --- ci-scripts/conf_files/{ => untested}/benetel-4g.conf | 0 ci-scripts/conf_files/{ => untested}/benetel-5g.conf | 0 .../enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf | 0 .../{ => untested}/enb.band7.tm1.fr1.25PRB.usrpb210.conf | 0 .../{ => untested}/gnb.band78.sa.fr1.106PRB.usrpn310.conf | 0 .../{ => untested}/gnb.band78.tm1.fr1.106PRB.usrpb210.conf | 0 .../{ => untested}/gnb.sa.band66.fr1.106PRB.usrpn300.conf | 0 .../{ => untested}/gnb.sa.band78.fr1.51PRB.usrpb210.conf | 0 .../proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename ci-scripts/conf_files/{ => untested}/benetel-4g.conf (100%) rename ci-scripts/conf_files/{ => untested}/benetel-5g.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band7.tm1.fr1.25PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/gnb.band78.sa.fr1.106PRB.usrpn310.conf (100%) rename ci-scripts/conf_files/{ => untested}/gnb.band78.tm1.fr1.106PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/gnb.sa.band66.fr1.106PRB.usrpn300.conf (100%) rename ci-scripts/conf_files/{ => untested}/gnb.sa.band78.fr1.51PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{episci => untested}/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf (100%) diff --git a/ci-scripts/conf_files/benetel-4g.conf b/ci-scripts/conf_files/untested/benetel-4g.conf similarity index 100% rename from ci-scripts/conf_files/benetel-4g.conf rename to ci-scripts/conf_files/untested/benetel-4g.conf diff --git a/ci-scripts/conf_files/benetel-5g.conf b/ci-scripts/conf_files/untested/benetel-5g.conf similarity index 100% rename from ci-scripts/conf_files/benetel-5g.conf rename to ci-scripts/conf_files/untested/benetel-5g.conf diff --git a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf rename to ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf diff --git a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf similarity index 100% rename from ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf rename to ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf diff --git a/ci-scripts/conf_files/gnb.sa.band78.fr1.51PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/gnb.sa.band78.fr1.51PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf rename to ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf From 537b721b4f9a25dc877a3a87d185be22e25a72fc Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 2 Jun 2023 14:14:48 +0200 Subject: [PATCH 43/58] LTE UE entry script: print both configs if present --- docker/scripts/lte_ue_entrypoint.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/docker/scripts/lte_ue_entrypoint.sh b/docker/scripts/lte_ue_entrypoint.sh index 74c76ed5ac..0d851d28c5 100755 --- a/docker/scripts/lte_ue_entrypoint.sh +++ b/docker/scripts/lte_ue_entrypoint.sh @@ -3,21 +3,31 @@ set -uo pipefail PREFIX=/opt/oai-lte-ue -CONFIGFILE=$PREFIX/etc/ue_usim.conf +USIM_CONFIGFILE=$PREFIX/etc/ue_usim.conf -if [ ! -f $CONFIGFILE ]; then - echo "No configuration file found: please mount at $CONFIGFILE" +if [ ! -f $USIM_CONFIGFILE ]; then + echo "No ue_usim.conf configuration file found: please mount at $USIM_CONFIGFILE" exit 255 fi echo "==================================" -echo "== Configuration file:" -cat $CONFIGFILE +echo "== USIM Configuration file:" +cat $USIM_CONFIGFILE #now generate USIM files # At this point all operations will be run from $PREFIX! cd $PREFIX -$PREFIX/bin/conf2uedata -c $CONFIGFILE -o $PREFIX +$PREFIX/bin/conf2uedata -c $USIM_CONFIGFILE -o $PREFIX + +CONFIGFILE=$PREFIX/etc/ue.conf + +if [ ! -f $CONFIGFILE ]; then + echo "No ue.conf configuration file found" +else + echo "==================================" + echo "== UE Configuration file:" + cat $CONFIGFILE +fi # Load the USRP binaries echo "==================================" @@ -36,10 +46,9 @@ while [[ $# -gt 0 ]]; do new_args+=("$1") shift done -FILE=$PREFIX/etc/ue.conf if [[ -f "$FILE" ]]; then new_args+=("-O") - new_args+=("$PREFIX/etc/ue.conf") + new_args+=("$CONFIGFILE") fi # enable printing of stack traces on assert From d7d679aa0306900f80caa7d3f755a47572f1bb88 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 2 Jun 2023 14:17:53 +0200 Subject: [PATCH 44/58] Remove fields not present in NSA-gNB config --- ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf | 3 --- 1 file changed, 3 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 48196df57f..53b81d0ae1 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -46,9 +46,6 @@ gNBs = # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 initialDLBWPsubcarrierSpacing = 1; - #pdcch-ConfigCommon - initialDLBWPcontrolResourceSetZero = 0; - initialDLBWPsearchSpaceZero = 0; #uplinkConfigCommon #frequencyInfoUL From 89db66183483531e318ed753753b1527f4ac0649 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 2 Jun 2023 17:32:17 +0200 Subject: [PATCH 45/58] fixup --- docker/scripts/lte_ue_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/scripts/lte_ue_entrypoint.sh b/docker/scripts/lte_ue_entrypoint.sh index 0d851d28c5..a8d0f8fd1a 100755 --- a/docker/scripts/lte_ue_entrypoint.sh +++ b/docker/scripts/lte_ue_entrypoint.sh @@ -46,7 +46,7 @@ while [[ $# -gt 0 ]]; do new_args+=("$1") shift done -if [[ -f "$FILE" ]]; then +if [[ -f "$CONFIGFILE" ]]; then new_args+=("-O") new_args+=("$CONFIGFILE") fi From 82d0f2db6c239d4f1a915b7dba731e9850c35608 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 5 Jun 2023 14:12:38 +0200 Subject: [PATCH 46/58] Renamed config file name for 4g_rfsim_mbms --- ....rfsim-tm1-mbms.conf => enb.band7.tm1.25PRB.rfsim.mbms.conf} | 0 ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ci-scripts/conf_files/{enb.band7.25prb.rfsim-tm1-mbms.conf => enb.band7.tm1.25PRB.rfsim.mbms.conf} (100%) diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1-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.25prb.rfsim-tm1-mbms.conf rename to ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf 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 66ae5877e1..5dc9ae1a04 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.25prb.rfsim-tm1-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 From b4c410d6ed70af6920db7d9c9155a2cedaeaa0cf Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 5 Jun 2023 14:13:50 +0200 Subject: [PATCH 47/58] Rename the config file for 4g_rfsim_fembms --- .../conf_files/enb.band7.25prb.rfsim-tm1.conf | 398 ------------------ .../4g_rfsimulator_fembms/docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 399 deletions(-) delete mode 100644 ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf deleted file mode 100644 index e98896ac5d..0000000000 --- a/ci-scripts/conf_files/enb.band7.25prb.rfsim-tm1.conf +++ /dev/null @@ -1,398 +0,0 @@ -Active_eNBs = ( "eNB-Eurecom-LTEBox"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_ID = 0xe00; - - cell_type = "CELL_MACRO_ENB"; - - eNB_name = "eNB-Eurecom-LTEBox"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } ); - - tr_s_preference = "local_mac" - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNODEB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 25; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 125; - pbch_repetition = "FALSE"; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 0; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower = -27; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnabled = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; - /* srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =;*/ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -104; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; - /* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; - */ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff = 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - ue_TransmissionMode = 1; - mbms_dedicated_serving_cell = "DISABLE" - - //Parameters for SIB18 - rxPool_sc_CP_Len = "normal"; - rxPool_sc_Period = "sf40"; - rxPool_data_CP_Len = "normal"; - rxPool_ResourceConfig_prb_Num = 20; - rxPool_ResourceConfig_prb_Start = 5; - rxPool_ResourceConfig_prb_End = 44; - rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - rxPool_ResourceConfig_offsetIndicator_choice = 0; - rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; -/* rxPool_dataHoppingConfig_hoppingParameter = 0; - rxPool_dataHoppingConfig_numSubbands = "ns1"; - rxPool_dataHoppingConfig_rbOffset = 0; - rxPool_commTxResourceUC-ReqAllowed = "TRUE"; -*/ - // Parameters for SIB19 - discRxPool_cp_Len = "normal" - discRxPool_discPeriod = "rf32" - discRxPool_numRetx = 1; - discRxPool_numRepetition = 2; - discRxPool_ResourceConfig_prb_Num = 5; - discRxPool_ResourceConfig_prb_Start = 3; - discRxPool_ResourceConfig_prb_End = 21; - discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - discRxPool_ResourceConfig_offsetIndicator_choice = 0; - discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - - } - ); - - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - enable_measurement_reports = "no"; - - ///X2 - enable_x2 = "no"; - t_reloc_prep = 1000; /* unit: millisecond */ - tx2_reloc_overall = 2000; /* unit: millisecond */ - t_dc_prep = 1000; /* unit: millisecond */ - t_dc_overall = 2000; /* unit: millisecond */ - - ////////// MCE parameters: - target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); - - ///M2 - enable_enb_m2 = "yes"; - - - mbms_configuration_data_list = ( - { - mbsfn_sync_area = 0x0001; - mbms_service_area_list=( - { - mbms_service_area=0x0001; - } - ); - } - - ); - - - - NETWORK_INTERFACES : - { - - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - - ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24"; - ENB_PORT_FOR_M2C = 36443; # Spec 36443 - }; - } -); - -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "local_RRC"; - phy_test_mode = 0; - puSch10xSnr = 200; - puCch10xSnr = 200; - } -); - -L1s = ( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -MCEs = ( - { - MCE_ID = 0xe00; - - MCE_name = "MCE-Vicomtech-LTEBox"; - - //M2 - enable_mce_m2 = "yes"; - - //M3 - enable_mce_m3 = "yes"; - - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); - - - - NETWORK_INTERFACES : - { - MCE_INTERFACE_NAME_FOR_M2_ENB = "lo"; - MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24"; - MCE_PORT_FOR_M2C = 36443; # Spec 36443 - - MCE_INTERFACE_NAME_FOR_M3_MME = "lo"; - MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24"; - MCE_PORT_FOR_M3C = 36444; # Spec 36444 - }; - - plnm: - { - mcc = 208; - mnc = 93; - mnc_length = 2; - }; - - mbms_sched_info : - { - mcch_update_time = 10; - mbms_area_config_list = ( - { - common_sf_allocation_period = 1; #rf4(0) rf8(1) rf16(2) rf32(3) rf64(4) rf128(5) rf256(6) - mbms_area_id = 0; - pmch_config_list = ( - { - allocated_sf_end=32; - data_mcs=15; - mch_scheduling_period = 0; #rf8(0) rf16(1) rf32(2) rf64(3) rf128(4) rf256(5) rf512(6) rf1024(7) - mbms_session_list = ( - { - #plnm + service_id ->tmgi - plnm: - { - mcc = 208; - mnc = 93; - mnc_length = 2; - } - service_id=0; #keep this allways as 0 (workaround for TUN if) - lcid=5; #this must be properly defined lcid:6+service:0 -> rab_id:5 //with new RLC set lcid either 4 or 5 - } - ); - } - ); - - mbms_sf_config_list = ( - { - radioframe_allocation_period=0; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5) - radioframe_alloocation_offset=0; - num_frame="oneFrame"; - subframe_allocation=57; #xx111001 - //num_frame="fourFrame"; - //subframe_allocation=14548987; # - } - ); - - } - ); - }; - - - mcch_config_per_mbsfn_area = ( - { - mbsfn_area = 0; - pdcch_length = 1; #s1(0), s2(1) - repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3) - offset = 0; - modification_period = 0; #rf512(0; rf1024(1) - subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000 - mcs = 0; #n2(0), n7(1), n13(2), n19(3) - } - ); - - #); #end mbms_scheduling_info - - } -); - -MMEs = ( - { - MME_ID = 0xe00; - - MME_name = "MME-MBMS-Vicomtech-LTEBox"; - - //M3 - enable_mme_m3 = "yes"; - NETWORK_INTERFACES : - { - MME_INTERFACE_NAME_FOR_M3_MCE = "lo"; - MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24"; - MME_PORT_FOR_M3C = 36444; # Spec 36444 - - }; - } -); - - -RUs = ( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 0 - att_rx = 0; - bands = [7]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 125; - eNB_instances = [0]; - - } -); - -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"; - } -); - -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"; - m3ap_log_level = "debug"; - m2ap_log_level = "debug"; - mce_app_log_level = "debug"; - mme_app_log_level = "debug"; -}; 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 3efc61505f..f568989f3f 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.25prb.rfsim-tm1.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 From f64763a06ba81bb8961288c0fdafa50845402a22 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 5 Jun 2023 16:21:36 +0200 Subject: [PATCH 48/58] Removing field not present in 5g-fdd-rfsim config file --- ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf index 7b1464c403..dd2bbb0418 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf @@ -20,13 +20,6 @@ gNBs = min_rxtxtime = 6; enable_sdap = 1; - pdcch_ConfigSIB1 = ( - { - controlResourceSetZero = 12; - searchSpaceZero = 0; - } - ); - servingCellConfigCommon = ( { #spCellConfigCommon From d62a921485f38521119e018462c2101d1866bf70 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 14:37:14 +0200 Subject: [PATCH 49/58] Removed identical config file used for lte-b200-fdd-10mhz-tm1-cdrx --- .../enb.band7.50prb.usrpb200-tm1-cdrx.conf | 263 ------------------ .../docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 264 deletions(-) delete mode 100644 ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf deleted file mode 100644 index 41c2e3a668..0000000000 --- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf +++ /dev/null @@ -1,263 +0,0 @@ -Active_eNBs = ( "eNB-in-docker"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_ID = 0xe01; - cell_type = "CELL_MACRO_ENB"; - eNB_name = "eNB-in-docker"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); - - tr_s_preference = "local_mac" - - // In seconds - rrc_inactivity_threshold = 0; - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "3GPP_eNODEB"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "FDD"; - tdd_config = 3; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 7; - downlink_frequency = 2680000000L; - uplink_frequency_offset = -120000000; - Nid_cell = 0; - N_RB_DL = 50; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 115; - pbch_repetition = "FALSE"; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 0; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower= -29; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnabled = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; -/* - srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =; -*/ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -96; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; -/* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; -*/ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff = 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - ue_TransmissionMode = 1; - - //Parameters for SIB18 - rxPool_sc_CP_Len = "normal"; - rxPool_sc_Period = "sf40"; - rxPool_data_CP_Len = "normal"; - rxPool_ResourceConfig_prb_Num = 20; - rxPool_ResourceConfig_prb_Start = 5; - rxPool_ResourceConfig_prb_End = 44; - rxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - rxPool_ResourceConfig_offsetIndicator_choice = 0; - rxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; - rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; -/* - rxPool_dataHoppingConfig_hoppingParameter = 0; - rxPool_dataHoppingConfig_numSubbands = "ns1"; - rxPool_dataHoppingConfig_rbOffset = 0; - rxPool_commTxResourceUC-ReqAllowed = "TRUE"; -*/ - // Parameters for SIB19 - discRxPool_cp_Len = "normal" - discRxPool_discPeriod = "rf32" - discRxPool_numRetx = 1; - discRxPool_numRepetition = 2; - discRxPool_ResourceConfig_prb_Num = 5; - discRxPool_ResourceConfig_prb_Start = 3; - discRxPool_ResourceConfig_prb_End = 21; - discRxPool_ResourceConfig_offsetIndicator_present = "prSmall"; - discRxPool_ResourceConfig_offsetIndicator_choice = 0; - discRxPool_ResourceConfig_subframeBitmap_present = "prBs40"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff"; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; - discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; - - //SSB central frequency of NR secondary cell group (for ENDC NSA) - nr_scg_ssb_freq = 641272; - } - ); - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - enable_measurement_reports = "no"; - - ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); - - ///X2 - enable_x2 = "no"; - t_reloc_prep = 1000; /* unit: millisecond */ - tx2_reloc_overall = 2000; /* unit: millisecond */ - t_dc_prep = 1000; /* unit: millisecond */ - t_dc_overall = 2000; /* unit: millisecond */ - - NETWORK_INTERFACES : - { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - }; - } -); - -MACRLCs = -( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "local_RRC"; - phy_test_mode = 0; - puSch10xSnr = 160; - puCch10xSnr = 160; - } -); - -L1s = -( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -RUs = -( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 3 - att_rx = 0; - bands = [7]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 115; - eNB_instances = [0]; -# clock_src = "external"; - } -); - -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"; - } -); - -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/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml index 0613025571..c707d6bda1 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From 902c5164509d54b4749f71c70b1a64ff5411d358 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 14:48:39 +0200 Subject: [PATCH 50/58] Removed identical file for lte-b200-tdd-05mhz-tm2 and reusing existing config file --- .../enb.band40.25prb.usrpb200-tm2.conf | 218 ------------------ .../lte_b200_tdd_05Mhz_tm2/docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf deleted file mode 100644 index 96912e4577..0000000000 --- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm2.conf +++ /dev/null @@ -1,218 +0,0 @@ -Active_eNBs = ( "eNB-in-docker"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_ID = 0xe00; - - cell_type = "CELL_MACRO_ENB"; - - eNB_name = "eNB-in-docker"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "eNodeB_3GPP"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "TDD"; - tdd_config = 1; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 40; - downlink_frequency = 2350000000L; - uplink_frequency_offset = 0000000; - Nid_cell = 0; - N_RB_DL = 25; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 125; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 1; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower =-27; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnabled = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; - /* srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =;*/ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -106; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; - /* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; - */ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff = 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - - ue_TransmissionMode = 1; - } - ); - - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); - - enable_measurement_reports = "no"; - - ///X2 - enable_x2 = "no"; - t_reloc_prep = 1000; /* unit: millisecond */ - tx2_reloc_overall = 2000; /* unit: millisecond */ - t_dc_prep = 1000; /* unit: millisecond */ - t_dc_overall = 2000; /* unit: millisecond */ - - NETWORK_INTERFACES : - { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - }; - - log_config : - { - global_log_level ="debug"; - hw_log_level ="info"; - phy_log_level ="info"; - mac_log_level ="info"; - rlc_log_level ="info"; - pdcp_log_level ="info"; - rrc_log_level ="info"; - }; - - } -); -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "local_RRC"; - scheduler_mode = "fairRR"; - puSch10xSnr = 150; - puCch10xSnr = 150; - } -); - -L1s = ( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -RUs = ( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 6 - att_rx = 6; - bands = [38]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 125; - eNB_instances = [0]; - - } -); - -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"; - } -); diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml index 44c61d8787..53748b6efc 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml @@ -10,7 +10,7 @@ services: USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --log_config.global_log_options level,nocolor,time,line_num,function #USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --eNBs.[0].component_carriers.[0].nb_antennas_tx 2 --eNBs.[0].component_carriers.[0].nb_antennas_rx 2 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm2.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From c45494b8c5f7fdbb1ec5f429b155b1f5369f40c3 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 14:52:45 +0200 Subject: [PATCH 51/58] Rename config file used for lte-b200-tdd --- .../conf_files/enb.band40.25prb.usrpb200.conf | 218 ++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf new file mode 100644 index 0000000000..9b812aa755 --- /dev/null +++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf @@ -0,0 +1,218 @@ +Active_eNBs = ( "eNB-Eurecom_LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB-Eurecom_LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = 1; + plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); + + ////////// Physical parameters: + + component_carriers = ( + { + node_function = "eNodeB_3GPP"; + node_timing = "synch_to_ext_device"; + node_synch_ref = 0; + frame_type = "TDD"; + tdd_config = 1; + tdd_config_s = 0; + prefix_type = "NORMAL"; + eutra_band = 40; + downlink_frequency = 2350000000L; + uplink_frequency_offset = 0; + Nid_cell = 0; + N_RB_DL = 25; + Nid_cell_mbsfn = 0; + nb_antenna_ports = 1; + nb_antennas_tx = 1; + nb_antennas_rx = 1; + tx_gain = 90; + rx_gain = 125; + prach_root = 0; + prach_config_index = 0; + prach_high_speed = "DISABLE"; + prach_zero_correlation = 1; + prach_freq_offset = 2; + pucch_delta_shift = 1; + pucch_nRB_CQI = 1; + pucch_nCS_AN = 0; + pucch_n1_AN = 0; + pdsch_referenceSignalPower =-27; + pdsch_p_b = 0; + pusch_n_SB = 1; + pusch_enable64QAM = "DISABLE"; + pusch_hoppingMode = "interSubFrame"; + pusch_hoppingOffset = 0; + pusch_groupHoppingEnabled = "ENABLE"; + pusch_groupAssignment = 0; + pusch_sequenceHoppingEnabled = "DISABLE"; + pusch_nDMRS1 = 1; + phich_duration = "NORMAL"; + phich_resource = "ONESIXTH"; + srs_enable = "DISABLE"; + /* srs_BandwidthConfig =; + srs_SubframeConfig =; + srs_ackNackST =; + srs_MaxUpPts =;*/ + + pusch_p0_Nominal = -96; + pusch_alpha = "AL1"; + pucch_p0_Nominal = -106; + msg3_delta_Preamble = 6; + pucch_deltaF_Format1 = "deltaF2"; + pucch_deltaF_Format1b = "deltaF3"; + pucch_deltaF_Format2 = "deltaF0"; + pucch_deltaF_Format2a = "deltaF0"; + pucch_deltaF_Format2b = "deltaF0"; + + rach_numberOfRA_Preambles = 64; + rach_preamblesGroupAConfig = "DISABLE"; + /* + rach_sizeOfRA_PreamblesGroupA = ; + rach_messageSizeGroupA = ; + rach_messagePowerOffsetGroupB = ; + */ + rach_powerRampingStep = 4; + rach_preambleInitialReceivedTargetPower = -108; + rach_preambleTransMax = 10; + rach_raResponseWindowSize = 10; + rach_macContentionResolutionTimer = 48; + rach_maxHARQ_Msg3Tx = 4; + + pcch_default_PagingCycle = 128; + pcch_nB = "oneT"; + bcch_modificationPeriodCoeff = 2; + ue_TimersAndConstants_t300 = 1000; + ue_TimersAndConstants_t301 = 1000; + ue_TimersAndConstants_t310 = 1000; + ue_TimersAndConstants_t311 = 10000; + ue_TimersAndConstants_n310 = 20; + ue_TimersAndConstants_n311 = 1; + + ue_TransmissionMode = 1; + } + ); + + + srb1_parameters : + { + # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] + timer_poll_retransmit = 80; + + # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] + timer_reordering = 35; + + # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] + timer_status_prohibit = 0; + + # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] + poll_pdu = 4; + + # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] + poll_byte = 99999; + + # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] + max_retx_threshold = 4; + } + + # ------- SCTP definitions + SCTP : + { + # Number of streams to use in input/output + SCTP_INSTREAMS = 2; + SCTP_OUTSTREAMS = 2; + }; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "172.21.18.48"; + ipv6 = "192:168:30::17"; + port = 36412 ; + active = "yes"; + preference = "ipv4"; + } + ); + + enable_measurement_reports = "no"; + + ///X2 + enable_x2 = "no"; + t_reloc_prep = 1000; /* unit: millisecond */ + tx2_reloc_overall = 2000; /* unit: millisecond */ + t_dc_prep = 1000; /* unit: millisecond */ + t_dc_overall = 2000; /* unit: millisecond */ + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; + ENB_PORT_FOR_S1U = 2152; # Spec 2152 + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; + ENB_PORT_FOR_X2C = 36422; # Spec 36422 + }; + + log_config : + { + global_log_level ="debug"; + hw_log_level ="info"; + phy_log_level ="info"; + mac_log_level ="info"; + rlc_log_level ="info"; + pdcp_log_level ="info"; + rrc_log_level ="info"; + }; + + } +); +MACRLCs = ( + { + num_cc = 1; + tr_s_preference = "local_L1"; + tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; + puSch10xSnr = 150; + puCch10xSnr = 150; + } +); + +L1s = ( + { + num_cc = 1; + tr_n_preference = "local_mac"; + } +); + +RUs = ( + { + local_rf = "yes" + nb_tx = 1 + nb_rx = 1 + att_tx = 6 + att_rx = 6; + bands = [38]; + max_pdschReferenceSignalPower = -27; + max_rxgain = 125; + eNB_instances = [0]; + + } +); + +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"; + } +); From c22f5ed7e596f166cc9248be08113ef989152b0f Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 14:57:01 +0200 Subject: [PATCH 52/58] Using renamed config file for lte-b200-tdd-05mhz-tm1 --- ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml index 7d0a1a87af..1c6051ee61 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From 422f8e476c52e2d23d5c90fea4a0e26b6abbbf93 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 14:58:27 +0200 Subject: [PATCH 53/58] Using renamed config file for lte-b200-tdd-05mhz-tm2 --- ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml index 53748b6efc..01bf774044 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml @@ -10,7 +10,7 @@ services: USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --log_config.global_log_options level,nocolor,time,line_num,function #USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --eNBs.[0].component_carriers.[0].nb_antennas_tx 2 --eNBs.[0].component_carriers.[0].nb_antennas_rx 2 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From bf40e967233e50b0abb6a59453875af94f6ee116 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 14:59:01 +0200 Subject: [PATCH 54/58] Using renamed config file for lte-b200-tdd-10mhz-tm1 --- ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml index 0a103b8c21..39f365eaf0 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].N_RB_DL 50 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From f94a8f4a0d06b4a56d141efa4eeb7f1f9685c51c Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 15:01:31 +0200 Subject: [PATCH 55/58] Using renamed config file for lte-b200-tdd-20mhz-tm1 --- ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml index 9e0ed337a0..2bc0b61305 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --eNBs.[0].component_carriers.[0].N_RB_DL 100 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From 0db42d35a5d77fc553284f64088bbdbf9fe41721 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 6 Jun 2023 15:02:33 +0200 Subject: [PATCH 56/58] Removing used config file for lte-tdd-tm1 --- .../enb.band40.25prb.usrpb200-tm1.conf | 218 ------------------ 1 file changed, 218 deletions(-) delete mode 100644 ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf deleted file mode 100644 index 9b812aa755..0000000000 --- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200-tm1.conf +++ /dev/null @@ -1,218 +0,0 @@ -Active_eNBs = ( "eNB-Eurecom_LTEBox"); -# Asn1_verbosity, choice in: none, info, annoying -Asn1_verbosity = "none"; - -eNBs = -( - { - ////////// Identification parameters: - eNB_ID = 0xe00; - - cell_type = "CELL_MACRO_ENB"; - - eNB_name = "eNB-Eurecom_LTEBox"; - - // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; - plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } ); - - ////////// Physical parameters: - - component_carriers = ( - { - node_function = "eNodeB_3GPP"; - node_timing = "synch_to_ext_device"; - node_synch_ref = 0; - frame_type = "TDD"; - tdd_config = 1; - tdd_config_s = 0; - prefix_type = "NORMAL"; - eutra_band = 40; - downlink_frequency = 2350000000L; - uplink_frequency_offset = 0; - Nid_cell = 0; - N_RB_DL = 25; - Nid_cell_mbsfn = 0; - nb_antenna_ports = 1; - nb_antennas_tx = 1; - nb_antennas_rx = 1; - tx_gain = 90; - rx_gain = 125; - prach_root = 0; - prach_config_index = 0; - prach_high_speed = "DISABLE"; - prach_zero_correlation = 1; - prach_freq_offset = 2; - pucch_delta_shift = 1; - pucch_nRB_CQI = 1; - pucch_nCS_AN = 0; - pucch_n1_AN = 0; - pdsch_referenceSignalPower =-27; - pdsch_p_b = 0; - pusch_n_SB = 1; - pusch_enable64QAM = "DISABLE"; - pusch_hoppingMode = "interSubFrame"; - pusch_hoppingOffset = 0; - pusch_groupHoppingEnabled = "ENABLE"; - pusch_groupAssignment = 0; - pusch_sequenceHoppingEnabled = "DISABLE"; - pusch_nDMRS1 = 1; - phich_duration = "NORMAL"; - phich_resource = "ONESIXTH"; - srs_enable = "DISABLE"; - /* srs_BandwidthConfig =; - srs_SubframeConfig =; - srs_ackNackST =; - srs_MaxUpPts =;*/ - - pusch_p0_Nominal = -96; - pusch_alpha = "AL1"; - pucch_p0_Nominal = -106; - msg3_delta_Preamble = 6; - pucch_deltaF_Format1 = "deltaF2"; - pucch_deltaF_Format1b = "deltaF3"; - pucch_deltaF_Format2 = "deltaF0"; - pucch_deltaF_Format2a = "deltaF0"; - pucch_deltaF_Format2b = "deltaF0"; - - rach_numberOfRA_Preambles = 64; - rach_preamblesGroupAConfig = "DISABLE"; - /* - rach_sizeOfRA_PreamblesGroupA = ; - rach_messageSizeGroupA = ; - rach_messagePowerOffsetGroupB = ; - */ - rach_powerRampingStep = 4; - rach_preambleInitialReceivedTargetPower = -108; - rach_preambleTransMax = 10; - rach_raResponseWindowSize = 10; - rach_macContentionResolutionTimer = 48; - rach_maxHARQ_Msg3Tx = 4; - - pcch_default_PagingCycle = 128; - pcch_nB = "oneT"; - bcch_modificationPeriodCoeff = 2; - ue_TimersAndConstants_t300 = 1000; - ue_TimersAndConstants_t301 = 1000; - ue_TimersAndConstants_t310 = 1000; - ue_TimersAndConstants_t311 = 10000; - ue_TimersAndConstants_n310 = 20; - ue_TimersAndConstants_n311 = 1; - - ue_TransmissionMode = 1; - } - ); - - - srb1_parameters : - { - # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500] - timer_poll_retransmit = 80; - - # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200] - timer_reordering = 35; - - # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500] - timer_status_prohibit = 0; - - # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)] - poll_pdu = 4; - - # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)] - poll_byte = 99999; - - # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32] - max_retx_threshold = 4; - } - - # ------- SCTP definitions - SCTP : - { - # Number of streams to use in input/output - SCTP_INSTREAMS = 2; - SCTP_OUTSTREAMS = 2; - }; - - ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); - - enable_measurement_reports = "no"; - - ///X2 - enable_x2 = "no"; - t_reloc_prep = 1000; /* unit: millisecond */ - tx2_reloc_overall = 2000; /* unit: millisecond */ - t_dc_prep = 1000; /* unit: millisecond */ - t_dc_overall = 2000; /* unit: millisecond */ - - NETWORK_INTERFACES : - { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; - ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; - ENB_PORT_FOR_X2C = 36422; # Spec 36422 - }; - - log_config : - { - global_log_level ="debug"; - hw_log_level ="info"; - phy_log_level ="info"; - mac_log_level ="info"; - rlc_log_level ="info"; - pdcp_log_level ="info"; - rrc_log_level ="info"; - }; - - } -); -MACRLCs = ( - { - num_cc = 1; - tr_s_preference = "local_L1"; - tr_n_preference = "local_RRC"; - scheduler_mode = "fairRR"; - puSch10xSnr = 150; - puCch10xSnr = 150; - } -); - -L1s = ( - { - num_cc = 1; - tr_n_preference = "local_mac"; - } -); - -RUs = ( - { - local_rf = "yes" - nb_tx = 1 - nb_rx = 1 - att_tx = 6 - att_rx = 6; - bands = [38]; - max_pdschReferenceSignalPower = -27; - max_rxgain = 125; - eNB_instances = [0]; - - } -); - -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"; - } -); From 85cdcd14c3d892fec5dfc37ef2e2c65e2323afc3 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 7 Jun 2023 08:46:06 +0200 Subject: [PATCH 57/58] Rename files to follow style guide --- ...onf => enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf} | 0 ...prb.usrpb200-tm1.conf => enb.band7.100prb.usrpb200.tm1.conf} | 0 ...d7.25prb.rfsim-nos1.conf => enb.band7.25prb.rfsim.nos1.conf} | 0 ...0-tm1-norrc.conf => enb.band7.25prb.usrpb200.tm1-norrc.conf} | 0 ...5prb.usrpb200-tm1.conf => enb.band7.25prb.usrpb200.tm1.conf} | 0 ...0prb.usrpb200-tm1.conf => enb.band7.50prb.usrpb200.tm1.conf} | 0 .../yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml | 2 +- ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml | 2 +- .../lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml | 2 +- ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml | 2 +- .../yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml | 2 +- ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml | 2 +- .../lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml | 2 +- 13 files changed, 7 insertions(+), 7 deletions(-) rename ci-scripts/conf_files/{enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf => enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf} (100%) rename ci-scripts/conf_files/{enb.band7.100prb.usrpb200-tm1.conf => enb.band7.100prb.usrpb200.tm1.conf} (100%) rename ci-scripts/conf_files/{enb.band7.25prb.rfsim-nos1.conf => enb.band7.25prb.rfsim.nos1.conf} (100%) rename ci-scripts/conf_files/{enb.band7.25prb.usrpb200-tm1-norrc.conf => enb.band7.25prb.usrpb200.tm1-norrc.conf} (100%) rename ci-scripts/conf_files/{enb.band7.25prb.usrpb200-tm1.conf => enb.band7.25prb.usrpb200.tm1.conf} (100%) rename ci-scripts/conf_files/{enb.band7.50prb.usrpb200-tm1.conf => enb.band7.50prb.usrpb200.tm1.conf} (100%) diff --git a/ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf similarity index 100% rename from ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf rename to ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf diff --git a/ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf rename to ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf rename to ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf rename to ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf rename to ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf rename to ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml index 4361409488..bb0bb9f982 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml @@ -13,7 +13,7 @@ services: RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1 volumes: - - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.25prb.rfsim.nos1.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml index 8307ec4f34..27258e72ee 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.25prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml index b306920833..52a5302a39 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml index 7e2bdfbe8b..d8fa5d4fd0 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.50prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml index c707d6bda1..69f47b2bf0 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.50prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml index 58dc034d1e..041cce37aa 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.100prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml index 138f2088d9..da2f109cd7 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: From 7042a9e10868a823e5a9ce3c5c83b4f10421d783 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 7 Jun 2023 08:48:47 +0200 Subject: [PATCH 58/58] Move untested files to ci-scripts/conf_files/untested --- .../enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf | 0 .../enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf | 0 .../enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf | 0 .../conf_files/{ => untested}/enb.band7.tm1.100PRB.usrpb210.conf | 0 .../{ => untested}/enb.band7.tm1.25PRB.slave.usrpb210.conf | 0 .../conf_files/{ => untested}/enb.band7.tm1.25PRB.usrpb210.conf | 0 .../conf_files/{ => untested}/enb.band7.tm2.25PRB.usrpb210.conf | 0 .../{ => untested}/enb.slave.band13.tm1.25PRB.usrpb210.conf | 0 .../conf_files/{ => untested}/episci/episci_nr-ue.nfapi.conf | 0 .../{ => untested}/episci/episci_rcc.band7.tm1.nfapi.conf | 0 .../{ => untested}/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf | 0 ci-scripts/conf_files/{ => untested}/episci/episci_ue.nfapi.conf | 0 .../conf_files/{ => untested}/episci/episci_ue_test_sfr.conf | 0 .../{ => untested}/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf | 0 .../conf_files/{ => untested}/episci/proxy_nr-ue.nfapi.conf | 0 .../{ => untested}/episci/proxy_rcc.band7.tm1.nfapi.conf | 0 .../{ => untested}/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf | 0 ci-scripts/conf_files/{ => untested}/episci/proxy_ue.nfapi.conf | 0 .../conf_files/{ => untested}/gNB_SA_n78_106PRB.2x2_usrpn310.conf | 0 .../conf_files/{ => untested}/gNB_SA_n78_133PRB.2x2_usrpn310.conf | 0 ci-scripts/conf_files/{ => untested}/lte-tdd-basic-sim.conf | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename ci-scripts/conf_files/{ => untested}/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band7.tm1.100PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band7.tm1.25PRB.slave.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band7.tm1.25PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.band7.tm2.25PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/enb.slave.band13.tm1.25PRB.usrpb210.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/episci_nr-ue.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/episci_rcc.band7.tm1.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/episci_ue.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/episci_ue_test_sfr.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/proxy_nr-ue.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/proxy_rcc.band7.tm1.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/episci/proxy_ue.nfapi.conf (100%) rename ci-scripts/conf_files/{ => untested}/gNB_SA_n78_106PRB.2x2_usrpn310.conf (100%) rename ci-scripts/conf_files/{ => untested}/gNB_SA_n78_133PRB.2x2_usrpn310.conf (100%) rename ci-scripts/conf_files/{ => untested}/lte-tdd-basic-sim.conf (100%) diff --git a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf rename to ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf diff --git a/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf rename to ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf diff --git a/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf rename to ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf diff --git a/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf rename to ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf diff --git a/ci-scripts/conf_files/episci/episci_ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/episci_ue.nfapi.conf rename to ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf diff --git a/ci-scripts/conf_files/episci/episci_ue_test_sfr.conf b/ci-scripts/conf_files/untested/episci/episci_ue_test_sfr.conf similarity index 100% rename from ci-scripts/conf_files/episci/episci_ue_test_sfr.conf rename to ci-scripts/conf_files/untested/episci/episci_ue_test_sfr.conf diff --git a/ci-scripts/conf_files/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf similarity index 100% rename from ci-scripts/conf_files/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf rename to ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf diff --git a/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf rename to ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf diff --git a/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf rename to ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf diff --git a/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf rename to ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf diff --git a/ci-scripts/conf_files/episci/proxy_ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf similarity index 100% rename from ci-scripts/conf_files/episci/proxy_ue.nfapi.conf rename to ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf diff --git a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf rename to ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf diff --git a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf rename to ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf diff --git a/ci-scripts/conf_files/lte-tdd-basic-sim.conf b/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf similarity index 100% rename from ci-scripts/conf_files/lte-tdd-basic-sim.conf rename to ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf