fix(unit test): add T2 ofload case to nr-uesoftmodem unit test

First, build nr_ulsim/nr_dlsim including required dfts and ldpc to run
these tests in the unit tests.

Second, pass the environment variable LD_LIBRARY_PATH so that
nr_ulsim/nr_dlsim find dfts/ldpc, because we use asan inside.

CHANGELOG.md

@@ -1,61 +1,5 @@
 # RELEASE NOTES: #
 
-## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##
-
-General 5G improvements (both gNB and UE):
-- Make standalone mode (SA) the default (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Experimental support for FR2 operation
-- Support for GEO NTN and simulation of GEO satellite channel in RFsimulator
-  (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Support 2-step RA
-- Add optional LTTng logger in logging module (see
-  [`lttng_logs.md`](common/utils/LOG/DOC/lttng_logs.md))
-- Support for YAML-based config files (alongside libconfig) (see
-  [`gnb.sa.band78.106prb.rfsim.yaml`](ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml) and
-  [`nrue.uicc.yaml`](ci-scripts/conf_files/nrue.uicc.yaml))
-- Add new L1 scope based on Dear ImGui (see [`readme.md`](openair1/PHY/TOOLS/readme.md))
-- Allow cross-compilation on ARM (via SIMDE SIMD emulation library)
-- Allow to build and run with clang
-- Support/check for Linux capabilities, allow to run without sudo (see
-  [`tuning_and_security.md`](doc/tuning_and_security.md))
-- OAI does not modify CPU frequency and networking stack
-  ([`tuning_and_security.md`](doc/tuning_and_security.md))
-- Bugfixes in the entire stack (e.g.  #547, #663, #674, #687, #712, #736, #739,
-  #741, #756, #762, #773, ...)
-
-5G gNB:
-- Support for FR2 interoperability with COTS UE (no beam switching supported yet)
-- Add 4-layer DL MIMO (experimental)
-- Add gNB Neighbour configuration and Mobility over F1 interface (see
-  [`handover-tutorial.md`](doc/handover-tutorial.md))
-- Enhance O-RAN FHI 7.2: (see [`ORAN_FHI7.2_Tutorial.md`](doc/ORAN_FHI7.2_Tutorial.md))
-  * Support different bandwidths (40/60/80/100MHz) and antenna configs (1x1 up
-    to 4x4) for Benetel/VVDN/LITEON RUs
-  * Add support for multi-RU support (single-cell/distributed antenna)
-- Support AMD T2 Telco card look-aside L1 accelerator (see
-  [`LDPC_T2_OFFLOAD_SETUP.md`](doc/LDPC_T2_OFFLOAD_SETUP.md))
-- Support Nvidia Aerial/ARC in-line L1 accelerator (see
-  [`Aerial_FAPI_Split_Tutorial.md`](doc/Aerial_FAPI_Split_Tutorial.md))
-- Various fixes for multi-UE operation: by default support of up to 16 UEs concurrently
-- Documentation for
-  - 5G MAC (see [`mac-usage.md`](doc/MAC/mac-usage.md))
-  - 5G RRC (see [`rrc-usage.md`](doc/RRC/rrc-usage.md))
-  - E1 (see [`E1-design.md`](doc/E1AP/E1-design.md))
-  - F1 (see [`F1-design.md`](doc/F1AP/F1-design.md))
-
-5G UE:
-- Basic interoperability with COTS gNB (Nokia gNB)
-- Implement PHR reporting
-- Implement RRC re-establishment
-- Implement PUCCH/PUSCH/SRS power control
-- Implement UCI on PUSCH and aperiodic CSI reporting
-- Support of cell search (within the selected UE bandwidth) (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Enhance connection control: implement timers, resync
-- A lot of internal cleanup
-
-This release also includes many fixes and documentation updates. See
-`doc/README.md` in the repository for an overview of documentation.
-
 ## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
 
 This release improves existing 5G support and adds various new features.

CMakeLists.txt

@@ -43,7 +43,7 @@ include("cmake_targets/CPM.cmake")
 option(CCACHE_ACTIVE "CCache" ON)
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND AND CCACHE_ACTIVE)
-  if(${CMAKE_VERSION} VERSION_LESS "3.4.0")
+  if(${CMAKE_VERSION} VERSION_LESS "3.4.0") 
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
     message(STATUS "Found ccache in ${CCACHE_FOUND}. Using ccache. CMake < 3.4")
   else()
@@ -105,13 +105,13 @@ add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of bui
 
 # in case /proc/cpuinfo exists we want to inspect available Intrinsics
 # -so not to go always through SIMDE emulation
-# -so to avoid AVX512 instructions generation by gcc
+# -so to avoid AVX512 instructions generation by gcc   
 if(EXISTS "/proc/cpuinfo" AND NOT CROSS_COMPILE)
   file(STRINGS "/proc/cpuinfo" CPUFLAGS REGEX flags LIMIT_COUNT 1)
 else()
   message(WARNING "did not find /proc/cpuinfo -- not setting any x86-specific compilation variables")
 endif()
-
+ 
 eval_boolean(AUTODETECT_AVX512 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx512")
 add_boolean_option(AVX512 ${AUTODETECT_AVX512} "Whether AVX512 intrinsics is available on the host processor" ON)
 
@@ -175,9 +175,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
 endif()
 
 set(CMAKE_C_FLAGS
-  "${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops ${CMAKE_C_FLAGS}")
+  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops")
 set(CMAKE_CXX_FLAGS
-  "${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11 ${CMAKE_CXX_FLAGS}")
+  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11")
 
 
 add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)" ON)
@@ -260,6 +260,7 @@ endif()
 
 # Debug related options
 #########################################
+add_boolean_option(DEBUG_ASN1 False "Enable ASN1 debug logs" OFF)
 # asn1c skeletons have hardcoded this flag to make customized debug logs
 # OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
 # see common/utils/config.h
@@ -270,11 +271,6 @@ add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
 
-add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
-if (TRACY_ENABLE)
-  CPMAddPackage("gh:wolfpld/tracy#v0.11.1")
-endif()
-
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
 target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -298,7 +294,6 @@ message(STATUS "Selected KPM Version: ${KPM_VERSION}")
 
 
 add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)
-add_boolean_option(ENABLE_IMSCOPE_RECORD OFF "Enable recording IQ data for imscope" OFF)
 
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
@@ -346,7 +341,6 @@ set(NGAP_DIR ${OPENAIR3_DIR}/NGAP)
 include_directories ("${NGAP_DIR}")
 add_library(ngap
   ${NGAP_DIR}/ngap_gNB.c
-  ${NGAP_DIR}/ngap_common.c
   ${NGAP_DIR}/ngap_gNB_context_management_procedures.c
   ${NGAP_DIR}/ngap_gNB_decoder.c
   ${NGAP_DIR}/ngap_gNB_encoder.c
@@ -450,12 +444,9 @@ add_library(f1ap
             ${F1AP_DIR}/f1ap_handlers.c
             ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
-target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
+target_link_libraries(f1ap PUBLIC asn1_f1ap L2_NR)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
-if(E2_AGENT)
-  target_compile_definitions(f1ap PRIVATE E2_AGENT)
-endif()
 
 # LPP
 ##############
@@ -489,6 +480,44 @@ target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBR
 add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)
 target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 
+##########################################################
+
+# LDPC offload library - AMD T2 Accelerator Card
+##########################################################
+
+add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
+if (ENABLE_LDPC_T2)
+  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
+  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
+  if (NOT PMD_T2)
+    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
+  endif()
+  message(STATUS "T2 build: use ${PMD_T2}")
+  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
+  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
+  set(PHY_NRLDPC_CODING_T2_SRC
+    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_t2/nrLDPC_coding_t2.c
+  )
+  add_library(ldpc_slot_t2 MODULE ${PHY_NRLDPC_CODING_T2_SRC})
+  set_target_properties(ldpc_slot_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_link_libraries(ldpc_slot_t2 PRIVATE ldpc_gen_HEADERS ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
+endif()
+
+##########################################################
+
+# LDPC offload library - XDMA
+##########################################################
+add_boolean_option(ENABLE_LDPC_XDMA OFF "Build support for LDPC Offload to XDMA library" OFF)
+if (ENABLE_LDPC_XDMA)
+  set(PHY_NRLDPC_CODING_XDMA_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/nrLDPC_coding_xdma_offload.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/nrLDPC_coding_xdma.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_encoder.c
+  )
+  add_library(ldpc_xdma MODULE ${PHY_NRLDPC_CODING_XDMA_SRC})
+endif()
+
 include_directories ("${OPENAIR_DIR}/radio/COMMON")
 
 ##############################################################
@@ -498,6 +527,7 @@ include_directories ("${OPENAIR_DIR}/radio/COMMON")
 add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION with max 256 UE" ON)
 add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE" ON)
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE" ON)
+add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE" ON)
 
 ##########################
 # SCHEDULING/REAL-TIME/PERF options
@@ -509,15 +539,20 @@ add_boolean_option(ENABLE_VCD_FIFO         False  "time measurements of proc cal
 ##########################
 # PHY options
 ##########################
-add_integer_option(MAX_NUM_CCs             1     "Carrier component data arrays size (oai doesn't support carrier aggreagtion for now)" ON)
+add_boolean_option(LOCALIZATION            False "???" ON)
+add_integer_option(MAX_NUM_CCs             1     "????" ON)
 add_boolean_option(SMBV                    False "Rohde&Schwarz SMBV100A vector signal generator" ON)
 add_boolean_option(DEBUG_PHY               False "Enable PHY layer debugging options" ON)
 add_boolean_option(DEBUG_PHY_PROC          False "Enable debugging of PHY layer procedures" ON)
+add_boolean_option(MEX                     False "Enabling compilation with mex" ON)
 
 ##########################
 # NAS LAYER OPTIONS
 ##########################
+add_boolean_option(ENABLE_NAS_UE_LOGGING   True  "????" ON)
 add_boolean_option(NAS_BUILT_IN_UE         True  "UE NAS layer present in this executable" ON)
+add_boolean_option(NAS_UE                  True  "NAS UE INSTANCE (<> NAS_MME)" ON)
+
 
 ##########################
 # RRC LAYER OPTIONS
@@ -619,8 +654,7 @@ if (cap_FOUND)
   target_link_libraries(UTIL PRIVATE cap)
   target_compile_definitions(UTIL PRIVATE HAVE_LIB_CAP)
 endif()
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils barrier actor)
-target_link_libraries(UTIL PUBLIC instrumentation)
+target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils)
 
 set(SECURITY_SRC
   ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -661,7 +695,7 @@ set(SCHED_NR_SRC
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
-target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs)
 
 set(SCHED_SRC_RU
   ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -679,17 +713,18 @@ set(SCHED_SRC_UE
   ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 set(SCHED_SRC_NR_UE
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c
 )
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
-target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 # nFAPI
 #################################
@@ -700,7 +735,7 @@ set(NFAPI_SRC
 )
 add_library(NFAPI_LIB ${NFAPI_SRC})
 target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
+target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)
 
 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -713,7 +748,6 @@ set(NFAPI_PNF_SRC
 )
 add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
 target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_PNF_LIB PUBLIC nr_fapi_p7)
 
 include_directories(${NFAPI_DIR}/pnf/public_inc)
 include_directories(${NFAPI_DIR}/pnf/inc)
@@ -726,7 +760,7 @@ set(NFAPI_VNF_SRC
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
 target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7)
+target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5)
 if(OAI_AERIAL)
   target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
 endif()
@@ -742,17 +776,21 @@ set(NFAPI_USER_SRC
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
-target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
-if(OAI_AERIAL)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
-endif()
+target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
 #############################
+set(PHY_TURBOSRC
+  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
+  ${OPENAIR1_DIR}/PHY/CODING/3gpplte.c
+  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
+  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
+  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
+  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder.c
+)
 set(PHY_POLARSRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
+  ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -773,17 +811,92 @@ set(PHY_TURBOIF
   ${OPENAIR1_DIR}/PHY/CODING/coding_load.c
 )
 
+set(PHY_LDPC_ORIG_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c
+)
+add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
+target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
+
+set(PHY_LDPC_OPTIM_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
+  )
+add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
+target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
+
+set(PHY_LDPC_OPTIM8SEG_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
+)
+add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
+target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
+
+set(PHY_LDPC_OPTIM8SEGMULTI_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
+  )
+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
+
+set(PHY_LDPC_CUDA_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
+)
+
+set(PHY_LDPC_CL_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
+)
+add_custom_target( nrLDPC_decoder_kernels_CL
+                   COMMAND gcc ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c -dD -DNRLDPC_KERNEL_SOURCE -E -o ${CMAKE_CURRENT_BINARY_DIR}/nrLDPC_decoder_kernels_CL.clc
+                   SOURCES ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
+)
+add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
+target_link_libraries(ldpc_cl OpenCL)
+add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)
+
+set(PHY_NRLDPC_CODING_SEGMENT_SRC
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_encoder.c
+)
+
+set(PHY_NR_CODINGIF
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
+)
+
 set(PHY_NRLDPC_CODINGIF
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface_load.c
 )
 
+##############################################
+# Base CUDA setting
+##############################################
+
+add_boolean_option(ENABLE_LDPC_CUDA OFF "Build support for CUDA" OFF)
+if (ENABLE_LDPC_CUDA)
+  find_package(CUDA REQUIRED)
+  SET(CUDA_NVCC_FLAG "${CUDA_NVCC_FLAGS};-arch=sm_60;")
+  SET(CUDA_VERBOSE_BUILD ON)
+  cuda_add_library(ldpc_cuda MODULE ${PHY_LDPC_CUDA_SRC})
+  set_target_properties(ldpc_cuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+  if (NOT CUDA_FOUND)
+    message(FATAL_ERROR "no CUDA found")
+  endif()
+endif()
+
+add_library(coding MODULE ${PHY_TURBOSRC} )
+
 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
 
-add_library(crc_byte OBJECT ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c)
+add_library(ldpc_slot_segment MODULE ${PHY_NRLDPC_CODING_SEGMENT_SRC})
 
 set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
+#  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
+#  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sldch.c
+#  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slsch.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/get_pmi.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/group_hopping.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich_common.c
@@ -803,9 +916,12 @@ set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_mbsfn.c
   ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_ul_ref.c
   ${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
+  ${OPENAIR1_DIR}/PHY/CODING/nr_segmentation.c
+  ${OPENAIR1_DIR}/PHY/CODING/nr_rate_matching.c
   ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
   ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
+  ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c
   ${PHY_TURBOIF}
   ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
   ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
@@ -841,9 +957,13 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pcfich.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pucch.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch.c
+#  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/rar_tools.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
+#  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
+#  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
+#  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_init.c
   )
@@ -892,7 +1012,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/rar_tools_ue.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/initial_sync.c
-  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
   ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz_ue.c
@@ -909,11 +1028,10 @@ set(PHY_SRC_UE
   )
 
   set(PHY_NR_SRC_COMMON
-  ${OPENAIR1_DIR}/PHY/CODING/nr_segmentation.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
   ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_csirs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
+  ${OPENAIR1_DIR}/PHY/NR_REFSIG/scrambling_luts.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/refsig.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
   )
@@ -931,8 +1049,11 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
@@ -959,6 +1080,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
+  ${PHY_NR_CODINGIF}
   ${PHY_NRLDPC_CODINGIF}
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c
@@ -979,7 +1101,10 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding_slot.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/
@@ -1013,6 +1138,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
+  ${PHY_NR_CODINGIF}
   ${PHY_NRLDPC_CODINGIF}
   )
 
@@ -1021,12 +1147,12 @@ if (${SMBV})
   set(PHY_SRC "${PHY_SRC} ${OPENAIR1_DIR}/PHY/TOOLS/smbv.c")
 endif  (${SMBV})
 
+set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
+
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
-target_link_libraries(PHY_COMMON
-  PRIVATE shlib_loader asn1_lte_rrc_hdrs crc_byte
-  PUBLIC UTIL
-)
+target_link_libraries(PHY_COMMON PRIVATE shlib_loader)
 add_dependencies(PHY_COMMON dfts)
+target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)
 
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1035,7 +1161,7 @@ pkg_check_modules(blas REQUIRED blas)
 pkg_check_modules(lapacke REQUIRED lapacke)
 
 add_library(PHY_UE ${PHY_SRC_UE})
-target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 # RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will
 # be empty for Ubuntu, a no-op
 pkg_check_modules(cblas cblas)
@@ -1043,7 +1169,6 @@ target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapa
 target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
-target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
 add_library(PHY_NR ${PHY_NR_SRC})
 target_link_libraries(PHY_NR nr_phy_common nr_common)
@@ -1053,10 +1178,32 @@ target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)
 
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)
 
 add_library(PHY_RU ${PHY_SRC_RU})
-target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
+target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
+
+#Library for mex functions
+#########################3
+set(PHY_MEX_UE
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/get_pmi.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch_common.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  )
+add_library(PHY_MEX ${PHY_MEX_UE})
+target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs UTIL)
 
 #Layer 2 library
 #####################
@@ -1103,7 +1250,7 @@ set(NR_SDAP_SRC
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
   )
-
+  
 set(L2_SRC
   ${PDCP_DIR}/pdcp.c
   ${PDCP_DIR}/pdcp_fifo.c
@@ -1112,6 +1259,7 @@ set(L2_SRC
   ${PDCP_DIR}/pdcp_util.c
   ${PDCP_DIR}/pdcp_security.c
   ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
+#  ${RRC_DIR}/rrc_UE.c
   ${RRC_DIR}/rrc_eNB.c
   ${RRC_DIR}/rrc_eNB_endc.c
   ${RRC_DIR}/rrc_eNB_S1AP.c
@@ -1126,6 +1274,7 @@ set(L2_SRC
 
 set(L2_RRC_SRC
   ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
+  #  ${RRC_DIR}/rrc_UE.c
   ${RRC_DIR}/rrc_eNB.c
   ${RRC_DIR}/rrc_eNB_endc.c
   ${RRC_DIR}/rrc_eNB_S1AP.c
@@ -1184,6 +1333,7 @@ set(NR_L2_SRC_UE
   ${NR_SDAP_SRC}
   ${NR_UE_RRC_DIR}/L2_interface_ue.c
   ${NR_UE_RRC_DIR}/main_ue.c
+  ${NR_RRC_DIR}/nr_rrc_config.c
   ${NR_UE_RRC_DIR}/rrc_UE.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
@@ -1251,13 +1401,14 @@ set (MAC_NR_SRC_UE
   ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
   ${NR_UE_MAC_DIR}/config_ue.c
   ${NR_UE_MAC_DIR}/config_ue_sl.c
-  ${NR_UE_MAC_DIR}/mac_tables.c
+  ${NR_UE_MAC_DIR}/mac_vars.c
   ${NR_UE_MAC_DIR}/main_ue_nr.c
   ${NR_UE_MAC_DIR}/nr_ue_procedures.c
   ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
   ${NR_UE_MAC_DIR}/nr_ue_scheduler_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
+  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
 )
 
 set (ENB_APP_SRC
@@ -1306,7 +1457,7 @@ endif()
 
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
-target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures)
 
 add_library(L2_LTE ${L2_LTE_SRC})
 target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1337,9 +1488,10 @@ if(E2_AGENT)
 endif()
 
 add_library(L2_LTE_NR
-  # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
-  ${MAC_DIR}/dummy_functions.c
+  ${L2_RRC_SRC}
+  ${MAC_SRC}
   ${ENB_APP_SRC}
+  ${MCE_APP_SRC}
 )
 
 target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
@@ -1349,18 +1501,21 @@ add_library(L2_UE
   ${MAC_SRC_UE}
 )
 target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(L2_UE PRIVATE GTPV1U)
+
+add_library(L2_UE_LTE_NR
+  ${L2_RRC_SRC_UE}
+  ${MAC_SRC_UE}
+)
+target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)
 
 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
-target_link_libraries(NR_L2_UE PRIVATE nr_rlc)
-target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_common nr_ue_power_procedures nr_ue_ra_procedures)
-target_link_libraries(NR_L2_UE PRIVATE nr_nas)
+target_link_libraries(NR_L2_UE PRIVATE f1ap nr_rlc)
+target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_common nr_ue_power_procedures)
 
 add_library(MAC_NR_COMMON
             ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
-            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c
             ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c
 )
 target_link_libraries(MAC_NR_COMMON PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1402,7 +1557,6 @@ add_library(SCTP_CLIENT ${SCTP_SRC})
 target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
-
 set(libnas_api_OBJS
   ${NAS_SRC}COMMON/API/NETWORK/as_message.c
   ${NAS_SRC}COMMON/API/NETWORK/nas_message.c
@@ -1555,6 +1709,7 @@ set (libnas_utils_OBJS
   ${NAS_SRC}COMMON/UTIL/nas_timer.c
   ${NAS_SRC}COMMON/UTIL/socket.c
   ${NAS_SRC}COMMON/UTIL/stty.c
+  ${NAS_SRC}COMMON/UTIL/TLVEncoder.c
   ${NAS_SRC}COMMON/UTIL/TLVDecoder.c
   ${NAS_SRC}COMMON/UTIL/OctetString.c
 )
@@ -1630,6 +1785,60 @@ set(libnas_ue_esm_sap_OBJS
   ${NAS_SRC}UE/ESM/SAP/esm_sap.c
   )
 
+set(libnrnas_emm_msg_OBJS
+  ${NAS_SRC}COMMON/EMM/MSG/RegistrationRequest.c
+  ${NAS_SRC}COMMON/EMM/MSG/RegistrationAccept.c
+  ${NAS_SRC}COMMON/EMM/MSG/FGSIdentityResponse.c
+  ${NAS_SRC}COMMON/EMM/MSG/FGSAuthenticationResponse.c
+  ${NAS_SRC}COMMON/EMM/MSG/FGSNASSecurityModeComplete.c
+  ${NAS_SRC}COMMON/EMM/MSG/RegistrationComplete.c
+  ${NAS_SRC}COMMON/EMM/MSG/FGSUplinkNasTransport.c
+  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishRequest.c
+  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
+  ${NAS_SRC}COMMON/EMM/MSG/FGSDeregistrationRequestUEOriginating.c
+  )
+
+set(libnrnas_ies_OBJS
+  ${NAS_SRC}COMMON/IES/ExtendedProtocolDiscriminator.c
+  ${NAS_SRC}COMMON/IES/FGSMobileIdentity.c
+  ${NAS_SRC}COMMON/IES/FGSRegistrationType.c
+  ${NAS_SRC}COMMON/IES/SpareHalfOctet.c
+  ${NAS_SRC}COMMON/IES/FGSRegistrationResult.c
+  ${NAS_SRC}COMMON/IES/FGMMCapability.c
+  ${NAS_SRC}COMMON/IES/NrUESecurityCapability.c
+  ${NAS_SRC}COMMON/IES/FGCNasMessageContainer.c
+  ${NAS_SRC}COMMON/IES/SORTransparentContainer.c
+  )
+
+add_library(LIB_NAS_SIMUE
+  ${NAS_SRC}UE/nas_itti_messaging.c
+  ${NAS_SRC}UE/nas_network.c
+  ${NAS_SRC}UE/nas_parser.c
+  ${NAS_SRC}UE/nas_proc.c
+  ${NAS_SRC}UE/nas_user.c
+  ${NAS_SRC}NR_UE/nr_nas_msg.c
+  ${libnas_api_OBJS}
+  ${libnas_ue_api_OBJS}
+  ${libnas_emm_msg_OBJS}
+  ${libnas_esm_msg_OBJS}
+  ${libnas_ies_OBJS}
+  ${libnas_utils_OBJS}
+  ${libnas_ue_emm_OBJS}
+  ${libnas_ue_emm_sap_OBJS}
+  ${libnas_ue_esm_OBJS}
+  ${libnas_ue_esm_sap_OBJS}
+  ${libnrnas_emm_msg_OBJS}
+  ${libnrnas_ies_OBJS}
+  $<TARGET_OBJECTS:ds>
+  )
+target_include_directories(LIB_NAS_SIMUE PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
+target_link_libraries(LIB_NAS_SIMUE PRIVATE lte_rrc)
+
+
+
+set(NAS_SIM_LIB LIB_NAS_SIMUE)
+target_link_libraries(LIB_NAS_SIMUE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
 add_library(LIB_NAS_UE
   ${NAS_SRC}UE/nas_itti_messaging.c
   ${NAS_SRC}UE/nas_network.c
@@ -1657,7 +1866,6 @@ include_directories(${NAS_SRC}UE)
 include_directories(${NAS_SRC}UE/API/USER)
 include_directories(${NAS_SRC}UE/API/USIM)
 include_directories(${NAS_SRC}UE/EMM)
-include_directories(${NAS_SRC}UE/EMM/MSG)
 include_directories(${NAS_SRC}UE/EMM/SAP)
 include_directories(${NAS_SRC}UE/ESM)
 include_directories(${NAS_SRC}UE/ESM/SAP)
@@ -1669,6 +1877,15 @@ set (NBIOT_SOURCES
   )
 add_library(NB_IoT MODULE ${NBIOT_SOURCES} )
 
+add_library(LIB_5GNAS_GNB
+  ${NAS_SRC}/COMMON/nr_common.c
+  ${OPENAIR3_DIR}//UICC/usim_interface.c
+  )
+
+target_include_directories(LIB_5GNAS_GNB PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
+target_link_libraries(LIB_5GNAS_GNB PRIVATE SECURITY)
+target_link_libraries(LIB_5GNAS_GNB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
 # Simulation library
 ##########################
 set (SIMUSRC
@@ -1715,6 +1932,12 @@ add_executable(measurement_display
   ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)
 
+add_executable(test5Gnas
+  ${OPENAIR_DIR}/openair3/TEST/test5Gnas.c
+)
+target_link_libraries (test5Gnas LIB_5GNAS_GNB minimal_lib )
+
+
 # lte-softmodem is both eNB and UE implementation
 ###################################################
 
@@ -1747,7 +1970,6 @@ target_link_libraries(lte-softmodem PRIVATE
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 if(E2_AGENT)
   target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1803,7 +2025,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
@@ -1850,6 +2071,16 @@ if(E2_AGENT)
 endif()
 
 
+add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_slot_segment)
+
+if (ENABLE_LDPC_T2)
+  add_dependencies(nr-softmodem ldpc_t2 ldpc_slot_t2)
+endif()
+
+if (ENABLE_LDPC_XDMA)
+  add_dependencies(nr-softmodem ldpc_xdma)
+endif()
+
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
   asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
@@ -1872,7 +2103,7 @@ if(E2_AGENT)
   target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
   target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
-
+                     
 # nr-uesoftmodem is  UE implementation
 #######################################
 
@@ -1880,30 +2111,41 @@ add_executable(nr-uesoftmodem
   ${rrc_h}
   ${s1ap_h}
   ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
-  ${OPENAIR_DIR}/executables/position_interface.c
   ${OPENAIR_DIR}/executables/nr-ue.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
   ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
-  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c
+  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
-  ${NFAPI_USER_DIR}/nfapi.c
-  ${PHY_INTERFACE_DIR}/queue_t.c
   )
 
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
   nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
-  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
-  ITTI SIMU shlib_loader
+  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB
+  NFAPI_USER_LIB MISC_NFAPI_NR_LIB
+  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU shlib_loader
   -Wl,--end-group z dl)
 
 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(nr-uesoftmodem PRIVATE nr_nas lib_uicc usim_lib)
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
+add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_slot_segment)
+if (ENABLE_LDPC_CUDA)
+   add_dependencies(nr-uesoftmodem ldpc_cuda)
+   add_dependencies(nr-softmodem ldpc_cuda)
+endif()
+
+if (ENABLE_LDPC_T2)
+  add_dependencies(nr-uesoftmodem ldpc_t2 ldpc_slot_t2)
+endif()
+
+if (ENABLE_LDPC_XDMA)
+  add_dependencies(nr-uesoftmodem ldpc_xdma)
+endif()
+
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
@@ -1954,37 +2196,42 @@ target_link_libraries(smallblocktest PRIVATE
 
 
 add_executable(ldpctest
-  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
-)
+   ${PHY_NR_CODINGIF}
+   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
+   )
+
+add_dependencies(ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
+if (ENABLE_LDPC_CUDA)
+  add_dependencies(ldpctest ldpc_cuda)
+endif()
 target_link_libraries(ldpctest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
   m pthread dl shlib_loader ${T_LIB}
-  # link 'check_crc' to make it resolved in the LDPC coding libraries
-  # 'check_crc' is not used in ldpctest so it is not linked in the executable by default
-  # --whole-archive links 'check_crc' in the executable even though it is note used, see 'man ld'
-  -Wl,--whole-archive crc_byte -Wl,--no-whole-archive
-)
+  )
 
-add_library(physim_common OBJECT ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_unitary_common.c)
-target_link_libraries(physim_common PRIVATE UTIL)
-
-add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c)
+add_executable(nr_dlschsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  )
 target_link_libraries(nr_dlschsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)
 
-add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c)
+add_executable(nr_pbchsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  )
 target_link_libraries(nr_pbchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_psbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
@@ -1993,19 +2240,24 @@ add_executable(nr_psbchsim
   )
 target_link_libraries(nr_psbchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
-add_executable(nr_pucchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c)
+#PUCCH ---> Prashanth
+add_executable(nr_pucchsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  )
 target_link_libraries(nr_pucchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader
 )
 target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
@@ -2014,28 +2266,33 @@ add_executable(nr_dlsim
   )
 target_link_libraries(nr_dlsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
   )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
-add_executable(nr_prachsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c)
+add_executable(nr_prachsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+)
 target_link_libraries(nr_prachsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader physim_common)
+  m pthread ${T_LIB} ITTI dl shlib_loader)
 target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_ulschsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_ulschsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader
 )
 target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
@@ -2043,9 +2300,17 @@ add_executable(nr_ulsim
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 
+if (ENABLE_LDPC_T2)
+  add_dependencies(nr_ulsim ldpc_t2 ldpc_slot_t2)
+endif()
+if (ENABLE_LDPC_XDMA)
+  add_dependencies(nr_ulsim ldpc_xdma)
+endif()
+add_dependencies(nr_ulsim ldpc_slot_segment)
+
 target_link_libraries(nr_ulsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common
+  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2085,6 +2350,10 @@ foreach(myExe s1ap
     )
 endforeach(myExe)
 
+# to be added
+#../targets/TEST/PDCP/test_pdcp.c
+#../targets/TEST/PDCP/with_rlc/test_pdcp_rlc.c
+
 #ensure that the T header files are generated before targets depending on them
 if (${T_TRACER})
   foreach(i
@@ -2097,14 +2366,15 @@ if (${T_TRACER})
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
-        oai_eth_transpro oai_mobipass HASHTABLE UTIL OMG_SUMO
+        oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
         MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
-        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
-        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
+        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
+        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
         CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
-        dfts config_internals nr_common crc_byte)
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc ldpc_slot_segment ldpc_slot_t2 ldpc_xdma
+        dfts config_internals nr_common)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()

README.md

@@ -7,8 +7,9 @@
     <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
     <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
     <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
     <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 41"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore40-Green" alt="Supported OS Fedora 40"></a>
 </p>
 
 <p align="center">

charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.dlsim100rbtm2}}
       nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
       {{- end }}

charts/physims/charts/dlsim.basic/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.dlsimbasic}}
       nodeName: {{ .Values.global.nodeName.dlsimbasic }}
       {{- end }}

charts/physims/charts/ldpctest/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.ldpctest}}
       nodeName: {{ .Values.global.nodeName.ldpctest }}
       {{- end }}

charts/physims/charts/nr-dlschsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlschsim}}
       nodeName: {{ .Values.global.nodeName.nrdlschsim }}
       {{- end }}

charts/physims/charts/nr-dlsim.basic/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimbasic}}
       nodeName: {{ .Values.global.nodeName.nrdlsimbasic }}
       {{- end }}

charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimdmrsptrs}}
       nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
       {{- end }}

charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimmcsmimo}}
       nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
       {{- end }}

charts/physims/charts/nr-dlsim.offset/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimoffset}}
       nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
       {{- end }}

charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpbschsim106rb}}
       nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpbchsim217rb}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpbchsim273rb}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.scs/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-pbchsim-scs
-description: A Helm subchart for nr-pbchsim network function ("Other SCS" tests)
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-pbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-scs.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-pbchsim-scs.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-pbchsim-scs.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-scs.chart" . }}
-{{ include "oai-nr-pbchsim-scs.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-scs.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-scs.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-scs.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-pbchsim.scs/templates/job.yaml

@@ -1,47 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.otherSCS" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName}}
-      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
-      {{- end }}

charts/physims/charts/nr-pbchsim.scs/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-scs
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-pbchsim-scs"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/physims/charts/nr-prachsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrprachsim}}
       nodeName: {{ .Values.global.nodeName.nrprachsim }}
       {{- end }}

charts/physims/charts/nr-psbchsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpsbchsim}}
       nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
       {{- end }}

charts/physims/charts/nr-pucchsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpucchsim}}
       nodeName: {{ .Values.global.nodeName.nrpucchsim }}
       {{- end }}

charts/physims/charts/nr-ulschsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulschsim}}
       nodeName: {{ .Values.global.nodeName.nrulschsim }}
       {{- end }}

charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsim3gpp}}
       nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
       {{- end }}

charts/physims/charts/nr-ulsim.mimo/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsimmimo}}
       nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
       {{- end }}

charts/physims/charts/nr-ulsim.misc/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsimmisc}}
       nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
       {{- end }}

charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
@@ -44,6 +39,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsimscfdma}}
       nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
       {{- end }}

charts/physims/charts/polartest/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.polartest}}
       nodeName: {{ .Values.global.nodeName.polartest }}
       {{- end }}

charts/physims/charts/smallblocktest/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.smallblocktest}}
       nodeName: {{ .Values.global.nodeName.smallblocktest }}
       {{- end }}

charts/physims/charts/ulsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.ulsim}}
       nodeName: {{ .Values.global.nodeName.ulsim }}
       {{- end }}

charts/physims/values.yaml

@@ -1,21 +1,40 @@
 # Default values for oai-physim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
+
 global:
   serviceAccountName: oai-physim-sa
   namespace: "OAICICD_PROJECT"
-  image:
+  image: 
     registry: local
     repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
     version: TAG
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
   # removing the node selector
-  # will place on two nodes intel 3rd gen and 5th gen with RT kernel
-  nodeSelector:
-    type: ran
-  nodeName: ''
-  resources:
-    define: false
-    requests:
-      cpu: 1.5
+  nodeSelector: {}
+  # It is not a good way of assigning pods to the nodes: this way we bypass the scheduler. At the moment we don't provide the resource information of these pods.
+  # Therefore, Openshift assigns the pods to the same node because it thinks the pods don't consume much resources. This isn't the case, they consume a lot of resources.
+  nodeName:
+    dlsim100rbtm2: acamas
+    dlsimbasic: acamas
+    ldpctest: acamas
+    nrdlschsim: acamas
+    nrdlsimbasic: acamas
+    nrdlsimdmrsptrs: acamas
+    nrdlsimmcsmimo: acamas
+    nrdlsimoffset: dedale
+    nrpbschsim106rb: dedale
+    nrpbchsim217rb: dedale
+    nrpbchsim273rb: dedale
+    nrpsbchsim: dedale
+    nrprachsim: dedale
+    nrpucchsim: dedale
+    nrulschsim: demophon
+    nrulsim3gpp: demophon
+    nrulsimmimo: demophon
+    nrulsimmisc: demophon
+    nrulsimscfdma: demophon
+    polartest: demophon
+    smallblocktest: demophon
+    ulsim: demophon

ci-scripts/Jenkinsfile-GitLab-Container

@@ -27,7 +27,6 @@ def nodeExecutor = params.nodeExecutor
 def doBuild = true
 def do4Gtest = false
 def do5Gtest = false
-def do5GUeTest = false
 
 //
 def gitCommitAuthorEmailAddr
@@ -65,24 +64,17 @@ pipeline {
               message += " - ~BUILD-ONLY (execute only build stages)\n"
               message += " - ~4G-LTE (perform 4G tests)\n"
               message += " - ~5G-NR (perform 5G tests)\n"
-              message += " - ~CI (perform both 4G and 5G tests)\n"
-              message += " - ~nrUE (perform only 5G-UE related tests including physims excluding LDPC tests)\n\n"
+              message += " - ~CI (perform both 4G and 5G tests)\n\n"
               message += "Not performing CI due to lack of labels"
               addGitLabMRComment comment: message
               error('Not performing CI due to lack of labels')
             } else if (LABEL_CHECK == 'FULL') {
               do4Gtest = true
               do5Gtest = true
-              do5GUeTest = true
             } else if (LABEL_CHECK == "SHORTEN-4G") {
               do4Gtest = true
             } else if (LABEL_CHECK == 'SHORTEN-5G') {
               do5Gtest = true
-            } else if (LABEL_CHECK == 'SHORTEN-5G-UE') {
-              do5GUeTest = true
-            } else if (LABEL_CHECK == 'SHORTEN-4G-5G-UE') {
-              do4Gtest = true
-              do5GUeTest = true
             } else if (LABEL_CHECK == 'documentation') {
               doBuild = false
             } else {
@@ -153,28 +145,6 @@ pipeline {
             }
           }
         }
-        stage ("Ubuntu-ARM-Image-Builder") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                ubuntuArmBuildStatus = finalizeSlaveJob('RAN-Ubuntu-ARM-Image-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuArmBuildStatus
-              }
-            }
-          }
-        }
         stage ("RHEL-Cluster-Image-Builder") {
           steps {
             script {
@@ -247,7 +217,7 @@ pipeline {
       when { expression {doBuild} }
       parallel {
         stage ("PhySim-Cluster") {
-          when { expression {do4Gtest || do5Gtest || do5GUeTest} }
+          when { expression {do4Gtest || do5Gtest} }
           steps {
             script {
               triggerSlaveJob ('RAN-PhySim-Cluster', 'PhySim-Cluster')
@@ -293,7 +263,7 @@ pipeline {
           }
         }
         stage ("RF-Sim-Test-5G") {
-          when { expression {do5Gtest || do5GUeTest} }
+          when { expression {do5Gtest} }
           steps {
             script {
               triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G')
@@ -315,29 +285,6 @@ pipeline {
             }
           }
         }
-        stage ("OAI-FLEXRIC-RAN-Integration-Test") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                flexricRAN5GStatus = finalizeSlaveJob('OAI-FLEXRIC-RAN-Integration-Test')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += flexricRAN5GStatus
-              }
-            }
-          }
-        }
         stage ("L2-Sim-Test-4G") {
           when { expression {do4Gtest} }
           steps {
@@ -546,6 +493,29 @@ pipeline {
             }
           }
         }
+        stage ("Interop-F1") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += f1InteropStatus
+              }
+            }
+          }
+        }
         stage ("Sanity-Check OAI-CN5G") {
           when { expression {do5Gtest} }
           steps {
@@ -639,7 +609,7 @@ pipeline {
           }
         }
         stage ("SA-OAIUE-CN5G") {
-          when { expression {do5Gtest || do5GUeTest} }
+          when { expression {do5Gtest} }
           steps {
             script {
               triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
@@ -688,6 +658,9 @@ pipeline {
         if ("MERGE".equals(env.gitlabActionType)) {
           addGitLabMRComment comment: message
           def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+          sendSocialMediaMessage('ci-enb', 'good', message2)
+        } else {
+          sendSocialMediaMessage('ci-enb', 'good', message)
         }
         echo "Pipeline is SUCCESSFUL"
       }
@@ -699,6 +672,9 @@ pipeline {
           def fullMessage = message + '\n\nList of failing test stages:' + failingStages
           addGitLabMRComment comment: fullMessage
           def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+          sendSocialMediaMessage('ci-enb', 'danger', message2)
+        } else {
+          sendSocialMediaMessage('ci-enb', 'danger', message)
         }
         echo "Pipeline FAILED"
       }
@@ -822,3 +798,9 @@ def finalizeSlaveJob(jobName) {
     return artifactUrl
   }
 }
+
+// Abstraction function to send social media messages:
+// like on Slack or Mattermost
+def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
+  slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
+}

ci-scripts/Jenkinsfile-cluster

@@ -144,6 +144,23 @@ pipeline {
             echo "no eNB_mergeRequest given - not merging develop"
           }
 
+          if (params.EPC_IPAddress == null) {
+            echo "no EPC_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.EPC_Type == null) {
+            echo "no EPC_Type given"
+            allParametersPresent = false
+          }
+          if (params.EPC_SourceCodePath == null) {
+            echo "no EPC_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.EPC_Credentials == null) {
+            echo "no EPC_Credentials given"
+            allParametersPresent = false
+          }
+
           if (params.OC_Credentials == null) {
             echo "no OC_Credentials given"
             allParametersPresent = false
@@ -189,6 +206,7 @@ pipeline {
             }
             withCredentials([
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
             ]) {
               sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
@@ -196,7 +214,7 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   try {
                    timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
                    }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'

ci-scripts/Jenkinsfile-colosseum

@@ -20,8 +20,8 @@
  *      contact@openairinterface.org
  */
 
-def node = "${params.JenkinsNode}"
-def resource = "${params.JenkinsResource}"
+def node = "porcepix"
+def resource = "CI-NEU-CI"
 
 pipeline {
   agent {

ci-scripts/Jenkinsfile-nrue

@@ -141,6 +141,18 @@ pipeline {
             }
           }
 
+          if (params.EPC_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_Type == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_SourceCodePath == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_Credentials == null) {
+            allParametersPresent = false
+          }
           if (params.OC_Credentials == null) {
             allParametersPresent = false
           }
@@ -189,6 +201,7 @@ pipeline {
             withCredentials([
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
             ]) {
               sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
@@ -197,7 +210,7 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   try {
                    timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath}"
                    }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
@@ -227,6 +240,10 @@ pipeline {
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
                 archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
               }
+              if (fileExists("test_logs_CN.zip")){
+                sh "mv test_logs_CN.zip test_logs_CN_${env.BUILD_ID}.zip"
+                archiveArtifacts artifacts: "test_logs_CN_${env.BUILD_ID}.zip"
+            }
             if (fileExists("test_results.html")) {
               sh "mv test_results.html test_results-${env.JOB_NAME}.html"
               sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"

ci-scripts/Jenkinsfile-physim-deploy

@@ -133,6 +133,19 @@ pipeline {
             }
           }
 
+          if (params.EPC_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_Type == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_SourceCodePath == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_Credentials == null) {
+            allParametersPresent = false
+          }
+
           if (params.OC_Credentials == null) {
             allParametersPresent = false
           }
@@ -180,6 +193,7 @@ pipeline {
             }
             withCredentials([
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
             ]) {
               sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
@@ -188,7 +202,7 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   try {
                    timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
                    }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
@@ -218,6 +232,10 @@ pipeline {
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
                 archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
               }
+              if (fileExists("test_logs_CN.zip")){
+                sh "mv test_logs_CN.zip test_logs_CN_${env.BUILD_ID}.zip"
+                archiveArtifacts artifacts: "test_logs_CN_${env.BUILD_ID}.zip"
+            }
             if (fileExists("test_results.html")) {
               sh "mv test_results.html test_results-${env.JOB_NAME}.html"
               sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -141,6 +141,24 @@ pipeline {
                         }
                     }
 
+                    if (params.EPC_IPAddress == null) {
+                        allParametersPresent = false
+                    } else {
+                        if (params.EPC_IPAddress == "none") {
+                            doEpcLogCollection = false
+                            echo "No EPC collections (ping/iperf/hss/mme/spgw)"
+                        }
+                    }
+                    if (params.EPC_Type == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
@@ -182,6 +200,7 @@ pipeline {
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
                         ]) {
                             sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
@@ -189,7 +208,7 @@ pipeline {
                             if (fileExists(xmlFile)) {
                                 try {
                                   timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                   }
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
@@ -290,6 +309,9 @@ pipeline {
                         withCredentials([
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
                         ]) {
+                            echo '\u2705 \u001B[32mLog Collection (OAI UE - Run)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
+
                             echo '\u2705 \u001B[32mLog Transfer (OAI UE - Run)\u001B[0m'
                             sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
                         }
@@ -300,6 +322,111 @@ pipeline {
                         }
                     }
                 }
+                stage('Log Collection (Ping)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (Ping)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectPing --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (Ping)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/ping.log.zip ./ping.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("ping.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "ping.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (Iperf)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (Iperf)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectIperf --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (Iperf)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/iperf.log.zip ./iperf.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("iperf.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "iperf.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (SPGW)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (SPGW)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (SPGW)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("spgw.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "spgw.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (MME)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (MME)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (MME)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/mme.log.zip ./mme.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("mme.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "mme.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (HSS)') {
+                    when {
+                       expression {doEpcLogCollection}
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (HSS)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (HSS)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/hss.log.zip ./hss.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("hss.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "hss.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
             }
         }
     }

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -143,6 +143,19 @@ pipeline {
                         }
                     }
 
+                    if (params.EPC_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Type == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
@@ -185,6 +198,7 @@ pipeline {
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
                         ]) {
                             sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
@@ -192,7 +206,7 @@ pipeline {
                                 if (fileExists(xmlFile)) {
                                     try {
                                       timeout (time: 60, unit: 'MINUTES') {
-                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                       }
                                     } catch (Exception e) {
                                         currentBuild.result = 'FAILURE'
@@ -218,6 +232,48 @@ pipeline {
                         }
                     }
                 }
+                stage('Terminate SPGW') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate SPGW\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                        }
+                    }
+                }
+                stage('Terminate MME') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate MME\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                        }
+                    }
+                }
+                stage('Terminate HSS') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate HSS\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                        }
+                    }
+                }
             }
         }
         stage('Log Collection') {
@@ -263,6 +319,116 @@ pipeline {
                         }
                     }
                 }
+                stage('Log Collection (SPGW)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (SPGW)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (SPGW)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("spgw.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "spgw.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (MME)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (MME)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (MME)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/mme.log.zip ./mme.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("mme.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "mme.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (HSS)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (HSS)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (HSS)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/hss.log.zip ./hss.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("hss.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "hss.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (Ping)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (Ping)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectPing --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (Ping)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/ping.log.zip ./ping.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("ping.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "ping.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (Iperf)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (Iperf)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectIperf --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (Iperf)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/iperf.log.zip ./iperf.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("iperf.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "iperf.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
             }
         }
     }

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -154,6 +154,19 @@ pipeline {
             }
           }
 
+          if (params.EPC_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_Type == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_SourceCodePath == null) {
+            allParametersPresent = false
+          }
+          if (params.EPC_Credentials == null) {
+            allParametersPresent = false
+          }
+
           if (allParametersPresent) {
             echo "All parameters are present"
             if (eNB_AllowMergeRequestProcess) {
@@ -196,6 +209,7 @@ pipeline {
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
             ]) {
               sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
@@ -204,7 +218,7 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   try {
                    timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --XMLTestFile=${xmlFile}"
+                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                    }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
@@ -279,6 +293,9 @@ pipeline {
                 withCredentials([
                     [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
                 ]) {
+                    echo '\u2705 \u001B[32mLog Collection (OAI UE - Run)\u001B[0m'
+                    sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
+
                     echo '\u2705 \u001B[32mLog Transfer (OAI UE - Run)\u001B[0m'
                     sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
                   }
@@ -289,6 +306,55 @@ pipeline {
                   }
             }
         }
+        stage('Log Collection (CN)') {
+          // Bypassing this stage if EPC server is not defined
+          when {
+            expression { params.EPC_IPAddress != "none" }
+          }
+          steps {
+            script {
+              withCredentials([
+                   [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+              ]) {
+                echo '\u2705 \u001B[32mLog Collection (HSS)\u001B[0m'
+                sh "python3 ci-scripts/main.py --mode=LogCollectHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+                if (params.EPC_Type != 'OAICN5G') {
+                  sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/hss.log.zip ./hss.log.${env.BUILD_ID}.zip || true"
+                }
+                echo '\u2705 \u001B[32mLog Collection (MME or AMF)\u001B[0m'
+                sh "python3 ci-scripts/main.py --mode=LogCollectMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+                if (params.EPC_Type == 'OAICN5G') {
+                  sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/mme.log.zip ./amf.log.${env.BUILD_ID}.zip || true"
+                } else {
+                  sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/mme.log.zip ./mme.log.${env.BUILD_ID}.zip || true"
+                }
+                echo '\u2705 \u001B[32mLog Collection (SPGW or SMF/UPF)\u001B[0m'
+                sh "python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+                if (params.EPC_Type == 'OAICN5G') {
+                  sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./smf-upf.log.${env.BUILD_ID}.zip || true"
+                } else {
+                  sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
+                }
+              }
+              if(fileExists("hss.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "hss.log.${env.BUILD_ID}.zip"
+              }
+              if(fileExists("mme.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "mme.log.${env.BUILD_ID}.zip"
+              }
+              if(fileExists("spgw.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "spgw.log.${env.BUILD_ID}.zip"
+              }
+              if(fileExists("amf.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "amf.log.${env.BUILD_ID}.zip"
+              }
+              if(fileExists("smf-upf.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "smf-upf.log.${env.BUILD_ID}.zip"
+              }
+              echo '\u2705 \u001B[32mLog Collection for CoreNetwork Done!\u001B[0m'
+            }
+          }
+        }
       }
     }
   }

ci-scripts/Jenkinsfile-tmp-ran

@@ -58,8 +58,6 @@ def eNB_CommitID
 def eNB_AllowMergeRequestProcess = false
 def eNB_TargetBranch
 
-def flexricOption = ""
-
 pipeline {
     agent {
         label pythonExecutor
@@ -137,11 +135,17 @@ pipeline {
                         }
                     }
 
-                    if (params.Flexric_Tag != null) {
-                        echo "This pipeline is configured to run with a FlexRIC deployment."
-                        echo "Appending FlexRicTag option to the list of options"
-                        flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-                        echo "Using new Flexric option: ${flexricOption}"
+                    if (params.EPC_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Type == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Credentials == null) {
+                        allParametersPresent = false
                     }
 
                     if (allParametersPresent) {
@@ -149,12 +153,13 @@ pipeline {
                         if (eNB_AllowMergeRequestProcess) {
                             sh "git fetch"
                             sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else if (eNB_CommitID != 'develop') {
+                        } else {
                             sh "git fetch"
                             sh "git checkout -f ${eNB_CommitID}"
                         }
                     } else {
-                        error "Some parameters are missing"
+                        echo "Some parameters are missing"
+                        sh "./ci-scripts/fail.sh"
                     }
                 }
             }
@@ -183,14 +188,15 @@ pipeline {
                         }
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
                         ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
                                   timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                   }
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
@@ -223,6 +229,69 @@ pipeline {
                         }
                     }
                 }
+                stage('Terminate SPGW') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate SPGW\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termSPGW] = true
+                            }
+                        }
+                    }
+                }
+                stage('Terminate MME') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate MME\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termMME] = true
+                            }
+                        }
+                    }
+                }
+                stage('Terminate HSS') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate HSS\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termHSS] = true
+                            }
+                        }
+                    }
+                }
             }
         }
         stage('Log Collection') {
@@ -268,6 +337,116 @@ pipeline {
                         }
                     }
                 }
+                stage('Log Collection (SPGW)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (SPGW)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (SPGW)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("spgw.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "spgw.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (MME)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (MME)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (MME)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/mme.log.zip ./mme.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("mme.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "mme.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (HSS)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (HSS)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (HSS)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/hss.log.zip ./hss.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("hss.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "hss.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (Ping)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (Ping)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectPing --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (Ping)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/ping.log.zip ./ping.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("ping.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "ping.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (Iperf)') {
+                    // Bypassing this stage if EPC server is not defined
+                    when {
+                      expression { params.EPC_IPAddress != "none" }
+                    }
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (Iperf)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectIperf --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (Iperf)\u001B[0m'
+                            sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/iperf.log.zip ./iperf.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("iperf.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "iperf.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -297,6 +476,27 @@ pipeline {
                         sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
                     }
                 }
+                if ((!termStatusArray[termSPGW]) && (params.EPC_IPAddress != "none")) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                    }
+                }
+                if ((!termStatusArray[termMME]) && (params.EPC_IPAddress != "none")) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                    }
+                }
+                if ((!termStatusArray[termHSS]) && (params.EPC_IPAddress != "none")) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
+                    }
+                }
             }
         }
     }

ci-scripts/args_parse.py

@@ -41,27 +41,23 @@ import constants as CONST
 #-----------------------------------------------------------
 
 
-def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
 
 
     py_param_file_present = False
     py_params={}
 
-    force_local = False
     while len(argvs) > 1:
         myArgv = argvs.pop(1)	# 0th is this file's name
 
 	    #--help
-        if re.match(r'^\-\-help$', myArgv, re.IGNORECASE):
+        if re.match('^\-\-help$', myArgv, re.IGNORECASE):
             HELP.GenericHelp(CONST.Version)
             sys.exit(0)
-        if re.match(r'^\-\-local$', myArgv, re.IGNORECASE):
-            force_local = True
-
 
 	    #--apply=<filename> as parameters file, to replace inline parameters
-        elif re.match(r'^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-Apply=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE)
             py_params_file = matchReg.group(1)
             with open(py_params_file,'r') as file:
           	# The FullLoader parameter handles the conversion from YAML
@@ -71,27 +67,29 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
 	    		#AssignParams(py_params) #to be uncommented once validated
 
 	    #consider inline parameters
-        elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
             mode = matchReg.group(1)
-        elif re.match(r'^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
             else:
-                matchReg = re.match(r'^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
+                matchReg = re.match('^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.ranRepository = matchReg.group(1)
             RAN.ranRepository=matchReg.group(1)
             HTML.ranRepository=matchReg.group(1)
+            ldpc.ranRepository=matchReg.group(1)
             CONTAINERS.ranRepository=matchReg.group(1)
             SCA.ranRepository=matchReg.group(1)
             PHYSIM.ranRepository=matchReg.group(1)
             CLUSTER.ranRepository=matchReg.group(1)
-        elif re.match(r'^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
             else:
-                matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
+                matchReg = re.match('^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
             doMerge = matchReg.group(1)
+            ldpc.ranAllowMerge=matchReg.group(1)
             if ((doMerge == 'true') or (doMerge == 'True')):
                 CiTestObj.ranAllowMerge = True
                 RAN.ranAllowMerge=True
@@ -100,166 +98,183 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
                 SCA.ranAllowMerge=True
                 PHYSIM.ranAllowMerge=True
                 CLUSTER.ranAllowMerge=True
-        elif re.match(r'^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
             else:
-                matchReg = re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
+                matchReg = re.match('^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.ranBranch = matchReg.group(1)
             RAN.ranBranch=matchReg.group(1)
             HTML.ranBranch=matchReg.group(1)
+            ldpc.ranBranch=matchReg.group(1)
             CONTAINERS.ranBranch=matchReg.group(1)
             SCA.ranBranch=matchReg.group(1)
             PHYSIM.ranBranch=matchReg.group(1)
             CLUSTER.ranBranch=matchReg.group(1)
-        elif re.match(r'^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
             else:
-                matchReg = re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
+                matchReg = re.match('^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
             CiTestObj.ranCommitID = matchReg.group(1)
             RAN.ranCommitID=matchReg.group(1)
             HTML.ranCommitID=matchReg.group(1)
+            ldpc.ranCommitID=matchReg.group(1)
             CONTAINERS.ranCommitID=matchReg.group(1)
             SCA.ranCommitID=matchReg.group(1)
             PHYSIM.ranCommitID=matchReg.group(1)
             CLUSTER.ranCommitID=matchReg.group(1)
-        elif re.match(r'^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
             else:
-                matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+                matchReg = re.match('^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
             CiTestObj.ranTargetBranch = matchReg.group(1)
             RAN.ranTargetBranch=matchReg.group(1)
             HTML.ranTargetBranch=matchReg.group(1)
+            ldpc.ranTargetBranch=matchReg.group(1)
             CONTAINERS.ranTargetBranch=matchReg.group(1)
             SCA.ranTargetBranch=matchReg.group(1)
             PHYSIM.ranTargetBranch=matchReg.group(1)
             CLUSTER.ranTargetBranch=matchReg.group(1)
-        elif re.match(r'^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBIPAddress=matchReg.group(1)
+                ldpc.eNBIpAddr=matchReg.group(1)
                 CONTAINERS.eNBIPAddress=matchReg.group(1)
                 SCA.eNBIPAddress=matchReg.group(1)
                 PHYSIM.eNBIPAddress=matchReg.group(1)
                 CLUSTER.eNBIPAddress=matchReg.group(1)
-            elif re.match(r'^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1IPAddress=matchReg.group(1)
                 CONTAINERS.eNB1IPAddress=matchReg.group(1)
-            elif re.match(r'^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2IPAddress=matchReg.group(1)
                 CONTAINERS.eNB2IPAddress=matchReg.group(1)
-        elif re.match(r'^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBUserName=matchReg.group(1)
+                ldpc.eNBUserName=matchReg.group(1)
                 CONTAINERS.eNBUserName=matchReg.group(1)
                 SCA.eNBUserName=matchReg.group(1)
                 PHYSIM.eNBUserName=matchReg.group(1)
                 CLUSTER.eNBUserName=matchReg.group(1)
-            elif re.match(r'^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1UserName=matchReg.group(1)
                 CONTAINERS.eNB1UserName=matchReg.group(1)
-            elif re.match(r'^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2UserName=matchReg.group(1)
                 CONTAINERS.eNB2UserName=matchReg.group(1)
-        elif re.match(r'^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBPassword=matchReg.group(1)
+                ldpc.eNBPassWord=matchReg.group(1)
                 CONTAINERS.eNBPassword=matchReg.group(1)
                 SCA.eNBPassword=matchReg.group(1)
                 PHYSIM.eNBPassword=matchReg.group(1)
                 CLUSTER.eNBPassword=matchReg.group(1)
-            elif re.match(r'^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1Password=matchReg.group(1)
                 CONTAINERS.eNB1Password=matchReg.group(1)
-            elif re.match(r'^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2Password=matchReg.group(1)
                 CONTAINERS.eNB2Password=matchReg.group(1)
-        elif re.match(r'^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+            if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBSourceCodePath=matchReg.group(1)
+                ldpc.eNBSourceCodePath=matchReg.group(1)
                 CONTAINERS.eNBSourceCodePath=matchReg.group(1)
                 SCA.eNBSourceCodePath=matchReg.group(1)
                 PHYSIM.eNBSourceCodePath=matchReg.group(1)
                 CLUSTER.eNBSourceCodePath=matchReg.group(1)
-            elif re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+                EPC.eNBSourceCodePath=matchReg.group(1)
+            elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1SourceCodePath=matchReg.group(1)
                 CONTAINERS.eNB1SourceCodePath=matchReg.group(1)
-            elif re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+            elif re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2SourceCodePath=matchReg.group(1)
                 CONTAINERS.eNB2SourceCodePath=matchReg.group(1)
-        elif re.match(r'^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --EPCIPAddress ignored")
-        elif re.match(r'^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --EPCUserName ignored")
-        elif re.match(r'^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --EPCPassword ignored")
-        elif re.match(r'^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --EPCSourceCodePath ignored")
-        elif re.match(r'^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --EPCType ignored")
-        elif re.match(r'^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --EPCContainerPrefix ignored")
-        elif re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE)
+            EPC.IPAddress=matchReg.group(1)
+        elif re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE)
+            EPC.UserName=matchReg.group(1)
+        elif re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE)
+            EPC.Password=matchReg.group(1)
+        elif re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+            EPC.SourceCodePath=matchReg.group(1)
+        elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
+            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE) or re.match('OC-OAI-CN5G', matchReg.group(1), re.IGNORECASE):
+                EPC.Type=matchReg.group(1)
+            else:
+                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-Docker or OC-OAI-CN5G)')
+        elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
+            EPC.ContainerPrefix=matchReg.group(1)
+        elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.testXMLfiles.append(matchReg.group(1))
             HTML.testXMLfiles.append(matchReg.group(1))
             HTML.nbTestXMLfiles=HTML.nbTestXMLfiles+1
-        elif re.match(r'^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE): # cleanup
-            matchReg = re.match(r'^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.UEIPAddress = matchReg.group(1)
-        elif re.match(r'^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.UEUserName = matchReg.group(1)
-        elif re.match(r'^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.UEPassword = matchReg.group(1)
-        elif re.match(r'^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.UESourceCodePath = matchReg.group(1)
-        elif re.match(r'^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
             finalStatus = matchReg.group(1)
             if ((finalStatus == 'true') or (finalStatus == 'True')):
                 CiTestObj.finalStatus = True
-        elif re.match(r'^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
             PHYSIM.OCUserName = matchReg.group(1)
             CLUSTER.OCUserName = matchReg.group(1)
-        elif re.match(r'^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE)
+            EPC.OCUserName = matchReg.group(1)
+        elif re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE)
             PHYSIM.OCPassword = matchReg.group(1)
             CLUSTER.OCPassword = matchReg.group(1)
-        elif re.match(r'^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
+            EPC.OCPassword = matchReg.group(1)
+        elif re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
             PHYSIM.OCProjectName = matchReg.group(1)
             CLUSTER.OCProjectName = matchReg.group(1)
-        elif re.match(r'^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE)
+            EPC.OCProjectName = matchReg.group(1)
+        elif re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE)
             CLUSTER.OCUrl = matchReg.group(1)
-        elif re.match(r'^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE)
             CLUSTER.OCRegistry = matchReg.group(1)
-        elif re.match(r'^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
             RAN.BuildId = matchReg.group(1)
-        elif re.match(r'^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE)
-            CONTAINERS.flexricTag = matchReg.group(1)
         else:
             HELP.GenericHelp(CONST.Version)
             sys.exit('Invalid Parameter: ' + myArgv)
 
-    return py_param_file_present, py_params, mode, force_local
+    return py_param_file_present, py_params, mode

ci-scripts/checkGitLabMergeRequestLabels.sh

@@ -78,10 +78,9 @@ IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY`
 IS_MR_CI=`echo $LABELS | grep -c CI`
 IS_MR_4G=`echo $LABELS | grep -c 4G-LTE`
 IS_MR_5G=`echo $LABELS | grep -c 5G-NR`
-IS_MR_5G_UE=`echo $LABELS | grep -c nrUE`
 
 # none is present! No CI
-if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ] && [ $IS_MR_5G_UE -eq 0 ]
+if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ]
 then
     echo "NONE"
     exit 0
@@ -94,12 +93,6 @@ then
     exit 0
 fi
 
-if [ $IS_MR_5G_UE -eq 1 ] && [ $IS_MR_4G -eq 1 ]
-then
-    echo "SHORTEN-4G-5G-UE"
-    exit 0
-fi
-
 # 4G is present: run only 4G
 if [ $IS_MR_4G -eq 1 ]
 then
@@ -114,12 +107,6 @@ then
     exit 0
 fi
 
-if [ $IS_MR_5G_UE -eq 1 ]
-then
-    echo "SHORTEN-5G-UE"
-    exit 0
-fi
-
 # BUILD-ONLY is present: only build stages
 if [ $IS_MR_BUILD_ONLY -eq 1 ]
 then

ci-scripts/ci_infra.yaml

@@ -28,8 +28,8 @@ up2-fhi72:
 
 up2-aerial:
   Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
+  AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh
+  DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh
   NetworkScript: ip a show dev wwan0
   IF: wwan0
   MTU: 1500
@@ -63,87 +63,51 @@ adb_ue_2:
 
 oc-cn5g:
   Host: avra
+  Namespace: "oaicicd-core-for-ci-ran"
+  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102"
   NetworkScript: echo "inet 172.21.6.102"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran %%log_dir%%"
 
 oc-cn5g-20897:
   Host: cacofonix
+  Namespace: "oaicicd-core-for-fhi72"
+  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
   NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
-
-oc-cn5g-20897-aerial2:
-  Host: aerial2
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial %%log_dir%%"
 
 matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec prod-trf-gen
   RunIperf3Server: False
-  Deploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type start-basic"
-  Undeploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type stop-basic"
-  LogCollect:
-    - "docker logs oai-smf > %%log_dir%%/oai-smf.log"
-    - "docker logs oai-amf > %%log_dir%%/oai-amf.log"
-    - "docker logs oai-upf > %%log_dir%%/oai-upf.log"
 
 porcepix-cn4g:
   Host: porcepix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
   CmdPrefix: docker exec prod-trf-gen
-  Deploy: "! scripts/magma-epc-deploy.sh /opt/oai-epc-magma/docker-compose.yml"
-  Undeploy: "docker compose -f /opt/oai-epc-magma/docker-compose.yml down"
-  LogCollect: "! scripts/magma-epc-logcollect.sh %%log_dir%%"
+
+porcepix-cn5g:
+  Host: porcepix
+  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec prod-trf-gen
+  RunIperf3Server: False
 
 nano-cn4g:
   Host: nano
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
   CmdPrefix: docker exec prod-trf-gen
-  Deploy: "! scripts/magma-epc-deploy.sh /opt/oai-epc-magma/docker-compose.yml"
-  Undeploy: "docker compose -f /opt/oai-epc-magma/docker-compose.yml down"
-  LogCollect: "! scripts/magma-epc-logcollect.sh %%log_dir%%"
 
 ltebox-nano:
   Host: nano
   NetworkScript: ip a show dev tun1
-  Deploy:
-    - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
-    - "sleep 1"
-    - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 1"
-  Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
-  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"
 
 sabox-nepes:
   Host: nepes
   NetworkScript: ip a show dev tun1
-  Deploy:
-    - "sudo su -c 'screen -dm -S simulated_5g_hss /opt/hss_sim0609/start_5g_hss'"
-    - "sleep 1"
-    - "sudo /opt/ltebox/tools/start_sabox < /dev/null &> /dev/null"
-    - "sleep 1"
-  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{amfLog.0,ngapcLog.0,ngapcommonLog.0,ngapsLog.0,xGwLog.0,upfLog.0} %%log_dir%%"
-  Undeploy: "sudo /opt/ltebox/tools/stop_sabox; sudo killall screen"
 
 ltebox-nepes:
   Host: nepes
   NetworkScript: ip a show dev tun1
-  Deploy:
-    - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
-    - "sleep 1"
-    - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 1"
-  Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
-  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"
 
 amarisoft_ue:
   Host: amariue
@@ -386,15 +350,6 @@ rfsim5g_ext_dn:
   NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
   CmdPrefix: docker exec rfsim5g-oai-ext-dn
 
-oai_ext_dn:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec oai-ext-dn
-
-rfsim5g_5gc_fixed_ip:
-  Host: "%%current_host%%"
-  NetworkScript: echo "inet 12.1.1.1"
-
 rfsim4g_ue:
   Host: "%%current_host%%"
   NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
@@ -423,9 +378,23 @@ rfsim4g_enb_fembms:
 
 rfsim4g_ue_fembms:
   Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem2
+  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
   CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_uem2
+  IF: oaitun_uem1
+
+l2sim5g_ue:
+  Host: "%%current_host%%"
+  AttachScript: docker start l2sim-oai-nr-ue0
+  DetachScript: docker stop l2sim-oai-nr-ue0
+  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
+  CmdPrefix: docker exec l2sim-oai-nr-ue0
+  IF: oaitun_ue1
+  MTU: 1500
+
+l2sim5g_ext_dn:
+  Host: "%%current_host%%"
+  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
+  CmdPrefix: docker exec l2sim-oai-ext-dn
 
 l2sim4g_ue:
   Host: "%%current_host%%"
@@ -440,3 +409,7 @@ l2sim4g_ext_dn:
   Host: "%%current_host%%"
   NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
   CmdPrefix: docker exec l2sim4g-trf-gen
+
+test:
+  Host: localhost
+  NetworkScript: echo "inet 127.0.0.1 mtu 1500"

ci-scripts/cls_analysis.py

@@ -1,82 +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 logging
-import re
-
-# Define the mapping of physim_test values to search patterns
-PHYSIM_PATTERN_MAPPING = {
-	'nr_ulsim': [
-		r'(Total PHY proc rx)\s+(\d+\.\d+)\s+us',  # Pattern for RX PHY processing time
-		r'(ULSCH total decoding time)\s+(\d+\.\d+)\s+us',  # Pattern for ULSCH decoding time
-	],
-	'nr_dlsim': [
-		r'(PHY proc tx)\s+(\d+\.\d+)\s+us',  # Pattern for TX PHY processing time
-		r'(DLSCH encoding time)\s+(\d+\.\d+)\s+us',  # Pattern for DLSCH encoding time
-	],
-	'ldpctest': [
-		r'(Encoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for encoding time mean
-		r'(Decoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for decoding time mean
-	],
-}
-# Define test conditions based on the simulation type
-PHYSIM_TEST_CONDITION = {
-	'nr_ulsim': 'test OK',  # For nr_ulsim, check if 'test OK' is present
-	'nr_dlsim': 'test OK',  # For nr_dlsim, check if 'test OK' is present
-	'ldpctest': None,	  # No condition for ldpctest, just process the patterns
-}
-
-class Analysis():
-
-	def analyze_physim(log, physim_test, options, threshold):
-		search_patterns = PHYSIM_PATTERN_MAPPING.get(physim_test)
-		test_condition = PHYSIM_TEST_CONDITION.get(physim_test)
-		success = False
-		msg = ''
-
-		try:
-			with open(log, 'r') as f:
-				log_content = f.read()
-		except FileNotFoundError as e:
-			msg = f'{log} file not found, exception: {e}'
-			return False, msg
-		except Exception as e:
-			msg = f'Error while parsing log file {log}: exception: {e}'
-			return False, msg
-
-		if test_condition and test_condition not in log_content:
-			msg = f"Test did not succeed, '{test_condition}' not found in log file {log}."
-			return False, msg
-
-		time1_match = re.search(search_patterns[0], log_content)
-		time2_match = re.search(search_patterns[1], log_content)
-		if not(time1_match and time2_match):
-			msg = f"Processing time not found in log file {log}."
-			return False, msg
-
-		success = float(time2_match.group(2)) < float(threshold)
-		if success:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us'
-		else:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us exceeds a limit of {threshold} us'
-
-		return success,msg

ci-scripts/cls_cluster.py

@@ -43,6 +43,9 @@ NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
+CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
+CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
+
 
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
@@ -64,6 +67,49 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
+def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
+	logging.debug(f'OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster: {ocNamespace}')
+	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+	if not succeeded:
+		return False, CONST.OC_LOGIN_FAIL
+	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
+	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Deployment failed')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
+def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
+	logging.debug(f'OC OAI CN5G: Terminating CN on Openshift Cluster: {ocNamespace}')
+	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+	if not succeeded:
+		return False, CONST.OC_LOGIN_FAIL
+	cmd.run(f'rm -Rf {path}/logs')
+	cmd.run(f'mkdir -p {path}/logs')
+	logging.debug('OC OAI CN5G: Collecting log files to workspace')
+	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
+	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
+	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
+		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
+		if not podName:
+			logging.debug(f'{ii} pod not found!')
+		else:
+			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
+	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
+	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
+	ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Undeployment failed')
+		cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""
@@ -80,12 +126,24 @@ class Cluster:
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
+		self.imageToPull = ''
+		self.testSvrId = None
 
 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
-		self.cmd.run(f'oc delete secret etc-pki-entitlement')
-		ret = self.cmd.run(f"oc get secret etc-pki-entitlement -n openshift-config-managed -o json | jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' | jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' | oc create -f -", silent=True)
-		if ret.returncode != 0:
+		self.cmd.run('oc delete secret etc-pki-entitlement')
+		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????.pem | tail -1', silent=True)
+		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", ret.stdout)
+		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', silent=True)
+		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", ret.stdout)
+		if regres1 is None or regres2 is None:
+			logging.error("could not find entitlements")
+			return False
+		file1 = regres1.group(0)
+		file2 = regres2.group(0)
+		ret = self.cmd.run(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}')
+		regres = re.search(r"secret/etc-pki-entitlement created", ret.stdout)
+		if ret.returncode != 0 or regres is None:
 			logging.error("could not create secret/etc-pki-entitlement")
 			return False
 		return True
@@ -94,7 +152,7 @@ class Cluster:
 		self._retag_image_statement(name, name, newTag, filename)
 		self.cmd.run(f'oc delete -f {filename}')
 		ret = self.cmd.run(f'oc create -f {filename}')
-		if re.search(r'buildconfig.build.openshift.io/[a-zA-Z\-0-9]+ created', ret.stdout) is not None:
+		if re.search('buildconfig.build.openshift.io/[a-zA-Z\-0-9]+ created', ret.stdout) is not None:
 			return True
 		logging.error('error while creating buildconfig: ' + ret.stdout)
 		return False
@@ -162,17 +220,19 @@ class Cluster:
 			return -1
 		return int(result.group("size"))
 
-	def _deploy_pod(self, filename, timeout = 120):
+	def _deploy_pod(self, filename, timeout = 30):
 		ret = self.cmd.run(f'oc create -f {filename}')
-		result = re.search(r'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', ret.stdout)
+		result = re.search(f'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', ret.stdout)
 		if result is None:
 			logging.error(f'could not deploy pod: {ret.stdout}')
 			return None
 		pod = result.group("pod")
 		logging.debug(f'checking if pod {pod} is in Running state')
-		ret = self.cmd.run(f'oc wait --for=condition=ready pod {pod} --timeout={timeout}s', silent=True)
-		if ret.returncode == 0:
-			return pod
+		while timeout > 0:
+			ret = self.cmd.run(f'oc get pod {pod} -o json | jq -Mc .status.phase', silent=True)
+			if re.search('"Running"', ret.stdout) is not None: return pod
+			timeout -= 1
+			time.sleep(1)
 		logging.error(f'pod {pod} did not reach Running state')
 		self._undeploy_pod(filename)
 		return None
@@ -180,30 +240,44 @@ class Cluster:
 	def _undeploy_pod(self, filename):
 		self.cmd.run(f'oc delete -f {filename}')
 
-	def PullClusterImage(self, HTML, node, images, tag_prefix):
-		logging.debug(f'Pull OC image {images} to server {node}')
+	def PullClusterImage(self, HTML, RAN):
+		if self.testSvrId == None: self.testSvrId = self.eNBIPAddress
+		if self.imageToPull == '':
+			HELP.GenericHelp(CONST.Version)
+			raise ValueError('Insufficient Parameter')
+		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
 		self.testCase_id = HTML.testCase_id
-		with cls_cmd.getConnection(node) as cmd:
-			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
-			if not succeeded:
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
-			if ret.returncode != 0:
-				logging.error(f'cannot authenticate at registry')
-				OC_logout(cmd)
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
-			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)
+		cmd = cls_cmd.getConnection(self.testSvrId)
+		logging.info(cmd.run('docker --version'))
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
+		if not succeeded:
+			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
+		if ret.returncode != 0:
+			logging.error(f'\u001B[1m Unable to access OC project {CI_OC_RAN_NAMESPACE}\u001B[0m')
 			OC_logout(cmd)
-		param = f"on node {node}"
-		if success:
-			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
-		else:
-			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
-		return success
+			cmd.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		for image in self.imageToPull:
+			imagePrefix = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
+			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			imageTag = f"{image}:{tag}"
+			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
+			if ret.returncode != 0:
+				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
+				OC_logout(cmd)
+				cmd.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			cmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
+			cmd.run(f'docker rmi {imagePrefix}/{imageTag}')
+		OC_logout(cmd)
+		cmd.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
 
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -269,9 +343,9 @@ class Cluster:
 
 		# delete old images by Sagar Arora <sagar.arora@openairinterface.org>:
 		# 1. retrieve all images and their timestamp
-		# 2. awk retrieves those whose timestamp is older than 3 weeks
+		# 2. awk retrieves those whose timestamp is older than 4 weeks
 		# 3. issue delete command on corresponding istags (the images are dangling and will be cleaned by the registry)
-		delete_cmd = "oc get istag -o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{\"\\n\"}}{{end}}' | awk '$2 <= \"'$(date -d '-3weeks' -Ins --utc | sed 's/+0000/Z/')'\" { print $1 }' | xargs --no-run-if-empty oc delete istag"
+		delete_cmd = "oc get istag -o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{\"\\n\"}}{{end}}' | awk '$2 <= \"'$(date -d '-4weeks' -Ins --utc | sed 's/+0000/Z/')'\" { print $1 }' | xargs --no-run-if-empty oc delete istag"
 		response = self.cmd.run(delete_cmd)
 		logging.debug(f"deleted images:\n{response.stdout}")
 
@@ -284,7 +358,7 @@ class Cluster:
 			self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml')
 			ranbase_job = self._start_build('ran-base')
 			attemptedImages += ['ran-base']
-			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 1000)
+			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 800)
 			if not status: logging.error('failure during build of ran-base')
 			self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect
 			# recover logs by mounting image
@@ -322,7 +396,7 @@ class Cluster:
 			self.cmd.run(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log')
 			self.cmd.run(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log')
 			self.cmd.run(f'oc logs {clang_job} &> cmake_targets/log/oai-clang.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
 		if status:
 			self._recreate_is_tag('oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
@@ -346,7 +420,7 @@ class Cluster:
 			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
 			attemptedImages += ['oai-gnb-aw2s']
 
-			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 800)
+			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 600)
 			if not wait: logging.error('error during build of eNB/gNB')
 			status = status and wait
 			# recover logs
@@ -375,14 +449,14 @@ class Cluster:
 			nrue_job = self._start_build('oai-nr-ue')
 			attemptedImages += ['oai-nr-ue']
 
-			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 800)
+			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 600)
 			if not wait: logging.error('error during build of nr-cuup/lteUE/nrUE')
 			status = status and wait
 			# recover logs
 			self.cmd.run(f'oc logs {nr_cuup_job} &> cmake_targets/log/oai-nr-cuup.log')
 			self.cmd.run(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log')
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
 		if status:
 			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
@@ -395,7 +469,7 @@ class Cluster:
 			if not wait: logging.error('error during build of ranbuildfhi72_job')
 			status = status and wait
 			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
 		if status:
 			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
@@ -410,7 +484,7 @@ class Cluster:
 			status = status and wait
 			# recover logs
 			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
 		# split and analyze logs
 		imageSize = {}
@@ -426,9 +500,9 @@ class Cluster:
 				imageSize[image] = f'{sizeMb:.1f} Mbytes (uncompressed: ~{sizeMb*2.5:.1f} Mbytes)'
 			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')
 
-		grep_exp = r"\|".join(attemptedImages)
+		grep_exp = "\|".join(attemptedImages)
 		self.cmd.run(f'oc get images | grep -e \'{grep_exp}\' &> cmake_targets/log/image_registry.log');
-		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> cmake_targets/log/build_pod_summary.log; done')
+		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> cmake_targets/log/build_pod_summary.log; done', '\$', 60)
 
 		build_log_name = f'build_log_{self.testCase_id}'
 		cls_containerize.CopyLogsToExecutor(self.cmd, lSourcePath, build_log_name)

ci-scripts/cls_cmd.py

@@ -124,12 +124,12 @@ class LocalCmd(Cmd):
 			ret.args += f" &> {redirect}"
 			ret.stdout = ""
 		if not silent:
-			logging.debug(f"local> {ret.args}")
+			logging.info(f"local> {ret.args}")
 		return ret
 
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
 		if not silent:
-			logging.debug(f"local> {line}")
+			logging.info(f"local> {line}")
 		try:
 			if line.strip().endswith('&'):
 				# if we wait for stdout, subprocess does not return before the end of the command
@@ -217,8 +217,6 @@ class RemoteCmd(Cmd):
 		return client
 
 	def _lookup_ssh_config(hostname):
-		if is_local(hostname):
-			raise ValueError("Using localhost as SSH target is not allowed: use LocalCmd instead.")
 		ssh_config = paramiko.SSHConfig()
 		user_config_file = os.path.expanduser("~/.ssh/config")
 		if os.path.exists(user_config_file):
@@ -244,7 +242,7 @@ class RemoteCmd(Cmd):
 		p = parameters if parameters else ""
 		r = f"> {redirect}" if redirect else ""
 		if not silent:
-			logging.debug(f"local> ssh {host} bash -s {p} < {path} {r} # {path} from localhost")
+			logging.info(f"local> ssh {host} bash -s {p} < {path} {r} # {path} from localhost")
 		client = RemoteCmd._ssh_init()
 		cfg = RemoteCmd._lookup_ssh_config(host)
 		client.connect(**cfg)
@@ -264,7 +262,7 @@ class RemoteCmd(Cmd):
 
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
 		if not silent:
-			logging.debug(f"ssh[{self.hostname}]> {line}")
+			logging.info(f"ssh[{self.hostname}]> {line}")
 		if self.cwd:
 			line = f"cd {self.cwd} && {line}"
 		try:

ci-scripts/cls_containerize.py

@@ -43,6 +43,7 @@ from zipfile import ZipFile
 # OAI Testing modules
 #-----------------------------------------------------------
 import cls_cmd
+import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
@@ -51,7 +52,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
 
 def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -70,8 +71,6 @@ def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranc
 	return ret.returncode == 0
 
 def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
-	if ranCommitID == 'develop':
-		return 'develop'
 	shortCommit = ranCommitID[0:8]
 	if ranAllowMerge:
 		# Allowing contributor to have a name/branchName format
@@ -93,7 +92,7 @@ def CopyLogsToExecutor(cmd, sourcePath, log_name):
 		os.remove(f'./{log_name}.zip')
 	if (os.path.isdir(f'./{log_name}')):
 		shutil.rmtree(f'./{log_name}')
-	cmd.copyin(src=f'{sourcePath}/cmake_targets/{log_name}.zip', tgt=f'{os.getcwd()}/{log_name}.zip')
+	cmd.copyin(f'{sourcePath}/cmake_targets/{log_name}.zip', f'./{log_name}.zip')
 	cmd.run(f'rm -f {log_name}.zip')
 	ZipFile(f'{log_name}.zip').extractall('.')
 
@@ -145,6 +144,21 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo
 
+def GetCredentials(instance):
+    server_id = instance.eNB_serverId[instance.eNB_instance]
+    if server_id == '0':
+        return (instance.eNBIPAddress, instance.eNBUserName, instance.eNBPassword, instance.eNBSourceCodePath)
+    elif server_id == '1':
+        return (instance.eNB1IPAddress, instance.eNB1UserName, instance.eNB1Password, instance.eNB1SourceCodePath)
+    elif server_id == '2':
+        return (instance.eNB2IPAddress, instance.eNB2UserName, instance.eNB2Password, instance.eNB2SourceCodePath)
+    else:
+        raise Exception ("Only supports maximum of 3 servers")
+
+def GetContainerName(ssh, svcName, file):
+	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".container_name'", silent=True)
+	return ret.stdout
+
 def GetImageName(ssh, svcName, file):
 	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".image'", silent=True)
 	if ret.returncode != 0:
@@ -152,31 +166,31 @@ def GetImageName(ssh, svcName, file):
 	else:
 		return ret.stdout.strip()
 
-def GetServiceHealth(ssh, svcName, file):
-	if svcName is None:
-		return False, f"Service {svcName} not found in {file}"
-	image = GetImageName(ssh, svcName, file)
-	if 'db_init' in svcName or 'db-init' in svcName: # exits with 0, there cannot be healthy
-		return True, f"Service {svcName} healthy, image {image}"
-	for _ in range(8):
-		result = ssh.run(f"docker compose -f {file} ps --format json {svcName}  | jq -r 'if type==\"array\" then .[0].Health else .Health end'", silent=True)
+def GetContainerHealth(ssh, containerName):
+	if containerName is None:
+		return False
+	if 'db_init' in containerName or 'db-init' in containerName: # exits with 0, there cannot be healthy
+		return True
+	time.sleep(5)
+	for _ in range(3):
+		result = ssh.run(f'docker inspect --format="{{{{.State.Health.Status}}}}" {containerName}', silent=True)
 		if result.stdout == 'healthy':
-			return True, f"Service {svcName} healthy, image {image}"
-		time.sleep(5)
-	return False, f"Failed to deploy: service {svcName}"
+			return True
+		time.sleep(10)
+	return False
 
 def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
-	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
+	ret = ssh.run(f'cat {wd}/.env', silent=True)
 	if ret.returncode != 0:
 		return False
 	env_vars = ret.stdout.strip().splitlines()
 	logging.info(f'{prompt} {wd}/.env: {env_vars}')
 	return True
 
-def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
-	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
+def WriteEnvFile(ssh, services, wd, tag):
+	ret = ssh.run(f'cat {wd}/.env', silent=True)
 	registry = "oai-ci" # pull_images() gives us this registry path
-	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
+	envs = {"REGISTRY":registry, "TAG": tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
 		old_envs = {}
@@ -194,9 +208,7 @@ def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
-			if "oai-enb" in image: envs["ENB_IMG"] = "oai-enb-asan"
-			elif "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
-			elif "oai-lte-ue" in image: envs["LTEUE_IMG"] = "oai-lte-ue-asan"
+			if "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
 			elif "oai-nr-ue" in image: envs["NRUE_IMG"] = "oai-nr-ue-asan"
 			elif "oai-nr-cuup" in image: envs["NRCUUP_IMG"] = "oai-nr-cuup-asan"
 			else: logging.warning("undetected image format {image}, cannot use asan")
@@ -215,10 +227,11 @@ def GetServices(ssh, requested, file):
     else:
         return requested
 
-def CopyinServiceLog(ssh, lSourcePath, yaml, svcName, wd_yaml, filename):
+def CopyinContainerLog(ssh, lSourcePath, yaml, containerName, filename):
 	remote_filename = f"{lSourcePath}/cmake_targets/log/{filename}"
-	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
+	ssh.run(f'docker logs {containerName} &> {remote_filename}')
 	local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml}"
+	os.system(f'mkdir -p {local_dir}')
 	local_filename = f"{local_dir}/{filename}"
 	return ssh.copyin(remote_filename, local_filename)
 
@@ -331,35 +344,40 @@ class Containerize():
 		self.cliOptions = ''
 
 		self.imageToCopy = ''
+		self.registrySvrId = ''
+		self.testSvrId = ''
+		self.imageToPull = []
 		#checkers from xml
 		self.ran_checkers={}
-		self.num_attempts = 1
-
-		self.flexricTag = ''
 
 #-----------------------------------------------------------
 # Container management functions
 #-----------------------------------------------------------
 
-	def GetCredentials(self, server_id):
-		if server_id == '0':
-			ip, path = self.eNBIPAddress, self.eNBSourceCodePath
-		elif server_id == '1':
-			ip, path = self.eNB1IPAddress, self.eNB1SourceCodePath
-		elif server_id == '2':
-			ip, path = self.eNB2IPAddress, self.eNB2SourceCodePath
-		else:
-			raise ValueError(f"unknown server ID '{server_id}'")
-		if ip == '' or path == '':
-			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: IP/node {ip}, path {path}')
-		return (ip, path)
-
 	def BuildImage(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		cmd = cls_cmd.RemoteCmd(lIpAddr)
 	
 		# Checking the hostname to get adapted on cli and dockerfileprefixes
 		cmd.run('hostnamectl')
@@ -397,9 +415,7 @@ class Containerize():
 				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
@@ -407,13 +423,6 @@ class Containerize():
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu22.cross-arm64'
-		result = re.search('native_arm', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-			imageNames.append(('ran-build-fhi72', 'build.fhi72.native_arm', 'ran-build-fhi72', ''))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 		
 		self.testCase_id = HTML.testCase_id
 		cmd.cd(lSourcePath)
@@ -498,10 +507,10 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.*.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.*.tar.gz')
+				cmd.run('rm -f nvipc_src.2024.05.23.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -562,12 +571,50 @@ class Containerize():
 			return False
 
 	def BuildProxy(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.proxyCommit is None:
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter (need proxyCommit for proxy build)')
 		logging.debug('Building on server: ' + lIpAddr)
-		ssh = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
+		# Check that we are on Ubuntu
+		mySSH.command('hostnamectl', '\$', 5)
+		result = re.search('Ubuntu',  mySSH.getBefore())
+		self.host = result.group(0)
+		if self.host != 'Ubuntu':
+			logging.error('\u001B[1m Can build proxy only on Ubuntu server\u001B[0m')
+			mySSH.close()
+			sys.exit(1)
+
+		self.cli = 'docker'
+		self.cliBuildOptions = ''
+
+		# Workaround for some servers, we need to erase completely the workspace
+		if self.forcedWorkspaceCleanup:
+			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
 
-		self.testCase_id = HTML.testCase_id
 		oldRanCommidID = self.ranCommitID
 		oldRanRepository = self.ranRepository
 		oldRanAllowMerge = self.ranAllowMerge
@@ -576,38 +623,30 @@ class Containerize():
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
 		self.ranTargetBranch = 'master'
+		mySSH.command('cd ' +lSourcePath, '\$', 3)
+		# to prevent accidentally overwriting data that might be used later
+		self.ranCommitID = oldRanCommidID
+		self.ranRepository = oldRanRepository
+		self.ranAllowMerge = oldRanAllowMerge
+		self.ranTargetBranch = oldRanTargetBranch
 
 		# Let's remove any previous run artifacts if still there
-		ssh.run('docker image prune --force')
+		mySSH.command(self.cli + ' image prune --force', '\$', 30)
 		# Remove any previous proxy image
-		ssh.run('docker image rm oai-lte-multi-ue-proxy:latest')
+		mySSH.command(self.cli + ' image rm oai-lte-multi-ue-proxy:latest || true', '\$', 30)
 
 		tag = self.proxyCommit
 		logging.debug('building L2sim proxy image for tag ' + tag)
 		# check if the corresponding proxy image with tag exists. If not, build it
-		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		buildProxy = ret.returncode != 0 # if no image, build new proxy
+		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+		buildProxy = mySSH.getBefore().count('o such image') != 0
 		if buildProxy:
-			ssh.run(f'rm -Rf {lSourcePath}')
-			success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-			if not success:
-				raise Exception("could not clone proxy repository")
-
-			filename = f'build_log_{self.testCase_id}'
-			fullpath = f'{lSourcePath}/{filename}'
-
-			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
-			ssh.run(f'zip -r -qq {fullpath}.zip {fullpath}')
-			local_file = f"{os.getcwd()}/../cmake_targets/log/{filename}.zip"
-			ssh.copyin(f'{fullpath}.zip', local_file)
-			# don't delete such that we might recover the zips
-			#ssh.run(f'rm -f {fullpath}.zip')
-
-			ssh.run('docker image prune --force')
-			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-			if ret.returncode != 0:
+			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target oai-lte-multi-ue-proxy --tag proxy:' + tag + ' --file docker/Dockerfile.ubuntu18.04 . > cmake_targets/log/proxy-build.log 2>&1', '\$', 180)
+			mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+			mySSH.command(self.cli + ' image prune --force || true','\$', 15)
+			if mySSH.getBefore().count('o such image') != 0:
 				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-				ssh.close()
+				mySSH.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
 				return False
@@ -615,20 +654,33 @@ class Containerize():
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
 
 		# retag the build images to that we pick it up later
-		ssh.run(f'docker image tag proxy:{tag} oai-lte-multi-ue-proxy:latest')
+		mySSH.command('docker image tag proxy:' + tag + ' oai-lte-multi-ue-proxy:latest', '\$', 5)
+
+		# no merge: is a push to develop, tag the image so we can push it to the registry
+		if not self.ranAllowMerge:
+			mySSH.command('docker image tag proxy:' + tag + ' proxy:develop', '\$', 5)
 
 		# we assume that the host on which this is built will also run the proxy. The proxy
 		# currently requires the following command, and the docker-compose up mechanism of
 		# the CI does not allow to run arbitrary commands. Note that the following actually
 		# belongs to the deployment, not the build of the proxy...
 		logging.warning('the following command belongs to deployment, but no mechanism exists to exec it there!')
-		ssh.run('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up')
+		mySSH.command('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up', '\$', 5)
 
-		# to prevent accidentally overwriting data that might be used later
-		self.ranCommitID = oldRanCommidID
-		self.ranRepository = oldRanRepository
-		self.ranAllowMerge = oldRanAllowMerge
-		self.ranTargetBranch = oldRanTargetBranch
+		# Analyzing the logs
+		if buildProxy:
+			self.testCase_id = HTML.testCase_id
+			mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+			mySSH.command('mkdir -p proxy_build_log_' + self.testCase_id, '\$', 5)
+			mySSH.command('mv log/* ' + 'proxy_build_log_' + self.testCase_id, '\$', 5)
+			if (os.path.isfile('./proxy_build_log_' + self.testCase_id + '.zip')):
+				os.remove('./proxy_build_log_' + self.testCase_id + '.zip')
+			if (os.path.isdir('./proxy_build_log_' + self.testCase_id)):
+				shutil.rmtree('./proxy_build_log_' + self.testCase_id)
+			mySSH.command('zip -r -qq proxy_build_log_' + self.testCase_id + '.zip proxy_build_log_' + self.testCase_id, '\$', 5)
+			mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
+			# don't delete such that we might recover the zips
+			#mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
 
 		# we do not analyze the logs (we assume the proxy builds fine at this stage),
 		# but need to have the following information to correctly display the HTML
@@ -640,11 +692,11 @@ class Containerize():
 		files['Target Image Creation'] = errorandwarnings
 		collectInfo = {}
 		collectInfo['proxy'] = files
-		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
+		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
 		# Cleaning any created tmp volume
-		ssh.run('docker volume prune --force')
-		ssh.close()
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
+		mySSH.close()
 
 		allImagesSize = {}
 		if result is not None:
@@ -664,8 +716,27 @@ class Containerize():
 			return False
 
 	def BuildRunTests(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.RemoteCmd(lIpAddr)
 		cmd.cd(lSourcePath)
@@ -712,7 +783,7 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
 
 		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
+		ret = cmd.run(f'docker run -a STDOUT -e LD_LIBRARY_PATH=. --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
 		cmd.run(f'docker rmi ran-unittests:{baseTag}')
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
@@ -727,16 +798,34 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 
-	def Push_Image_to_Local_Registry(self, HTML, svr_id, tag_prefix=""):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
-		logging.debug('Pushing images to server: ' + lIpAddr)
-		ssh = cls_cmd.getConnection(lIpAddr)
+	def Push_Image_to_Local_Registry(self, HTML):
+		if self.registrySvrId == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.registrySvrId == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.registrySvrId == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('Pushing images from server: ' + lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
-		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
-		if ret.returncode != 0:
+		mySSH.command(f'docker login -u oaicicd -p oaicicd {imagePrefix}', '\$', 5)
+		if re.search('Login Succeeded', mySSH.getBefore()) is None:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
-			ssh.close()
+			mySSH.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
@@ -744,103 +833,150 @@ class Containerize():
 		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
 		for image in IMAGES:
-			tagToUse = tag_prefix + CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			imageTag = f"{image}:{tagToUse}"
-			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
-			if ret.returncode != 0:
+			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}', '\$', 5)
+			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
 				continue
-			ret = ssh.run(f'docker push {imagePrefix}/{imageTag}')
-			if ret.returncode != 0:
+			mySSH.command(f'docker push {imagePrefix}/{imageTag}', '\$', 120)
+			if re.search(': digest:', mySSH.getBefore()) is None:
+				logging.debug(mySSH.getBefore())
 				msg = f'Could not push {image} to local registry : {imageTag}'
 				logging.error(msg)
-				ssh.close()
+				mySSH.close()
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-			# Creating a develop tag on the local private registry
-			if not self.ranAllowMerge:
-				devTag = f"{tag_prefix}develop"
-				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:{devTag}')
-				ssh.run(f'docker push {imagePrefix}/{image}:{devTag}')
-				ssh.run(f'docker rmi {imagePrefix}/{image}:{devTag}')
-			ssh.run(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}')
+			mySSH.command(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}', '\$', 30)
 
-		ret = ssh.run(f'docker logout {imagePrefix}')
-		if ret.returncode != 0:
+		mySSH.command(f'docker logout {imagePrefix}', '\$', 5)
+		if re.search('Removing login credentials', mySSH.getBefore()) is None:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
-			ssh.close()
+			mySSH.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
-		ssh.close()
+		mySSH.close()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
 
-	def Pull_Image(cmd, images, tag, tag_prefix, registry, username, password):
-		if username is not None and password is not None:
-			logging.info(f"logging into registry {username}@{registry}")
-			response = cmd.run(f'docker login -u {username} -p {password} {registry}', silent=True, reportNonZero=False)
-			if response.returncode != 0:
-				msg = f'Could not log into registry {username}@{registry}'
-				logging.error(msg)
-				return False, msg
-		pulled_images = []
-		for image in images:
-			imagePrefTag = f"{image}:{tag_prefix}{tag}"
-			imageTag = f"{image}:{tag}"
-			response = cmd.run(f'docker pull {registry}/{imagePrefTag}')
-			if response.returncode != 0:
-				msg = f'Could not pull {image} from local registry: {imagePrefTag}'
-				logging.error(msg)
-				return False, msg
-			cmd.run(f'docker tag {registry}/{imagePrefTag} oai-ci/{imageTag}')
-			cmd.run(f'docker rmi {registry}/{imagePrefTag}')
-			pulled_images += [f"oai-ci/{imageTag}"]
-		if username is not None and password is not None:
-			response = cmd.run(f'docker logout {registry}')
-			# we have the images, if logout fails it's no problem
-		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
-		return True, msg
-
-	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, tag_prefix="", registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
+	def Pull_Image_from_Local_Registry(self, HTML):
+		# This method can be called either onto a remote server (different from python executor)
+		# or directly on the python executor (ie lIpAddr == 'none')
+		if self.testSvrId == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.testSvrId == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.testSvrId == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
-		if not tag:
-			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-		with cls_cmd.getConnection(lIpAddr) as cmd:
-			success, msg = Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, username, password)
-		param = f"on node {lIpAddr}"
-		if success:
-			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
+		myCmd = cls_cmd.getConnection(lIpAddr)
+		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
+		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
+		if response.returncode != 0:
+			msg = 'Could not log into local registry'
+			logging.error(msg)
+			myCmd.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+		pulled_images = []
+		for image in self.imageToPull:
+			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			imageTag = f"{image}:{tagToUse}"
+			cmd = f'docker pull {imagePrefix}/{imageTag}'
+			response = myCmd.run(cmd, timeout=120)
+			if response.returncode != 0:
+				logging.debug(response)
+				msg = f'Could not pull {image} from local registry : {imageTag}'
+				logging.error(msg)
+				myCmd.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			myCmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
+			myCmd.run(f'docker rmi {imagePrefix}/{imageTag}')
+			pulled_images += [f"oai-ci/{imageTag}"]
+		response = myCmd.run(f'docker logout {imagePrefix}')
+		if response.returncode != 0:
+			msg = 'Could not log off from local registry'
+			logging.error(msg)
+			myCmd.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+		myCmd.close()
+		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
+		HTML.CreateHtmlTestRowQueue('N/A', 'OK', [msg])
+		return True
+
+	def Clean_Test_Server_Images(self, HTML):
+		# This method can be called either onto a remote server (different from python executor)
+		# or directly on the python executor (ie lIpAddr == 'none')
+		if self.testSvrId == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.testSvrId == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.testSvrId == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if lIpAddr != 'none':
+			logging.debug('Removing test images from server: ' + lIpAddr)
+			myCmd = cls_cmd.RemoteCmd(lIpAddr)
 		else:
-			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
-		return success
+			logging.debug('Removing test images locally')
+			myCmd = cls_cmd.LocalCmd()
 
-	def Clean_Test_Server_Images(self, HTML, svr_id, images, tag=None):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
-		logging.debug(f'\u001B[1m Cleaning image(s) from server: {lIpAddr}\u001B[0m')
-		if not tag:
+		for image in IMAGES:
 			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			imageTag = f"{image}:{tag}"
+			cmd = f'docker rmi oai-ci/{imageTag}'
+			myCmd.run(cmd, reportNonZero=False)
 
-		status = True
-		with cls_cmd.getConnection(lIpAddr) as myCmd:
-			removed_images = []
-			for image in images:
-				fullImage = f"oai-ci/{image}:{tag}"
-				cmd = f'docker rmi {fullImage}'
-				if myCmd.run(cmd).returncode != 0:
-					status = False
-				removed_images += [fullImage]
-
-		msg = "Removed Images:\n" + '\n'.join(removed_images)
-		s = 'OK' if status else 'KO'
-		param = f"on node {lIpAddr}"
-		HTML.CreateHtmlTestRowQueue(param, s, [msg])
-		return status
+		myCmd.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
 
 	def Create_Workspace(self,HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		
 		success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		if success:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
@@ -849,63 +985,60 @@ class Containerize():
 		return success
 
 	def DeployObject(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		num_attempts = self.num_attempts
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
-		logging.debug(f'Deploying OAI Object on server: {lIpAddr}')
+		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
-		# creating the log folder by default
-		local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml.split('/')[-1]}"
-		os.system(f'mkdir -p {local_dir}')
 		wd = f'{lSourcePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
-		yaml_dir = yaml.split('/')[-1]
+
 		with cls_cmd.getConnection(lIpAddr) as ssh:
-			services = GetServices(ssh, self.services[self.eNB_instance], wd_yaml)
+			services = GetServices(ssh, self.services[self.eNB_instance], f"{wd}/docker-compose.y*ml")
 			if services == [] or services == ' ' or services == None:
-				msg = 'Cannot determine services to start'
+				msg = "Cannot determine services to start"
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
+
 			ExistEnvFilePrint(ssh, wd)
-			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
-			if num_attempts <= 0:
-				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
-			for attempt in range(num_attempts):
-				imagesInfo = []
-				healthInfo = []
-				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d -- {services}')
-				if status.returncode != 0:
-					msg = f'cannot deploy services {services}: {status.stdout}'
-					logging.error(msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
-					return False
-				for svc in services.split():
-					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
-					logging.info(msg)
-					imagesInfo.append(msg)
-					healthInfo.append(health)
-				deployed = all(healthInfo)
-				if deployed:
-					break
-				elif (attempt < num_attempts - 1):
-					warning_msg = f'Restart services {services}'
-					logging.warning(warning_msg)
-					imagesInfo.append(warning_msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', ['\n'.join(imagesInfo)])
-					for svc in services.split():
-						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')
-					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')
-		if deployed:
+			WriteEnvFile(ssh, services, wd, self.deploymentTag)
+
+			logging.info(f"will start services {services}")
+			status = ssh.run(f'docker compose -f {wd}/docker-compose.y*ml up -d -- {services}')
+			if status.returncode != 0:
+				msg = f"cannot deploy services {services}: {status.stdout}"
+				logging.error(msg)
+				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
+				return False
+
+			imagesInfo = []
+			fstatus = True
+			for svc in services.split():
+				containerName = GetContainerName(ssh, svc, f"{wd}/docker-compose.y*ml")
+				healthy = GetContainerHealth(ssh, containerName)
+				if not healthy:
+					tgtlogfile = f'{svc}-{HTML.testCase_id}.log'
+					logging.warning(f"Deployment Failed: Trying to copy container logs to {tgtlogfile}")
+					yaml_dir = yaml.split('/')[-1]
+					CopyinContainerLog(ssh, lSourcePath, yaml_dir, containerName, tgtlogfile)
+					imagesInfo += [f"Failed to deploy: service {svc}"]
+					fstatus = False
+				else:
+					image = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
+					logging.info(f"service {svc} healthy, container {containerName}, image {image}")
+					imagesInfo += [f"service {svc} healthy, image {image}"]
+		if fstatus:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
-		return deployed
+		return fstatus
 
 	def UndeployObject(self, HTML, RAN):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
 		wd = f'{lSourcePath}/{yaml}'
@@ -917,7 +1050,7 @@ class Containerize():
 			if services is not None:
 				all_serv = " ".join([s for s, _ in services])
 				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
-				copyin_res = all(CopyinServiceLog(ssh, lSourcePath, yaml_dir, s, f"{wd}/docker-compose.y*ml", f'{s}-{HTML.testCase_id}.log') for s, c in services)
+				copyin_res = all(CopyinContainerLog(ssh, lSourcePath, yaml_dir, c, f'{s}-{HTML.testCase_id}.log') for s, c in services)
 			else:
 				logging.warning('could not identify services to stop => no log file')
 			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
@@ -933,3 +1066,121 @@ class Containerize():
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
 		return success
+
+	def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
+		logging.debug('Checking IP routing on ' + svrName)
+		mySSH = SSH.SSHConnection()
+		if svrName == 'porcepix':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to asterix gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10)
+			result = re.search('172.21.16.127', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10)
+			# Check if route to obelix enb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
+			result = re.search('172.21.16.128', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev eno1', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'asterix':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to porcepix epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev em1', '\$', 10)
+			# Check if route to porcepix cn5g exists
+			mySSH.command('ip route | grep --colour=never "192.168.70.128/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.70.128/26 via 172.21.16.136 dev em1', '\$', 10)
+			# Check if X2 route to obelix enb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
+			result = re.search('172.21.16.128', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev em1', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'obelix':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to porcepix epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev eno1', '\$', 10)
+			# Check if X2 route to asterix gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10)
+			result = re.search('172.21.16.127', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10)
+			# Check if X2 route to nepes gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
+			result = re.search('172.21.16.137', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.137 dev eno1', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'nepes':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to ofqot gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
+			result = re.search('172.21.16.109', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.109 dev enp0s31f6', '\$', 10)
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'ofqot':
+			mySSH.open(ipAddr, userName, password)
+			# Check if X2 route to nepes enb/epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
+			result = re.search('172.21.16.137', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.137 dev enp2s0', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()

ci-scripts/cls_corenetwork.py

@@ -1,169 +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
-# */
-#---------------------------------------------------------------------
-#
-#   Required Python Version
-#     Python 3.x
-#
-#---------------------------------------------------------------------
-
-import logging
-import yaml
-import re
-
-import cls_cmd
-
-def listify(s):
-	if s is None:
-		return None
-	if isinstance(s, list):
-		return [str(x) for x in s]
-	return [str(s)]
-
-class CoreNetwork:
-
-	def __init__(self, cn_name, node=None, d=None, filename="ci_infra.yaml"):
-		with open(filename, "r") as f:
-			all_cns = yaml.load(f, Loader=yaml.FullLoader) # TODO why full?
-		c = all_cns.get(cn_name)
-		if c is None:
-			raise Exception(f'no such core network name "{cn_name}" in "{filename}"')
-		self._cn_name = cn_name
-		self._host = c.get('Host').strip()
-		if self._host == "%%current_host%%":
-			if node is None:
-				raise Exception(f"core network {self} requires node, but none provided (cannot replace %%current_host%%)")
-			self._host = node
-		if d is not None:
-			raise Exception("directory handling not implemented")
-		self._deploy = listify(c.get('Deploy'))
-		self._undeploy = listify(c.get('Undeploy'))
-		self._logCollect = listify(c.get('LogCollect'))
-		# check if at least one command contains "%%log_dir%%"
-		if self._logCollect and not any(filter(lambda s: "%%log_dir%%" in s, self._logCollect)):
-			raise ValueError(f"(At least one) LogCollect expression for {cn_name} must contain \"%%log_dir%%\"")
-		self._getNetwork = listify(c.get('NetworkScript'))
-		self._cmd_prefix = c.get('CmdPrefix')
-		iperf = c.get('RunIperf3Server')
-		self._run_iperf = bool(iperf if iperf is not None else True)
-		logging.info(f'initialized core {self} from {filename}')
-
-	def __str__(self):
-		return f"{self._cn_name}@{self._host} [IP: {self.getIP()}]"
-
-	def __repr__(self):
-		return self.__str__()
-
-	def _exec_script(host, line, silent):
-		# take off "!", split in words
-		words = line[1:].strip().split(" ")
-		script_name = words[0]
-		options = " ".join(words[1:])
-		ret = cls_cmd.runScript(host, script_name, 300, parameters=options, silent=silent)
-		return ret
-
-	def _command(self, cmd_list, must_succeed=False, silent=False):
-		succeeded = True
-		output = ""
-		with cls_cmd.getConnection(self._host) as c:
-			for cmd in cmd_list:
-				cmd = cmd.strip()
-				if cmd.startswith("!"):
-					ret = CoreNetwork._exec_script(self._host, cmd, silent=silent)
-				else:
-					ret = c.run(cmd, silent=silent)
-				output += ret.stdout
-				if ret.returncode != 0:
-					logging.warn(f"cmd \"{cmd}\" returned code {ret.returncode}, stdout {ret.stdout}")
-				if ret.returncode != 0 and must_succeed:
-					succeeded = False
-					break
-		return succeeded, output
-
-	def deploy(self):
-		# we first undeploy to make sure the core has been stopped
-		logging.info(f'undeploy core network {self} before deployment')
-		self._command(self._undeploy)
-		logging.info(f'deploy core network {self}')
-		success, output = self._command(self._deploy, must_succeed=True)
-		if not success:
-			logging.error(f'failure during deployment of core network {self}:\n{output}')
-			return False, output
-		logging.info(f'retrieve IP address')
-		ip = self.getIP()
-		if ip is None:
-			logging.error(f'could not retrieve pingable address of core network {self}')
-			return False, output
-		logging.info(f'deployed core network {self}, pingable IP address {ip}')
-		return True, output
-
-	def _collect_logs(self, log_dir):
-		logging.info(f'collecting logs into (local) {log_dir}')
-		remote_dir = "/tmp/cn-undeploy-logs"
-		with cls_cmd.getConnection(self._host) as c:
-			# create a directory for log collection
-			c.run(f'rm -rf {remote_dir}')
-			ret = c.run(f'mkdir {remote_dir}')
-			if ret.returncode != 0:
-				logging.error("cannot create directory for log collection")
-				return []
-			# inform core network implementation where to store logs
-			# (remote_dir), and trigger log collection
-			log_cmd = [s.replace('%%log_dir%%', remote_dir) for s in self._logCollect]
-			self._command(log_cmd)
-			# enumerate collected files
-			ret = c.run(f'ls {remote_dir}/*')
-			if ret.returncode != 0:
-				logging.error("cannot enumerate log files")
-				return []
-			log_files = []
-			# copy them to the executor one by one, and store in log_dir
-			for f in ret.stdout.split("\n"):
-				l = f.replace(remote_dir, log_dir)
-				c.copyin(f, l)
-				log_files.append(l)
-			c.run(f'rm -rf {remote_dir}')
-			return log_files
-
-	def undeploy(self, log_dir=None):
-		log_files = []
-		if log_dir is not None:
-			log_files = self._collect_logs(log_dir)
-		else:
-			logging.warning("no directory for log collection specified, cannot retrieve core network logs")
-		logging.info(f'undeploy core network {self}')
-		_, output = self._command(self._undeploy)
-		return log_files, output
-
-	def getIP(self):
-		success, output = self._command(self._getNetwork)
-		result = re.search(r'inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output)
-		if success and result and result.group('ip'):
-			return result.group('ip')
-		return None
-
-	def getCmdPrefix(self):
-		return self._cmd_prefix or ""
-
-	def getHost(self):
-		return self._host
-
-	def runIperf3Server(self):
-		return self._run_iperf

ci-scripts/cls_module.py

@@ -62,7 +62,10 @@ class Module_UE:
 			self.trace = m.get('trace') == True
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
-			logging.info(f'initialized UE {self} from {filename}')
+			self.runIperf3Server = m.get('RunIperf3Server', True)
+			self.namespace = m.get('Namespace')
+			self.cnPath = m.get('CNPath')
+			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
 
 	def __str__(self):
 		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
@@ -162,7 +165,7 @@ class Module_UE:
 
 	def getIP(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search(r'inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output.stdout)
+		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output.stdout)
 		if result and result.group('ip'):
 			ip = result.group('ip')
 			return ip
@@ -170,7 +173,7 @@ class Module_UE:
 
 	def checkMTU(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search(r'mtu (?P<mtu>[0-9]+)', output.stdout)
+		result = re.search('mtu (?P<mtu>[0-9]+)', output.stdout)
 		if result and result.group('mtu') and int(result.group('mtu')) == self.MTU:
 			logging.debug(f'\u001B[1mUE Module {self.module_name} NIC MTU is {self.MTU} as expected\u001B[0m')
 			return True
@@ -187,6 +190,15 @@ class Module_UE:
 	def getHost(self):
 		return self.host
 
+	def getNamespace(self):
+		return self.namespace
+
+	def getCNPath(self):
+		return self.cnPath
+
+	def getRunIperf3Server(self):
+		return self.runIperf3Server
+
 	def getCmdPrefix(self):
 		return self.cmd_prefix if self.cmd_prefix else ""
 

ci-scripts/cls_native.py

@@ -22,15 +22,11 @@
 
 import logging
 import re
-import os
 
 import cls_cmd
 import cls_oai_html
-import cls_analysis
 import constants as CONST
 
-LOG_PATH_PHYSIM = 'phy_sim_logs'
-
 class Native():
 
 	def Build(test_case, HTML, host, directory, options):
@@ -66,19 +62,3 @@ class Native():
 			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
-
-	def Run_Physim(HTML, host, directory, options, physim_test, threshold):
-		logging.debug(f'Runnin {physim_test} on server: {host}')
-		workSpacePath = f'{directory}/cmake_targets'
-		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')
-		runLogFile=f'physim_{HTML.testCase_id}.log'
-		with cls_cmd.getConnection(host) as cmd:
-			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')
-			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')
-		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)
-		if success:
-			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
-		else:
-			logging.error(msg)
-			HTML.CreateHtmlTestRowQueue(options, 'KO', [msg])
-		return success

ci-scripts/cls_oai_html.py

@@ -147,7 +147,7 @@ class HTMLManagement():
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
 			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			if self.ranAllowMerge != '' and self.ranCommitID != 'develop':
+			if self.ranAllowMerge != '':
 				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
 				commit_message = commit_message.strip()
 				self.htmlFile.write('     <tr>\n')

ci-scripts/cls_oaicitest.py

@@ -43,16 +43,16 @@ import json
 #import our libs
 import helpreadme as HELP
 import constants as CONST
+import sshconnection
 
 import cls_module
-import cls_corenetwork
 import cls_cmd
 
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
 #-----------------------------------------------------------
 def Iperf_ComputeModifiedBW(idx, ue_num, profile, args):
-	result = re.search(r'-b\s*(?P<iperf_bandwidth>[0-9\.]+)(?P<unit>[KMG])', str(args))
+	result = re.search('-b\s*(?P<iperf_bandwidth>[0-9\.]+)(?P<unit>[KMG])', str(args))
 	if result is None:
 		raise ValueError(f'requested iperf bandwidth not found in iperf options "{args}"')
 	iperf_bandwidth = float(result.group('iperf_bandwidth'))
@@ -78,7 +78,7 @@ def Iperf_ComputeModifiedBW(idx, ue_num, profile, args):
 	return iperf_bandwidth_new, args_new
 
 def Iperf_ComputeTime(args):
-	result = re.search(r'-t\s*(?P<iperf_time>\d+)', str(args))
+	result = re.search('-t\s*(?P<iperf_time>\d+)', str(args))
 	if result is None:
 		raise Exception('Iperf time not found!')
 	return int(result.group('iperf_time'))
@@ -184,10 +184,11 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 			return (False, 'Iperf UDP: Server report not found!')
 		if (os.path.getsize(server_filename)==0):
 			return (False, 'Iperf UDP: Log file is empty')
-		statusTemplate = r'(?:|\[ *\d+\].*) +0\.0+-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
+		# Computing the requested bandwidth in float
+		statusTemplate = r'(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
 		with open(server_filename, 'r') as server_file:
 			for line in server_file.readlines():
-				result = re.search(statusTemplate, str(line)) or result
+				result = re.search(statusTemplate, str(line))
 		if result is None:
 			return (False, 'Could not parse server report!')
 		bitrate = float(result.group('bitrate'))
@@ -210,7 +211,7 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 		jit_msg = f'Jitter      : {jitter}'
 		pal_msg = f'Packet Loss : {packetloss}'
 		if float(packetloss) > float(iperf_packetloss_threshold):
-			pal_msg += f' (too high! >{iperf_packetloss_threshold}%)'
+			pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
 		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
 
 def Custom_Command(HTML, node, command, command_fail):
@@ -363,21 +364,29 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def Ping_common(self, cn, ue, logPath):
+	def Ping_common(self, EPC, ue, logPath):
+		# Launch ping on the EPC side (true for ltebox and old open-air-cn)
 		ping_status = 0
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
-		svrIP = cn.getIP()
-		if not svrIP:
-			return (False, f"CN {cn.getName()} has no IP address")
 		ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
-		ping_time = re.findall(r"-c *(\d+)",str(self.ping_args))
+		ping_time = re.findall("-c *(\d+)",str(self.ping_args))
 		local_ping_log_file = f'{logPath}/{ping_log_file}'
-		if re.search('%cn_ip%', self.ping_args) or re.search(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+', self.ping_args):
-			raise Exception(f"ping_args should not have IP address: {self.ping_args}")
+		# if has pattern %cn_ip%, replace with core IP address, else we assume the IP is present
+		if re.search('%cn_ip%', self.ping_args):
+			#target address is different depending on EPC type
+			if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
+				self.ping_args = re.sub('%cn_ip%', EPC.MmeIPAddress, self.ping_args)
+			elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
+				self.ping_args = re.sub('%cn_ip%', EPC.MmeIPAddress, self.ping_args)
+			elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE):
+				self.ping_args = re.sub('%cn_ip%', '172.21.6.100', self.ping_args)
+			else:
+				self.ping_args = re.sub('%cn_ip%', EPC.IPAddress, self.ping_args)
+		#ping from module NIC rather than IP address to make sure round trip is over the air
 		interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
-		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {svrIP} 2>&1 | tee /tmp/{ping_log_file}'
+		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} 2>&1 | tee /tmp/{ping_log_file}'
 		cmd = cls_cmd.getConnection(ue.getHost())
 		response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
 		ue_header = f'UE {ue.getName()} ({ueIP})'
@@ -391,12 +400,12 @@ class OaiCiTest():
 
 		with open(local_ping_log_file, 'r') as f:
 			ping_output = "".join(f.readlines())
-		result = re.search(r', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
+		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
 		if result is None:
 			message = ue_header + ': Packet Loss Not Found!'
 			return (False, message)
 		packetloss = result.group('packetloss')
-		result = re.search(r'rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', ping_output)
+		result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', ping_output)
 		if result is None:
 			message = ue_header + ': Ping RTT_Min RTT_Avg RTT_Max Not Found!'
 			return (False, message)
@@ -426,18 +435,22 @@ class OaiCiTest():
 
 		return (True, message)
 
-	def Ping(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
-		if self.ue_ids == [] or self.svr_id == None:
-			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
+	def Ping(self, HTML, EPC, CONTAINERS):
+		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+
+		if self.ue_ids == []:
+			raise Exception("no module names in self.ue_ids provided")
 		# Creating destination log folder if needed on the python executor workspace
 		with cls_cmd.getConnection('localhost') as local:
 			ymlPath = CONTAINERS.yamlPath[0].split('/')
 			logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
 			local.run(f'mkdir -p {logPath}', silent=True)
-		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
-		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		logging.debug(ues)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(self.Ping_common, cn, ue, logPath) for ue in ues]
+			futures = [executor.submit(self.Ping_common, EPC, ue, logPath) for ue in ues]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -458,14 +471,15 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
 		return success
 
-	def Iperf_Module(self, cn, ue, idx, ue_num, logPath):
+	def Iperf_Module(self, EPC, ue, svr, idx, ue_num, logPath):
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
-		svrIP = cn.getIP()
+		svrIP = svr.getIP()
 		if not svrIP:
 			return (False, f"Iperf server {ue.getName()} has no IP address")
 
+		runIperf3Server = svr.getRunIperf3Server()
 		iperf_opt = self.iperf_args
 		jsonReport = "--json"
 		serverReport = ""
@@ -482,13 +496,13 @@ class OaiCiTest():
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
 		ue_header = f'UE {ue.getName()} ({ueIP})'
-		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
+		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
 			port = 5002 + idx
 			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False, silent=True)
-			if cn.runIperf3Server():
-				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
+			if runIperf3Server:
+				cmd_svr.run(f'{svr.getCmdPrefix()} nohup timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=t)
 			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=t)
 			# note: copy iperf3 log to the current directory for log analysis and log collection
 			dest_filename = f'{logPath}/{client_filename}'
@@ -503,7 +517,11 @@ class OaiCiTest():
 
 		return (status, f'{ue_header}\n{msg}')
 
-	def Iperf(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
+	def Iperf(self,HTML,EPC,CONTAINERS):
+		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+
 		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
 		if self.ue_ids == [] or self.svr_id == None:
@@ -513,10 +531,11 @@ class OaiCiTest():
 			ymlPath = CONTAINERS.yamlPath[0].split('/')
 			logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
 			local.run(f'mkdir -p {logPath}', silent=True)
-		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
-		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		svr = cls_module.Module_UE(self.svr_id,self.svr_node)
+		logging.debug(ues)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(self.Iperf_Module, cn, ue, i, len(ues), logPath) for i, ue in enumerate(ues)]
+			futures = [executor.submit(self.Iperf_Module, EPC, ue, svr, i, len(ues), logPath) for i, ue in enumerate(ues)]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -537,17 +556,17 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 		return success
 
-	def Iperf2_Unidir(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
+	def Iperf2_Unidir(self,HTML,EPC,CONTAINERS):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip(), infra_file)
-		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip())
+		svr = cls_module.Module_UE(self.svr_id,self.svr_node)
 		ueIP = ue.getIP()
 		if not ueIP:
-			return False
-		svrIP = cn.getIP()
+			return (False, f"UE {ue.getName()} has no IP address")
+		svrIP = svr.getIP()
 		if not svrIP:
-			return False
+			return (False, f"Iperf server {ue.getName()} has no IP address")
 		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
 		ymlPath = CONTAINERS.yamlPath[0].split('/')
 		logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
@@ -556,15 +575,17 @@ class OaiCiTest():
 		t = iperf_time*2.5
 		with cls_cmd.getConnection('localhost') as local:
 			local.run(f'mkdir -p {logPath}')
-		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
+		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
 			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
 			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> /tmp/{server_filename} &', timeout=t)
-			cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 >> /dev/null', timeout=t)
+			cmd_svr.run(f'{svr.getCmdPrefix()} timeout -vk3 {t} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1', timeout=t)
 			localPath = f'{os.getcwd()}'
 			# note: copy iperf2 log to the directory for log collection
-			cmd_ue.copyin(f'/tmp/{server_filename}', f'{logPath}/{server_filename}')
+			cmd_ue.copyin(f'/tmp/{server_filename}', f'{localPath}/{logPath}/{server_filename}')
+			# note: copy iperf2 log to the current directory for log analysis and log collection
+			cmd_ue.copyin(f'/tmp/{server_filename}', f'{localPath}/{server_filename}')
 			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
-		success, msg = Iperf_analyzeV2UDP(f'{logPath}/{server_filename}', self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+		success, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		ue_header = f'UE {ue.getName()} ({ueIP})'
 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -628,7 +649,7 @@ class OaiCiTest():
 				result = re.search('warning: discard PDU, sn out of window', str(line))
 				if result is not None:
 					nbPduDiscard += 1
-				result = re.search('--nfapi STANDALONE_PNF --node-number 2', str(line))
+				result = re.search('--nfapi STANDALONE_PNF --node-number 2 --sa', str(line))
 				if result is not None:
 					frequency_found = True
 			result = re.search('Exiting OAI softmodem', str(line))
@@ -678,7 +699,7 @@ class OaiCiTest():
 				result = re.search('TRIED TO PUSH MBMS DATA', str(line))
 				if result is not None:
 					mbms_messages += 1
-			result = re.search(r"MIB Information => ([a-zA-Z]{1,10}), ([a-zA-Z]{1,10}), NidCell (?P<nidcell>\d{1,3}), N_RB_DL (?P<n_rb_dl>\d{1,3}), PHICH DURATION (?P<phich_duration>\d), PHICH RESOURCE (?P<phich_resource>.{1,4}), TX_ANT (?P<tx_ant>\d)", str(line))
+			result = re.search("MIB Information => ([a-zA-Z]{1,10}), ([a-zA-Z]{1,10}), NidCell (?P<nidcell>\d{1,3}), N_RB_DL (?P<n_rb_dl>\d{1,3}), PHICH DURATION (?P<phich_duration>\d), PHICH RESOURCE (?P<phich_resource>.{1,4}), TX_ANT (?P<tx_ant>\d)", str(line))
 			if result is not None and (not mib_found):
 				try:
 					mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
@@ -711,7 +732,7 @@ class OaiCiTest():
 					frequency_found = True
 				except Exception as e:
 					logging.error(f'\033[91m UE did not find PBCH\033[0m')
-			result = re.search(r"PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
+			result = re.search("PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
 			if result is not None and (not plmn_found):
 				try:
 					mibMsg = f"PLMN MCC = {result.group('mcc')} MNC = {result.group('mnc')}"
@@ -720,7 +741,7 @@ class OaiCiTest():
 					plmn_found = True
 				except Exception as e:
 					logging.error(f'\033[91m PLMN not found \033[0m')
-			result = re.search(r"Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
+			result = re.search("Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
 			if result is not None:
 				try:
 					mibMsg = f"The operator is: {result.group('operator')}"
@@ -736,7 +757,7 @@ class OaiCiTest():
 					logging.debug(f'\033[94m{mibMsg}\033[0m')
 				except Exception as e:
 					logging.error(f'\033[91m SIB5 InterFreqCarrierFreq element not found \033[0m')
-			result = re.search(r"DL Carrier Frequency/ARFCN : \-*(?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
+			result = re.search("DL Carrier Frequency/ARFCN : \-*(?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
 			if result is not None:
 				try:
 					freq = result.group('carrier_frequency')
@@ -746,7 +767,7 @@ class OaiCiTest():
 					logging.debug(f'\033[94m    DL Carrier Frequency is:  {freq}\033[0m')
 				except Exception as e:
 					logging.error(f'\033[91m    DL Carrier Frequency not found \033[0m')
-			result = re.search(r"AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
+			result = re.search("AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
 			if result is not None:
 				try:
 					prb = result.group('allowed_bandwidth')
@@ -856,35 +877,6 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue(f'N/A', 'OK', messages)
 		return True
 
-	def DeployCoreNetwork(cn_id, HTML):
-		core_name = cn_id.strip()
-		cn = cls_corenetwork.CoreNetwork(core_name)
-		success, output = cn.deploy()
-		logging.info(f"deployment core network {core_name} success {success}, output:\n{output}")
-		if success:
-			msg = f"Started {cn}"
-			HTML.CreateHtmlTestRowQueue(core_name, 'OK', [msg])
-		else:
-			msg = f"deployment of core network {core_name} FAILED"
-			logging.error(msg)
-			HTML.CreateHtmlTestRowQueue(core_name, 'KO', [msg])
-		return success
-
-	def UndeployCoreNetwork(cn_id, HTML):
-		# Ping, Iperf, DeployObject put logs into a path based on YAML. We
-		# can't do this here (because there is no yaml), so hardcode a path for
-		# "cn_logs" for the moment
-		logPath = f'{os.getcwd()}/../cmake_targets/log/cn_logs'
-		with cls_cmd.getConnection('localhost') as local:
-			local.run(f'mkdir -p {logPath}', silent=True)
-		core_name = cn_id.strip()
-		cn = cls_corenetwork.CoreNetwork(core_name)
-		logs, output = cn.undeploy(log_dir=logPath)
-		logging.info(f"undeployed core network {core_name}, logs {logs}, output:\n{output}")
-		message = "Log files: " + ", ".join([os.path.basename(l) for l in logs])
-		HTML.CreateHtmlTestRowQueue(core_name, 'OK', [message])
-		return True
-
 	def LogCollectBuild(self,RAN):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
@@ -903,10 +895,55 @@ class OaiCiTest():
 			SourceCodePath = self.UESourceCodePath
 		else:
 			sys.exit('Insufficient Parameter')
-		with cls_cmd.getConnection(IPAddress) as cmd:
-			d = f'{SourceCodePath}/cmake_targets'
-			cmd.run(f'rm -f {d}/build.log.zip')
-			cmd.run(f'cd {d} && zip -r build.log.zip build_log_*/*')
+		SSH = sshconnection.SSHConnection()
+		SSH.open(IPAddress, UserName, Password)
+		SSH.command(f'cd {SourceCodePath}', '\$', 5)
+		SSH.command('cd cmake_targets', '\$', 5)
+		SSH.command('rm -f build.log.zip', '\$', 5)
+		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
+		SSH.close()
+
+	def LogCollectPing(self,EPC):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if EPC.IPAddress == 'none':
+			sys.exit(0)
+		SSH = sshconnection.SSHConnection()
+		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
+		SSH.command('cd scripts', '\$', 5)
+		SSH.command('rm -f ping.log.zip', '\$', 5)
+		SSH.command('zip ping.log.zip ping*.log', '\$', 60)
+		SSH.command('rm ping*.log', '\$', 5)
+		SSH.close()
+
+	def LogCollectIperf(self,EPC):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if EPC.IPAddress == 'none':
+			sys.exit(0)
+		SSH = sshconnection.SSHConnection()
+		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
+		SSH.command('cd scripts', '\$', 5)
+		SSH.command('rm -f iperf.log.zip', '\$', 5)
+		SSH.command('zip iperf.log.zip iperf*.log', '\$', 60)
+		SSH.command('rm iperf*.log', '\$', 5)
+		SSH.close()
+	
+	def LogCollectOAIUE(self):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if self.UEIPAddress == 'none':
+			sys.exit(0)
+		SSH = sshconnection.SSHConnection()
+		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
+		SSH.command(f'cd cmake_targets', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm -f ue.log.zip', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
+		SSH.close()
 
 	def ShowTestID(self):
 		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')

ci-scripts/cls_physim.py

@@ -0,0 +1,262 @@
+# * 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
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#to use logging.info()
+import logging
+#to create a SSH object locally in the methods
+import sshconnection
+#to update the HTML object
+import cls_oai_html
+import cls_cmd
+#for log folder maintenance
+import os
+import re
+
+class PhySim:
+	def __init__(self):
+		self.buildargs = ""
+		self.runargs = ""
+		self.eNBIpAddr = ""
+		self.eNBUserName = ""
+		self.eNBPassWord = ""
+		self.eNBSourceCodePath = ""
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID= ""
+		self.ranAllowMerge= ""
+		self.ranTargetBranch= ""
+		self.forced_workspace_cleanup=False
+		#private attributes
+		self.__workSpacePath=''
+		self.__buildLogFile='compile_phy_sim.log'
+		self.__runLogFile=''
+		self.__runLogPath='phy_sim_logs'
+
+
+#-----------------
+#PRIVATE Methods
+#-----------------
+
+	def __CheckResults_LDPCcudaTest(self,HTML,CONST,testcase_id):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		#retrieve run log file and store it locally$
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
+		mySSH.close()
+		#parse results looking for Encoding and Decoding mean values
+		runResults=[]
+		with open(self.__runLogFile) as f:
+			for line in f:
+				if 'mean' in line:
+					runResults.append(line)
+		#the values are appended for each mean value (2), so we take these 2 values from the list
+		info = runResults[0] + runResults[1]
+
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+
+		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
+		return True
+
+	def __CheckResults_LDPCt2Test(self,HTML,CONST,testcase_id):
+		thrs_KO = int(self.timethrs)
+		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+		#retrieve run log file and store it locally$
+		mySSH.copyin(f'{self.__workSpacePath}{self.__runLogFile}', f'{self.__runLogFile}')
+		mySSH.close()
+		#parse results looking for encoder/decoder processing time values
+
+		with open(self.__runLogFile) as g:
+			for line in g:
+				res_enc = re.search(r"DLSCH encoding time\s+(\d+\.\d+)\s+us",line)
+				res_dec = re.search(r'ULSCH total decoding time\s+(\d+\.\d+)\s+us',line)
+				if res_dec is not None:
+					time = res_dec.group(1)
+					info = res_dec.group(0)
+					break
+				if res_enc is not None:
+					time = res_enc.group(1)
+					info = res_enc.group(0)
+					break
+
+		# In case the T2 board does work properly, there is no statistics
+		if res_enc is None and res_dec is None:
+			logging.error(f'no statistics: res_enc {res_enc} res_dec {res_dec}')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
+			os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+			return False
+
+		#once parsed move the local logfile to its folder
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+		success = float(time) < thrs_KO
+		if success:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
+		else:
+			error_msg = f'Processing time exceeds a limit of {thrs_KO} us'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
+		return success
+
+	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
+		#retrieve run log file and store it locally
+		mySSH = sshconnection.SSHConnection()
+		filename = self.__workSpacePath + self.__runLogFile
+		ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.')
+		if ret != 0:
+			error_msg = f'could not recover test result file {filename}'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
+			return False
+
+		PUSCH_OK = False
+		with open(self.__runLogFile) as f:
+			PUSCH_OK = 'PUSCH test OK' in f.read()
+
+		# once parsed move the local logfile to its folder for tidiness
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+
+		#updating the HTML with results
+		if PUSCH_OK:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"])
+		else:
+			error_msg = 'error: no "PUSCH test OK"'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
+		return PUSCH_OK
+
+	def __CheckBuild_PhySim(self, HTML, CONST):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		#retrieve compile log file and store it locally
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__buildLogFile, '.')
+		#delete older run log file
+		mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5)
+		mySSH.close()
+		#check build result from local compile log file
+		with open(self.__buildLogFile) as f:
+			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
+				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
+				return True
+		logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
+		HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
+		HTML.CreateHtmlTabFooter(False)
+		return False
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+	def Build_PhySim(self,htmlObj,constObj):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+
+		#create working dir
+		mySSH.command('mkdir -p ' + self.eNBSourceCodePath, '\$', 5)
+		mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5)
+
+		if not self.ranRepository.lower().endswith('.git'):
+			self.ranRepository+='.git'
+
+		#git clone
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone '  + self.ranRepository + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		#git config
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
+
+		#git clean depending on self.forced_workspace_cleanup captured in xml
+		if self.forced_workspace_cleanup==True:
+			logging.info('Cleaning workspace ...')
+			mySSH.command('echo ' + self.eNBPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		else:
+			logging.info('Workspace cleaning was disabled')
+
+		# if the commit ID is provided, use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should have already been checked earlier
+		if (self.ranAllowMerge):
+			if self.ranTargetBranch == '':
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+			else:
+				logging.info('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+
+		#build
+		mySSH.command('source oaienv', '\$', 5)
+		mySSH.command('cd cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p log', '\$', 5)
+		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)
+
+		mySSH.close()
+		return __CheckBuild_PhySim(htmlObj,constObj)
+
+
+	def Run_CUDATest(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
+		#create run logs folder locally
+		os.system('mkdir -p ./'+self.__runLogPath)
+		#log file is tc_<testcase_id>.log remotely
+		self.__runLogFile='physim_'+str(testcase_id)+'.log'
+		#open a session for test run
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command('cd '+self.__workSpacePath,'\$',5)
+		#run and redirect the results to a log file
+		mySSH.command(self.__workSpacePath+'ran_build/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
+		mySSH.close()
+		return self.__CheckResults_LDPCcudaTest(htmlObj,constObj,testcase_id)
+
+	def Run_T2Test(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = f'{self.eNBSourceCodePath}/cmake_targets/'
+		#create run logs folder locally
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		#log file is tc_<testcase_id>.log remotely
+		self.__runLogFile=f'physim_{str(testcase_id)}.log'
+		#open a session for test run
+		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+		mySSH.run(f'cd {self.__workSpacePath}')
+		#run and redirect the results to a log file
+		mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1')
+		mySSH.close()
+		return self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id)
+
+	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		self.__runLogFile = f'physim_{testcase_id}.log'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.close()
+		return self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)

ci-scripts/cls_physim1.py

@@ -137,7 +137,9 @@ class PhySim:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')
 
 		# Using helm charts deployment
-		mySSH.command(f'helm install physim ./charts/physims/ --set global.image.version={imageTag} --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
+		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
+		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
+		mySSH.command('helm install physim ./charts/physims/ --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
 		if mySSH.getBefore().count('STATUS: deployed') == 0:
 			logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m')
 			mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30)
@@ -161,7 +163,7 @@ class PhySim:
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 23:
+			if (running_count + completed_count) == 22:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())

ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf

@@ -228,7 +228,7 @@ RUs = (
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 0
-        att_rx         = 6;
+        att_rx         = 0;
         eNB_instances  = [0];
     }
 );

ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf

@@ -230,7 +230,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf

@@ -230,7 +230,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf

@@ -230,7 +230,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf

@@ -191,7 +191,7 @@ RUs = (
          nb_tx          = 1
          nb_rx          = 1
          att_tx         = 6
-         att_rx         = 12;
+         att_rx         = 6;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 125;

ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf

@@ -191,7 +191,7 @@ RUs = (
          nb_tx          = 1
          nb_rx          = 1
          att_tx         = 6
-         att_rx         = 12;
+         att_rx         = 6;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 125;

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "cu-rfsim");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cu.sa.f1.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cucp.sa.f1.conf

@@ -1,6 +1,8 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf

@@ -1,6 +1,8 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cuup.sa.f1.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf

@@ -0,0 +1,225 @@
+Active_gNBs = ( "du-rfsim");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID = 0xe00;
+    gNB_DU_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;
+
+    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_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_address = "192.168.72.142";
+    remote_n_address = "192.168.72.140";
+    local_n_portc   = 500;
+    local_n_portd   = 2152;
+    remote_n_portc  = 501;
+    remote_n_portd  = 2152;
+    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];
+         clock_src = "internal";
+    }
+);  
+
+
+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";
+  nr_phy_log_level = "info";
+  nr_mac_log_level = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  f1ap_log_level   = "info";
+  ngap_log_level   = "debug";
+};

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

@@ -91,8 +91,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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
@@ -189,11 +189,11 @@ RUs = (
          nb_rx          = 1
          # The higher att for TX than RX is because we use a circulator (as for TDD),
          # while we should use a duplexer in the FDD case. However, it uses the same setup.
-         att_tx         = 16
+         att_tx         = 18
          att_rx         = 0;
          bands          = [1];
          max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 110;
+         max_rxgain                    = 108;
          eNB_instances  = [0];
          clock_src = "internal";
     }

ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf

@@ -90,7 +90,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -92,7 +92,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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
@@ -194,11 +194,11 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 1
          nb_rx          = 1
-         att_tx         = 4;
-         att_rx         = 4;
+         att_tx         = 10;
+         att_rx         = 10;
          bands          = [78];
          max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 106;
+         max_rxgain                    = 114;
          eNB_instances  = [0];
          clock_src = "internal";
     }

ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf

@@ -1,43 +0,0 @@
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "nfapi";
-  remote_n_address = "192.168.71.140"; // vnf addr
-  local_n_address  = "192.168.71.141"; // pnf addr
-  local_n_portc    = 50000; // pnf p5 port [!]
-  remote_n_portc   = 50001; // vnf p5 port
-  local_n_portd    = 50010; // pnf p7 port
-  remote_n_portd   = 50011; // vnf p7 port
-  prach_dtx_threshold   = 120;
-  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          = [7];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-});
-
-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";
-};

ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf

@@ -1,31 +0,0 @@
-usrp-tx-thread-config = 1;
-tune-offset = 30720000;
-
-L1s = ({
-  num_cc = 1;
-  tr_n_preference = "nfapi";
-  remote_n_address = "127.0.0.1"; // vnf addr
-  local_n_address  = "127.0.0.1"; // pnf addr
-  local_n_portc    = 50000; // pnf p5 port [!]
-  remote_n_portc   = 50001; // vnf p5 port
-  local_n_portd    = 50010; // pnf p7 port
-  remote_n_portd   = 50011; // vnf p7 port
-  prach_dtx_threshold = 120;
-  pusch_dtx_threshold = 20;
-  max_ldpc_iterations = 10;
-});
-
-RUs = ({
-  local_rf       = "yes"
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain     = 75;
-  eNB_instances  = [0];
-  #clock_src = "internal";
-  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
-});
-

ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf

@@ -1,224 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 4;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    do_CSIRS              = 1;
-    do_SRS                = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 4100.16 MHz
-      absoluteFrequencySSB                                             = 673344;
-      # this is 4071 MHz
-      dl_absoluteFrequencyPointA                                       = 671400;
-      dl_frequencyBand                                                 = 77;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 162;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 162;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-     #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
-# 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                               = -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                                           = 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;
-#one (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                                                  = -70;
-
-      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                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      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.61.132"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference = "nfapi";
-  remote_s_address = "127.0.0.1"; // pnf addr [!]
-  local_s_address  = "127.0.0.1"; // vnf addr
-  local_s_portc    = 50001; // vnf p5 port
-  remote_s_portc   = 50000; // pnf p5 port [!]
-  local_s_portd    = 50011; // vnf p7 port [!]
-  remote_s_portd   = 50010; // pnf p7 port [!]
-
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 250;
-  pusch_FailureThres          = 100;
-  ul_max_mcs		      = 28;
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea1", "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia1", "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 = "yes";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -2,6 +2,7 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
 nfapi = "AERIAL";
 
 gNBs =
@@ -35,6 +36,13 @@ gNBs =
     do_SRS                = 0;
     min_rxtxtime          = 2;
 
+    pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+    );
+
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
@@ -109,8 +117,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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
@@ -181,7 +189,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :

ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf

@@ -90,7 +90,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf

@@ -89,7 +89,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf

@@ -31,11 +31,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3319.68 MHz
-      absoluteFrequencySSB                                             = 621312;
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 641032;
       dl_frequencyBand                                                 = 78;
-      # this is 3300.6 MHz
-      dl_absoluteFrequencyPointA                                       = 620040;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640000;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -89,7 +89,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf

@@ -89,7 +89,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf

@@ -91,7 +91,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf

@@ -84,8 +84,8 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#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;

ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf

@@ -89,8 +89,8 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#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;

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf

@@ -1,301 +0,0 @@
-Active_gNBs = ( "5G-GOA-gNB");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "5G-GOA-gNB";
-
-    // 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:
-
-    sib1_tda                                                  = 5;
-    min_rxtxtime                                              = 6;
-    num_dlharq                                                = 32;
-    num_ulharq                                                = 32;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # GSCN 6221
-      absoluteFrequencySSB                                          = 497770;
-      dl_frequencyBand                                              = 254;
-      # this is 2486.15 MHz
-      dl_absoluteFrequencyPointA                                    = 497230;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 0;
-        dl_carrierBandwidth                                         = 25;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 0;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 2;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 254;
-      # this is 1612.65 MHz
-      ul_absoluteFrequencyPointA                                    = 322530;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 0;
-      ul_carrierBandwidth                                           = 25;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 0;
-      #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;
-#one (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                                      = 0;
-# 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_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                                             = 0;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 0;
-      # 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;
-
-  #ext2
-    #ntn_Config_r17
-      cellSpecificKoffset_r17                                       = 40;
-      ta-Common-r17                                                 = 4634000; # 18.87 ms
-      ta-CommonDrift-r17                                            = -230000; # -46 µs/s
-      positionX-r17                                                 = 0;
-      positionY-r17                                                 = -2166908; # -2816980.4 m
-      positionZ-r17                                                 =  4910784; #  6384019.2 m
-      velocityVX-r17                                                = 0;
-      velocityVY-r17                                                = 115246; # 6914.76 m/s
-      velocityVZ-r17                                                =  50853; # 3051.18 m/s
-  }
-
-  );
-
-    TIMERS :
-    {
-      sr_ProhibitTimer       = 0;
-      sr_TransMax            = 64;
-      sr_ProhibitTimer_v1700 = 512;
-      t300                   = 2000;
-      t301                   = 2000;
-      t319                   = 2000;
-    };
-
-    # ------- 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"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/26";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/26";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-#  ulsch_max_frame_inactivity  = 0;
-  pusch_TargetSNRx10          = 150;
-  pucch_TargetSNRx10          = 200;
-  dl_max_mcs                  = 9;
-  ul_max_mcs                  = 9;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 150;
-  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          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 114;
-         sf_extension                  = 0;
-         eNB_instances  = [0];
-         sdr_addrs = "type=x300";
-         clock_src = "internal";
-         # if_freq = 3700000000L;
-         # if_offset = 1000000;
-    }
-);
-
-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_DISABLE";
-  }
-);
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = 4043;
-  options = ("chanmod"); #("saviq"); or/and "chanmod"
-  prop_delay = 20;
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
-channelmod = {
-  max_chan=10;
-  modellist="modellist_rfsimu_1";
-  modellist_rfsimu_1 = (
-    {
-      model_name     = "rfsimu_channel_enB0"
-      type           = "SAT_LEO_TRANS";
-      noise_power_dB = -100;
-    },
-    {
-      model_name     = "rfsimu_channel_ue0"
-      type           = "SAT_LEO_TRANS";
-      noise_power_dB = -100;
-    }
-  );
-};
-
-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";
-};

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf

@@ -1,282 +0,0 @@
-Active_gNBs = ( "5G-GOA-gNB");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "5G-GOA-gNB";
-
-    // 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:
-
-    sib1_tda                                                  = 5;
-    min_rxtxtime                                              = 6;
-    disable_harq                                              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # GSCN 6221
-      absoluteFrequencySSB                                          = 497770;
-      dl_frequencyBand                                              = 254;
-      # this is 2486.15 MHz
-      dl_absoluteFrequencyPointA                                    = 497230;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 0;
-        dl_carrierBandwidth                                         = 25;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 0;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 2;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 254;
-      # this is 1612.65 MHz
-      ul_absoluteFrequencyPointA                                    = 322530;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 0;
-      ul_carrierBandwidth                                           = 25;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 0;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 7;
-#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;
-#one (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                                  = 1;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        # not allowed when format < 4
-        # msg1_SubcarrierSpacing                                      = 0;
-# 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_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                                             = 0;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 0;
-      # 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;
-
-  #ext2
-    #ntn_Config_r17
-      cellSpecificKoffset_r17                                       = 478;
-      ta-Common-r17                                                 = 58629666; # 238.74 ms
-      positionX-r17                                                 = 0;
-      positionY-r17                                                 = 0;
-      positionZ-r17                                                 = 32433846;
-      velocityVX-r17                                                = 0;
-      velocityVY-r17                                                = 0;
-      velocityVZ-r17                                                = 0;
-  }
-
-  );
-
-    TIMERS :
-    {
-      sr_ProhibitTimer       = 0;
-      sr_TransMax            = 64;
-      sr_ProhibitTimer_v1700 = 512;
-      t300                   = 2000;
-      t301                   = 2000;
-      t319                   = 2000;
-    };
-
-    # ------- 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"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/26";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/26";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-#  ulsch_max_frame_inactivity  = 0;
-  pusch_TargetSNRx10          = 150;
-  pucch_TargetSNRx10          = 200;
-  dl_max_mcs                  = 9;
-  ul_max_mcs                  = 9;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 150;
-  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          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 114;
-         sf_extension                  = 0;
-         eNB_instances  = [0];
-         sdr_addrs = "type=x300";
-         clock_src = "internal";
-         # if_freq = 3700000000L;
-         # if_offset = 1000000;
-    }
-);
-
-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_DISABLE";
-  }
-);
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  prop_delay = 238.74;
-  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";
-};

ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf

@@ -2,6 +2,8 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
+
 gNBs =
 (
  {
@@ -88,8 +90,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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

ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf

@@ -87,7 +87,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.sa.band66.ntn.25prb.rfsim.conf

@@ -28,11 +28,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # GSCN 3855 - 308430
-      absoluteFrequencySSB                                          = 308430;
-      dl_frequencyBand                                              = 255;
-      # this is 1540.35 MHz
-      dl_absoluteFrequencyPointA                                    = 308070;
+      # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
+      absoluteFrequencySSB                                          = 430590;
+      dl_frequencyBand                                              = 66;
+      # this is 2150.43 MHz
+      dl_absoluteFrequencyPointA                                    = 430086;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -47,13 +47,14 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 0;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 0;
+        initialDLBWPcontrolResourceSetZero                          = 2;
         initialDLBWPsearchSpaceZero                                 = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
-      ul_frequencyBand                                              = 255;
-      ul_absoluteFrequencyPointA                                    = 328370;
+      ul_frequencyBand                                              = 66;
+      # this is 1750.43 MHz
+      ul_absoluteFrequencyPointA                                    = 350086;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -87,7 +88,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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
@@ -146,14 +147,7 @@ gNBs =
 
   #ext2
     #ntn_Config_r17
-      cellSpecificKoffset_r17                                       = 478; //GEO
-      ta-Common-r17                                                 = 58629666; # 238.74 ms
-      positionX-r17                                                 = 0;
-      positionY-r17                                                 = 0;
-      positionZ-r17                                                 = 32433846;
-      velocityVX-r17                                                = 0;
-      velocityVY-r17                                                = 0;
-      velocityVZ-r17                                                = 0;
+      cellSpecificKoffset_r17                                       = 478;
   }
 
   );

ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf

@@ -88,7 +88,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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

ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf

@@ -2,6 +2,7 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
 usrp-tx-thread-config = 1;
 tune-offset = 30720000;
 
@@ -20,6 +21,7 @@ gNBs =
 
     ////////// Physical parameters:
 
+    ssb_SubcarrierOffset  = 0;
     pdsch_AntennaPorts_XP = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
@@ -33,9 +35,9 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 4100.16 MHz
+      # this is 3300.60 MHz + 81*12*30e-3 MHz = 3329.76
       absoluteFrequencySSB                                             = 673344;
-      # this is 4071 MHz
+      # this is 3300.60 MHz
       dl_absoluteFrequencyPointA                                       = 671400;
       dl_frequencyBand                                                 = 77;
       #scs-SpecificCarrierList
@@ -91,8 +93,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf

@@ -13,17 +13,24 @@ gNBs =
     tracking_area_code  =  1;
     plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
 
+    //nr_cellid = 12345678L;
     nr_cellid = 1;
 
     ////////// Physical parameters:
 
     pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
+    pdsch_AntennaPorts_N1 = 1;
+    maxMIMO_layers        = 2;
     pusch_AntennaPorts    = 4;
     do_CSIRS              = 1;
-    do_SRS                = 0;
-    force_UL256qam_off    = 1;
+    do_SRS                = 0 ;
+
+    pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 11;
+        searchSpaceZero = 0;
+      }
+    );
 
     servingCellConfigCommon = (
     {
@@ -31,12 +38,11 @@ gNBs =
       physCellId                                                    = 0;
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # center frequency = 4049.76 MHz
-      # selected SSB frequency = 4049.76 MHz
-      absoluteFrequencySSB                                          = 669984;
+      # this is 3450.72 MHz (center frequency)
+      absoluteFrequencySSB                                          = 666624;
       dl_frequencyBand                                              = 77;
-      # frequency point A = 4000.62 MHz
-      dl_absoluteFrequencyPointA                                    = 666708;
+      # this is 3401.58 MHz
+      dl_absoluteFrequencyPointA                                    = 663348;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -89,8 +95,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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
@@ -178,8 +184,10 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 250;
+  pusch_TargetSNRx10          = 180;
+  pucch_TargetSNRx10          = 230;
+  ul_bler_target_upper=.35;
+  ul_bler_target_lower=.15;
   pusch_FailureThres          = 100;
 }
 );
@@ -203,7 +211,7 @@ RUs = (
   local_rf       = "no";
   nb_tx          = 4;
   nb_rx          = 4;
-  att_tx         = 0;
+  att_tx         = 0
   att_rx         = 0;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
@@ -211,12 +219,22 @@ RUs = (
   sf_extension                  = 0;
   eNB_instances  = [0];
   ru_thread_core = 5;
-  sl_ahead       = 10;
+  sl_ahead       = 5;
+  clock_src = "internal";
   tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
+  do_precoding = 0; # needs to match O-RU configuration
 }
 );
 
+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
@@ -234,8 +252,7 @@ security = {
   drb_integrity = "no";
 };
 
-log_config :
-{
+log_config : {
   global_log_level = "info";
   hw_log_level     = "info";
   phy_log_level    = "info";
@@ -249,20 +266,28 @@ log_config :
 
 fhi_72 = {
   dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
-  dpdk_iova_mode = "VA";
   system_core = 0;
   io_core = 1;
   worker_cores = (2);
-  ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9600;
+  du_addr = ("76:76:64:6e:00:01", "76:76:64:6e:00:01");
+  ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb");
+  mtu = 9216; # check if xran uses this properly
   fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
+    Tadv_cp_dl = 125;
+    T2a_cp_dl = (285, 429); # (min, max)
+    T2a_cp_ul = (285, 429); # (min, max)
+    T2a_up = (125, 428); # (min, max)
+    Ta3 = (130, 170); # (min, max)
+    T1a_cp_dl = (285, 470); # (min, max)
+    T1a_cp_ul = (285, 429); # (min, max)
+    T1a_up = (125, 350); # (min, max)
+    Ta4 = (110, 180); # (min, max)
     ru_config = {
       iq_width = 9;
       iq_width_prach = 9;
     };
+    prach_config = {
+      eAxC_offset = 4;
+    };
   });
 };

ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf

@@ -2,6 +2,7 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
 usrp-tx-thread-config = 1;
 
 gNBs = (
@@ -31,10 +32,10 @@ gNBs = (
 
     # downlinkConfigCommon
       # frequencyInfoDL
-      # this is 4100.16 MHz
+      # this is 3900.60 MHz + (134 PRBs + 4 SCs)@30kHz SCS (GSCN: 8158)
       absoluteFrequencySSB                  = 673344;
       dl_frequencyBand                      = 77;
-      # this is 4051.02 MHz
+      # this is 3900.60 MHz
       dl_absoluteFrequencyPointA            = 670068;
 
       # scs-SpecificCarrierList
@@ -91,8 +92,8 @@ gNBs = (
           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;
-          # one (0..15) 4,8,12,16,...60,64
+          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

ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf

@@ -1,4 +1,4 @@
-Active_gNBs = ( "gnb-rfsim");
+Active_gNBs = ( "gnb-l2sim-vnf");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -6,20 +6,14 @@ gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gnb-rfsim";
+    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
-
-#     tr_s_preference     = "local_mac"
+    nr_cellid = 12345678L;
 
     ////////// Physical parameters:
 
@@ -33,45 +27,44 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-      absoluteFrequencySSB                                          = 621312;
-      # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                       = 620040;
+      # 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                                            = 189
+        dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=189 (275*(275-L+1) + 275-1-RBstart)
-        initialDLBWPlocationAndBandwidth                                        =  24199;
+        # 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;
+        initialDLBWPsubcarrierSpacing                                   = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 11;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-
+        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPsearchSpaceZero                                     = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
+      ul_frequencyBand                                              = 78;
       #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
+      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 189;
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        =  24199;
+        initialULBWPlocationAndBandwidth                            = 12952;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
+        initialULBWPsubcarrierSpacing                               = 1;
       #rach-ConfigCommon
         #rach-ConfigGeneric
           prach_ConfigurationIndex                                  = 98;
@@ -79,8 +72,8 @@ gNBs =
 #0 = one, 1=two, 2=four, 3=eight
           prach_msg1_FDM                                            = 0;
           prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          preambleReceivedTargetPower                               = -104;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
           preambleTransMax                                          = 6;
 #powerRampingStep
@@ -88,12 +81,12 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        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;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#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;
@@ -147,7 +140,7 @@ gNBs =
       nrofUplinkSlots                                               = 2;
       nrofUplinkSymbols                                             = 4;
 
-  ssPBCH_BlockPower                                             = -25;
+      ssPBCH_BlockPower                                             = -25;
   }
 
   );
@@ -161,60 +154,35 @@ gNBs =
         SCTP_OUTSTREAMS = 2;
     };
 
+
     ////////// AMF parameters:
-        amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
-        NETWORK_INTERFACES :
-        {
 
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
-           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        };
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.128";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.128";
+        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
+    };
 
   }
 );
 
 MACRLCs = (
-  {
-    num_cc           = 1;
-    tr_s_preference  = "local_L1";
-    tr_n_preference  = "local_RRC";
-    pusch_TargetSNRx10 = 200;
-    pucch_TargetSNRx10 = 200;
-  }
+        {
+        num_cc = 1;
+        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";
+        }
 );
 
-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];
-         sf_extension = 0
-         sdr_addrs = "serial=XXXXXXX"
-    }
-);
-
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
@@ -241,5 +209,5 @@ security = {
        rlc_log_level                         ="info";
        pdcp_log_level                        ="info";
        rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
     };

ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf

@@ -26,6 +26,14 @@ gNBs =
     pdsch_AntennaPorts_XP                                     = 1;
     pusch_AntennaPorts                                        = 1;
 
+
+    pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+    );
+
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
@@ -89,8 +97,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf

@@ -91,8 +91,8 @@ gNBs =
         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;
-#one (0..15) 4,8,12,16,...60,64
+        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

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf

@@ -1,239 +0,0 @@
-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 = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 12345678L
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
-#spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-      #frequencyInfoDL
-      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-      absoluteFrequencySSB                                          = 621312;
-      # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                    = 620040;
-      #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                  = 4;
-      #one (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_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"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.151";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.151";
-        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;
-  }
-);
-
-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];
-       sf_extension                  = 0;
-       sdr_addrs                     = "serial=XXXXXXX";
-    }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-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                        ="info";
-};
-
-e2_agent = {
-  near_ric_ip_addr = "192.168.70.150";
-  #sm_dir = "/path/where/the/SMs/are/located/"
-  sm_dir = "/usr/local/lib/flexric/"
-};

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf

@@ -21,6 +21,12 @@ gNBs =
     do_CSIRS                                                  = 0;
     do_SRS                                                    = 0;
     min_rxtxtime = 6;
+      pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+      );
 
     servingCellConfigCommon = (
     {
@@ -88,7 +94,7 @@ gNBs =
 #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;
-#one (0..15) 4,8,12,16,...60,64
+#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