Merge branch 'integration_2022_wk42b' into 'develop'

integration_2022_wk42b See merge request oai/openairinterface5g!1773 MR !1479 [CI] Update for retransmission checkers MR !1733 pusch_Config harmonization MR !1748 Fixes for build on centos 7/8, SIMDE, auto-detect AVX2/512 and architecture MR !1756 feat(ci): adding push / pull images operations to/from a local registry MR !1760 Add time stamp in the logs MR !1761 Merge targets/COMMON to executables MR !1771 Draft: Remove CN_UTIL MR !1770 (fix): removing the amf fqdn paramter MR !1768 Rename radio folder MR !1766 NR UE fix rxdata allocation MR !1720 NR MIMO 2x2 Support Hooks in L2simulator
2022-10-21 13:09:39 +00:00
parent 3bc86d69c0 925563ba97
commit a0fae95c79
246 changed files with 9068 additions and 3150 deletions
@@ -55,17 +55,17 @@ if (${RF_BOARD} STREQUAL "OAI_USRP")
  find_package(Boost REQUIRED)

 elseif (${RF_BOARD} STREQUAL "OAI_IRIS")
-    include_directories("${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/")
+    include_directories("${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/")

    set(HW_SOURCE ${HW_SOURCE}
-            ${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/iris_lib.cpp)
+            ${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/iris_lib.cpp)
    LINK_DIRECTORIES("/usr/local/lib")
    set(option_HW_lib "-lSoapySDR -rdynamic -ldl")

 elseif (${RF_BOARD} STREQUAL "OAI_AW2SORI")
-    include_directories("${OPENAIR_DIR}/sdr/AW2SORI")
+    include_directories("${OPENAIR_DIR}/radio/AW2SORI")
    set(HW_SOURCE ${HW_SOURCE}
-	    ${OPENAIR_DIR}/sdr/AW2SORI/ARCH/AW2SORI/oaiori.c)
+	    ${OPENAIR_DIR}/radio/AW2SORI/ARCH/AW2SORI/oaiori.c)
    LINK_DIRECTORIES("/usr/local/lib")
    set(openair_HW_lib "-shared -fPIC -msse4 -g -ggdb -lori")

@@ -193,43 +193,56 @@ endif ()
 if (CMAKE_BUILD_TYPE STREQUAL "")
   set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 endif()
-message("CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
+message(STATUS "CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
 add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." Debug Release RelWithDebInfo MinSizeRel)

-Message("Architecture is ${CMAKE_SYSTEM_PROCESSOR}")
 # 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   
-if(EXISTS  "/proc/cpuinfo")
-   file(STRINGS "/proc/cpuinfo" CPUINFO REGEX flags LIMIT_COUNT 1)
-   message("AVX512 is ${AVX512}")
-   message("AVX2 is ${AVX2}")
-   if ("${AVX512}" STREQUAL "False")
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mno-avx512f -march=native -DSIMDE_X86_AVX2_NATIVE -DSIMDE_X86_AVX2_NATIVE -DSIMDE_X86_AVX512BW_NATIVE -DSIMDE_X86_AVX512F_NATIVE -DSIMDE_X86_AVX512VL_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_GFNI_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE4_1_NATIVE -DSIMDE_X86_SSE4_2_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_SSSE3_NATIVE -DSIMDE_X86_VPCLMULQDQ_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
-   else()
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512")   
-   endif()
-   if (CPUINFO MATCHES "avx2" AND "${AVX2}" STREQUAL "True")
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX2_NATIVE -DSIMDE_X86_VPCLMULQDQ_NATIVE")
-   endif()
-   if (CPUINFO MATCHES "sse4_1")
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_1_NATIVE")
-   endif()
-   if (CPUINFO MATCHES "sse4_2")
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_2_NATIVE")
-   endif()
-   if (CPUINFO MATCHES "ssse3")
-      set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
-   endif()
+execute_process(COMMAND uname -m OUTPUT_VARIABLE CPUARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "CPUARCH ${CPUARCH}")
+if(EXISTS "/proc/cpuinfo")
+  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")
+
+eval_boolean(AUTODETECT_AVX2 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx2")
+add_boolean_option(AVX2 ${AUTODETECT_AVX2} "Whether AVX2 intrinsics is available on the host processor")
+
+if(${CPUARCH} STREQUAL "x86_64" AND DEFINED CPUFLAGS)
+  # The following intrinsics are assumed to be available on any x86 system
+  # (avx, f16c, fma, gnfi, mmx, pclmul, sse, sse2, sse3, xop)
+  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_GFNI_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
+  message(STATUS "AVX512 intrinsics are ${AVX512}")
+  if(${AVX512})
+    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX512BW_NATIVE -DSIMDE_X86_AVX512F_NATIVE -DSIMDE_X86_AVX512VL_NATIVE -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512")
+  else()
+    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mno-avx512f -march=native")
+  endif()
+  message(STATUS "AVX2 intrinsics are ${AVX2}")
+  if(${AVX2})
+    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX2_NATIVE -DSIMDE_X86_VPCLMULQDQ_NATIVE")
+  endif()
+  if (CPUINFO MATCHES "sse4_1")
+    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_1_NATIVE")
+  endif()
+  if(CPUINFO MATCHES "sse4_2")
+    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_2_NATIVE")
+  endif()
+  if(CPUINFO MATCHES "ssse3")
+    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
+  endif()
+elseif(${CPUARCH} NOT STREQUAL "x86_64")
+  message(FATAL_ERROR "Cannot compile for CPU architecture ${CPUARCH}")
 endif()

 set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -fno-var-tracking-assignments -march=native")

-Message("C_FLAGS_PROCESSOR is ${C_FLAGS_PROCESSOR}")
-
-#
 # add autotools definitions that were maybe used!
-
 add_definitions("-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP")

 set(commonOpts "-pipe -Wno-packed-bitfield-compat -fPIC -Wall -fno-strict-aliasing -rdynamic")
@@ -276,7 +289,7 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${C
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
-set(CMAKE_C_FLAGS_DEBUG "${debugOpt} -O0")
+set(CMAKE_C_FLAGS_DEBUG "${debugOpt} -Og")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${debugOpt} -O2")
 set(CMAKE_C_FLAGS_RELEASE "-O3")

@@ -290,7 +303,6 @@ set(GIT_COMMIT_DATE   "UNKNOWN")

 find_package(Git)
 if(GIT_FOUND)
-  message("git found: ${GIT_EXECUTABLE}")
  # Get the current working branch
  execute_process(
    COMMAND git rev-parse --abbrev-ref HEAD
@@ -752,53 +764,53 @@ set (SHLIB_LOADER_SOURCES
 ######################################################################

 set(HWLIB_USRP_SOURCE
-  ${OPENAIR_DIR}/sdr/USRP/USERSPACE/LIB/usrp_lib.cpp
+  ${OPENAIR_DIR}/radio/USRP/USERSPACE/LIB/usrp_lib.cpp
  )
 add_library(oai_usrpdevif MODULE ${HWLIB_USRP_SOURCE} )
 target_include_directories(oai_usrpdevif PRIVATE
-  "${OPENAIR_DIR}/sdr/USRP/USERSPACE/LIB/"
+  "${OPENAIR_DIR}/radio/USRP/USERSPACE/LIB/"
  ${Boost_INCLUDE_DIR}
 )
 target_link_libraries(oai_usrpdevif uhd)

-include_directories("${OPENAIR_DIR}/sdr/BLADERF/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/radio/BLADERF/USERSPACE/LIB/")
 set(HWLIB_BLADERF_SOURCE
-  ${OPENAIR_DIR}/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.c
+  ${OPENAIR_DIR}/radio/BLADERF/USERSPACE/LIB/bladerf_lib.c
  )
 add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
 target_link_libraries(oai_bladerfdevif bladeRF)

-include_directories("${OPENAIR_DIR}/sdr/LMSSDR/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/radio/LMSSDR/USERSPACE/LIB/")

 set(HWLIB_LMSSDR_SOURCE
-  ${OPENAIR_DIR}/sdr/LMSSDR/USERSPACE/LIB/lms_lib.cpp
+  ${OPENAIR_DIR}/radio/LMSSDR/USERSPACE/LIB/lms_lib.cpp
  )
 add_library(oai_lmssdrdevif MODULE ${HWLIB_LMSSDR_SOURCE} )
 target_include_directories(oai_lmssdrdevif PRIVATE /usr/local/include/lime)
 target_link_libraries(oai_lmssdrdevif LimeSuite )


-include_directories("${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/")
 set(TPLIB_ETHERNET_SOURCE
-  ${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/eth_udp.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/eth_raw.c
+  ${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+  ${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/eth_udp.c
+  ${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/eth_raw.c
  )
 add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )

-include_directories("${OPENAIR_DIR}/sdr/AW2SORI/")
+include_directories("${OPENAIR_DIR}/radio/AW2SORI/")
 link_directories("/usr/local/lib")
 set(HWLIB_AW2SORI_SOURCE
-  ${OPENAIR_DIR}/sdr/AW2SORI/oaiori.c
+  ${OPENAIR_DIR}/radio/AW2SORI/oaiori.c
  )
 add_library(aw2sori_transpro MODULE ${HWLIB_AW2SORI_SOURCE})
 target_compile_options(aw2sori_transpro PRIVATE -shared -fPIC -msse4 -g -ggdb -DLITE_COMPILATION)
 target_link_libraries(aw2sori_transpro libori.so)

-include_directories("${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/")
 set(option_HWIRISLIB_lib "-l SoapySDR")
 set(HWLIB_IRIS_SOURCE
-  ${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/iris_lib.cpp
+  ${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/iris_lib.cpp
  )
 add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE})
 target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.7/)
@@ -811,11 +823,11 @@ target_link_libraries(oai_irisdevif SoapySDR)
 include_directories ("/usr/include/dpdk")

 set(HWLIB_BENETEL_4G_SOURCE
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/benetel.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/shared_buffers.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/low.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/low_dpdk.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/dpdk_driver.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/benetel.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/shared_buffers.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/low.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/low_dpdk.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/dpdk_driver.c
  )
 add_library(benetel_4g MODULE ${HWLIB_BENETEL_4G_SOURCE} )

@@ -829,11 +841,11 @@ TARGET_LINK_LIBRARIES(benetel_4g pthread dl rt m numa)
 ######################################################################

 set(HWLIB_BENETEL_5G_SOURCE
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/benetel.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/shared_buffers.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/low.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/low_dpdk.c
-  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/dpdk_driver.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/benetel.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/shared_buffers.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/low.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/low_dpdk.c
+  ${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/dpdk_driver.c
  )
 add_library(benetel_5g MODULE ${HWLIB_BENETEL_5G_SOURCE} )

@@ -870,7 +882,7 @@ endif ()

 ##########################################################

-include_directories ("${OPENAIR_DIR}/sdr/COMMON")
+include_directories ("${OPENAIR_DIR}/radio/COMMON")

 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
@@ -1035,7 +1047,7 @@ include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
 include_directories("${OPENAIR_DIR}/targets/COMMON")
-include_directories("${OPENAIR_DIR}/sdr/COMMON")
+include_directories("${OPENAIR_DIR}/radio/COMMON")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PHY")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/RRC")
@@ -2112,12 +2124,6 @@ include_directories("${OPENAIR1_DIR}/SCHED_NR_UE")
 # CN libs
 ##########################

-add_library(CN_UTILS
-  ${OPENAIR3_DIR}/UTILS/conversions.c
-  ${OPENAIR3_DIR}/UTILS/enum_string.c
-  ${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
-  )
-
 add_library (GTPV1U
  ${NR_RRC_DIR}/rrc_gNB_GTPV1U.c
  ${RRC_DIR}/rrc_eNB_GTPV1U.c
@@ -2539,15 +2545,15 @@ target_link_libraries(nrscope ${XFORMS_LIBRARIES})


 add_library(rfsimulator MODULE
-  ${OPENAIR_DIR}/sdr/rfsimulator/simulator.c
-  ${OPENAIR_DIR}/sdr/rfsimulator/apply_channelmod.c
-  ${OPENAIR_DIR}/sdr/rfsimulator/new_channel_sim.c
+  ${OPENAIR_DIR}/radio/rfsimulator/simulator.c
+  ${OPENAIR_DIR}/radio/rfsimulator/apply_channelmod.c
+  ${OPENAIR_DIR}/radio/rfsimulator/new_channel_sim.c
  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
 	)
 target_link_libraries(rfsimulator SIMU_COMMON ${ATLAS_LIBRARIES})

 add_library(oai_iqplayer MODULE
-	${OPENAIR_DIR}/sdr/iqplayer/iqplayer_lib.c
+	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
 	)
 set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")

@@ -2608,7 +2614,7 @@ add_executable(nfapi_test
  )

 add_executable(replay_node
-  ${OPENAIR_DIR}/sdr/rfsimulator/stored_node.c
+  ${OPENAIR_DIR}/radio/rfsimulator/stored_node.c
  )
 target_link_libraries (replay_node minimal_lib)

@@ -2633,10 +2639,10 @@ add_executable(lte-softmodem
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
-  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/create_tasks.c
+  ${OPENAIR_DIR}/executables/create_tasks_mbms.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR2_DIR}/F1AP/dummy_enb.c
@@ -2673,10 +2679,10 @@ add_executable(ocp-enb
  ${OPENAIR_DIR}/executables/transport_split.c
  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
-  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/create_tasks.c
+  ${OPENAIR_DIR}/executables/create_tasks_mbms.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -2704,8 +2710,8 @@ target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m CONFIG_LIB rt cryp
 add_executable(oairu
  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
  ${OPENAIR_TARGETS}/RT/USER/ru_control.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
-  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
  ${OPENAIR_DIR}/executables/main_ru.c
@@ -2729,9 +2735,9 @@ add_executable(lte-uesoftmodem
  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
  ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
-  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/create_tasks_ue.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -2776,8 +2782,8 @@ add_executable(nr-softmodem
  ${OPENAIR_DIR}/executables/nr-softmodem.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
-  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -2821,8 +2827,8 @@ add_executable(nr-uesoftmodem
  ${OPENAIR_DIR}/executables/nr-ue.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
-  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
@@ -2875,7 +2881,7 @@ target_link_libraries (dlsim_tm4
 add_executable(rftest
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_scope.c
-  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${SHLIB_LOADER_SOURCES}
 )
@@ -61,7 +61,7 @@ class AS_UE:
 	def KillASUE(self):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		mySSH.command('killall --signal SIGKILL lteue-avx2', '#', 5)
+		mySSH.command('killall --signal SIGKILL lteue-avx2', '\$', 5)
 		mySSH.close()

 	def RunScenario(self):
@@ -70,10 +70,10 @@ class AS_UE:

 		logging.debug("Deleting old artifacts :")
 		cmd='rm -rf ' + self.Ping + ' ' + self.UELog 
-		mySSH.command(cmd,'#',5)
+		mySSH.command(cmd, '\$',5)
 		logging.debug("Running scenario :")
 		cmd='echo $USER; nohup '+self.Cmd + ' ' + self.Config + ' &'
-		mySSH.command(cmd,'#',5)
+		mySSH.command(cmd, '\$',5)

 		mySSH.close()

@@ -81,7 +81,7 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 		if ranTargetBranch == '':
 			ranTargetBranch = 'develop'
 		logging.debug(f'Merging with the target branch: {ranTargetBranch}')
-		sshSession.command(f'git merge --ff origin/{ranTargetBranch} -m "Temporary merge for CI"', '\$', 5)
+		sshSession.command(f'git merge --ff origin/{ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)

 def CopyLogsToExecutor(sshSession, sourcePath, log_name, scpIp, scpUser, scpPw):
 	sshSession.command(f'cd {sourcePath}/cmake_targets', '\$', 5)
@@ -208,6 +208,7 @@ class Containerize():
 		self.imageToCopy = ''
 		self.registrySvrId = ''
 		self.testSvrId = ''
+		self.imageToPull = []

 		#checkers from xml
 		self.ran_checkers={}
@@ -547,72 +548,194 @@ class Containerize():
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)

-	def Copy_Image_to_Test_Server(self, HTML):
-		imageTag = 'develop'
-		if (self.ranAllowMerge):
-			imageTag = 'ci-temp'
+	def ImageTagToUse(self, imageName):
+		shortCommit = self.ranCommitID[0:8]
+		if self.ranAllowMerge:
+			tagToUse = f'{self.ranBranch}-{shortCommit}'
+		else:
+			tagToUse = f'develop-{shortCommit}'
+		fullTag = f'porcepix.sboai.cs.eurecom.fr/{imageName}:{tagToUse}'
+		return fullTag

-		lSsh = SSH.SSHConnection()
-		# Going to the Docker Registry server
+	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
-		lSsh.open(lIpAddr, lUserName, lPassWord)
-		lSsh.command('docker save ' + self.imageToCopy + ':' + imageTag + ' | gzip --fast > ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
-		ret = lSsh.copyin(lIpAddr, lUserName, lPassWord, '~/' + self.imageToCopy + '-' + imageTag + '.tar.gz', '.')
-		if ret != 0:
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
-			self.exitStatus = 1
-			return False
-		lSsh.command('rm ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
-		if lSsh.getBefore().count('cannot remove'):
-			HTML.CreateHtmlTestRow('file not created by docker save', 'KO', CONST.ALL_PROCESSES_OK)
-			self.exitStatus = 1
-			return False
-		lSsh.close()
+			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)

-		# Going to the Test Server
+		mySSH.command('docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5)
+		if re.search('Login Succeeded', mySSH.getBefore()) is None:
+			msg = 'Could not log into local registry'
+			logging.error(msg)
+			mySSH.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+
+		orgTag = 'develop'
+		if self.ranAllowMerge:
+			orgTag = 'ci-temp'
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru']
+		for image in imageNames:
+			tagToUse = self.ImageTagToUse(image)
+			mySSH.command(f'docker image tag {image}:{orgTag} {tagToUse}', '\$', 5)
+			mySSH.command(f'docker push {tagToUse}', '\$', 120)
+			if re.search(': digest:', mySSH.getBefore()) is None:
+				logging.debug(mySSH.getBefore())
+				msg = f'Could not push {image} to local registry : {tagToUse}'
+				logging.error(msg)
+				mySSH.close()
+				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			mySSH.command(f'docker rmi {tagToUse} {image}:{orgTag}', '\$', 30)
+
+		mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5)
+		if re.search('Removing login credentials', mySSH.getBefore()) is None:
+			msg = 'Could not log off from local registry'
+			logging.error(msg)
+			mySSH.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+
+		mySSH.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
+
+	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
-		lSsh.open(lIpAddr, lUserName, lPassWord)
-		lSsh.copyout(lIpAddr, lUserName, lPassWord, './' + self.imageToCopy + '-' + imageTag + '.tar.gz', '~')
-		# copyout has no return code and will quit if something fails
-		lSsh.command('docker rmi ' + self.imageToCopy + ':' + imageTag, '\$', 10)
-		lSsh.command('docker load < ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
-		if lSsh.getBefore().count('o such file') or lSsh.getBefore().count('invalid tar header'):
-			logging.debug(lSsh.getBefore())
-			HTML.CreateHtmlTestRow('problem during docker load', 'KO', CONST.ALL_PROCESSES_OK)
-			self.exitStatus = 1
-			return False
-		lSsh.command('rm ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
-		if lSsh.getBefore().count('cannot remove'):
-			HTML.CreateHtmlTestRow('file not copied during scp?', 'KO', CONST.ALL_PROCESSES_OK)
-			self.exitStatus = 1
-			return False
-		lSsh.close()
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if lIpAddr != 'none':
+			logging.debug('Pulling images onto server: ' + lIpAddr)
+			mySSH = SSH.SSHConnection()
+			mySSH.open(lIpAddr, lUserName, lPassWord)
+		else:
+			logging.debug('Pulling images locally')

-		if os.path.isfile('./' + self.imageToCopy + '-' + imageTag + '.tar.gz'):
-			os.remove('./' + self.imageToCopy + '-' + imageTag + '.tar.gz')
+		cmd = 'docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr'
+		if lIpAddr != 'none':
+			mySSH.command(cmd, '\$', 5)
+			response = mySSH.getBefore()
+		else:
+			logging.info(cmd)
+			response = subprocess.check_output(cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT)
+		if re.search('Login Succeeded', response) is None:
+			msg = 'Could not log into local registry'
+			logging.error(msg)
+			if lIpAddr != 'none':
+				mySSH.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False

+		for image in self.imageToPull:
+			tagToUse = self.ImageTagToUse(image)
+			cmd = f'docker pull {tagToUse}'
+			if lIpAddr != 'none':
+				mySSH.command(cmd, '\$', 120)
+				response = mySSH.getBefore()
+			else:
+				logging.info(cmd)
+				response = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+			if re.search('Status: Downloaded newer image for |Status: Image is up to date for', response) is None:
+				logging.debug(response)
+				msg = f'Could not pull {image} from local registry : {tagToUse}'
+				logging.error(msg)
+				if lIpAddr != 'none':
+					mySSH.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+
+		cmd = 'docker logout porcepix.sboai.cs.eurecom.fr'
+		if lIpAddr != 'none':
+			mySSH.command(cmd, '\$', 5)
+			response = mySSH.getBefore()
+		else:
+			logging.info(cmd)
+			response = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+		if re.search('Removing login credentials', response) is None:
+			msg = 'Could not log off from local registry'
+			logging.error(msg)
+			mySSH.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+
+		if lIpAddr != 'none':
+			mySSH.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		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)
+			mySSH = SSH.SSHConnection()
+			mySSH.open(lIpAddr, lUserName, lPassWord)
+		else:
+			logging.debug('Removing test images locally')
+
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru']
+		for image in imageNames:
+			cmd = f'docker rmi {self.ImageTagToUse(image)} || true'
+			if lIpAddr != 'none':
+				mySSH.command(cmd, '\$', 5)
+			else:
+				logging.info(cmd)
+				subprocess.run(cmd, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+		if lIpAddr != 'none':
+			mySSH.close()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True

@@ -639,16 +762,15 @@ class Containerize():

 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
-		
+
 		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
 		mySSH.command('cp docker-compose.yml ci-docker-compose.yml', '\$', 5)
-		imageTag = 'develop'
-		if (self.ranAllowMerge):
-			imageTag = 'ci-temp'
-		mySSH.command('sed -i -e "s/image: oai-enb:latest/image: oai-enb:' + imageTag + '/" ci-docker-compose.yml', '\$', 2)
-		mySSH.command('sed -i -e "s/image: oai-gnb:latest/image: oai-gnb:' + imageTag + '/" ci-docker-compose.yml', '\$', 2)
+		imagesList = ['oai-enb', 'oai-gnb']
+		for image in imagesList:
+			imageToUse = self.ImageTagToUse(image)
+			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: {imageToUse}#" ci-docker-compose.yml', '\$', 2)
 		localMmeIpAddr = EPC.MmeIPAddress
 		mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)
 #		if self.flexranCtrlDeployed:
@@ -672,6 +794,8 @@ class Containerize():
 		healthyNb = 0
 		startingNb = 0
 		containerName = ''
+		usedImage = ''
+		imageInfo = ''
 		if result is not None:
 			containerName = result.group('container_name')
 			time.sleep(5)
@@ -686,6 +810,20 @@ class Containerize():
 				else:
 					time.sleep(10)
 					cnt += 1
+			mySSH.command('docker inspect --format="ImageUsed: {{.Config.Image}}" ' + containerName, '\$', 5)
+			for stdoutLine in mySSH.getBefore().split('\n'):
+				if stdoutLine.count('ImageUsed: porcepix'):
+					usedImage = stdoutLine.replace('ImageUsed: porcepix', 'porcepix').strip()
+					logging.debug('Used image is ' + usedImage)
+			if usedImage != '':
+				mySSH.command('docker image inspect --format "* Size     = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id       = {{.Id}}" ' + usedImage, '\$', 5, silent=True)
+				for stdoutLine in mySSH.getBefore().split('\n'):
+					if re.search('Size     = [0-9]', stdoutLine) is not None:
+						imageInfo += stdoutLine.strip() + '\n'
+					if re.search('Creation = [0-9]', stdoutLine) is not None:
+						imageInfo += stdoutLine.strip() + '\n'
+					if re.search('Id       = sha256', stdoutLine) is not None:
+						imageInfo += stdoutLine.strip() + '\n'
 		logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)')
 		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
 		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
@@ -715,11 +853,24 @@ class Containerize():
 			mySSH.copyin(lIpAddr, lUserName, lPassWord, logfilename, '.')
 		mySSH.close()

+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">\n'
+		if usedImage != '':
+			html_cell += f'Used Image = {usedImage} :\n'
+			html_cell += imageInfo
+		else:
+			html_cell += 'Could not retrieve used image info!\n'
 		if status:
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+			html_cell += '\nHealthy deployment!\n'
+		else:
+			html_cell += '\nUnhealthy deployment! -- Check logs for reason!\n'
+		html_cell += '</pre>'
+		html_queue.put(html_cell)
+		if status:
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', CONST.ENB_PROCESS_OK, html_queue)
 		else:
 			self.exitStatus = 1
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', CONST.ENB_PROCESS_OK, html_queue)


 	def UndeployObject(self, HTML, RAN):
@@ -800,33 +951,40 @@ class Containerize():

 	def DeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0
-		logging.info('\u001B[1m Checking Services to deploy\u001B[0m')
+		logging.debug('\u001B[1m Checking Services to deploy\u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose config --services'
-		logging.debug(cmd)
+		logging.info(cmd)
 		try:
 			listServices = subprocess.check_output(cmd, shell=True, universal_newlines=True)
 		except Exception as e:
 			self.exitStatus = 1
 			HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK)
 			return
+		displayUsedTag = False
 		for reqSvc in self.services[0].split(' '):
 			res = re.search(reqSvc, listServices)
 			if res is None:
 				logging.error(reqSvc + ' not found in specified docker-compose')
 				self.exitStatus = 1
+			res = re.search('oai-gnb|oai-nr-ue|oai-cu|oai-du|oai_enb|oai_ue', reqSvc)
+			if res is not None:
+				displayUsedTag = True
 		if (self.exitStatus == 1):
 			HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK)
 			return

-		if (self.ranAllowMerge):
-			cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@ci-temp@" docker-compose.y*ml > docker-compose-ci.yml'
-		else:
-			cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@develop@" docker-compose.y*ml > docker-compose-ci.yml'
-		logging.debug(cmd)
-		subprocess.run(cmd, shell=True)
+		cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml'
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru']
+		for image in imageNames:
+			tagToUse = self.ImageTagToUse(image)
+			cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml'
+			subprocess.run(cmd, shell=True)
+		if displayUsedTag:
+			tagToUse = self.ImageTagToUse('oai-xxx')
+			logging.info(f'\u001B[1m Using Image Tag: {tagToUse}\u001B[0m')

 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml up -d ' + self.services[0]
-		logging.debug(cmd)
+		logging.info(cmd)
 		try:
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
 		except Exception as e:
@@ -835,7 +993,7 @@ class Containerize():
 			HTML.CreateHtmlTestRow('Could not deploy', 'KO', CONST.ALL_PROCESSES_OK)
 			return

-		logging.info('\u001B[1m Checking if all deployed healthy\u001B[0m')
+		logging.debug('\u001B[1m Checking if all deployed healthy\u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps -a'
 		count = 0
 		healthy = 0
@@ -930,7 +1088,7 @@ class Containerize():
 		cmd += ' -w /tmp/capture_'
 		ymlPath = self.yamlPath[0].split('/')
 		cmd += ymlPath[1] + '.pcap > /tmp/tshark.log 2>&1 &'
-		logging.debug(cmd)
+		logging.info(cmd)
 		networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 		self.tsharkStarted = True

@@ -939,22 +1097,23 @@ class Containerize():
 		ymlPath = self.yamlPath[0].split('/')
 		logPath = '../cmake_targets/log/' + ymlPath[1]

-		if (self.ranAllowMerge):
-			cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@ci-temp@" docker-compose.y*ml > docker-compose-ci.yml'
-		else:
-			cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@develop@" docker-compose.y*ml > docker-compose-ci.yml'
-		logging.debug(cmd)
+		cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml'
 		subprocess.run(cmd, shell=True)
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru']
+		for image in imageNames:
+			tagToUse = self.ImageTagToUse(image)
+			cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml'
+			subprocess.run(cmd, shell=True)

 		# check which containers are running for log recovery later
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all'
-		logging.debug(cmd)
+		logging.info(cmd)
 		deployStatusLogs = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)

 		# Stop the containers to shut down objects
 		logging.debug('\u001B[1m Stopping containers \u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml stop'
-		logging.debug(cmd)
+		logging.info(cmd)
 		try:
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
 		except Exception as e:
@@ -976,16 +1135,16 @@ class Containerize():
 				anyLogs = True
 				cName = res.group('container_name')
 				cmd = 'cd ' + self.yamlPath[0] + ' && docker logs ' + cName + ' > ' + cName + '.log 2>&1'
-				logging.debug(cmd)
+				logging.info(cmd)
 				subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
 				if re.search('magma-mme', cName) is not None:
 					cmd = 'cd ' + self.yamlPath[0] + ' && docker cp -L ' + cName + ':/var/log/mme.log ' + cName + '-full.log'
-					logging.debug(cmd)
+					logging.info(cmd)
 					subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
 		fullStatus = True
 		if anyLogs:
 			cmd = 'mkdir -p '+ logPath + ' && cp ' + self.yamlPath[0] + '/*.log ' + logPath
-			logging.debug(cmd)
+			logging.info(cmd)
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)

 			# Analyzing log file(s)!
@@ -1035,25 +1194,25 @@ class Containerize():
 						HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)

 			cmd = 'rm ' + self.yamlPath[0] + '/*.log'
-			logging.debug(cmd)
+			logging.info(cmd)
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 			if self.tsharkStarted:
 				self.tsharkStarted = True
 				ymlPath = self.yamlPath[0].split('/')
 				cmd = 'sudo chmod 666 /tmp/capture_' + ymlPath[1] + '.pcap'
-				logging.debug(cmd)
+				logging.info(cmd)
 				copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 				cmd = 'cp /tmp/capture_' + ymlPath[1] + '.pcap ' + logPath
-				logging.debug(cmd)
+				logging.info(cmd)
 				copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 				cmd = 'sudo rm /tmp/capture_' + ymlPath[1] + '.pcap'
-				logging.debug(cmd)
+				logging.info(cmd)
 				copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 				self.tsharkStarted = False

 		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml down'
-		logging.debug(cmd)
+		logging.info(cmd)
 		try:
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
 		except Exception as e:
@@ -1066,7 +1225,7 @@ class Containerize():
 		self.deployedContainers = []
 		# Cleaning any created tmp volume
 		cmd = 'docker volume prune --force || true'
-		logging.debug(cmd)
+		logging.info(cmd)
 		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)

 		if fullStatus:
@@ -1074,7 +1233,7 @@ class Containerize():
 			logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m')
 		else:
 			HTML.CreateHtmlTestRow('n/a', 'KO', CONST.ALL_PROCESSES_OK)
-			logging.info('\u001B[1m Undeploying OAI Object(s) FAIL\u001B[0m')
+			logging.error('\u001B[1m Undeploying OAI Object(s) FAIL\u001B[0m')

 	def StatsFromGenObject(self, HTML):
 		self.exitStatus = 0
@@ -1083,7 +1242,7 @@ class Containerize():

 		# if the containers are running, recover the logs!
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all'
-		logging.debug(cmd)
+		logging.info(cmd)
 		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
 		cmd = 'docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.MemPerc}}" '
 		anyLogs = False
@@ -1099,7 +1258,7 @@ class Containerize():
 				cmd += res.group('container_name') + ' '
 		message = ''
 		if anyLogs:
-			logging.debug(cmd)
+			logging.info(cmd)
 			stats = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
 			for statLine in stats.split('\n'):
 				logging.debug(statLine)
@@ -1119,7 +1278,7 @@ class Containerize():

 		cmd = 'docker exec ' + self.pingContName + ' /bin/bash -c "ping ' + self.pingOptions + '" 2>&1 | tee ' + logPath + '/ping_' + HTML.testCase_id + '.log || true'

-		logging.debug(cmd)
+		logging.info(cmd)
 		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)

 		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', deployStatus)
@@ -1176,9 +1335,9 @@ class Containerize():
 			logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m')
 			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', 1, html_queue)
 			# Automatic undeployment
-			logging.debug('----------------------------------------')
-			logging.debug('\u001B[1m Starting Automatic undeployment \u001B[0m')
-			logging.debug('----------------------------------------')
+			logging.warning('----------------------------------------')
+			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
+			logging.warning('----------------------------------------')
 			HTML.testCase_id = 'AUTO-UNDEPLOY'
 			HTML.desc = 'Automatic Un-Deployment'
 			self.UndeployGenObject(HTML, RAN, UE)
@@ -1194,23 +1353,23 @@ class Containerize():

 		# Start the server process
 		cmd = 'docker exec -d ' + self.svrContName + ' /bin/bash -c "nohup iperf ' + self.svrOptions + ' > /tmp/iperf_server.log 2>&1" || true'
-		logging.debug(cmd)
+		logging.info(cmd)
 		serverStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 		time.sleep(5)

 		# Start the client process

 		cmd = 'docker exec ' + self.cliContName + ' /bin/bash -c "iperf ' + self.cliOptions + '" 2>&1 | tee '+ logPath + '/iperf_client_' + HTML.testCase_id + '.log || true'
-		logging.debug(cmd)
+		logging.info(cmd)
 		clientStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)

 		# Stop the server process
 		cmd = 'docker exec ' + self.svrContName + ' /bin/bash -c "pkill iperf" || true'
-		logging.debug(cmd)
+		logging.info(cmd)
 		serverStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 		time.sleep(5)
 		cmd = 'docker cp ' + self.svrContName + ':/tmp/iperf_server.log '+ logPath + '/iperf_server_' + HTML.testCase_id + '.log'
-		logging.debug(cmd)
+		logging.info(cmd)
 		serverStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)

 		# Analyze client output
@@ -35,11 +35,6 @@ import re
 import subprocess
 import sshconnection

-logging.basicConfig(
-	level=logging.DEBUG,
-	format="[%(asctime)s] %(name)s:%(levelname)s: %(message)s"
-)
-
 class Log_Mgt:

 	def __init__(self,Username, IPAddress,Password,Path):
@@ -33,6 +33,7 @@
 #-----------------------------------------------------------
 import sys              # arg
 import re               # reg
+import fileinput
 import logging
 import os
 import time
@@ -102,9 +103,9 @@ class HTMLManagement():

 	def CreateHtmlHeader(self, ADBIPAddress):
 		if (not self.htmlHeaderCreated):
-			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-			logging.debug('\u001B[1m  Creating HTML header \u001B[0m')
-			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+			logging.info('\u001B[1m----------------------------------------\u001B[0m')
+			logging.info('\u001B[1m  Creating HTML header \u001B[0m')
+			logging.info('\u001B[1m----------------------------------------\u001B[0m')
 			self.htmlFile = open('test_results.html', 'w')
 			self.htmlFile.write('<!DOCTYPE html>\n')
 			self.htmlFile.write('<html class="no-js" lang="en-US">\n')
@@ -195,7 +196,10 @@ class HTMLManagement():
 			self.htmlFile.write('  <ul class="nav nav-pills">\n')
 			count = 0
 			while (count < self.nbTestXMLfiles):
-				pillMsg = '    <li><a data-toggle="pill" href="#'
+				if count == 0:
+					pillMsg = '    <li class="active"><a data-toggle="pill" href="#'
+				else:
+					pillMsg = '    <li><a data-toggle="pill" href="#'
 				pillMsg += self.htmlTabRefs[count]
 				pillMsg += '">'
 				pillMsg += '__STATE_' + self.htmlTabNames[count] + '__'
@@ -269,6 +273,15 @@ class HTMLManagement():

 	def CreateHtmlFooter(self, passStatus):
 		if (os.path.isfile('test_results.html')):
+			# Tagging the 1st tab as active so it is automatically opened.
+			firstTabFound = False
+			for line in fileinput.FileInput("test_results.html", inplace=1):
+				if re.search('tab-pane fade', line) and not firstTabFound:
+					firstTabFound = True
+					print(line.replace('tab-pane fade', 'tab-pane fade in active'), end ='')
+				else:
+					print(line, end ='')
+
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('</div>\n')
 			self.htmlFile.write('  <p></p>\n')
@@ -44,10 +44,6 @@ import datetime
 import signal
 import statistics as stat
 from multiprocessing import Process, Lock, SimpleQueue
-logging.basicConfig(
-	level=logging.DEBUG,
-	format="[%(asctime)s] %(name)s:%(levelname)s: %(message)s"
-)

 #import our libs
 import helpreadme as HELP
@@ -263,10 +259,10 @@ class OaiCiTest():
 		if self.ranAllowMerge:
 			if self.ranTargetBranch == '':
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					SSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+					SSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 			else:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				SSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+				SSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 		SSH.command('source oaienv', '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('mkdir -p log', '\$', 5)
@@ -1665,7 +1661,7 @@ class OaiCiTest():
 					logging.debug("Ping analysis from Amarisoft scenario")
 					path,ping_log_file = os.path.split(Module_UE.Ping)
 					SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-					SSH.command('cat ' + Module_UE.Ping, '\#', 5)
+					SSH.command('cat ' + Module_UE.Ping, '\$', 5)

 				else:
 					ping_status=-1
@@ -3128,7 +3124,7 @@ class OaiCiTest():
 				fileCheck = re.search('enb_', str(RAN.eNBLogFiles[0]))
 				if fileCheck is not None:
 					SSH.copyin(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath + '/cmake_targets/' + RAN.eNBLogFiles[0], '.')
-					logStatus = RAN.AnalyzeLogFile_eNB(RAN.eNBLogFiles[0])
+					logStatus = RAN.AnalyzeLogFile_eNB(RAN.eNBLogFiles[0],HTML, RAN.ran_checkers)
 					if logStatus < 0:
 						result = logStatus
 					RAN.eNBLogFiles[0]=''
@@ -3937,7 +3933,7 @@ class OaiCiTest():
 		sys.exit(1)

 	def ShowTestID(self):
-		logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-		logging.debug('\u001B[1mTest ID:' + self.testCase_id + '\u001B[0m')
-		logging.debug('\u001B[1m' + self.desc + '\u001B[0m')
-		logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+		logging.info('\u001B[1m----------------------------------------\u001B[0m')
+		logging.info('\u001B[1mTest ID:' + self.testCase_id + '\u001B[0m')
+		logging.info('\u001B[1m' + self.desc + '\u001B[0m')
+		logging.info('\u001B[1m----------------------------------------\u001B[0m')
@@ -180,10 +180,10 @@ class PhySim:
 		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"', '\$', 5)
+					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"', '\$', 5)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)

 		#build
 		mySSH.command('source oaienv', '\$', 5)
@@ -108,10 +108,10 @@ class PhySim:
 			imageTag = "ci-temp"
 			if self.ranTargetBranch == '':
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 			else:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 		else:
 			imageTag = "develop"

@@ -123,10 +123,10 @@ class StaticCodeAnalysis():
 		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"', '\$', 5)
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 			else:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)

 		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 60)
 		mySSH.command('sed -e "s@xenial@bionic@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.bionic', '\$', 6)
@@ -281,11 +281,11 @@ class StaticCodeAnalysis():
 			argToPass = '--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH=' + self.ranBranch
 			if self.ranTargetBranch == '':
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 					argToPass += ' --build-arg TARGET_BRANCH=develop '
 			else:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 				argToPass += ' --build-arg TARGET_BRANCH=' + self.ranTargetBranch + ' '

 		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
@@ -17,29 +17,16 @@ nssai_sst=222;
 nssai_sd=123;
 }

-L1s = (
+MACRLCs = (
        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "ens3";
-	remote_n_address = "127.0.0.1"; //Proxy IP
-	local_n_address  = "127.0.0.1";
-	local_n_portc    = 50600;
-	remote_n_portc   = 50601;
-	local_n_portd    = 50610;
-	remote_n_portd   = 50611;
-        }  
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
+        num_cc = 1;
+        tr_n_preference = "nfapi";
+        local_n_if_name  = "ens3";
+        remote_n_address = "127.0.0.1"; //Proxy IP
+        local_n_address  = "127.0.0.1";
+        local_n_portc    = 50600;
+        remote_n_portc   = 50601;
+        local_n_portd    = 50610;
+        remote_n_portd   = 50611;
+        }
 );
@@ -17,6 +17,9 @@ gNBs =

    ////////// Physical parameters:

+    pdsch_AntennaPorts_XP                                     = 2;
+    pusch_AntennaPorts                                        = 2;
+    do_CSIRS                                                  = 1;
    min_rxtxtime = 6;
     pdcch_ConfigSIB1 = (
      {
@@ -218,13 +221,13 @@ security = {

     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";
+       global_log_level                      ="analysis";
+       hw_log_level                          ="analysis";
+       phy_log_level                         ="analysis";
+       mac_log_level                         ="analysis";
+       rlc_log_level                         ="analysis";
+       pdcp_log_level                        ="analysis";
+       rrc_log_level                         ="analysis";
+       ngap_log_level                        ="analysis";
    };

@@ -17,29 +17,17 @@ nssai_sst=1;
 nssai_sd=1;
 }

-L1s = (
+MACRLCs = (
        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "lo:";
-	remote_n_address = "127.0.0.1"; //Proxy IP
-	local_n_address  = "127.0.0.1";
-	local_n_portc    = 50600;
-	remote_n_portc   = 50601;
-	local_n_portd    = 50610;
-	remote_n_portd   = 50611;
-        }  
+        num_cc = 1;
+        tr_n_preference = "nfapi";
+        local_n_if_name  = "lo:";
+        remote_n_address = "127.0.0.1"; //Proxy IP
+        local_n_address  = "127.0.0.1";
+        local_n_portc    = 50600;
+        remote_n_portc   = 50601;
+        local_n_portd    = 50610;
+        remote_n_portd   = 50611;
+        }
 );

-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
-);
@@ -70,7 +70,7 @@ import subprocess
 from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
-	format="[%(asctime)s] %(name)s:%(levelname)s: %(message)s"
+	format="[%(asctime)s] %(levelname)8s: %(message)s"
 )


@@ -84,7 +84,7 @@ logging.basicConfig(

 def CheckClassValidity(xml_class_list,action,id):
 	if action not in xml_class_list:
-		logging.debug('ERROR: test-case ' + id + ' has unlisted class ' + action + ' ##CHECK xml_class_list.yml')
+		logging.error('test-case ' + id + ' has unlisted class ' + action + ' ##CHECK xml_class_list.yml')
 		resp=False
 	else:
 		resp=True
@@ -199,6 +199,14 @@ def GetParametersFromXML(action):
 		else:
 			RAN.eNB_serverId[RAN.eNB_instance]=eNB_serverId

+		#retx checkers
+		string_field=test.findtext('d_retx_th')
+		if (string_field is not None):
+			RAN.ran_checkers['d_retx_th'] = [float(x) for x in string_field.split(',')]
+		string_field=test.findtext('u_retx_th')
+		if (string_field is not None):
+			RAN.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
+
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
 		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
@@ -328,14 +336,14 @@ def GetParametersFromXML(action):
 			CiTestObj.iperf_profile = 'balanced'
 		else:
 			if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
-				logging.debug('ERROR: test-case has wrong profile ' + CiTestObj.iperf_profile)
+				logging.error('test-case has wrong profile ' + CiTestObj.iperf_profile)
 				CiTestObj.iperf_profile = 'balanced'
 		CiTestObj.iperf_options = test.findtext('iperf_options')
 		if (CiTestObj.iperf_options is None):
 			CiTestObj.iperf_options = 'check'
 		else:
 			if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
-				logging.debug('ERROR: test-case has wrong option ' + CiTestObj.iperf_options)
+				logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
 				CiTestObj.iperf_options = 'check'

 	elif action == 'IdleSleep':
@@ -372,6 +380,11 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			EPC.mmeConfFile = string_field

+	elif action == 'Initialize_HSS' or action == 'Initialize_SPGW':
+		pass
+	elif action == 'Terminate_HSS' or action == 'Terminate_MME' or action == 'Terminate_SPGW':
+		pass
+
 	elif action == 'Deploy_EPC':
 		string_field = test.findtext('parameters')
 		if (string_field is not None):
@@ -401,6 +414,12 @@ def GetParametersFromXML(action):
 		string_field = test.findtext('yaml_path')
 		if (string_field is not None):
 			CONTAINERS.yamlPath[CONTAINERS.eNB_instance] = string_field
+		string_field=test.findtext('d_retx_th')
+		if (string_field is not None):
+			CONTAINERS.ran_checkers['d_retx_th'] = [float(x) for x in string_field.split(',')]
+		string_field=test.findtext('u_retx_th')
+		if (string_field is not None):
+			CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]

 	elif action == 'DeployGenObject' or action == 'UndeployGenObject' or action == 'StatsFromGenObject':
 		string_field=test.findtext('yaml_path')
@@ -444,17 +463,6 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.cliOptions = string_field

-	elif action == 'Copy_Image_to_Test':
-		string_field = test.findtext('image_name')
-		if (string_field is not None):
-			CONTAINERS.imageToCopy = string_field
-		string_field = test.findtext('registry_svr_id')
-		if (string_field is not None):
-			CONTAINERS.registrySvrId = string_field
-		string_field = test.findtext('test_svr_id')
-		if (string_field is not None):
-			CONTAINERS.testSvrId = string_field
-
 	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest':
 		ldpc.runargs = test.findtext('physim_run_args')

@@ -464,8 +472,27 @@ def GetParametersFromXML(action):
 	elif action == 'Cppcheck_Analysis':
 		pass

+	elif action == 'Push_Local_Registry':
+		string_field = test.findtext('registry_svr_id')
+		if (string_field is not None):
+			CONTAINERS.registrySvrId = string_field
+
+	elif action == 'Pull_Local_Registry':
+		string_field = test.findtext('test_svr_id')
+		if (string_field is not None):
+			CONTAINERS.testSvrId = string_field
+		CONTAINERS.imageToPull.clear()
+		string_field = test.findtext('images_to_pull')
+		if (string_field is not None):
+			CONTAINERS.imageToPull = string_field.split()
+
+	elif action == 'Clean_Test_Server_Images':
+		string_field = test.findtext('test_svr_id')
+		if (string_field is not None):
+			CONTAINERS.testSvrId = string_field
+
 	else:
-		logging.error(f"unknown action {action}")
+		logging.warning(f"unknown action {action} from option-parsing point-of-view")


 #check if given test is in list
@@ -617,7 +644,7 @@ elif re.match('^LogCollecteNB$', mode, re.IGNORECASE):
 		sys.exit('Insufficient Parameter')
 	if RAN.eNBIPAddress == 'none':
 		cmd = 'zip -r enb.log.' + RAN.BuildId + '.zip cmake_targets/log'
-		logging.debug(cmd)
+		logging.info(cmd)
 		zipStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=60)
 		sys.exit(0)
 	RAN.LogCollecteNB()
@@ -683,17 +710,17 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
 		HTML.htmlNb_CATM_Modules=len(CiTestObj.CatMDevices)
 	HTML.CreateHtmlHeader(CiTestObj.ADBIPAddress)
 elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
-	logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-	logging.debug('\u001B[1m  Creating HTML footer \u001B[0m')
-	logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+	logging.info('\u001B[1m----------------------------------------\u001B[0m')
+	logging.info('\u001B[1m  Creating HTML footer \u001B[0m')
+	logging.info('\u001B[1m----------------------------------------\u001B[0m')

 	CiTestObj.RetrieveSystemVersion('eNB',HTML,RAN)
 	CiTestObj.RetrieveSystemVersion('UE',HTML,RAN)
 	HTML.CreateHtmlFooter(CiTestObj.finalStatus)
 elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re.IGNORECASE):
-	logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-	logging.debug('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
-	logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+	logging.info('\u001B[1m----------------------------------------\u001B[0m')
+	logging.info('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
+	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	if re.match('^TesteNB$', mode, re.IGNORECASE):
 		if RAN.eNBIPAddress == '' or RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '' or EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '' or CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == '':
 			HELP.GenericHelp(CONST.Version)
@@ -736,7 +763,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			HTML.testUnstable = True
 			CiTestObj.testMinStableId = xmlRoot.findtext('TestMinId',default='999999')
 			HTML.testMinStableId = CiTestObj.testMinStableId
-			logging.debug('Test is tagged as Unstable -- starting from TestID ' + str(CiTestObj.testMinStableId))
+			logging.warning('Test is tagged as Unstable -- starting from TestID ' + str(CiTestObj.testMinStableId))
 	all_tests=xmlRoot.findall('testCase')

 	exclusion_tests=exclusion_tests.split()
@@ -747,10 +774,10 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	for test in exclusion_tests:
 		if     (not re.match('^[0-9]{6}$', test) and
 				not re.match('^[0-9]{1,5}\+$', test)):
-			logging.debug('ERROR: exclusion test is invalidly formatted: ' + test)
+			logging.error('exclusion test is invalidly formatted: ' + test)
 			sys.exit(1)
 		else:
-			logging.debug(test)
+			logging.info(test)

 	#check that requested tests are well formatted
 	#(6 digits or less than 6 digits followed by +)
@@ -758,9 +785,9 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	for test in requested_tests:
 		if     (re.match('^[0-9]{6}$', test) or
 				re.match('^[0-9]{1,5}\+$', test)):
-			logging.debug('INFO: test group/case requested: ' + test)
+			logging.info('test group/case requested: ' + test)
 		else:
-			logging.debug('ERROR: requested test is invalidly formatted: ' + test)
+			logging.error('requested test is invalidly formatted: ' + test)
 			sys.exit(1)
 	if (EPC.IPAddress != '') and (EPC.IPAddress != 'none'):
 		CiTestObj.CheckFlexranCtrlInstallation(RAN,EPC,CONTAINERS)
@@ -771,9 +798,9 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	todo_tests=[]
 	for test in requested_tests:
 		if    (test_in_list(test, exclusion_tests)):
-			logging.debug('INFO: test will be skipped: ' + test)
+			logging.info('test will be skipped: ' + test)
 		else:
-			#logging.debug('INFO: test will be run: ' + test)
+			#logging.info('test will be run: ' + test)
 			todo_tests.append(test)

 	signal.signal(signal.SIGUSR1, receive_signal)
@@ -937,8 +964,16 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					CONTAINERS.BuildImage(HTML)
 				elif action == 'Build_Proxy':
 					CONTAINERS.BuildProxy(HTML)
-				elif action == 'Copy_Image_to_Test':
-					success = CONTAINERS.Copy_Image_to_Test_Server(HTML)
+				elif action == 'Push_Local_Registry':
+					success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Pull_Local_Registry':
+					success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Clean_Test_Server_Images':
+					success = CONTAINERS.Clean_Test_Server_Images(HTML)
 					if not success:
 						RAN.prematureExit = True
 				elif action == 'Deploy_Object':
@@ -973,23 +1008,25 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 						RAN.prematureExit = True
 				elif action == 'StatsFromGenObject':
 					CONTAINERS.StatsFromGenObject(HTML)
+				elif action == 'Push_Images_To_Test_Servers':
+					logging.debug('To be implemented')
 				else:
 					sys.exit('Invalid class (action) from xml')
 				if RAN.prematureExit:
 					if CiTestObj.testCase_id == CiTestObj.testMinStableId:
-						logging.debug('Scenario has reached minimal stability point')
+						logging.warning('Scenario has reached minimal stability point')
 						CiTestObj.testStabilityPointReached = True
 						HTML.testStabilityPointReached = True
 		CiTestObj.FailReportCnt += 1
 	if CiTestObj.FailReportCnt == CiTestObj.repeatCounts[0] and RAN.prematureExit:
-		logging.debug('Scenario failed ' + str(CiTestObj.FailReportCnt) + ' time(s)')
+		logging.error('\u001B[1;37;41mScenario failed ' + str(CiTestObj.FailReportCnt) + ' time(s)\u001B[0m')
 		HTML.CreateHtmlTabFooter(False)
 		if CiTestObj.testUnstable and (CiTestObj.testStabilityPointReached or CiTestObj.testMinStableId == '999999'):
-			logging.debug('Scenario has reached minimal stability point -- Not a Failure')
+			logging.warning('\u001B[1;30;43mScenario has reached minimal stability point -- Not a Failure\u001B[0m')
 		else:
 			sys.exit('Failed Scenario')
 	else:
-		logging.info('Scenario passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)')
+		logging.info('\u001B[1;37;42mScenario passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)\u001B[0m')
 		HTML.CreateHtmlTabFooter(True)
 elif re.match('^LoadParams$', mode, re.IGNORECASE):
 	pass
@@ -97,7 +97,8 @@ class RANManagement():
 		self.eNB_Trace = '' #if 'yes', Tshark will be launched at initialization
 		self.eNB_Stats = '' #if 'yes', Statistics Monitor will be launched at initialization		
 		self.USRPIPAddress = ''
-
+		#checkers from xml
+		self.ran_checkers={}


 #-----------------------------------------------------------
@@ -202,10 +203,10 @@ class RANManagement():
 		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"', '\$', 5)
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 			else:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 		logging.debug(mySSH.getBefore()) # print what git said when merging/checking out
 		mySSH.command('source oaienv', '\$', 5)
 		mySSH.command('cd cmake_targets', '\$', 5)
@@ -680,7 +681,7 @@ class RANManagement():
 			mySSH.close()
 			mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + extracted_log_file, '.')
 			logging.debug('\u001B[1m Analyzing eNB replay logfile \u001B[0m')
-			logStatus = self.AnalyzeLogFile_eNB(extracted_log_file, HTML)
+			logStatus = self.AnalyzeLogFile_eNB(extracted_log_file, HTML, self.ran_checkers)
 			HTML.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			self.eNBLogFiles[int(self.eNB_instance)] = ''
 		else:
@@ -713,7 +714,7 @@ class RANManagement():
 					#
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')
 				logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + fileToAnalyze)
-				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze, HTML)
+				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze, HTML, self.ran_checkers)
 				if (logStatus < 0):
 					HTML.CreateHtmlTestRow('N/A', 'KO', logStatus)
 					#display rt stats for gNB only
@@ -747,6 +748,25 @@ class RANManagement():
 		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm enb*.log core* enb_*record.raw enb_*.pcap gnb_*.pcap enb_*txt physim_*.log *stats.log *monitor.pickle *monitor*.png ping*.log* iperf*.log log/*/*.log log/*/*.pcap', '\$', 15)
 		mySSH.close()

+	def _analyzeUeRetx(self, rounds, checkers, regex):
+		if len(rounds) == 0 or len(checkers) == 0:
+			logging.warning(f'warning: rounds={rounds} checkers={checkers}')
+			return []
+
+		perc = list(0 for i in checkers) # results in %
+		stats = list(False for i in checkers) # status if succeeded
+		tmp = re.match(regex, rounds)
+		if tmp is None:
+			logging.error('_analyzeUeRetx: did not match regex for DL retx analysis')
+			return stats
+		retx_data = [float(x) for x in tmp.groups()]
+		for i in range(0, len(perc)):
+			#case where numerator > denumerator with denum ==0 is disregarded, cannot hapen in principle, will lead to 0%
+			perc[i] = 0 if (retx_data[i] == 0) else 100 * retx_data[i + 1] / retx_data[i]
+			#treating % > 100 , % > requirement
+			stats[i] = perc[i] < 100 and perc[i] <= checkers[i]
+		return stats
+
 	def AnalyzeLogFile_eNB(self, eNBlogFile, HTML, checkers={}):
 		if (not os.path.isfile('./' + eNBlogFile)):
 			return -1
@@ -808,8 +828,7 @@ class RANManagement():
 		gnb_markers ={'SgNBReleaseRequestAcknowledge': [],'FAILURE': [], 'scgFailureInformationNR-r15': [], 'SgNBReleaseRequest': [], 'Detected UL Failure on PUSCH':[]}
 		nodeB_prefix_found = False
 		RealTimeProcessingIssue = False
-		DLRetxIssue = False
-		ULRetxIssue = False
+		retx_status = {}
 		nrRrcRcfgComplete = 0
 		harqFeedbackPast = 0
 		showedByeMsg = False # last line is Bye. -> stopped properly
@@ -992,7 +1011,8 @@ class RANManagement():
 				rnti = result.group(1)

 				#remove 1- all useless char before relevant info (ulsch or dlsch) 2- trailing char
-				dlsch_ulsch_stats[rnti+k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())
+				if not rnti in dlsch_ulsch_stats: dlsch_ulsch_stats[rnti] = {}
+				dlsch_ulsch_stats[rnti][k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())

 			result = re.search('Received NR_RRCReconfigurationComplete from UE', str(line))
 			if result is not None:
@@ -1138,51 +1158,20 @@ class RANManagement():
 			htmleNBFailureMsg += htmlMsg

 			#ulsch and dlsch statistics and checkers
-			#print statistics into html
-			if len(dlsch_ulsch_stats)!=0: #check if dictionary is not empty
-				#for each dictionary key, generate the msg for html as information
+			for ue in dlsch_ulsch_stats:
+				dlulstat = dlsch_ulsch_stats[ue]
+				#print statistics into html
 				statMsg=''
-				for key in dlsch_ulsch_stats: 
-					statMsg += dlsch_ulsch_stats[key] + '\n' 
-					logging.debug(dlsch_ulsch_stats[key])
+				for key in dlulstat:
+					statMsg += dlulstat[key] + '\n'
+					logging.debug(dlulstat[key])
 				htmleNBFailureMsg += statMsg

-			#checker
-			if (len(dlsch_ulsch_stats)!=0) and (len(checkers)!=0):
-				if 'd_retx_th' in checkers:
-					dlsch_checker_status = list(0 for i in checkers['d_retx_th'])#status 0 / -1
-					d_perc_retx = list(0 for i in checkers['d_retx_th'])#results in %
-
-				if 'u_retx_th' in checkers:
-					ulsch_checker_status = list(0 for i in checkers['u_retx_th'])
-					u_perc_retx = list(0 for i in checkers['u_retx_th'])
-
-				#ul and dl retransmissions checkers
-				#NOTICE:  DL and UL regex are different 
-
-				if ('dlsch_rounds' in dlsch_ulsch_stats) and ('d_retx_th' in checkers):
-					tmp=re.match(r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)',dlsch_ulsch_stats['dlsch_rounds'])
-					if tmp is not None :
-						#captures the different groups from the regex
-						retx_data=[float(x) for x in tmp.groups()]
-						for i in range(0,len(d_perc_retx)):
-							#case where numerator > denumerator with denum ==0 is disregarded, cannot hapen in principle, will lead to 0%
-							d_perc_retx[i] = 0 if (retx_data[i] == 0)  else 100*retx_data[i+1]/retx_data[i]
-							#treating % > 100 , % > requirement
-							if (d_perc_retx[i] > 100) or (d_perc_retx[i] > checkers['d_retx_th'][i]): dlsch_checker_status[i] = -1
-					if -1 in dlsch_checker_status:
-						DLRetxIssue = True
-
-				if ('ulsch_rounds' in dlsch_ulsch_stats)  and ('u_retx_th' in checkers):
-					tmp=re.match(r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+.*,\s+ulsch_errors\s+(\d+)',dlsch_ulsch_stats['ulsch_rounds'])
-					if tmp is not None :
-						retx_data=[float(x) for x in tmp.groups()]
-						for i in range(0,len(d_perc_retx)):
-							u_perc_retx[i] = 0 if (retx_data[i] == 0) else 100*retx_data[i+1]/retx_data[i]
-							if (u_perc_retx[i] > 100) or (u_perc_retx[i] > checkers['u_retx_th'][i]): ulsch_checker_status[i] = -1
-					if -1 in ulsch_checker_status:
-						ULRetxIssue = True
-
+				retx_status[ue] = {}
+				dlcheckers = [] if 'd_retx_th' not in checkers else checkers['d_retx_th']
+				retx_status[ue]['dl'] = self._analyzeUeRetx(dlulstat['dlsch_rounds'], dlcheckers, r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)')
+				ulcheckers = [] if 'u_retx_th' not in checkers else checkers['u_retx_th']
+				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+.*,\s+ulsch_errors\s+(\d+)')


 			#real time statistics
@@ -1243,21 +1232,15 @@ class RANManagement():
 			logging.debug(statMsg)
 			htmleNBFailureMsg += htmlMsg			

-		if DLRetxIssue:
-			retx_checker_status_str = ''
-			for status in dlsch_checker_status : retx_checker_status_str+=str(status)+ ' '
-			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with too many retransmissions / errors issue in DL ! \u001B[0m')
-			logging.debug('\u001B[1;37;41m Status : ' + retx_checker_status_str + ' \u001B[0m')
-			htmleNBFailureMsg += 'Fail due to retransmissions / errors issue in DL, status : ' + retx_checker_status_str + '\n'
-			global_status = CONST.ENB_RETX_ISSUE
-
-		if ULRetxIssue:
-			retx_checker_status_str = ''
-			for status in ulsch_checker_status : retx_checker_status_str+=str(status)+ ' '
-			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with too many retransmissions / errors issue in UL ! \u001B[0m')
-			logging.debug('\u001B[1;37;41m Status : ' + retx_checker_status_str + ' \u001B[0m')
-			htmleNBFailureMsg += 'Fail due to retransmissions / errors issue in UL, status : ' + retx_checker_status_str + '\n'
-			global_status = CONST.ENB_RETX_ISSUE
+		for ue in retx_status:
+			msg = f"retransmissions for UE {ue}: DL {retx_status[ue]['dl']} UL {retx_status[ue]['ul']}"
+			if False in retx_status[ue]['dl'] or False in retx_status[ue]['ul']:
+				msg = 'Failure: ' + msg
+				logging.error(f'\u001B[1;37;41m {msg}\u001B[0m')
+				htmleNBFailureMsg += f'{msg}\n'
+				global_status = CONST.ENB_RETX_ISSUE
+			else:
+				logging.debug(msg)

 		if RealTimeProcessingIssue:
 			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with real time processing issue! \u001B[0m')
@@ -56,7 +56,7 @@ class SSHConnection():
 		self.picocom_closure = True

 	def open(self, ipaddress, username, password):
-		prompt = "#" if username == "root" else "\$"
+		prompt = "\$"
 		count = 0
 		connect_status = False
 		while count < 4:
@@ -74,7 +74,7 @@ class SSHConnection():
 					count = 10
 					connect_status = True
 				else:
-					logging.debug('self.sshresponse = ' + str(self.sshresponse))
+					logging.warning('self.sshresponse = ' + str(self.sshresponse))
 			elif self.sshresponse == 1:
 				self.ssh.sendline(password)
 				self.sshresponse = self.ssh.expect([prompt, 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
@@ -82,7 +82,7 @@ class SSHConnection():
 					count = 10
 					connect_status = True
 				else:
-					logging.debug('self.sshresponse = ' + str(self.sshresponse))
+					logging.warning('self.sshresponse = ' + str(self.sshresponse))
 			elif self.sshresponse == 2:
 				# We directly ended up on the remote server because of pubkey auth
 				count = 10
@@ -91,8 +91,8 @@ class SSHConnection():
 				self.sshresponse = self.ssh.expect([prompt])
 			else:
 				# debug output
-				logging.debug(str(self.ssh.before))
-				logging.debug('self.sshresponse = ' + str(self.sshresponse))
+				logging.warning(str(self.ssh.before))
+				logging.warning('self.sshresponse = ' + str(self.sshresponse))
 			# adding a tempo when failure
 			if not connect_status:
 				time.sleep(1)
@@ -108,7 +108,7 @@ class SSHConnection():


 	def cde_check_value(self, commandline, expected, timeout):
-		logging.debug(commandline)
+		logging.info(commandline)
 		self.ssh.timeout = timeout
 		self.ssh.sendline(commandline)
 		expected.append(pexpect.EOF)
@@ -118,7 +118,7 @@ class SSHConnection():

 	def command(self, commandline, expectedline, timeout, silent=False, resync=False):
 		if not silent:
-			logging.debug(commandline)
+			logging.info(commandline)
 		self.ssh.timeout = timeout
 		# Nasty patch when pexpect output is out of sync.
 		# Much pronounced when running back-to-back-back oc commands
@@ -133,27 +133,27 @@ class SSHConnection():
 		if self.sshresponse == 0:
 			return 0
 		elif self.sshresponse == 1:
-			logging.debug('\u001B[1;37;41m Unexpected EOF \u001B[0m')
-			logging.debug('Expected Line : ' + expectedline)
-			logging.debug(str(self.ssh.before))
+			logging.error('\u001B[1;37;41m Unexpected EOF \u001B[0m')
+			logging.error('Expected Line : ' + expectedline)
+			logging.error(str(self.ssh.before))
 			sys.exit(self.sshresponse)
 		elif self.sshresponse == 2:
-			logging.debug('\u001B[1;37;41m Unexpected TIMEOUT \u001B[0m')
-			logging.debug('Expected Line : ' + expectedline)
+			logging.error('\u001B[1;37;41m Unexpected TIMEOUT \u001B[0m')
+			logging.error('Expected Line : ' + expectedline)
 			result = re.search('ping |iperf |picocom', str(commandline))
 			if result is None:
-				logging.debug(str(self.ssh.before))
+				logging.warning(str(self.ssh.before))
 				sys.exit(self.sshresponse)
 			else:
 				return -1
 		else:
-			logging.debug('\u001B[1;37;41m Unexpected Others \u001B[0m')
-			logging.debug('Expected Line : ' + expectedline)
+			logging.error('\u001B[1;37;41m Unexpected Others \u001B[0m')
+			logging.error('Expected Line : ' + expectedline)
 			sys.exit(self.sshresponse)

 	def command2(self, commandline, timeout, silent=False):
 		if not silent:
-			logging.debug(commandline)
+			logging.info(commandline)
 		self.cmd2Results = ''
 		noHistoryCmd = 'unset HISTFILE; ' + commandline
 		myHost = self.username + '@' + self.ipaddress
@@ -165,7 +165,7 @@ class SSHConnection():

 	def command3(self, commandline, timeout, silent=False):
 		if not silent:
-			logging.debug(commandline)
+			logging.info(commandline)
 		self.cmd2Results = ''
 		noHistoryCmd = 'unset HISTFILE; ' + commandline
 		myHost = self.username + '@' + self.ipaddress
@@ -186,14 +186,14 @@ class SSHConnection():
 			pass
 		elif self.sshresponse == 1:
 			if not self.picocom_closure:
-				logging.debug('\u001B[1;37;41m Unexpected TIMEOUT during closing\u001B[0m')
+				logging.warning('\u001B[1;37;41m Unexpected TIMEOUT during closing\u001B[0m')
 		else:
-			logging.debug('\u001B[1;37;41m Unexpected Others during closing\u001B[0m')
+			logging.warning('\u001B[1;37;41m Unexpected Others during closing\u001B[0m')

 	def copyin(self, ipaddress, username, password, source, destination):
 		count = 0
 		copy_status = False
-		logging.debug('scp -r '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
+		logging.info('scp -r '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
 		while count < 10:
 			scp_spawn = pexpect.spawn('scp -r '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 100)
 			scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
@@ -206,7 +206,7 @@ class SSHConnection():
 					count = 10
 					copy_status = True
 				else:
-					logging.debug('1 - scp_response = ' + str(scp_response))
+					logging.warning('1 - scp_response = ' + str(scp_response))
 			elif scp_response == 1:
 				scp_spawn.sendline(password)
 				scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
@@ -214,12 +214,12 @@ class SSHConnection():
 					count = 10
 					copy_status = True
 				else:
-					logging.debug('2 - scp_response = ' + str(scp_response))
+					logging.warning('2 - scp_response = ' + str(scp_response))
 			elif scp_response == 2:
 				count = 10
 				copy_status = True
 			else:
-				logging.debug('3 - scp_response = ' + str(scp_response))
+				logging.warning('3 - scp_response = ' + str(scp_response))
 			# adding a tempo when failure
 			if not copy_status:
 				time.sleep(1)
@@ -232,7 +232,7 @@ class SSHConnection():
 	def copyout(self, ipaddress, username, password, source, destination):
 		count = 0
 		copy_status = False
-		logging.debug('scp -r ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
+		logging.info('scp -r ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
 		while count < 4:
 			scp_spawn = pexpect.spawn('scp -r ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 100)
 			scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
@@ -245,7 +245,7 @@ class SSHConnection():
 					count = 10
 					copy_status = True
 				else:
-					logging.debug('1 - scp_response = ' + str(scp_response))
+					logging.warning('1 - scp_response = ' + str(scp_response))
 			elif scp_response == 1:
 				scp_spawn.sendline(password)
 				scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
@@ -253,12 +253,12 @@ class SSHConnection():
 					count = 10
 					copy_status = True
 				else:
-					logging.debug('2 - scp_response = ' + str(scp_response))
+					logging.warning('2 - scp_response = ' + str(scp_response))
 			elif scp_response == 2:
 				count = 10
 				copy_status = True
 			else:
-				logging.debug('3 - scp_response = ' + str(scp_response))
+				logging.warning('3 - scp_response = ' + str(scp_response))
 			# adding a tempo when failure
 			if not copy_status:
 				time.sleep(1)
@@ -40,7 +40,6 @@
  - IdleSleep
  - Perform_X2_Handover
  - Build_Image
-  - Copy_Image_to_Test
  - Deploy_Object
  - Undeploy_Object
  - Cppcheck_Analysis
@@ -51,3 +50,6 @@
  - IperfFromContainer
  - StatsFromGenObject
  - LicenceAndFormattingCheck
+  - Push_Local_Registry
+  - Pull_Local_Registry
+  - Clean_Test_Server_Images
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>56cfdc0</proxy_commit>
+                <proxy_commit>a6169d8</proxy_commit>
        </testCase>

 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
+ 111111
 100001
 000000
 000001
@@ -42,6 +43,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000000">
                <class>DeployGenObject</class>
                <desc>Deploy Cassandra Database</desc>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -25,6 +25,7 @@
        <htmlTabName>Monolithic eNB - FDD 05MHz</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
+ 111111
 100011
 000011
 000001
@@ -42,6 +43,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000011">
                <class>DeployGenObject</class>
                <desc>Deploy Cassandra Database</desc>
@@ -74,7 +82,7 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-                <services>enb</services>
+                <services>oai_enb0</services>
                <nb_healthy>8</nb_healthy>
        </testCase>

@@ -97,7 +105,7 @@
        <testCase id="020012">
                <class>PingFromContainer</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
-		<container_name>rfsim4g-trf-gen</container_name>
+                <container_name>rfsim4g-trf-gen</container_name>
                <options>-c 20 12.0.0.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100011
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -25,6 +25,7 @@
        <htmlTabName>Monolithic eNB - FDD 05MHz - noS1</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
+ 111111
 100011
 000013
 000001
@@ -38,6 +39,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000001">
                <class>IdleSleep</class>
                <desc>Sleep</desc>
@@ -54,7 +62,7 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
-                <services>enb</services>
+                <services>oai_enb0</services>
                <nb_healthy>1</nb_healthy>
        </testCase>

@@ -77,7 +85,7 @@
        <testCase id="020012">
                <class>PingFromContainer</class>
                <desc>Ping LTE-UE from eNB</desc>
-				<container_name>rfsim4g-oai-enb</container_name>
+                <container_name>rfsim4g-oai-enb</container_name>
                <options>-I oaitun_enb1 -c 20 10.0.1.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100011
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -25,6 +25,7 @@
        <htmlTabName>Monolithic eNB - FDD 10MHz</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
+ 111111
 100011
 000011
 000001
@@ -42,6 +43,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000011">
                <class>DeployGenObject</class>
                <desc>Deploy Cassandra Database</desc>
@@ -74,7 +82,7 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 4G eNB RF sim (FDD 10MHz)</desc>
                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-                <services>enb</services>
+                <services>oai_enb0</services>
                <nb_healthy>8</nb_healthy>
        </testCase>

@@ -97,7 +105,7 @@
        <testCase id="020012">
                <class>PingFromContainer</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
-		<container_name>rfsim4g-trf-gen</container_name>
+                <container_name>rfsim4g-trf-gen</container_name>
                <options>-c 20 12.0.0.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100011
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -25,6 +25,7 @@
        <htmlTabName>Monolithic eNB - FDD 20MHz</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
+ 111111
 100011
 000011
 000001
@@ -42,6 +43,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000011">
                <class>DeployGenObject</class>
                <desc>Deploy Cassandra Database</desc>
@@ -74,7 +82,7 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 4G eNB RF sim (FDD 20MHz)</desc>
                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-                <services>enb</services>
+                <services>oai_enb0</services>
                <nb_healthy>8</nb_healthy>
        </testCase>

@@ -97,7 +105,7 @@
        <testCase id="020012">
                <class>PingFromContainer</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
-		<container_name>rfsim4g-trf-gen</container_name>
+                <container_name>rfsim4g-trf-gen</container_name>
                <options>-c 20 12.0.0.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100011
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -24,8 +24,9 @@
        <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
        <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
-		<repeatCount>1</repeatCount>
+        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
+ 111111
 100011
 000011
 000001
@@ -43,6 +44,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000011">
                <class>DeployGenObject</class>
                <desc>Deploy Cassandra Database</desc>
@@ -75,7 +83,7 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 4G eNB RF sim (TDD 05MHz)</desc>
                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-                <services>enb</services>
+                <services>oai_enb0</services>
                <nb_healthy>7</nb_healthy>
        </testCase>

@@ -98,7 +106,7 @@
        <testCase id="020012">
                <class>PingFromContainer</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
-		<container_name>rfsim4g-trf-gen</container_name>
+                <container_name>rfsim4g-trf-gen</container_name>
                <options>-c 20 12.0.0.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100011
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -25,6 +25,7 @@
        <htmlTabName>CU-DU F1 split</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
+ 111111
 100021
 000020
 000021
@@ -38,6 +39,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000020">
                <class>DeployGenObject</class>
                <desc>Deploy MySql Database</desc>
@@ -89,7 +97,7 @@
        <testCase id="020022">
                <class>PingFromContainer</class>
                <desc>Ping NR-UE from ext-dn</desc>
-		<container_name>rfsim5g-oai-ext-dn</container_name>
+                <container_name>rfsim5g-oai-ext-dn</container_name>
                <options>-c 20 12.1.1.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -116,8 +124,8 @@
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <d_retx_th>5,0,0,0</d_retx_th>
-                <u_retx_th>5,0,0,0</u_retx_th>
+                <d_retx_th>1,0,0,0</d_retx_th>
+                <u_retx_th>1,0,0,0</u_retx_th>
        </testCase>

 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100022
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
+ 111111
 100011
 000010
 000011
@@ -39,6 +40,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000010">
                <class>DeployGenObject</class>
                <desc>Deploy MySql Database</desc>
@@ -82,7 +90,7 @@
        <testCase id="020012">
                <class>PingFromContainer</class>
                <desc>Ping NR-UE from ext-dn</desc>
-		<container_name>rfsim5g-oai-ext-dn</container_name>
+                <container_name>rfsim5g-oai-ext-dn</container_name>
                <options>-c 20 12.1.1.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -109,8 +117,8 @@
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <d_retx_th>5,0,0,0</d_retx_th>
-                <u_retx_th>5,0,0,0</u_retx_th>
+                <d_retx_th>1,0,0,0</d_retx_th>
+                <u_retx_th>1,0,0,0</u_retx_th>
        </testCase>

 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100012
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
+ 111111
 100001
 000000
 000001
@@ -40,6 +41,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000000">
                <class>DeployGenObject</class>
                <desc>Deploy MySql Database</desc>
@@ -98,6 +106,8 @@
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <d_retx_th>20,50,100,100</d_retx_th>
+                <u_retx_th>0,0,0,0</u_retx_th>
        </testCase>

        <testCase id="200000">
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
+ 111111
 100001
 000000
 000001
@@ -42,6 +43,13 @@
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
        <testCase id="000000">
                <class>DeployGenObject</class>
                <desc>Deploy MySql Database</desc>
@@ -93,7 +101,7 @@
        <testCase id="020002">
                <class>PingFromContainer</class>
                <desc>Ping NR-UE from ext-dn</desc>
-		<container_name>rfsim5g-oai-ext-dn</container_name>
+                <container_name>rfsim5g-oai-ext-dn</container_name>
                <options>-c 20 12.1.1.2</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -109,7 +117,7 @@
        <testCase id="020004">
                <class>PingFromContainer</class>
                <desc>Ping Second NR-UE from ext-dn</desc>
-		<container_name>rfsim5g-oai-ext-dn</container_name>
+                <container_name>rfsim5g-oai-ext-dn</container_name>
                <options>-c 20 12.1.1.3</options>
                <loss_threshold>5</loss_threshold>
        </testCase>
@@ -136,8 +144,8 @@
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <d_retx_th>5,0,0,0</d_retx_th>
-                <u_retx_th>5,0,0,0</u_retx_th>
+                <d_retx_th>1,0,0,0</d_retx_th>
+                <u_retx_th>1,0,0,0</u_retx_th>
        </testCase>

 </testCaseList>
@@ -26,6 +26,7 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
+ 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

@@ -35,4 +36,10 @@
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
        </testCase>

+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
 </testCaseList>
@@ -26,6 +26,7 @@
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
 000001
+ 000010
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

@@ -38,4 +39,10 @@
 		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>

+	<testCase id="000010">
+		<class>Push_Local_Registry</class>
+		<desc>Push Images to Local Registry</desc>
+		<registry_svr_id>0</registry_svr_id>
+	</testCase>
+
 </testCaseList>
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>56cfdc0</proxy_commit>
+                <proxy_commit>a6169d8</proxy_commit>
        </testCase>

 </testCaseList>
@@ -0,0 +1,168 @@
+<!--
+
+ 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
+
+Replace xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-05-tm1</htmlTabRef>
+    <htmlTabName>Test-05MHz-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030101
+000001
+040301 000001 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
+030201
+    </TestCaseRequestedList>
+    <TestCaseExclusionList></TestCaseExclusionList>
+
+    <testCase id="111110">
+        <class>Pull_Local_Registry</class>
+        <desc>Pull Images from Local Registry</desc>
+        <test_svr_id>0</test_svr_id>
+        <images_to_pull>oai-enb</images_to_pull>
+    </testCase>
+
+    <testCase id="030101">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="000001">
+        <class>IdleSleep</class>
+        <desc>Sleep</desc>
+        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+    </testCase>
+
+    <testCase id="030201">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy eNB</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="040101">
+        <class>Initialize_UE</class>
+        <desc>Initialize UE</desc>
+    </testCase>
+
+    <testCase id="040201">
+        <class>Terminate_UE</class>
+        <desc>Terminate UE</desc>
+    </testCase>
+
+    <testCase id="040301">
+        <class>Attach_UE</class>
+        <desc>Attach UE</desc>
+    </testCase>
+
+    <testCase id="040401">
+        <class>Detach_UE</class>
+        <desc>Detach UE</desc>
+    </testCase>
+
+    <testCase id="040501">
+        <class>Ping</class>
+        <desc>ping (5MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040603">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040604">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040605">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040606">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040607">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040641">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040642">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040643">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040644">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+</testCaseList>
+
@@ -26,9 +26,10 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
+ 111110
+ 111111
 000001
 010002
- 030000
 030101
 000001
 030102
@@ -49,6 +50,20 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

+	<testCase id="111110">
+		<class>Pull_Local_Registry</class>
+		<desc>Pull Images from Local Registry</desc>
+		<test_svr_id>0</test_svr_id>
+		<images_to_pull>oai-enb</images_to_pull>
+	</testCase>
+
+	<testCase id="111111">
+		<class>Pull_Local_Registry</class>
+		<desc>Pull Images from Local Registry</desc>
+		<test_svr_id>1</test_svr_id>
+		<images_to_pull>oai-gnb</images_to_pull>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
@@ -62,14 +77,6 @@
 		<id>idefix</id>
 	</testCase>

-	<testCase id="030000">
-		<class>Copy_Image_to_Test</class>
-		<desc>Copy gNB image to test server</desc>
-		<image_name>oai-gnb</image_name>
-		<registry_svr_id>0</registry_svr_id>
-		<test_svr_id>1</test_svr_id>
-	</testCase>
-
 	<testCase id="030101">
 		<class>Deploy_Object</class>
 		<desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
@@ -180,6 +187,8 @@
 		<yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
        <eNB_instance>1</eNB_instance>
        <eNB_serverId>1</eNB_serverId>
+        <d_retx_th>1,100,100,100</d_retx_th>
+        <u_retx_th>1,100,100,100</u_retx_th>
    </testCase>

 </testCaseList>
@@ -28,6 +28,8 @@
 	<TestCaseRequestedList>
 030202
 030201
+ 222220
+ 222221
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

@@ -47,5 +49,17 @@
        <eNB_serverId>1</eNB_serverId>
    </testCase>

+	<testCase id="222220">
+		<class>Clean_Test_Server_Images</class>
+		<desc>Clean Test Images on Test Server</desc>
+		<test_svr_id>0</test_svr_id>
+	</testCase>
+
+	<testCase id="222221">
+		<class>Clean_Test_Server_Images</class>
+		<desc>Clean Test Images on Test Server</desc>
+		<test_svr_id>1</test_svr_id>
+	</testCase>
+
 </testCaseList>

@@ -26,8 +26,8 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+    111111
    010002
-    030000
    030101
    000001
    010000
@@ -47,6 +47,13 @@
    -->
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id="111111">
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <test_svr_id>0</test_svr_id>
+    <images_to_pull>oai-gnb</images_to_pull>
+  </testCase>
+
  <testCase id="010000">
    <class>Initialize_UE</class>
    <desc>Initialize Quectel</desc>
@@ -60,14 +67,6 @@
    <id>idefix</id>
  </testCase>

-  <testCase id="030000">
-    <class>Copy_Image_to_Test</class>
-    <desc>Copy gNB image to test server</desc>
-    <image_name>oai-gnb</image_name>
-    <registry_svr_id>1</registry_svr_id>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
  <testCase id="030101">
    <class>Deploy_Object</class>
    <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
@@ -162,6 +161,8 @@
    <yaml_path>ci-scripts/yaml_files/sa_b200_gnb</yaml_path>
    <eNB_instance>0</eNB_instance>
    <eNB_serverId>0</eNB_serverId>
+    <d_retx_th>1,100,100,100</d_retx_th>
+    <u_retx_th>1,100,100,100</u_retx_th>
  </testCase>

 </testCaseList>
@@ -27,6 +27,7 @@
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
  030201
+  222222
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

@@ -39,4 +40,10 @@
    <image_tag>sa-test</image_tag>
  </testCase>

+  <testCase id="222222">
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <test_svr_id>0</test_svr_id>
+  </testCase>
+
 </testCaseList>
@@ -1,144 +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
-
-->
-<testCaseList>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040606">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040607">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>
@@ -143,6 +143,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
+		<d_retx_th>5,50,100,100</d_retx_th>
+		<u_retx_th>5,50,100,100</u_retx_th>
 	</testCase>

 </testCaseList>
@@ -133,6 +133,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
+		<d_retx_th>5,50,100,100</d_retx_th>
+		<u_retx_th>5,50,100,100</u_retx_th>
 	</testCase>

 </testCaseList>
@@ -169,6 +169,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
+		<d_retx_th>5,50,100,100</d_retx_th>
+		<u_retx_th>5,50,100,100</u_retx_th>
 	</testCase>

 </testCaseList>
@@ -146,7 +146,7 @@ rfsim4g-trf-gen          /bin/bash -c ip route add  ...   Up (healthy)
 ## 2.3. Deploy OAI eNB in RF simulator mode ##

 ```bash
-$ docker-compose up -d enb
+$ docker-compose up -d oai_enb0
 Creating rfsim4g-oai-enb ... done
 ```

@@ -179,7 +179,7 @@ services:
            timeout: 5s
            retries: 5

-    enb:
+    oai_enb0:
        image: oai-enb:develop
        privileged: true
        container_name: rfsim4g-oai-enb
@@ -1,7 +1,7 @@
 version: '3.8'

 services:
-    enb:
+    oai_enb0:
        image: oai-enb:develop
        privileged: true
        container_name: rfsim4g-oai-enb
@@ -179,7 +179,7 @@ services:
            timeout: 5s
            retries: 5

-    enb:
+    oai_enb0:
        image: oai-enb:develop
        privileged: true
        container_name: rfsim4g-oai-enb
@@ -179,7 +179,7 @@ services:
            timeout: 5s
            retries: 5

-    enb:
+    oai_enb0:
        image: oai-enb:develop
        privileged: true
        container_name: rfsim4g-oai-enb
@@ -179,7 +179,7 @@ services:
            timeout: 5s
            retries: 5

-    enb:
+    oai_enb0:
        image: oai-enb:develop
        privileged: true
        container_name: rfsim4g-oai-enb
@@ -0,0 +1,43 @@
+version: '3.8'
+
+services:
+    enb_mono_fdd:
+        image: oai-enb:latest
+        privileged: true
+        container_name: lte-b200-enb-fdd-05Mhz-tm1
+        environment:
+            USE_FDD_MONO: 'yes'
+            USE_B2XX: 'yes'
+            ENB_NAME: eNB-in-docker
+            MCC: '208'
+            MNC: '92'
+            MNC_LENGTH: 2
+            TAC: 1
+            UTRA_BAND_ID: 7
+            DL_FREQUENCY_IN_MHZ: 2680
+            UL_FREQUENCY_OFFSET_IN_MHZ: 120
+            NID_CELL: 0
+            NB_PRB: 25
+            ENABLE_MEASUREMENT_REPORTS: 'no'
+            ENABLE_X2: 'no'
+            MME_S1C_IP_ADDRESS: 172.21.18.48
+            ENB_S1C_IF_NAME: eth0
+            ENB_S1C_IP_ADDRESS: 172.21.18.46
+            ENB_S1U_IF_NAME: eth0
+            ENB_S1U_IP_ADDRESS: 172.21.18.46
+            ENB_X2_IP_ADDRESS: 172.21.18.46
+            RRC_INACTIVITY_THRESHOLD: 30
+            FLEXRAN_ENABLED: 'no'
+            FLEXRAN_INTERFACE_NAME: eth0
+            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
+            THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
+            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
+        volumes:
+            - /dev:/dev
+        network_mode: "host"
+        healthcheck:
+            # pgrep does NOT work
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
@@ -53,8 +53,6 @@ BUILD_COVERITY_SCAN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-AVX512="True"
-AVX2="True"
 BUILD_ECLIPSE=0
 NR="False"
 OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope"
@@ -159,7 +157,7 @@ Options:
 --noavx512
   Disable AVX512 intrinsics whatever processor capability is
 --noavx2
-   Disable AVX2 intrinsics if processor supports it or use SIMDE emulation
+   Disable AVX2 intrinsics whatever processor capability is
 -k | --skip-shared-libraries
   Skip build for shared libraries to reduce compilation time when building frequently for debugging purposes
 --ninja
@@ -394,11 +392,11 @@ function main() {
            fi
            shift 2;;		
        --noavx512)
-            AVX512="False"
+            CMAKE_CMD="$CMAKE_CMD -DAVX512=OFF"
            echo_info "Disabling AVX512 instructions"
            shift 1;;
        --noavx2)
-            AVX2="False"
+            CMAKE_CMD="$CMAKE_CMD -DAVX2=OFF"
            echo_info "Disabling AVX2 instructions"
            shift 1;;
        -k | --skip-shared-libraries)
@@ -559,23 +557,9 @@ function main() {
  if [[ ${#CMAKE_C_FLAGS[@]} > 0 ]]; then CMAKE_CMD="$CMAKE_CMD -DCMAKE_C_FLAGS=\"${CMAKE_C_FLAGS[*]}\""; fi
  if [[ ${#CMAKE_CXX_FLAGS[@]} > 0 ]]; then CMAKE_CMD="$CMAKE_CMD -DCMAKE_CXX_FLAGS=\"${CMAKE_CXX_FLAGS[*]}\""; fi

-  # if --noavx512 is not specified the AVX512 equals "True" by default
-  # override AVX512 to "False" if processor does not have avx512
-  # this avoids having to specify --noavx512 systematically
-  if [ -f /proc/cpuinfo ]; then
-      if grep -q avx512 /proc/cpuinfo
-      then
-        echo_info "Processor has avx512 intrinsics"
-      else
-        echo_info "Processor does not have avx512 intrinsics"
-        echo_info "Forcing AVX512 to False"
-	AVX512="False"
-      fi
-  fi
-
  # for historical reasons we build in a subdirectory cmake_targets/XYZ/build,
  # e.g., cmake_targets/ran_build/build, hence the ../../..
-  CMAKE_CMD="$CMAKE_CMD -DAVX512=\"${AVX512[*]}\" -DAVX2=\"${AVX2[*]}\" ../../.."
+  CMAKE_CMD="$CMAKE_CMD ../../.."
  echo_info "running $CMAKE_CMD"
  eval $CMAKE_CMD
  
@@ -96,3 +96,11 @@ macro(compile_asn1 asn1Source asn1cCmd ResultFlag)
     DEPENDS ${asn1Source}
   )
 endmacro(compile_asn1)
+
+macro(eval_boolean VARIABLE)
+  if(${ARGN})
+    set(${VARIABLE} ON)
+  else()
+    set(${VARIABLE} OFF)
+  endif()
+endmacro()
@@ -33,7 +33,7 @@ OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "
 case "$OS_DISTRO" in
  fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum --skip-broken"; CMAKE="cmake3" ;;
-  centos) OS_BASEDISTRO="fedora"; INSTALLER="yum --skip-broken"; CMAKE="cmake3" ;;
+  centos) OS_BASEDISTRO="centos"; INSTALLER="yum --skip-broken"; CMAKE="cmake3" ;;
  debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
  ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
 esac
@@ -10,7 +10,7 @@ As a developer you may need to look at these sections:

 Loader usage examples can be found in oai sources:

-*  device and transport initialization code: [function `load_lib` in *sdr/COMMON/__common_lib.c__* ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/sdr/COMMON/common_lib.c#L91)
-*  turbo encoder and decoder initialization: [function `load_codinglib`in *openair1/PHY/CODING/__coding_load.c__*](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/CODING/coding_load.c#L113)
+*  device and transport initialization code: [function `load_lib` in *radio/COMMON/__common_lib.c__* ](./../../../radio/COMMON/common_lib.c#L91)
+*  turbo encoder and decoder initialization: [function `load_codinglib`in *openair1/PHY/CODING/__coding_load.c__*](./../../../develop/openair1/PHY/CODING/coding_load.c#L113)

 [loader home page](../loader.md)
@@ -7,9 +7,20 @@ All logging facility parameters are defined in the log_config section. Some para

 | name | type | default | description |
 |:---:|:---:|:---:|:----|
-| `global_log_level` | `pre-defined string of char` | `info` |  Allows printing of messages up to the specified  level. Available levels, from lower to higher are `error`,`warn`,`analysis`,`info`,`debug`,`trace` |
-| `global_log_online` | `boolean` | 1 (=true) | If false, all console messages are discarded, whatever their level |
-| `global_log_options` | `list of pre-defined string of char` |  |  5 options can be specified to trigger the information added in the header of the message:  `nocolor`, disable color usage in log messages, usefull when redirecting logs to a file, where escape sequences used for color selection can be annoying, `level`, add a one letter level id in the message header (T,D,I,A,W,E for trace, debug, info, analysis, warning, error),`thread`, add the thread name in the message header, `thread_id`, adds the thread ID in the message header, `function`, adds the function name, `line_num`, adds the line number, `time` adds the time since process starts|
+| `global_log_level` | `string` | `info` |  Allows printing of messages up to the specified level. Available levels, from lower to higher are `error`, `warn`, `analysis`, `info`, `debug`, `trace` |
+| `global_log_online` | `bool` | 1 (=`true`) | If `false`, all console messages are discarded, whatever their level |
+| `global_log_options` | `string` | _empty_ | _see following list_ |
+
+The following options can be specified to trigger the information added in the header of the message (`global_log_options`):
+
+- `nocolor`: disable color usage in log messages, useful when redirecting logs to a file, where escape sequences used for color selection can be annoying
+- `level`: add a one letter level ID in the message header (`T`,`D`,`I`,`A`,`W`,`E` for trace, debug, info, analysis, warning, error)
+- `thread`: add the thread name
+- `thread_id`: add the thread ID
+- `function`: add the function name
+- `line_num`: adds the (source code) line number
+- `time`: add the time since process started
+- `wall_clock`: add the system-wide clock time that measures real (i.e., wall-clock) time (`time` and `wall_clock` are mutually exclusive)

 ### Component specific parameters
 | name | type | default | description |
@@ -84,10 +84,10 @@ mapping log_options[] = {
  {"function", FLAG_FUNCT},
  {"time",     FLAG_TIME},
  {"thread_id", FLAG_THREAD_ID},
+  {"wall_clock", FLAG_REAL_TIME},
  {NULL,-1}
 };

-
 mapping log_maskmap[] = LOG_MASKMAP_INIT;

 char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, LOG_GREEN, "", LOG_BLUE, LOG_CYBL};  /*!< \brief Optional start-format strings for highlighting */
@@ -306,7 +306,7 @@ void  log_getconfig(log_t *g_log)

  for (int i=MIN_LOG_COMPONENTS; i < MAX_LOG_PREDEF_COMPONENTS; i++) {
    if(g_log->log_component[i].name == NULL) {
-      g_log->log_component[i].name = malloc(16);
+      g_log->log_component[i].name = malloc(17);
      sprintf((char *)g_log->log_component[i].name,"comp%i?",i);
      logparams_logfile[i].paramflags = PARAMFLAG_DONOTREAD;
      logparams_level[i].paramflags = PARAMFLAG_DONOTREAD;
@@ -512,6 +512,9 @@ int logInit (void)
    memset(&(g_log->log_component[i]),0,sizeof(log_component_t));
  }

+  AssertFatal(!((g_log->flag & FLAG_TIME) && (g_log->flag & FLAG_REAL_TIME)),
+		   "Invalid log options: time and wall_clock both set but are mutually exclusive\n");
+
  g_log->flag =  g_log->flag | FLAG_INITIALIZED;
  printf("log init done\n");
  return 0;
@@ -554,10 +557,12 @@ static inline int log_header(log_component_t *c,
  else
    l[0] = 0;

+  // output time information
  char timeString[32];
-  if ( flag & FLAG_TIME ) {
+  if ((flag & FLAG_TIME) || (flag & FLAG_REAL_TIME)) {
    struct timespec t;
-    if (clock_gettime(CLOCK_MONOTONIC, &t) == -1)
+    const clockid_t clock = flag & FLAG_TIME ? CLOCK_MONOTONIC : CLOCK_REALTIME;
+    if (clock_gettime(clock, &t) == -1)
        abort();
    snprintf(timeString, sizeof(timeString), "%lu.%06lu ",
             t.tv_sec,
@@ -129,6 +129,7 @@ extern "C" {
 #define FLAG_FILE_LINE   0x0040
 #define FLAG_TIME        0x0100
 #define FLAG_THREAD_ID   0x0200
+#define FLAG_REAL_TIME   0x0400
 #define FLAG_INITIALIZED 0x8000

 #define SET_LOG_OPTION(O)   g_log->flag = (g_log->flag | O)
@@ -76,7 +76,7 @@ cd cmake_targets/
 ```

 - The `-I` option is to install pre-requisites, you only need it the first time you build the softmodem or when some oai dependencies have changed.
- The `-w` option is to select the radio head support you want to include in your build. Radio head support is provided via a shared library, which is called the "oai device" The build script creates a soft link from `liboai_device.so` to the true device which will be used at run-time (here the USRP one,`liboai_usrpdevif.so` . USRP is the only hardware tested today in the Continuous Integration process. The RF simulator[RF simulator](../sdr/rfsimulator/README.md) is implemented as a specific device replacing RF hardware, it can be specifically built using `-w SIMU` option, but is also built during any softmodem build.
+- The `-w` option is to select the radio head support you want to include in your build. Radio head support is provided via a shared library, which is called the "oai device" The build script creates a soft link from `liboai_device.so` to the true device which will be used at run-time (here the USRP one,`liboai_usrpdevif.so` . USRP is the only hardware tested today in the Continuous Integration process. The RF simulator[RF simulator](../radio/rfsimulator/README.md) is implemented as a specific device replacing RF hardware, it can be specifically built using `-w SIMU` option, but is also built during any softmodem build.
 - `--eNB` is to build the `lte-softmodem` executable and all required shared libraries
 - `--gNB` is to build the `nr-softmodem` executable and all required shared libraries
 - `--UE` is to build the `lte-uesoftmodem` executable and all required shared libraries
@@ -23,7 +23,7 @@ It is planned to enhance this simulator with the following functionalities:
 - Support for multiple UE connections,each UE being a `lte-uesoftmodem` or `nr_uesoftmodem` instance.
 - Support for multiple eNodeB's or gNodeB's for hand-over tests

-   This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../sdr/rfsimulator/README.md ) contains the detailed documentation.
+   This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../radio/rfsimulator/README.md ) contains the detailed documentation.

 # L2 nFAPI Simulator

@@ -102,7 +102,7 @@ Some other useful paramters of the UE are

 Instead of randomly generated payload, in the phy-test mode we can also inject/receive user-plane traffic over a TUN interface. This is the so-called noS1 mode. 

-This setup is described in the [rfsimulator page](../sdr/rfsimulator/README.md#5g-case). In theory this should also work with the real hardware target although this has yet to be tested.
+This setup is described in the [rfsimulator page](../radio/rfsimulator/README.md#5g-case). In theory this should also work with the real hardware target although this has yet to be tested.

 ## do-ra setup with OAI

@@ -1,6 +1,6 @@
 #!/bin/bash

-set -euo pipefail
+set -uo pipefail

 PREFIX=/opt/oai-enb
 RRC_INACTIVITY_THRESHOLD=${RRC_INACTIVITY_THRESHOLD:-0}
@@ -1,6 +1,6 @@
 #!/bin/bash

-set -euo pipefail
+set -uo pipefail

 PREFIX=/opt/oai-gnb
 ENABLE_X2=${ENABLE_X2:-yes}
@@ -21,11 +21,9 @@ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.c
 # Defualt Parameters
 GNB_ID=${GNB_ID:-e00}
 NSSAI_SD=${NSSAI_SD:-ffffff}
-USE_FQDN=${USE_FQDN:-false}
-AMF_FQDN=${AMF_FQDN:-oai-amf-svc}
-
-# Resolve AMF FQDN
-if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi
+# AMF_IP_ADDRESS can be amf ip address of amf fqdn
+if [[ -v AMF_IP_ADDRESS ]] && [[ "${AMF_IP_ADDRESS}" =~ [a-zA-Z] ]] && [[ -z `getent hosts $AMF_IP_ADDRESS | awk '{print $1}'` ]]; then echo "not able to resolve AMF FQDN" && exit 1 ; fi
+[[ -v AMF_IP_ADDRESS ]] && [[ "${AMF_IP_ADDRESS}" =~ [a-zA-Z] ]] && AMF_IP_ADDRESS=$(getent hosts $AMF_IP_ADDRESS | awk '{print $1}')

 # Only this template will be manipulated
 CONFIG_FILES=`ls $PREFIX/etc/gnb.conf || true`
@@ -1,6 +1,6 @@
 #!/bin/bash

-set -euo pipefail
+set -uo pipefail

 PREFIX=/opt/oai-lte-ru

@@ -1,6 +1,6 @@
 #!/bin/bash

-set -euo pipefail
+set -uo pipefail

 PREFIX=/opt/oai-lte-ue

@@ -1,6 +1,6 @@
 #!/bin/bash

-set -euo pipefail
+set -uo pipefail

 PREFIX=/opt/oai-nr-ue

@@ -11,6 +11,10 @@ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/nr-ue
 # if none, pick the default
 if [ ! -f $PREFIX/etc/nr-ue.conf ]; then cp $PREFIX/etc/nr-ue-sim.conf $PREFIX/etc/nr-ue.conf; fi

+# RFSIMULATOR can have ip-address or service name
+if [[ -v RFSIMULATOR ]] && [[ "${RFSIMULATOR}" =~ [a-zA-Z] ]] && [[ -z `getent hosts $RFSIMULATOR | awk '{print $1}'` ]]; then echo "not able to resolve RFSIMULATOR FQDN" && exit 1 ; fi
+[[ -v RFSIMULATOR ]] && [[ "${RFSIMULATOR}" =~ [a-zA-Z] ]] && RFSIMULATOR=$(getent hosts $RFSIMULATOR | awk '{print $1}')
+
 # Only this template will be manipulated
 CONFIG_FILES=`ls $PREFIX/etc/nr-ue.conf || true`

@@ -45,8 +45,8 @@
 #include "common/utils/load_module_shlib.h"


-#include "sdr/COMMON/common_lib.h"
-#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
+#include "radio/COMMON/common_lib.h"
+#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"


 #include "PHY/phy_vars.h"
@@ -55,7 +55,7 @@
 #undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all

-#include "sdr/COMMON/common_lib.h"
+#include "radio/COMMON/common_lib.h"

 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all

@@ -37,8 +37,8 @@
 #include "common/ran_context.h"
 #include "rt_profiling.h"

-#include "sdr/COMMON/common_lib.h"
-#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
+#include "radio/COMMON/common_lib.h"
+#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"

 #include "PHY/LTE_TRANSPORT/if4_tools.h"

@@ -24,7 +24,7 @@
 #include <unistd.h>

 #include <sys/sysinfo.h>
-#include "sdr/COMMON/common_lib.h"
+#include "radio/COMMON/common_lib.h"
 #undef MALLOC
 #include "assertions.h"
 #include "PHY/types.h"
@@ -39,8 +39,8 @@
 #undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all

-#include "sdr/COMMON/common_lib.h"
-#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
+#include "radio/COMMON/common_lib.h"
+#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"

 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all

@@ -264,10 +264,10 @@ static void process_queued_nr_nfapi_msgs(NR_UE_MAC_INST_t *mac, int sfn_slot)
      send_nsa_standalone_msg(&UL_INFO, rach_ind->header.message_id);
      for (int i = 0; i < rach_ind->number_of_pdus; i++)
      {
-        free(rach_ind->pdu_list[i].preamble_list);
+        free_and_zero(rach_ind->pdu_list[i].preamble_list);
      }
-      free(rach_ind->pdu_list);
-      free(rach_ind);
+      free_and_zero(rach_ind->pdu_list);
+      free_and_zero(rach_ind);
      nr_Msg1_transmitted(0, 0, NFAPI_SFNSLOT2SFN(sfn_slot), 0);
  }
  if (dl_tti_request)
@@ -280,8 +280,7 @@ static void process_queued_nr_nfapi_msgs(NR_UE_MAC_INST_t *mac, int sfn_slot)
            NFAPI_SFNSLOT2SFN(dl_tti_sfn_slot), NFAPI_SFNSLOT2SLOT(dl_tti_sfn_slot));
      if (get_softmodem_params()->nsa)
        save_nr_measurement_info(dl_tti_request);
-      free(dl_tti_request);
-      dl_tti_request = NULL;
+      free_and_zero(dl_tti_request);
    }
    else if (dl_tti_request->dl_tti_request_body.nPDUs > 0 && tx_data_request->Number_of_PDUs > 0)
    {
@@ -437,6 +436,12 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
    mac->dl_info.slot = slot;
    mac->dl_info.dci_ind = NULL;
    mac->dl_info.rx_ind = NULL;
+    if (ch_info) {
+      mac->nr_ue_emul_l1.pmi = ch_info->csi[0].pmi;
+      mac->nr_ue_emul_l1.ri = ch_info->csi[0].ri;
+      mac->nr_ue_emul_l1.cqi = ch_info->csi[0].cqi;
+      free_and_zero(ch_info);
+    }

    if (is_nr_DL_slot(get_softmodem_params()->nsa ?
                      mac->scc->tdd_UL_DL_ConfigurationCommon :
@@ -35,8 +35,8 @@
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
 #include "common/utils/nr/nr_common.h"

-#include "sdr/COMMON/common_lib.h"
-#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
+#include "radio/COMMON/common_lib.h"
+#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"

 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
 #include "openair1/PHY/MODULATION/nr_modulation.h"
@@ -85,6 +85,7 @@ unsigned short config_frames[4] = {2,9,11,13};

 #include "nr_nas_msg_sim.h"
 #include <openair1/PHY/MODULATION/nr_modulation.h>
+#include "openair2/GNB_APP/gnb_paramdef.h"

 extern const char *duplex_mode[];
 THREAD_STRUCT thread_struct;
@@ -161,7 +162,7 @@ uint8_t abstraction_flag=0;

 nr_bler_struct nr_bler_data[NR_NUM_MCS];

-static void init_bler_table(void);
+static void init_bler_table(char*);

 /*---------------------BMC: timespec helpers -----------------------------*/

@@ -391,6 +392,17 @@ void *rrc_enb_process_msg(void *notUsed) {
  return NULL;
 }

+static void get_channel_model_mode() {
+  paramdef_t GNBParams[]  = GNBPARAMS_DESC;
+  config_get(GNBParams, sizeof(GNBParams)/sizeof(paramdef_t), NULL);
+  int num_xp_antennas = *GNBParams[GNB_PDSCH_ANTENNAPORTS_XP_IDX].iptr;
+
+  if (num_xp_antennas == 2)
+    init_bler_table("NR_MIMO2x2_AWGN_RESULTS_DIR");
+  else
+    init_bler_table("NR_AWGN_RESULTS_DIR");
+}
+

 int main( int argc, char **argv ) {
  int set_exe_prio = 1;
@@ -468,8 +480,8 @@ int main( int argc, char **argv ) {
  PHY_vars_UE_g = malloc(sizeof(PHY_VARS_NR_UE **));
  PHY_vars_UE_g[0] = malloc(sizeof(PHY_VARS_NR_UE *)*MAX_NUM_CCs);
  if (get_softmodem_params()->emulate_l1) {
-    RCconfig_nr_ue_L1();
-    init_bler_table();
+    RCconfig_nr_ue_macrlc();
+    get_channel_model_mode();
  }

  if (get_softmodem_params()->do_ra)
@@ -550,12 +562,12 @@ int main( int argc, char **argv ) {
 }

 // Read in each MCS file and build BLER-SINR-TB table
-static void init_bler_table(void) {
+static void init_bler_table(char *env_string) {
  memset(nr_bler_data, 0, sizeof(nr_bler_data));

-  const char *awgn_results_dir = getenv("AWGN_RESULTS_DIR");
+  const char *awgn_results_dir = getenv(env_string);
  if (!awgn_results_dir) {
-    LOG_W(NR_MAC, "No $AWGN_RESULTS_DIR\n");
+    LOG_W(NR_MAC, "No %s\n", env_string);
    return;
  }

@@ -577,7 +589,7 @@ static void init_bler_table(void) {
        continue;
      }

-      if (nlines > NUM_SINR) {
+      if (nlines > NR_NUM_SINR) {
        LOG_E(NR_MAC, "BLER FILE ERROR - num lines greater than expected - file: %s\n", fName);
        abort();
      }
@@ -1,7 +1,9 @@

 export OPENAIR_HOME=$(pwd)
 export OPENAIR_DIR=$(pwd)
-export AWGN_RESULTS_DIR=$OPENAIR_DIR/openair1/SIMULATION/NR_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
+export LTE_AWGN_RESULTS_DIR=$OPENAIR_DIR/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
+export NR_AWGN_RESULTS_DIR=$OPENAIR_DIR/openair1/SIMULATION/NR_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
+export NR_MIMO2x2_AWGN_RESULTS_DIR=$OPENAIR_DIR/openair1/SIMULATION/NR_PHY/BLER_SIMULATIONS/AWGN/AWGN_MIMO2x2_results
 export OPENAIR1_DIR=$OPENAIR_HOME/openair1
 export OPENAIR2_DIR=$OPENAIR_HOME/openair2
 export OPENAIR3_DIR=$OPENAIR_HOME/openair3
@@ -194,9 +194,9 @@ int init_codebook_gNB(PHY_VARS_gNB *gNB) {
        }
      }

-      int llc;
-      int mmc;
-      double complex phase_sign;
+      int llc = 0;
+      int mmc = 0;
+      double complex phase_sign = 0;
      //Table 5.2.2.2.1-6:
      //Codebook for 2-layer CSI reporting using antenna ports 3000 to 2999+PCSI-RS
      //Compute the code book size for generating 2 layers out of Tx antenna ports
@@ -408,7 +408,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
  common_vars->rxdataF  = (int32_t **)malloc16( fp->nb_antennas_rx*sizeof(int32_t *) );

  for (i=0; i<fp->nb_antennas_rx; i++) {
-    common_vars->rxdata[i] = (int32_t *) malloc16_clear( (2*(fp->samples_per_frame)+2048)*sizeof(int32_t) );
+    common_vars->rxdata[i] = (int32_t *) malloc16_clear( (2*(fp->samples_per_frame)+fp->ofdm_symbol_size)*sizeof(int32_t) );
    common_vars->rxdataF[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*(fp->samples_per_slot_wCP) );
  }

@@ -205,7 +205,7 @@ void pdcch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
                      uint32_t length) {
  int i;
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  //LOG_D(PHY, "%s(fp, subframe:%d, e, length:%d)\n", __FUNCTION__, subframe, length);
  reset = 1;
  // x1 is set in lte_gold_generic
@@ -56,7 +56,7 @@ void generate_edci_top(PHY_VARS_eNB *eNB, int frame, int subframe) {
 void mpdcch_scrambling(LTE_DL_FRAME_PARMS *frame_parms, mDCI_ALLOC_t *mdci, uint16_t i, uint8_t *e, uint32_t length) {
  int             n;
  uint8_t         reset;
-  uint32_t        x1, x2, s = 0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  uint8_t         Nacc = 4;
  uint16_t        j0, j, idelta;
  uint16_t        i0 = mdci->i0;
@@ -266,7 +266,7 @@ void generate_mdci_top(PHY_VARS_eNB *eNB, int frame, int subframe, int16_t amp,
  int             i;
  int             gain_lin_QPSK;
  uint16_t       *mpdcchtab;
-  uint32_t        x1, x2, s = 0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  uint8_t         Nacc = 4;
  uint16_t        j0, j, idelta;
  uint16_t        i0;
@@ -39,7 +39,7 @@ void generate_grouphop(LTE_DL_FRAME_PARMS *frame_parms)

  uint8_t ns;
  uint8_t reset=1;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  // This is from Section 5.5.1.3
  uint32_t fss_pusch = frame_parms->Nid_cell + frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;

@@ -113,7 +113,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms)

  uint16_t n=0;
  uint8_t reset=1;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  // This is from Section 5.5.1.3
  uint8_t Nsymb_UL = (frame_parms->Ncp_UL == NORMAL) ? 7 : 6;
  uint16_t next = 0;
@@ -146,7 +146,7 @@ void pbch_scrambling_fembms(LTE_DL_FRAME_PARMS *frame_parms,
 {
  int i;
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;

  reset = 1;
  // x1 is set in lte_gold_generic
@@ -425,7 +425,7 @@ void pbch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
 {
  int i;
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;

  reset = 1;
  // x1 is set in lte_gold_generic
@@ -41,7 +41,7 @@ void init_ncs_cell(LTE_DL_FRAME_PARMS *frame_parms,uint8_t ncs_cell[20][7])
 {

  uint8_t ns,l,reset=1,i,N_UL_symb;
-  uint32_t x1,x2,j=0,s=0;
+  uint32_t x1 = 0, x2 = 0, j = 0, s = 0;

  N_UL_symb = (frame_parms->Ncp==0) ? 7 : 6;
  x2 = frame_parms->Nid_cell;
@@ -1505,7 +1505,7 @@ void pdcch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,

  int i;
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;

  reset = 1;
  // x1 is set in first call to lte_gold_generic
@@ -360,7 +360,7 @@ void pbch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
                       uint8_t frame_mod4) {
  int i;
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  reset = 1;
  // x1 is set in first call to lte_gold_generic
  x2 = frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.6.1
@@ -564,7 +564,7 @@ void pbch_unscrambling_fembms(LTE_DL_FRAME_PARMS *frame_parms,
                              uint8_t frame_mod4) {
  int i;
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  reset = 1;
  // x1 is set in first call to lte_gold_generic
  x2 = frame_parms->Nid_cell+(1<<9); //this is c_init for FeMBMS in 36.211 Sec 6.6.1
@@ -23,7 +23,7 @@

 void nr_init_pbch_dmrs(PHY_VARS_gNB* gNB)
 {
-  unsigned int x1, x2;
+  unsigned int x1 = 0, x2 = 0;
  uint16_t Nid, i_ssb, i_ssb2;
  unsigned char Lmax, l, n_hf, N_hf;
  nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
@@ -55,8 +55,7 @@ void nr_init_pbch_dmrs(PHY_VARS_gNB* gNB)

 void nr_init_pdcch_dmrs(PHY_VARS_gNB* gNB, uint32_t Nid)
 {
-
-  uint32_t x1, x2;
+  uint32_t x1 = 0, x2 = 0;
  uint8_t reset;
  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
  uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;
@@ -79,8 +78,7 @@ void nr_init_pdcch_dmrs(PHY_VARS_gNB* gNB, uint32_t Nid)


 void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid) {
-  
-  uint32_t x1, x2;
+  uint32_t x1 = 0, x2 = 0;
  uint8_t reset;
  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
  uint32_t ****pdsch_dmrs = gNB->nr_gold_pdsch_dmrs;
@@ -104,7 +102,7 @@ void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid) {
 void nr_gold_pusch(PHY_VARS_gNB* gNB, int nscid, uint32_t nid) {

  unsigned char ns;
-  unsigned int n,x1,x2;
+  unsigned int n = 0, x1 = 0, x2 = 0;
  int reset;
  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
  unsigned short l;
@@ -127,7 +125,7 @@ void nr_gold_pusch(PHY_VARS_gNB* gNB, int nscid, uint32_t nid) {

 void nr_init_prs(PHY_VARS_gNB* gNB)
 {
-  unsigned int x1, x2;
+  unsigned int x1 = 0, x2 = 0;
  uint16_t Nid;

  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
@@ -23,7 +23,7 @@

 void nr_gold_pbch(PHY_VARS_NR_UE* ue)
 {
-  unsigned int n, x1, x2;
+  unsigned int n = 0, x1 = 0, x2 = 0;
  unsigned int Nid, i_ssb, i_ssb2;
  unsigned char Lmax, l, n_hf, N_hf;
  uint8_t reset;
@@ -55,7 +55,7 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
                   unsigned short nid)
 {
  unsigned char ns,l;
-  unsigned int n,x1,x2,x2tmp0;
+  unsigned int n = 0, x1 = 0, x2 = 0, x2tmp0 = 0;
  uint8_t reset;
  int pdcch_dmrs_init_length =  (((ue->frame_parms.N_RB_DL<<1)*3)>>5)+1;

@@ -78,8 +78,7 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
                   int nscid,
                   uint32_t nid) {
-
-  unsigned int x1,x2,x2tmp0;
+  unsigned int x1 = 0, x2 = 0, x2tmp0 = 0;
  uint8_t reset;
  int pdsch_dmrs_init_length =  ((ue->frame_parms.N_RB_DL*12)>>5)+1;

@@ -104,7 +103,7 @@ void nr_init_pusch_dmrs(PHY_VARS_NR_UE* ue,
                        uint16_t N_n_scid,
                        uint8_t n_scid)
 {
-  uint32_t x1, x2, n;
+  uint32_t x1 = 0, x2 = 0, n = 0;
  uint8_t reset, slot, symb;
  NR_DL_FRAME_PARMS *fp = &ue->frame_parms;
  uint32_t ****pusch_dmrs = ue->nr_gold_pusch_dmrs;
@@ -127,7 +126,7 @@ void nr_init_pusch_dmrs(PHY_VARS_NR_UE* ue,

 void init_nr_gold_prs(PHY_VARS_NR_UE* ue)
 {
-  unsigned int x1, x2;
+  unsigned int x1 = 0, x2 = 0;
  uint16_t Nid;

  NR_DL_FRAME_PARMS *fp = &ue->frame_parms;
@@ -28,7 +28,7 @@


 void nr_init_csi_rs(const NR_DL_FRAME_PARMS *fp, uint32_t ***csi_rs, uint32_t Nid) {
-  uint32_t x1, x2;
+  uint32_t x1 = 0, x2 = 0;
  uint8_t reset;
  int csi_dmrs_init_length =  ((fp->N_RB_DL<<4)>>5)+1;
  for (uint8_t slot=0; slot<fp->slots_per_frame; slot++) {
@@ -47,7 +47,7 @@ void nr_pdcch_scrambling(uint32_t *in,
                         uint32_t scrambling_RNTI,
                         uint32_t *out) {
  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  reset = 1;
  x2 = (scrambling_RNTI<<16) + Nid;
  LOG_D(PHY,"PDCCH Scrambling x2 %x : scrambling_RNTI %x \n", x2, scrambling_RNTI);
@@ -150,7 +150,7 @@ static void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
                        uint8_t encoded,
                        uint32_t unscrambling_mask) {
  uint8_t reset, offset;
-  uint32_t x1, x2, s=0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  uint32_t *pbch_e = pbch->pbch_e;
  reset = 1;
  // x1 is set in lte_gold_generic
@@ -1254,7 +1254,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,

    // first compute DMRS component

-    uint32_t x1, x2, s=0;
+    uint32_t x1 = 0, x2 = 0, s = 0;
    x2 = (((1<<17)*((14*slot) + (pucch_pdu->start_symbol_index+symb) + 1)*((2*pucch_pdu->dmrs_scrambling_id) + 1)) + (2*pucch_pdu->dmrs_scrambling_id))%(1U<<31); // c_init calculation according to TS38.211 subclause
 #ifdef DEBUG_NR_PUCCH_RX
    printf("slot %d, start_symbol_index %d, symbol %d, dmrs_scrambling_id %d\n",
@@ -804,7 +804,7 @@ void nr_pdcch_unscrambling(int16_t *e_rx,
                           int16_t *z2) {
  int i;
  uint8_t reset;
-  uint32_t x1, x2, s = 0;
+  uint32_t x1 = 0, x2 = 0, s = 0;
  uint16_t n_id; //{0,1,...,65535}
  uint32_t rnti = (uint32_t) scrambling_RNTI;
  reset = 1;
--- a/Show More
+++ b/Show More