Merge branch 'integration_2022_wk44' into 'develop'

integration_2022_wk44

See merge request oai/openairinterface5g!1800

!1745 Configurable re-transmission rounds in dlsim and ulsim
!1699 NR RRC pdsch_Config harmonization
!1787 Bugfix in Delta_TF calculation for PHR
!1790 remove unused NR RRC code
!1774 Fix BWP switching to the previous active BWP when there is a RA with Msg3 through DCCH or DTCH
!1772 Add RRC measurement configuration and handling
!1731 replacing call to RRC processing timers for msg3 dcch
!1764 NR_UE: improve timing and initial frequency synchronization
!1777 NR UE move DLSCH PHY memory to stack
!1791 missed to test return code of bind()

CMakeLists.txt

@@ -50,22 +50,22 @@ include_directories(${CRYPTO_INCLUDE_DIRS})
 #uhd 4.0 and iris installs by default in /usr/local
 include_directories("/usr/local/include/")
 #use native cmake method as this package is not in pkg-config
-add_list2_option(RF_BOARD "None" "RF head type" "None" "OAI_USRP" "OAI_BLADERF" "OAI_LMSSDR" "OAI_SIMU" "EXMIMO")
+add_list2_option(RF_BOARD "None" "RF head type" "None" "OAI_USRP" "OAI_BLADERF" "OAI_LMSSDR" "OAI_SIMU")
 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")
@@ -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,15 +882,13 @@ endif ()
 
 ##########################################################
 
-include_directories ("${OPENAIR_DIR}/sdr/COMMON")
+include_directories ("${OPENAIR_DIR}/radio/COMMON")
 
 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
 
 add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????")
-add_boolean_option(DEADLINE_SCHEDULER False "Use the Linux scheduler SCHED_DEADLINE: kernel >= 3.14")
-add_boolean_option(CPU_AFFINITY False "Enable CPU Affinity of threads (only valid without deadline scheduler). It is enabled only with >2 CPUs")
 add_boolean_option(NAS_NETLINK False "useless ??? Must be True to compile nasmesh driver without rtai ????")
 add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????")
 
@@ -904,8 +914,6 @@ add_boolean_option(LINUX_LIST              False "used only in lists.c: either u
 ##########################
 # PHY options
 ##########################
-add_boolean_option(DRIVER2013              True "only relevant for EXMIMO")
-add_boolean_option(EXMIMO_IOT              True "????")
 add_boolean_option(LOCALIZATION            False "???")
 add_integer_option(MAX_NUM_CCs             1     "????")
 add_boolean_option(SMBV                    False "Rohde&Schwarz SMBV100A vector signal generator")
@@ -1039,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")
@@ -1687,7 +1695,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_prach.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_nr.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pucch_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/csi_rx.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_uci_tools_common.c
@@ -2116,12 +2123,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
@@ -2383,6 +2384,7 @@ set(libnrnas_emm_msg_OBJS
   ${NAS_SRC}COMMON/EMM/MSG/RegistrationComplete.c
   ${NAS_SRC}COMMON/EMM/MSG/FGSUplinkNasTransport.c
   ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishRequest.c
+  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
   )
 
 set(libnrnas_ies_OBJS
@@ -2542,15 +2544,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}")
 
@@ -2611,7 +2613,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)
 
@@ -2636,10 +2638,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
@@ -2676,10 +2678,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
@@ -2707,8 +2709,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
@@ -2732,9 +2734,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
@@ -2779,8 +2781,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
@@ -2824,8 +2826,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
@@ -2878,7 +2880,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}
 )
@@ -3084,7 +3086,7 @@ if (${T_TRACER})
         nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
         #all "add_library" definitions
         ITTI RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP
-        params_libconfig oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
+        params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
         oai_eth_transpro oai_mobipass coding FLPT_MSG FLEXRAN_AGENT HASHTABLE UTIL OMG_SUMO
         SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
         NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
@@ -3181,24 +3183,6 @@ if(OAI_NW_DRIVER_USE_NETLINK)
 endif()
 make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})
 
-
-foreach(file IN ITEMS ${OCT_FILES})
-  string(REGEX REPLACE "oct *$" "cc" src ${file})
-  add_custom_command(
-    OUTPUT ${file}
-    DEPENDS ${OCT_DIR}/${src} OPENAIR0_LIB
-    COMMAND mkoctfile
-    ARGS ${OCT_FLAGS} ${OCT_INCL} ${OCT_LIBS}
-    ARGS -o ${file} ${OCT_DIR}/${src}
-    COMMENT "Generating ${file}"
-    VERBATIM
-  )
-endforeach(file)
-
-ADD_CUSTOM_TARGET(oarf
-   DEPENDS ${OCT_FILES}
-)
-
 include (${OPENAIR_DIR}/common/utils/telnetsrv/telnetsrv_CMakeLists.txt)
 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
 

ci-scripts/Jenkinsfile-GitLab-Container

@@ -285,6 +285,46 @@ pipeline {
             }
           }
         }
+        stage ("LTE-B200-FDD-LTEBOX-Container") {
+          when { expression {do4Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'RAN-LTE-FDD-LTEBOX-Container')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
+        stage ("LTE-B200-TDD-LTEBOX-Container") {
+          when { expression {do4Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'RAN-LTE-TDD-LTEBOX-Container')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
         stage ("NSA-B200-Module-LTEBOX-Container") {
           when { expression {do4Gtest || do5Gtest} }
           steps {

ci-scripts/Jenkinsfile-push-registry

@@ -65,19 +65,24 @@ pipeline {
           WEEK_REF = WEEK_REF.trim()
           WEEK_TAG = sh returnStdout: true, script: 'python3 ./ci-scripts/provideUniqueImageTag.py --start_tag ' + WEEK_REF
           WEEK_TAG = WEEK_TAG.trim()
+          WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%h" origin/develop | cut -c 1-8'
+          WEEK_SHA = WEEK_SHA.trim()
 
           withCredentials([
             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
           ]) {
             def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "proxy"]
             sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
+            sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
             listOfImages.eachWithIndex { item, iindex ->
-              sh "docker image tag ${item}:develop ${DH_Account}/${item}:develop"
-              sh "docker image tag ${item}:develop ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker pull --quiet porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
+              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
+              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
               sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
               sh "docker push --quiet ${DH_Account}/${item}:develop"
-              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop"
+              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
             }
+            sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
             sh "docker logout > /dev/null 2>&1"
           }
         }
@@ -87,6 +92,8 @@ pipeline {
   post {
     always {
       script {
+        sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
+        sh "docker logout > /dev/null 2>&1"
         echo "End of Registry Push"
       }
     }

ci-scripts/checkGitLabMergeRequestLabels.sh

@@ -97,7 +97,7 @@ fi
 if [ $IS_MR_4G -eq 1 ]
 then
     echo "SHORTEN-4G"
-    exit 1
+    exit 0
 fi
 
 # 5G is present: run only 5G
@@ -118,5 +118,5 @@ fi
 if [ $IS_MR_DOCUMENTATION -eq 1 ]
 then
     echo "documentation"
-    exit 1
+    exit 0
 fi

ci-scripts/cls_amarisoft_ue.py

@@ -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()
 

ci-scripts/cls_cluster.py

@@ -262,7 +262,7 @@ class Cluster:
 			attemptedImages += ['ran-base']
 			status = ranbase_job is not None and self._wait_build_end(mySSH, [ranbase_job], 600)
 			if not status: logging.error('failure during build of ran-base')
-			mySSH.command(f'oc logs {ranbase_job} > cmake_targets/log/ran-base.log', '\$', 10)
+			mySSH.command(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log', '\$', 10)
 			# recover logs by mounting image
 			self._retag_image_statement(mySSH, 'ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
 			pod = self._deploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
@@ -289,8 +289,9 @@ class Cluster:
 			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end(mySSH, [ranbuild_job, physim_job], 1200)
 			if not wait: logging.error('error during build of ranbuild_job or physim_job')
 			status = status and wait
-			mySSH.command(f'oc logs {ranbuild_job} > cmake_targets/log/ran-build.log', '\$', 10)
-			mySSH.command(f'oc logs {physim_job} > cmake_targets/log/oai-physim.log', '\$', 10)
+			mySSH.command(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log', '\$', 10)
+			mySSH.command(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log', '\$', 10)
+			mySSH.command('oc get pods.metrics.k8s.io >> cmake_targets/log/build-metrics.log', '\$', 10)
 
 		if status:
 			self._recreate_is_tag(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
@@ -318,9 +319,9 @@ class Cluster:
 			if not wait: logging.error('error during build of eNB/gNB')
 			status = status and wait
 			# recover logs
-			mySSH.command(f'oc logs {enb_job} > cmake_targets/log/oai-enb.log', '\$', 10)
-			mySSH.command(f'oc logs {gnb_job} > cmake_targets/log/oai-gnb.log', '\$', 10)
-			mySSH.command(f'oc logs {gnb_aw2s_job} > cmake_targets/log/oai-gnb-aw2s.log', '\$', 10)
+			mySSH.command(f'oc logs {enb_job} &> cmake_targets/log/oai-enb.log', '\$', 10)
+			mySSH.command(f'oc logs {gnb_job} &> cmake_targets/log/oai-gnb.log', '\$', 10)
+			mySSH.command(f'oc logs {gnb_aw2s_job} &> cmake_targets/log/oai-gnb-aw2s.log', '\$', 10)
 
 			self._recreate_is_tag(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
 			self._recreate_bc(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
@@ -340,8 +341,9 @@ class Cluster:
 			if not wait: logging.error('error during build of lteUE/nrUE')
 			status = status and wait
 			# recover logs
-			mySSH.command(f'oc logs {lteue_job} > cmake_targets/log/oai-lte-ue.log', '\$', 10)
-			mySSH.command(f'oc logs {nrue_job} > cmake_targets/log/oai-nr-ue.log', '\$', 10)
+			mySSH.command(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log', '\$', 10)
+			mySSH.command(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log', '\$', 10)
+			mySSH.command('oc get pods.metrics.k8s.io >> cmake_targets/log/build-metrics.log', '\$', 10)
 
 		# split and analyze logs
 		imageSize = {}
@@ -359,7 +361,8 @@ class Cluster:
 			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')
 
 		grep_exp = "\|".join(attemptedImages)
-		mySSH.command(f'oc get images | grep -e \'{grep_exp}\' > cmake_targets/log/image_registry.log', '\$', 10);
+		mySSH.command(f'oc get images | grep -e \'{grep_exp}\' &> cmake_targets/log/image_registry.log', '\$', 10);
+		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc get pod $pod -o json >> cmake_targets/log/build_pod_summary.log; done', '\$', 60)
 
 		build_log_name = f'build_log_{self.testCase_id}'
 		cls_containerize.CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, 'oaicicd', CONST.CI_NO_PASSWORD)

ci-scripts/cls_containerize.py

@@ -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,41 @@ 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)
+		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)
+		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 +994,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 +1089,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 +1098,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 +1136,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 +1195,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 +1226,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 +1234,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 +1243,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 +1259,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 +1279,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 +1336,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 +1354,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

ci-scripts/cls_log_mgt.py

@@ -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):

ci-scripts/cls_oai_html.py

@@ -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')

ci-scripts/cls_oaicitest.py

@@ -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
@@ -2387,6 +2383,8 @@ class OaiCiTest():
 				iperf_status = SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '"\' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
 				SSH.command('fromdos -o iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
 				SSH.command('cat iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+			# Copying locally iperf client for artifacting
+			SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.SourceCodePath+ '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
 		# TIMEOUT Case
 		if iperf_status < 0:
 			SSH.close()
@@ -2425,6 +2423,10 @@ class OaiCiTest():
 				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath+ '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
 			filename='iperf_server_' + self.testCase_id + '_' + device_id + '.log'
 			self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options,filename,0)
+		else:
+			# Copying all the time the iperf server for artifacting
+			if launchFromEpc:
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath+ '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
 		# in case of OAI-UE 
 		if (device_id == 'OAI-UE'):
 			SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
@@ -2784,6 +2786,8 @@ class OaiCiTest():
 					os.remove('iperf_' + self.testCase_id + '_' + device_id + '.log')
 			if (useIperf3):
 				SSH.command('stdbuf -o0 iperf3 -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+				# Copying the iperf client locally for artifacting
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
 
 				clientStatus = 0
 				self.Iperf_analyzeV3Output(lock, UE_IPAddress, device_id, statusQueue,SSH)
@@ -2799,6 +2803,8 @@ class OaiCiTest():
 						iperf_status = SSH.command('docker exec -it prod-trf-gen /bin/bash -c "' + prefix + 'iperf -c ' + UE_IPAddress + ' ' + modified_options + '" 2>&1 | tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
 					else:
 						iperf_status = SSH.command('stdbuf -o0 iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+					# Copying the iperf client locally for artifacting
+					SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
 				else:
 					if self.ueIperfVersion == self.dummyIperfVersion:
 						prefix = ''
@@ -2866,6 +2872,13 @@ class OaiCiTest():
 					pass
 				filename='iperf_server_' + self.testCase_id + '_' + device_id + '.log'
 				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options,filename,0)
+			else:
+				# Copying all the time the iperf server for artifacting
+				time.sleep(1)
+				if (device_id == 'OAI-UE'):
+					SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+				else:
+					SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.SourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
 
 			# in case of OAI UE: 
 			if (device_id == 'OAI-UE'):
@@ -3128,7 +3141,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]=''
@@ -3784,7 +3797,11 @@ class OaiCiTest():
 				HTML.CreateHtmlTestRow('Cannot perform requested X2 Handover', 'KO', CONST.ALL_PROCESSES_OK)
 
 	def LogCollectBuild(self,RAN):
-		SSH = sshconnection.SSHConnection()
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if RAN.eNBIPAddress == 'none' or self.UEIPAddress == 'none':
+			sys.exit(0)
+
 		if (RAN.eNBIPAddress != '' and RAN.eNBUserName != '' and RAN.eNBPassword != ''):
 			IPAddress = RAN.eNBIPAddress
 			UserName = RAN.eNBUserName
@@ -3797,6 +3814,7 @@ class OaiCiTest():
 			SourceCodePath = self.UESourceCodePath
 		else:
 			sys.exit('Insufficient Parameter')
+		SSH = sshconnection.SSHConnection()
 		SSH.open(IPAddress, UserName, Password)
 		SSH.command('cd ' + SourceCodePath, '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
@@ -3805,6 +3823,10 @@ class OaiCiTest():
 		SSH.close()
 
 	def LogCollectPing(self,EPC):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if self.IPAddress == 'none':
+			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 		SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
@@ -3815,6 +3837,10 @@ class OaiCiTest():
 		SSH.close()
 
 	def LogCollectIperf(self,EPC):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if self.IPAddress == 'none':
+			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 		SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
@@ -3825,6 +3851,10 @@ class OaiCiTest():
 		SSH.close()
 	
 	def LogCollectOAIUE(self):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if self.UEIPAddress == 'none':
+			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
 		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
@@ -3937,7 +3967,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')

ci-scripts/cls_physim.py

@@ -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)

ci-scripts/cls_physim1.py

@@ -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"
 
@@ -166,10 +166,10 @@ class PhySim:
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())
 			count +=1
-		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
 		if isRunning == False:
 			logging.error('\u001B[1m Some PODS Running FAILED \u001B[0m')
 			mySSH.command('oc get pods -l app.kubernetes.io/instance=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
+			mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
 			mySSH.command('helm uninstall physim 2>&1 >> cmake_targets/log/physim_helm_summary.txt', '\$', 6)
 			self.AnalyzeLogFile_phySim()
 			isFinished1 = False
@@ -206,6 +206,7 @@ class PhySim:
 		# Getting the logs of each executables running in individual pods
 		for podName in podNames:
 			mySSH.command(f'oc logs {podName} >> cmake_targets/log/physim_test.txt 2>&1', '\$', 15, resync=True)
+		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
 		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/log/physim_test.txt', '.')
 		try:
 			listLogFiles =  subprocess.check_output('egrep --colour=never "Execution Log file|Linux oai-" physim_test.txt', shell=True, universal_newlines=True)

ci-scripts/cls_static_code_analysis.py

@@ -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)

ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf

@@ -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;
+        }
 );

ci-scripts/conf_files/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf

@@ -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";
     };
 

ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf

@@ -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;
-    }
-);

ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf

@@ -0,0 +1,240 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    min_rxtxtime = 6;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 621312;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 620040;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 162;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=41,L=24 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                           = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPsearchSpaceZero                                             = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                                 = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 162;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                           = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES : {
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = ({
+  num_cc = 1;
+  tr_s_preference = "local_L1";
+  tr_n_preference = "local_RRC";
+});
+
+L1s = ({
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+});
+
+RUs = ({
+  local_rf       = "yes"
+  nb_tx          = 1
+  nb_rx          = 1
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [7];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 50;
+  eNB_instances  = [0];
+  bf_weights = [0x00007fff, 0x0000];
+  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
+});
+
+THREAD_STRUCT = ({
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+});
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config : {
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+};

ci-scripts/datalog_rt_stats.1x1.60.yaml

@@ -7,18 +7,18 @@ ColNames :
   - Average; Max; Count
   - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref :
-  feprx : 48.0
-  feptx_prec : 16.0
+  feprx : 46.0
+  feptx_prec : 11.0
   feptx_ofdm : 35.0
-  feptx_total : 59.0
+  feptx_total : 57.0
   L1 Tx processing : 210.0
-  DLSCH encoding : 129.0
-  L1 Rx processing : 359.0
-  PUSCH inner-receiver : 166.0
-  PUSCH decoding : 270.0
-  Schedule Response : 52.0
+  DLSCH encoding : 137.0
+  L1 Rx processing : 345.0
+  PUSCH inner-receiver : 184.0
+  PUSCH decoding : 276.0
+  Schedule Response : 48.0
   DL & UL scheduling timing : 13.0
-  UL Indication : 65.0
+  UL Indication : 60.0
 Threshold :
   feprx : 1.25
   feptx_prec : 1.25

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -0,0 +1,34 @@
+#this is a configuration file
+#used to build real time processing statistics 
+#for 5G NR phy test (gNB terminate)
+Title : Processing Time (us)
+ColNames :
+  - Metric
+  - Average; Max; Count
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+Ref : 
+  feprx : 84.0
+  feptx_prec : 11.0
+  feptx_ofdm : 35.0
+  feptx_total : 100.0
+  L1 Tx processing : 400.0
+  DLSCH encoding : 177.0
+  L1 Rx processing : 345.0
+  PUSCH inner-receiver : 184.0
+  PUSCH decoding : 276.0 
+  Schedule Response : 111.0
+  DL & UL scheduling timing : 37.0
+  UL Indication : 127.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25

ci-scripts/datalog_rt_stats.default.yaml

@@ -7,15 +7,15 @@ ColNames :
   - Average; Max; Count
   - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
-  feprx : 53.0
-  feptx_prec : 20.0
-  feptx_ofdm : 37.0
-  feptx_total : 62.0
+  feprx : 43.0
+  feptx_prec : 13.0
+  feptx_ofdm : 33.0
+  feptx_total : 55.0
   L1 Tx processing : 170.0
   DLSCH encoding : 118.0
-  L1 Rx processing : 275.0
-  PUSCH inner-receiver : 107.0
-  PUSCH decoding : 246.0
+  L1 Rx processing : 305.0
+  PUSCH inner-receiver : 117.0
+  PUSCH decoding : 303.0
   Schedule Response : 25.0
   DL & UL scheduling timing : 10.0
   UL Indication : 34.0

ci-scripts/doc/vm_based_simulator_build.md

@@ -12,11 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Detailed Description](#2-detailed-description)
-3.  [Typical Usage](#3-typical-usage)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_check_build.md

@@ -12,10 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Detailed Description](#2-detailed-description)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_create.md

@@ -12,11 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Detailed Description](#2-detailed-description)
-3.  [Typical Usage](#3-typical-usage)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_destroy.md

@@ -12,11 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Detailed Description](#2-detailed-description)
-3.  [Typical Usage](#3-typical-usage)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_env.md

@@ -12,12 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Prerequisites](#2-prerequisites)
-    1.  [uvtool installation](#21-uvtool-installation)
-    2.  [apt-cacher-server installation](#22-apt-cacher-server-installation)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_main_scripts.md

@@ -12,11 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Sub BASH scripts](#2-sub-bash-scripts)
-3.  [Main script features](#3-main-script-features)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_sources.md

@@ -12,11 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Centralized Workspace](#2-centralized-workspace)
-3.  [Create the ZIP file](#3-create-the-zip-file)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/doc/vm_based_simulator_test.md

@@ -12,14 +12,9 @@
   </tr>
 </table>
 
-## Table of Contents ##
+**Table of Contents**
 
-1.  [Introduction](#1-introduction)
-2.  [Detailed Description](#2-detailed-description)
-3.  [Typical Usage](#3-typical-usage)
-    1.  [Testing the physical simulators](#31-testing-the-physicals-simulators)
-    2.  [Testing the RF simulator](#33-testing-the-rf-simulator)
-    3.  [Testing the L2-nFAPI simulator](#33-testing-the-l2-nfapi-simulator)
+[[_TOC_]]
 
 # 1. Introduction #
 

ci-scripts/main.py

@@ -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
@@ -187,6 +187,9 @@ def GetParametersFromXML(action):
 		else :
 			RAN.air_interface[RAN.eNB_instance] = 'ocp-enb'
 
+		cmd_prefix = test.findtext('cmd_prefix')
+		if cmd_prefix is not None: RAN.cmd_prefix = cmd_prefix
+
 	elif action == 'Terminate_eNB':
 		eNB_instance=test.findtext('eNB_instance')
 		if (eNB_instance is None):
@@ -199,6 +202,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 +339,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 +383,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 +417,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 +466,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 +475,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 +647,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 +713,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 +766,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 +777,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 +788,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 +801,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,13 +967,22 @@ 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':
 					CONTAINERS.DeployObject(HTML, EPC)
 					if CONTAINERS.exitStatus==1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
 						RAN.prematureExit = True
 				elif action == 'Undeploy_Object':
 					CONTAINERS.UndeployObject(HTML, RAN)
@@ -973,23 +1012,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

ci-scripts/ran.py

@@ -97,7 +97,9 @@ 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={}
+		self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
 
 
 #-----------------------------------------------------------
@@ -202,10 +204,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)
@@ -471,11 +473,7 @@ class RANManagement():
 			gNB = False
 		else:
 			gNB = True
-		if ((self.USRPIPAddress!='') and (gNB==True)):
-			mySSH.command('echo ' + lPassWord + ' | echo "ulimit -c unlimited && sudo UHD_RFNOC_DIR=/usr/local/share/uhd/rfnoc ./ran_build/build/' + self.air_interface[self.eNB_instance] + ' -O ' + lSourcePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
-		#otherwise the regular command is ok
-		else:
-			mySSH.command('echo "ulimit -c unlimited && catchsegv ./ran_build/build/' + self.air_interface[self.eNB_instance] + ' -O ' + lSourcePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+		mySSH.command(f'echo "ulimit -c unlimited && {self.cmd_prefix} ./ran_build/build/{self.air_interface[self.eNB_instance]} -O {lSourcePath}/{ci_full_config_file} {extra_options}" > ./my-lte-softmodem-run{self.eNB_instance}.sh', '\$', 5)
 
 		mySSH.command('chmod 775 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf enb_' + self.testCase_id + '.log', '\$', 5)
@@ -566,7 +564,7 @@ class RANManagement():
 		mySSH.close()
 
 
-		HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'OK', CONST.ALL_PROCESSES_OK)
+		HTML.CreateHtmlTestRow(f'{self.cmd_prefix} {self.air_interface[self.eNB_instance]} -O {config_file} {extra_options}', 'OK', CONST.ALL_PROCESSES_OK)
 		logging.debug('\u001B[1m Initialize eNB/gNB/ocp-eNB Completed\u001B[0m')
 
 	def CheckeNBProcess(self, status_queue):
@@ -680,7 +678,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 +711,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
@@ -734,6 +732,16 @@ class RANManagement():
 
 	def LogCollecteNB(self):
 		mySSH = SSH.SSHConnection()
+		# Copying back to xNB server any log from all the runs.
+		# Should also contains ping and iperf logs
+		absPath = os.path.abspath('.')
+		if absPath.count('ci-scripts') == 0:
+			os.chdir('./ci-scripts')
+
+		for x in os.listdir():
+			if x.endswith('.log') or x.endswith('.log.png'):
+				mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, x, self.eNBSourceCodePath + '/cmake_targets/', silent=True, ignorePermDenied=True)
+		# Back to normal
 		mySSH.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
 		mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5)
 		mySSH.command('cd cmake_targets', '\$', 5)
@@ -747,6 +755,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 +835,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 +1018,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 +1165,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 +1239,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')

ci-scripts/sshconnection.py

@@ -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)
@@ -229,10 +229,11 @@ class SSHConnection():
 		else:
 			return -1
 
-	def copyout(self, ipaddress, username, password, source, destination):
+	def copyout(self, ipaddress, username, password, source, destination, silent=False, ignorePermDenied=False):
 		count = 0
 		copy_status = False
-		logging.debug('scp -r ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
+		if not silent:
+			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])
@@ -244,21 +245,29 @@ class SSHConnection():
 				if scp_response == 0:
 					count = 10
 					copy_status = True
+				elif scp_response == 1 and ignorePermDenied:
+					logging.warning(f'copyout(): permission denied, not copying file ({source})')
+					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])
 				if scp_response == 0 or scp_response == 3:
 					count = 10
 					copy_status = True
+				elif scp_response == 1 and ignorePermDenied:
+					logging.warning(f'copyout(): permission denied, not copying file ({source})')
+					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)

ci-scripts/xml_class_list.yml

@@ -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

ci-scripts/xml_files/container_4g_l2sim_proxy.xml

@@ -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>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -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>

ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -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>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml

@@ -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>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -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>

ci-scripts/xml_files/container_5g_f1_rfsim_down.xml

@@ -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>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -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>

ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml

@@ -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>

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -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">

ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml

@@ -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>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -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>

ci-scripts/xml_files/container_5g_rfsim_down.xml

@@ -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>

ci-scripts/xml_files/container_image_build.xml

@@ -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>

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -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>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -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
+
+Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-fdd-05-tm1</htmlTabRef>
+    <htmlTabName>Test-FDD-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>
+

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -0,0 +1,142 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-fdd-05-rrc-inactivity</htmlTabRef>
+    <htmlTabName>Test-FDD-05MHz-TM1-RRC-Inactivity</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030102
+000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 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="030102">
+        <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_no_rrc_activity</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="030201">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy eNB</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</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="000001">
+        <class>IdleSleep</class>
+        <desc>Waiting for 55 seconds</desc>
+        <idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
+    </testCase>
+
+    <testCase id="000002">
+        <class>IdleSleep</class>
+        <desc>Waiting for 10 seconds</desc>
+        <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+    </testCase>
+
+    <testCase id="000010">
+        <class>CheckStatusUE</class>
+        <desc>Check UE(s) status before attachment</desc>
+        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+    </testCase>
+
+    <testCase id="000011">
+        <class>CheckStatusUE</class>
+        <desc>Check UE(s) status before data disabling</desc>
+        <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+    </testCase>
+
+    <testCase id="000012">
+        <class>CheckStatusUE</class>
+        <desc>Check UE(s) status after data disabling</desc>
+        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+    </testCase>
+
+    <testCase id="000013">
+        <class>CheckStatusUE</class>
+        <desc>Check UE(s) status after data re-enabling</desc>
+        <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+    </testCase>
+
+    <testCase id="040302">
+        <class>DataDisable_UE</class>
+        <desc>Disabling Data Service on UE</desc>
+    </testCase>
+
+    <testCase id="040303">
+        <class>DataEnable_UE</class>
+        <desc>Enabling Data Service on UE</desc>
+    </testCase>
+
+    <testCase id="040502">
+        <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="040503">
+        <class>Ping</class>
+        <desc>ping (5MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    </testCase>
+
+</testCaseList>
+

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -0,0 +1,169 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
+
+040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201
+-->
+<testCaseList>
+    <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
+    <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030111
+000001
+040301 040511 040613 040614 040615 040651 040652 040653 040654 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="030111">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_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_10Mhz_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="040511">
+        <class>Ping</class>
+        <desc>ping (10MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040613">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040614">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040615">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040616">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - 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="040617">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - 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="040651">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040652">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040653">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - 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="040654">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - 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>
+

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -0,0 +1,105 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-fdd-10-cdrx-tm1</htmlTabRef>
+    <htmlTabName>Test-FDD-10MHz-CDRX-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030112
+040301 040512 040612 040650 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="030112">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="030201">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy eNB</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</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="040512">
+        <class>Ping</class>
+        <desc>ping (10MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040612">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040650">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+</testCaseList>
+

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -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
+
+Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-fdd-20-tm1</htmlTabRef>
+    <htmlTabName>Test-FDD-20MHz-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030121
+000001
+040301 040521 040623 040624 040625 040662 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="030121">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (FDD/Band7/20MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_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_20Mhz_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="040521">
+        <class>Ping</class>
+        <desc>ping (20MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040623">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040624">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040625">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040626">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - 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="040627">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - 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="040661">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040662">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040663">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - 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="040664">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - 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>
+

ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml

@@ -21,18 +21,18 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
+        <htmlTabRef>test-fdd-cleanup</htmlTabRef>
+        <htmlTabName>CleanUp 4G LTE FDD</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
-	</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>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -0,0 +1,172 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-tdd-05-tm1</htmlTabRef>
+    <htmlTabName>Test-TDD-05MHz-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030104
+040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 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="030104">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_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_tdd_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>25</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040601">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040602">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040603">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040604">
+        <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="040605">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040641">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 2M -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/2Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 2M -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/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040644">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</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="040645">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml

@@ -0,0 +1,172 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-tdd-05-tm2</htmlTabRef>
+    <htmlTabName>Test-TDD-05MHz-TM2</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030105
+040301 040502 040606 040608 040646 040648 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="030105">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2</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_tdd_05Mhz_tm2</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="040502">
+        <class>Ping</class>
+        <desc>ping (5MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040601">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040606">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040603">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040608">
+        <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="040605">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040641">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040646">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 2M -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/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040648">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</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="040645">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -0,0 +1,172 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-tdd-10-tm1</htmlTabRef>
+    <htmlTabName>Test-TDD-10MHz-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030114
+040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 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="030114">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (TDD/Band40/10MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_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_tdd_10Mhz_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="040511">
+        <class>Ping</class>
+        <desc>ping (10MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040611">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040612">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040613">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040614">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</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="040615">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040651">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040652">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040653">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040654">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</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="040655">
+        <class>Iperf</class>
+        <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -0,0 +1,172 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-tdd-20-tm1</htmlTabRef>
+    <htmlTabName>Test-TDD-20MHz-TM1</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030124
+040301 040521 040622 040621 040623 040662 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="030124">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_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_tdd_20Mhz_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="040521">
+        <class>Ping</class>
+        <desc>ping (20MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040621">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040622">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040623">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040624">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</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="040625">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040661">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040662">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040663">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040664">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</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="040665">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -0,0 +1,172 @@
+<!--
+
+ 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
+
+Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
+
+-->
+<testCaseList>
+    <htmlTabRef>test-tdd-20-tm1-def-sched</htmlTabRef>
+    <htmlTabName>Test-TDD-20MHz-TM1-Default-Scheduler</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+111110
+040101
+030125
+040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 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="030125">
+        <class>Deploy_Object</class>
+        <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</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_tdd_20Mhz_tm1_default_scheduler</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="040522">
+        <class>Ping</class>
+        <desc>ping (20MHz - 20 sec)</desc>
+        <ping_args>-c 20</ping_args>
+        <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040626">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040627">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040628">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040629">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</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="040630">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+    <testCase id="040666">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
+        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040667">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
+        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+    </testCase>
+
+    <testCase id="040668">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
+        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>unbalanced</iperf_profile>
+    </testCase>
+
+    <testCase id="040669">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</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="040670">
+        <class>Iperf</class>
+        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml

@@ -21,27 +21,18 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
+        <htmlTabRef>test-tdd-cleanup</htmlTabRef>
+        <htmlTabName>CleanUp 4G LTE TDD</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</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>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -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>

ci-scripts/xml_files/container_nsa_b200_terminate.xml

@@ -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>
 

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -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>

ci-scripts/xml_files/container_sa_b200_terminate.xml

@@ -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>

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml

@@ -1,150 +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
- 030104 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030104">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.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>25</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040604">
-		<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="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 2M -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/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -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/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</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="040645">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml

@@ -1,154 +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
-
- 030105 040301 040502 040606 040601 040603 040608 040605 040646 040641 040643 040648 040645 040401 040201 030201
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm2</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM2</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestUnstable>True</TestUnstable>
-	<TestMinId>040608</TestMinId>
-        <TestCaseRequestedList>
- 030201
- 040101
- 030105 040301 040502 040606 040608 040646 040648 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030105">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default --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="040502">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040606">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040608">
-		<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="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040646">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -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/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040648">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</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="040645">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_10mhz_tm1.xml

@@ -1,152 +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-10-tm1</htmlTabRef>
-	<htmlTabName>Test-10MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestUnstable>True</TestUnstable>
-	<TestMinId>040615</TestMinId>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030114 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030114">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/10MHz/info)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.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="040511">
-		<class>Ping</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>25</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040611">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040612">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040613">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040614">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</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="040615">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040651">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040652">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040653">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040654">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</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="040655">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml

@@ -1,153 +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-20-tm1</htmlTabRef>
-	<htmlTabName>Test-20MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestUnstable>True</TestUnstable>
-	<TestMinId>040623</TestMinId>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030124 040301 040521 040622 040621 040623 040662 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030124">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.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="040521">
-		<class>Ping</class>
-		<desc>ping (20MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>25</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040621">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040622">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040623">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040624">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</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="040625">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040661">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040662">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040663">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040664">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</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="040665">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml

@@ -1,152 +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-20-tm1-defSched</htmlTabRef>
-	<htmlTabName>Test-20MHz-TM1-default-scheduler</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestUnstable>True</TestUnstable>
-	<TestMinId>040522</TestMinId>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030125 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030125">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default --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="040522">
-		<class>Ping</class>
-		<desc>ping (20MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>25</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040626">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040627">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040628">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040629">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</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="040630">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040666">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
-		<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040667">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
-		<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040668">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
-		<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040669">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</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="040670">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_epc_start.xml

@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start-tab</htmlTabRef>
-	<htmlTabName>EPC-Start</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml

@@ -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>

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml

@@ -1,126 +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-rrc-no-flex</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030102 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Waiting for 55 seconds</desc>
-		<idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Waiting for 10 seconds</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000010">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status before attachment</desc>
-		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="000011">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status before data disabling</desc>
-		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="000012">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status after data disabling</desc>
-		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="000013">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status after data re-enabling</desc>
-		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="030102">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) for RRC Inactivity Timer testing -- no FlexRan Ctl</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="040302">
-		<class>DataDisable_UE</class>
-		<desc>Disabling Data Service on UE</desc>
-	</testCase>
-
-	<testCase id="040303">
-		<class>DataEnable_UE</class>
-		<desc>Enabling Data Service on UE</desc>
-	</testCase>
-
-	<testCase id="040502">
-		<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="040503">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml

@@ -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-10-tm1</htmlTabRef>
-	<htmlTabName>Test-10MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030111 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030111">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf --eNBs.[0].component_carriers.[0].drx_Config_present prRelease --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="040511">
-		<class>Ping</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040613">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040614">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040615">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040616">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - 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="040617">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - 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="040651">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040652">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040653">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - 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="040654">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - 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>

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml

@@ -1,89 +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-10-cdrx-tm1</htmlTabRef>
-	<htmlTabName>Test-10MHz-CDRX-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030112 040302 040512 040612 040650 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030112">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/10MHz) with CDRX</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf  --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --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="040302">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040512">
-		<class>Ping</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040612">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040650">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml

@@ -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-20-tm1</htmlTabRef>
-	<htmlTabName>Test-20MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030121 040301 040521 040623 040624 040625 040662 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>040626 040627 040661 040663 040664</TestCaseExclusionList>
-
-	<testCase id="030121">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.100PRB.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="040521">
-		<class>Ping</class>
-		<desc>ping (20MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040623">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040624">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040625">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040626">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - 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="040627">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - 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="040661">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040662">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040663">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - 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="040664">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - 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>

ci-scripts/xml_files/fr1_sa_quectel.xml

@@ -64,7 +64,7 @@
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
@@ -72,6 +72,7 @@
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
 
 	<testCase id="000001">
@@ -143,6 +144,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>

ci-scripts/xml_files/fr1_sa_quectel_162prb.xml

@@ -62,7 +62,7 @@
 	<testCase id="042000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
@@ -70,6 +70,7 @@
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
 
 	<testCase id="000001">
@@ -133,6 +134,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>

ci-scripts/xml_files/fr1_sa_quectel_stages.xml

@@ -68,7 +68,7 @@
 	<testCase id="041000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
@@ -76,6 +76,7 @@
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
 
 	<testCase id="000001">
@@ -169,6 +170,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>

ci-scripts/xml_files/fr1_sa_quectel_stages_162prb.xml

@@ -1,167 +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-SA-FR1-Tab4</htmlTabRef>
-	<htmlTabName>SA Staged DL with QUECTEL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 040000
- 000002
- 010000
- 000001
- 050000
- 000001
- 070000
- 000001
- 070001
- 000001
- 070002
- 000001
- 070003
- 000001
- 070004
- 000001
- 070005
- 000001
- 010002
- 080000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
-	</testCase>
-
-
-	<testCase id="010002">
-		<class>Terminate_UE</class>
-		<desc>Terminate Quectel</desc>
-		<id>nrmodule2_quectel</id>
-	</testCase>
-
-
-	<testCase id="040000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>nr</air_interface>
-		<eNB_Trace>yes</eNB_Trace>
-		<eNB_Stats>yes</eNB_Stats>
-		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
-		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<id>nrmodule2_quectel</id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<desc>iperf (DL/10Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 10M -t 30</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-	<testCase id="070001">
-		<class>Iperf</class>
-		<desc>iperf (DL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 20M -t 30</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-	<testCase id="070002">
-		<class>Iperf</class>
-		<desc>iperf (DL/40Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 40M -t 30</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-	<testCase id="070003">
-		<class>Iperf</class>
-		<desc>iperf (DL/60Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 60M -t 30</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-	<testCase id="070004">
-		<class>Iperf</class>
-		<desc>iperf (DL/90Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 90M -t 30</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-	<testCase id="070005">
-		<class>Iperf</class>
-		<desc>iperf (DL/140Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 140M -t 30</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-	<testCase id="080000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-

ci-scripts/xml_files/gnb_phytest_usrp_run.xml

@@ -37,6 +37,7 @@
     <rt_stats_cfg>datalog_rt_stats.default.yaml</rt_stats_cfg>
 		<air_interface>NR</air_interface>
 		<USRP_IPAddress>192.168.20.2</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0 --membind=netdev:enp94s0f0</cmd_prefix>
 	</testCase>
 
 	<testCase id="000001">

ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml

@@ -33,10 +33,11 @@
   <testCase id="190101">
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
-    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test --gNBs.[0].servingCellConfigCommon.[0].dl_carrierBandwidth 162 --gNBs.[0].servingCellConfigCommon.[0].ul_carrierBandwidth 162 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
     <rt_stats_cfg>datalog_rt_stats.1x1.60.yaml</rt_stats_cfg>
     <air_interface>NR</air_interface>
     <USRP_IPAddress>192.168.20.2</USRP_IPAddress>
+    <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0 --membind=netdev:enp94s0f0</cmd_prefix>
   </testCase>
 
   <testCase id="000001">

ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml

@@ -0,0 +1,56 @@
+<!--
+
+ 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>gNB-PHY-Test-60-2x2</htmlTabRef>
+  <htmlTabName>Timing phytest 60 MHz 2x2</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>
+290101 000001 290109
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="290101">
+    <class>Initialize_eNB</class>
+    <desc>Initialize gNB USRP</desc>
+    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.162PRB.usrpn300.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+    <rt_stats_cfg>datalog_rt_stats.60.2x2.yaml</rt_stats_cfg>
+    <air_interface>NR</air_interface>
+    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>
+    <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0 --membind=netdev:enp94s0f0</cmd_prefix>
+  </testCase>
+
+  <testCase id="000001">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+  </testCase>
+
+
+  <testCase id="290109">
+    <class>Terminate_eNB</class>
+    <desc>Terminate gNB</desc>
+    <air_interface>NR</air_interface>
+  </testCase>
+
+</testCaseList>

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md

@@ -14,20 +14,9 @@
 
 This page is only valid for an `Ubuntu18` host.
 
-**TABLE OF CONTENTS**
+**Table of Contents**
 
-1. [Retrieving the images on Docker-Hub](#1-retrieving-the-images-on-docker-hub)
-2. [Deploy containers](#2-deploy-containers)
-   1. [Deploy and Configure Cassandra Database](#21-deploy-and-configure-cassandra-database)
-   2. [Deploy OAI CN4G containers](#22-deploy-oai-cn4g-containers)
-   3. [Deploy OAI eNB in RF simulator mode](#23-deploy-oai-enb-in-rf-simulator-mode)
-   4. [Deploy OAI LTE UE in RF simulator mode](#24-deploy-oai-lte-ue-in-rf-simulator-mode)
-3. [Check traffic](#3-check-traffic)
-4. [Un-deployment](#4-un-deployment)
-5. [Explanation on the configuration](#5-explanation-on-the-configuration)
-   1. [UE IMSI and Keys](#51-ue-imsi-and-keys)
-   2. [PLMN and TAI](#52-plmn-and-tai)
-   3. [Access to Internet](#53-access-to-internet)
+[[_TOC_]]
 
 # 1. Retrieving the images on Docker-Hub #
 
@@ -157,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
 ```
 

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

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

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

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

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

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

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

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

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

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

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -16,22 +16,9 @@ This page is only valid for an `Ubuntu18` host.
 
 **NOTE: this version (2022-01-27) has been updated  for the `v1.3.0` version of the `OAI 5G CN`.**
 
-**TABLE OF CONTENTS**
+**Table of Contents**
 
-1. [Retrieving the images on Docker-Hub](#1-retrieving-the-images-on-docker-hub)
-2. [Deploy containers](#2-deploy-containers)
-   1. [Deploy OAI 5G Core Network](#21-deploy-oai-5g-core-network)
-   2. [Deploy OAI gNB in RF simulator mode and in Standalone Mode](#22-deploy-oai-gnb-in-rf-simulator-mode-and-in-standalone-mode)
-   3. [Deploy OAI NR-UE in RF simulator mode and in Standalone Mode](#23-deploy-oai-nr-ue-in-rf-simulator-mode-and-in-standalone-mode)
-   4. [Deploy Second OAI NR-UE in RF simulator mode and in Standalone Mode](#24-deploy-second-oai-nr-ue-in-rf-simulator-mode-and-in-standalone-mode)
-3. [Check traffic](#3-check-traffic)
-   1. [Check your Internet connectivity](#31-check-your-internet-connectivity)
-   2. [Start the iperf server inside the NR-UE container](#32-start-the-iperf-server-inside-the-nr-ue-container)
-   3. [Start the iperf client inside the ext-dn container](#33-start-the-iperf-client-inside-the-ext-dn-container)
-4. [Un-deployment](#4-un-deployment)
-5. [Explanations on the configuration in the docker-compose.yaml](##5-explanations-on-the-configuration-in-the-docker-composeyaml)
-   1. [Making the NR-UE connect to the core network](#51-making-the-nr-ue-connect-to-the-core-network)
-   2. [Making the gNB connect to the core network](#52-making-the-gnb-connect-to-the-core-network)
+[[_TOC_]]
 
 # 1. Retrieving the images on Docker-Hub #
 

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml

@@ -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: 0
+            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

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml

@@ -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

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml

@@ -0,0 +1,43 @@
+version: '3.8'
+
+services:
+    enb_mono_fdd:
+        image: oai-enb:latest
+        privileged: true
+        container_name: lte-b200-enb-fdd-10Mhz-tm1
+        environment:
+            USE_FDD_MONO: 'yes'
+            USE_B2XX: 'yes'
+            ENB_NAME: eNB-in-docker
+            MCC: '208'
+            MNC: '92'
+            MNC_LENGTH: 2
+            TAC: 1
+            UTRA_BAND_ID: 7
+            DL_FREQUENCY_IN_MHZ: 2680
+            UL_FREQUENCY_OFFSET_IN_MHZ: 120
+            NID_CELL: 0
+            NB_PRB: 50
+            ENABLE_MEASUREMENT_REPORTS: 'no'
+            ENABLE_X2: 'no'
+            MME_S1C_IP_ADDRESS: 172.21.18.48
+            ENB_S1C_IF_NAME: eth0
+            ENB_S1C_IP_ADDRESS: 172.21.18.46
+            ENB_S1U_IF_NAME: eth0
+            ENB_S1U_IP_ADDRESS: 172.21.18.46
+            ENB_X2_IP_ADDRESS: 172.21.18.46
+            RRC_INACTIVITY_THRESHOLD: 0
+            FLEXRAN_ENABLED: 'no'
+            FLEXRAN_INTERFACE_NAME: eth0
+            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
+            THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
+            USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function
+        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

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml

@@ -0,0 +1,43 @@
+version: '3.8'
+
+services:
+    enb_mono_fdd:
+        image: oai-enb:latest
+        privileged: true
+        container_name: lte-b200-enb-fdd-10Mhz-tm1
+        environment:
+            USE_FDD_MONO: 'yes'
+            USE_B2XX: 'yes'
+            ENB_NAME: eNB-in-docker
+            MCC: '208'
+            MNC: '92'
+            MNC_LENGTH: 2
+            TAC: 1
+            UTRA_BAND_ID: 7
+            DL_FREQUENCY_IN_MHZ: 2680
+            UL_FREQUENCY_OFFSET_IN_MHZ: 120
+            NID_CELL: 0
+            NB_PRB: 50
+            ENABLE_MEASUREMENT_REPORTS: 'no'
+            ENABLE_X2: 'no'
+            MME_S1C_IP_ADDRESS: 172.21.18.48
+            ENB_S1C_IF_NAME: eth0
+            ENB_S1C_IP_ADDRESS: 172.21.18.46
+            ENB_S1U_IF_NAME: eth0
+            ENB_S1U_IP_ADDRESS: 172.21.18.46
+            ENB_X2_IP_ADDRESS: 172.21.18.46
+            RRC_INACTIVITY_THRESHOLD: 0
+            FLEXRAN_ENABLED: 'no'
+            FLEXRAN_INTERFACE_NAME: eth0
+            FLEXRAN_IPV4_ADDRESS: 172.21.18.48
+            THREAD_PARALLEL_CONFIG: PARALLEL_SINGLE_THREAD
+            USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function
+        volumes:
+            - /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