update encoder

LDPC cuda cn_Proc parts successfully work in the ldpctest

See merge request oai/openairinterface5g!3469

.gitignore

@@ -5,6 +5,7 @@
 cmake_targets/log/
 cmake_targets/*/build/
 cmake_targets/ran_build/
+cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
 

CMakeLists.txt

@@ -172,7 +172,7 @@ else ()
 endif()
 
 # 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)
+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")
 
 # we need -rdynamic to incorporate all symbols in shared objects, see man page
 set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing -rdynamic")
@@ -300,15 +300,14 @@ add_definitions(-DHAVE_NETINET_IN_H)
 set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")
 set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")
 
-if (E2_AGENT)
-  set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
-  set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
-  message(STATUS "Selected E2AP version: ${E2AP_VERSION}")
+set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
+set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
+message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")
+
+set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
+set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
+message(STATUS "Selected KPM Version: ${KPM_VERSION}")
 
-  set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
-  set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
-  message(STATUS "Selected KPM version: ${KPM_VERSION}")
-endif()
 
 add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)
 add_boolean_option(ENABLE_IMSCOPE_RECORD OFF "Enable recording IQ data for imscope" OFF)
@@ -715,11 +714,6 @@ add_library(NFAPI_LIB ${NFAPI_SRC})
 target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
 target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
 
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_WLS)
-else()
-  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_SOCKET)
-endif()
 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
 
@@ -733,9 +727,6 @@ add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
 target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 target_link_libraries(NFAPI_PNF_LIB PUBLIC nr_fapi_p7)
 
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_PNF_LIB PRIVATE ENABLE_WLS)
-endif()
 include_directories(${NFAPI_DIR}/pnf/public_inc)
 include_directories(${NFAPI_DIR}/pnf/inc)
 
@@ -754,9 +745,6 @@ endif()
 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)
 
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_WLS)
-endif()
 # nFAPI user defined code
 #############################
 set(NFAPI_USER_SRC
@@ -766,15 +754,11 @@ set(NFAPI_USER_SRC
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_WLS)
-elseif (OAI_AERIAL)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
-else()
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_SOCKET)
-endif()
 target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
 target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
+if(OAI_AERIAL)
+  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
+endif()
 include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
@@ -848,7 +832,6 @@ set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
-  ${OPENAIR1_DIR}/PHY/log_tools.c
   )
 
 set(PHY_SRC
@@ -1063,7 +1046,7 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5)
+target_link_libraries(PHY_NR nr_phy_common nr_common)
 
 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
@@ -1164,6 +1147,7 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
   ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
+  ${NR_RRC_DIR}/nr_rrc_config.c
   ${NR_RRC_DIR}/rrc_gNB_nsa.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${NR_RRC_DIR}/rrc_gNB_NGAP.c
@@ -1246,7 +1230,6 @@ set (MAC_NR_SRC
   ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
-  ${NR_GNB_MAC_DIR}/nr_radio_config.c
  )
 
 
@@ -1855,12 +1838,6 @@ target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-add_boolean_option(OAI_WLS OFF "Activate OAI's WLS driver" OFF)
-if (OAI_WLS)
-    target_link_libraries(nr-softmodem PUBLIC wls_integration_lib)
-else()
-    target_link_libraries(nr-softmodem PUBLIC nfapi_socket_lib)
-endif()
 add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
 if (OAI_AERIAL)
   target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)

ci-scripts/Jenkinsfile-GitLab-Container

@@ -835,13 +835,11 @@ def finalizeSlaveJob(jobName) {
         selector: lastCompleted())
       if (fileExists(fileName)) {
         sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
-      } else {
-        sh "echo \"could not copy results from ${jobName}, please check pipeline ${BUILD_URL}\" > ${fileName}"
+        archiveArtifacts artifacts: fileName
+        // BUILD_URL is like  http://server:port/jenkins/job/foo/15/
+        // no need to add a prefixed '/'
+        artifactUrl += 'artifact/' + fileName
       }
-      archiveArtifacts artifacts: fileName
-      // BUILD_URL is like  http://server:port/jenkins/job/foo/15/
-      // no need to add a prefixed '/'
-      artifactUrl += 'artifact/' + fileName
     }
     artifactUrl = "\n * [${jobName}](${artifactUrl})"
     return artifactUrl

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -216,6 +216,24 @@ pipeline {
         }
         stage('Log Collection') {
             parallel {
+                stage('Log Collection (eNB - Build)') {
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
                 stage('Log Collection (eNB - Run)') {
                     steps {
                         withCredentials([

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -222,6 +222,24 @@ pipeline {
         }
         stage('Log Collection') {
             parallel {
+                stage('Log Collection (eNB - Build)') {
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
                 stage('Log Collection (eNB - Run)') {
                     steps {
                         withCredentials([

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

@@ -210,6 +210,24 @@ pipeline {
     }
     stage('Log Collection') {
       parallel {
+        stage('Log Collection (eNB - Build)') {
+          steps {
+            withCredentials([
+               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+            ]) {
+              echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+              sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+              echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+              sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
+            }
+            script {
+              if(fileExists("build.log.${env.BUILD_ID}.zip")) {
+                archiveArtifacts "build.log.${env.BUILD_ID}.zip"
+              }
+            }
+          }
+        }
         stage('Log Collection (eNB - Run)') {
           steps {
             withCredentials([

ci-scripts/Jenkinsfile-tmp-ran

@@ -227,6 +227,24 @@ pipeline {
         }
         stage('Log Collection') {
             parallel {
+                stage('Log Collection (eNB - Build)') {
+                    steps {
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
+                        ]) {
+                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
+                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
                 stage('Log Collection (eNB - Run)') {
                     steps {
                         withCredentials([

ci-scripts/README.md

@@ -1,52 +0,0 @@
-This document outlines how to use the OAI CI framework and gives a quickstart.
-
-[[_TOC_]]
-
-# Quickstart
-
-There is a script `main.py` that
-
-- reads scenario files from XML
-- executes the steps (e.g., deployment of core network, gNB, UE, attach, ping,
-  ...)
-
-To simplify, a script `run_locally.sh` can be used to run a single scenario.
-First, download images for gNB&UE (we assume you already downloaded the CN):
-
-    docker pull oaisoftwarealliance/oai-gnb:develop
-    docker tag oaisoftwarealliance/oai-gnb:develop oai-gnb
-    docker pull oaisoftwarealliance/oai-nr-ue:develop
-    docker tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue
-
-`run_locally.sh` expects `oai-gnb:latest` and `oai-nr-ue:latest` to be present,
-hence the tagging.
-
-Now, run the scenario:
-
-    cd ~/openairinterface5g/ci-scripts/
-    ./run_locally.sh xml_files/container_5g_rfsim_simple.xml
-
-Output should look like
-
-```
-[2025-08-07 18:07:49,631]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,631]     INFO:   Creating HTML header 
-[2025-08-07 18:07:49,631]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,766]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,767]     INFO:   Starting Scenario: xml_files/container_5g_rfsim_simple.xm
-l
-[2025-08-07 18:07:49,767]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,767]     INFO: placing all artifacts for this run in /home/richie/oai/cmake_targets/log/container_5g_rfsim_simple.xml.d/
-
-[...]
-
-[2025-08-07 18:07:49,771]     INFO: ----------------------------------------
-[2025-08-07 18:07:49,771]     INFO:  Test ID: 1 (#1)
-[2025-08-07 18:07:49,771]     INFO:  Deploy OAI 5G CoreNetwork
-[2025-08-07 18:07:49,771]     INFO: ----------------------------------------
-```
-
-it will run and end-to-end test, connecting one UE to the gNB, and ping, before
-undeploying. As shown, logs will be under
-`/home/richie/oai/cmake_targets/log/container_5g_rfsim_simple.xml.d/`. The
-python code also produces an HTML report in `ci-scripts/test_results.html`.

ci-scripts/as_ue/aw2s-multi-00102-20.cfg

@@ -5,16 +5,16 @@
 {
 #define N_ANTENNA_DL 1
 #define N_ANTENNA_UL 1
-#define DL_ARFCN 627360
+#define DL_ARFCN 631296
 #define TDD 1
 
-log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
 log_filename: "/tmp/ue.log",
 
 /* Enable remote API and Web interface */
 com_addr: "0.0.0.0:9002",
 
-include "rf_driver/config.cfg",
+include "rf_driver_20/1chan.cfg",
 
 /* If true, allow the simulation of several UEs at the same time and
 allow dynamic UE creation from remote API */
@@ -22,6 +22,7 @@ allow dynamic UE creation from remote API */
   cell_groups: [{
       group_type: "nr",
       multi_ue: true,
+      ldpc_max_its:8,
       cells: [{
       rf_port: 0,
       bandwidth: 20,

ci-scripts/as_ue/config.cfg

@@ -1,47 +0,0 @@
-/* Parameters for SDR device version 2023-06-10
- * Copyright (C) 2015-2023 Amarisoft
- */
-
-#if !defined(N_CELL)
-  #define N_CELL 1
-#endif
-
-#if N_ANTENNA_DL <= 2
-  #define N_CHAN N_CELL
-#else
-  #define N_CHAN 2*N_CELL
-#endif
-
-rf_driver: {
-    name: "sdr",
-
-    /* list of devices. 'dev0' is always the master. */
-#if N_CHAN == 1
-    args: "dev0=/dev/sdr0",
-#elif N_CHAN == 2
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
-#elif N_CHAN == 3
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2",
-#elif N_CHAN == 4
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3",
-#elif N_CHAN == 6
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3,dev4=/dev/sdr4,dev5=/dev/sdr5",
-#else
-    args: "",
-#endif
-
-    /* synchronisation source: internal, gps, external (default = internal) */
-    // sync: "gps",
-    //rx_antenna:"rx", // force to use the RX connector in TDD as RX antenna
-
-    /* PCIe jitter. decrease it to reduce latency */
-    fifo_tx_time: 50,
-    //rx_latency: 30,
-},
-
-#if 0
-  tx_pad_duration:300,
-#endif
-
-tx_gain: 75.0, /* TX gain (in dB) */
-rx_gain: 55.0, /* RX gain (in dB) */

ci-scripts/ci_infra.yaml

@@ -5,12 +5,10 @@ idefix:
   AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
   DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
   NetworkScript: ip a show dev wwan0
-  #Tracing:
-  #  Start: 'sudo rm -f ci_qlog/*; nohup sudo -b QLog/QLog -s ci_qlog -f NR5G.cfg &'
-  #  Stop: 'sudo killall QLog'
-  #  Collect: 'sudo mv ci_qlog/* %%log_dir%%/'
   IF: wwan0
   MTU: 1500
+  Trace: True
+  LogStore: /media/usb-drive/ci_qlogs
 
 up2:
   Host: up2
@@ -48,6 +46,7 @@ adb_ue_1:
   NetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
   CmdPrefix: adb -s R3CM40LZPHT shell
   MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_1-logs
 adb_ue_2:
   Host: nano
   InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
@@ -60,14 +59,15 @@ adb_ue_2:
   NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
   CmdPrefix: adb -s 5200c00db4413517 shell
   MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_2-logs
 
 oc-cn5g:
   Host: avra
   NetworkScript: echo "inet 172.21.6.102"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran %%log_dir%%"
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran %%log_dir%%"
 
 oc-cn5g-20897:
   Host: cacofonix
@@ -89,8 +89,8 @@ matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
   RunIperf3Server: False
-  Deploy: "cd /opt/oai-cn5g-fed-v2-jun-2025/docker-compose && python3 ./core-network.py --type start-basic"
-  Undeploy: "cd /opt/oai-cn5g-fed-v2-jun-2025/docker-compose && python3 ./core-network.py --type stop-basic"
+  Deploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type start-basic"
+  Undeploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type stop-basic"
   LogCollect:
     - "docker logs oai-smf > %%log_dir%%/oai-smf.log"
     - "docker logs oai-amf > %%log_dir%%/oai-amf.log"
@@ -147,131 +147,125 @@ ltebox-nepes:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz/aw2s-multi-00102-20.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-  #Tracing:
-  #  Start: '' # nothing to be done
-  #  Stop: '' # nothing to be done
-  #  Collect: 'cp /tmp/ue.log %%log_dir%%'
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
+  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_2x2:
   Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_2x2/aw2s-multi-00102-2x2-v2.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
+  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_fhi72:
   Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
+  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
   NetworkScript: ip netns exec ue1 ip a show dev pdn0
   CmdPrefix: ip netns exec ue1
   MTU: 1500
 amarisoft_ue_2:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
   NetworkScript: ip netns exec ue2 ip a show dev pdn0
   CmdPrefix: ip netns exec ue2
   MTU: 1500
 amarisoft_ue_3:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
   NetworkScript: ip netns exec ue3 ip a show dev pdn0
   CmdPrefix: ip netns exec ue3
   MTU: 1500
 amarisoft_ue_4:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
   NetworkScript: ip netns exec ue4 ip a show dev pdn0
   CmdPrefix: ip netns exec ue4
   MTU: 1500
 amarisoft_ue_5:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
   NetworkScript: ip netns exec ue5 ip a show dev pdn0
   CmdPrefix: ip netns exec ue5
   MTU: 1500
 amarisoft_ue_6:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
   NetworkScript: ip netns exec ue6 ip a show dev pdn0
   CmdPrefix: ip netns exec ue6
   MTU: 1500
 amarisoft_ue_7:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
   NetworkScript: ip netns exec ue7 ip a show dev pdn0
   CmdPrefix: ip netns exec ue7
   MTU: 1500
 amarisoft_ue_8:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
   NetworkScript: ip netns exec ue8 ip a show dev pdn0
   CmdPrefix: ip netns exec ue8
   MTU: 1500
 amarisoft_ue_9:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
   NetworkScript: ip netns exec ue9 ip a show dev pdn0
   CmdPrefix: ip netns exec ue9
   MTU: 1500
 amarisoft_ue_10:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
   NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
 amarisoft_ue_11:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
   NetworkScript: ip netns exec ue11 ip a show dev pdn0
   CmdPrefix: ip netns exec ue11
   MTU: 1500
 amarisoft_ue_12:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
   NetworkScript: ip netns exec ue12 ip a show dev pdn0
   CmdPrefix: ip netns exec ue12
   MTU: 1500
 amarisoft_ue_13:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
   NetworkScript: ip netns exec ue13 ip a show dev pdn0
   CmdPrefix: ip netns exec ue13
   MTU: 1500
 amarisoft_ue_14:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
   NetworkScript: ip netns exec ue14 ip a show dev pdn0
   CmdPrefix: ip netns exec ue14
   MTU: 1500
 amarisoft_ue_15:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
   NetworkScript: ip netns exec ue15 ip a show dev pdn0
   CmdPrefix: ip netns exec ue15
   MTU: 1500
 amarisoft_ue_16:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
   NetworkScript: ip netns exec ue16 ip a show dev pdn0
   CmdPrefix: ip netns exec ue16
   MTU: 1500
@@ -305,15 +299,6 @@ rfsim5g_ue:
   AttachScript: docker start rfsim5g-oai-nr-ue
   DetachScript: docker stop rfsim5g-oai-nr-ue
   MTU: 1500
-# for tests with second PDU session ID 2, needs to match requested PDU session name
-rfsim5g_ue_pdu_2:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1p2
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue1p2
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
 
 rfsim5g_ue2:
   Host: "%%current_host%%"

ci-scripts/cls_analysis.py

@@ -84,7 +84,7 @@ class Analysis():
 
 		return success,msg
 
-	def analyze_oc_physim(result_junit, details_json, logPath):
+	def analyze_oc_physim(result_junit, details_json):
 		try:
 			tree = ET.parse(result_junit)
 			root = tree.getroot()
@@ -124,7 +124,7 @@ class Analysis():
 			output = test.findtext("system-out")
 			output_check = "exceeds the threshold" not in output
 			# collect logs
-			log_dir = f'{logPath}/{test_exec}'
+			log_dir = f'../cmake_targets/log/{test_exec}'
 			os.makedirs(log_dir, exist_ok=True)
 			with open(f'{log_dir}/{test_name}.log', 'w') as f:
 				f.write(output)

ci-scripts/cls_ci_helper.py

@@ -1,44 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-
-import os
-from typing import NamedTuple
-import logging
-
-class TestCaseCtx(NamedTuple):
-    count: int
-    test_id: int
-    logPath: str
-
-    def Default(logPath):
-        return TestCaseCtx(123, 112233, logPath)
-    def baseFilename(self):
-        # typically, the test ID is of form 001234 (6 digits)
-        return f"{self.logPath}/{self.count}-{self.test_id:06d}"
-
-def archiveArtifact(cmd, ctx, remote_path):
-    base = os.path.basename(remote_path)
-    local = f"{ctx.baseFilename()}-{base}"
-    logging.info(f"Archive artifact '{local}'")
-    success = cmd.copyin(remote_path, local)
-    if success:
-        cmd.run(f'rm {remote_path}', silent=True)
-    return local if success else None

ci-scripts/cls_cluster.py

@@ -39,7 +39,6 @@ import constants as CONST
 import helpreadme as HELP
 import cls_containerize
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
@@ -208,12 +207,7 @@ class Cluster:
 			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
 		return success
 
-	def _retrieveOCLog(self, ctx, job, lSourcePath, image):
-		fn = f'{lSourcePath}/cmake_targets/log/{image}.log'
-		self.cmd.run(f'oc logs {job} &> {fn}')
-		return (image, archiveArtifact(self.cmd, ctx, fn))
-
-	def BuildClusterImage(self, ctx, HTML):
+	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
@@ -286,27 +280,22 @@ class Cluster:
 		self._recreate_entitlements()
 
 		status = True # flag to abandon compiling if any image fails
-		log_files = []
-		build_metrics = f"{lSourcePath}/cmake_targets/log/build-metrics.log"
+		attemptedImages = []
 		if forceBaseImageBuild:
 			self._recreate_is_tag('ran-base', baseTag, 'openshift/ran-base-is.yaml')
 			self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml')
 			ranbase_job = self._start_build('ran-base')
+			attemptedImages += ['ran-base']
 			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 1000)
 			if not status: logging.error('failure during build of ran-base')
-			log_files.append(self._retrieveOCLog(ctx, ranbase_job, lSourcePath, 'ran-base'))
-
+			self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect
 			# recover logs by mounting image
 			self._retag_image_statement('ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
 			pod = self._deploy_pod('openshift/ran-base-log-retrieval.yaml')
 			if pod is not None:
-				logdir = f'{lSourcePath}/cmake_targets/log/ran-base'
-				self.cmd.run(f'mkdir -p {logdir}')
-				self.cmd.run(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ {logdir}')
+				self.cmd.run(f'mkdir -p cmake_targets/log/ran-base')
+				self.cmd.run(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ cmake_targets/log/ran-base')
 				self._undeploy_pod('openshift/ran-base-log-retrieval.yaml')
-				ret = self.cmd.run(f'ls {logdir}')
-				for f in ret.stdout.splitlines():
-					archiveArtifact(self.cmd, ctx, f"{logdir}/{f}")
 			else:
 				status = False
 
@@ -315,24 +304,27 @@ class Cluster:
 			self._recreate_bc('oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel9')
 			physim_job = self._start_build('oai-physim')
+			attemptedImages += ['oai-physim']
 
 			self._recreate_is_tag('ran-build', imageTag, 'openshift/ran-build-is.yaml')
 			self._recreate_bc('ran-build', imageTag, 'openshift/ran-build-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel9')
 			ranbuild_job = self._start_build('ran-build')
+			attemptedImages += ['ran-build']
 
 			self._recreate_is_tag('oai-clang', imageTag, 'openshift/oai-clang-is.yaml')
 			self._recreate_bc('oai-clang', imageTag, 'openshift/oai-clang-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.clang.rhel9')
 			clang_job = self._start_build('oai-clang')
+			attemptedImages += ['oai-clang']
 
 			wait = ranbuild_job is not None and physim_job is not None and clang_job is not None and self._wait_build_end([ranbuild_job, physim_job, clang_job], 1200)
 			if not wait: logging.error('error during build of ranbuild_job or physim_job or clang_job')
 			status = status and wait
-			log_files.append(self._retrieveOCLog(ctx, ranbuild_job, lSourcePath, 'ran-build'))
-			log_files.append(self._retrieveOCLog(ctx, physim_job, lSourcePath, 'oai-physim'))
-			log_files.append(self._retrieveOCLog(ctx, clang_job, lSourcePath, 'oai-clang'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			self.cmd.run(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log')
+			self.cmd.run(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log')
+			self.cmd.run(f'oc logs {clang_job} &> cmake_targets/log/oai-clang.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
 
 		if status:
 			self._recreate_is_tag('oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
@@ -340,66 +332,72 @@ class Cluster:
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel9')
 			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel9')
 			enb_job = self._start_build('oai-enb')
+			attemptedImages += ['oai-enb']
 
 			self._recreate_is_tag('oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
 			self._recreate_bc('oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel9')
 			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel9')
 			gnb_job = self._start_build('oai-gnb')
+			attemptedImages += ['oai-gnb']
 
 			self._recreate_is_tag('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-is.yaml')
 			self._recreate_bc('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel9')
 			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel9')
 			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
+			attemptedImages += ['oai-gnb-aw2s']
 
 			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 800)
 			if not wait: logging.error('error during build of eNB/gNB')
 			status = status and wait
 			# recover logs
-			log_files.append(self._retrieveOCLog(ctx, enb_job, lSourcePath, 'oai-enb'))
-			log_files.append(self._retrieveOCLog(ctx, gnb_job, lSourcePath, 'oai-gnb'))
-			log_files.append(self._retrieveOCLog(ctx, gnb_aw2s_job, lSourcePath, 'oai-gnb-aw2s'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			self.cmd.run(f'oc logs {enb_job} &> cmake_targets/log/oai-enb.log')
+			self.cmd.run(f'oc logs {gnb_job} &> cmake_targets/log/oai-gnb.log')
+			self.cmd.run(f'oc logs {gnb_aw2s_job} &> cmake_targets/log/oai-gnb-aw2s.log')
 
 			self._recreate_is_tag('oai-nr-cuup', imageTag, 'openshift/oai-nr-cuup-is.yaml')
 			self._recreate_bc('oai-nr-cuup', imageTag, 'openshift/oai-nr-cuup-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nr-cuup.rhel9')
 			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nr-cuup.rhel9')
 			nr_cuup_job = self._start_build('oai-nr-cuup')
+			attemptedImages += ['oai-nr-cuup']
 
 			self._recreate_is_tag('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
 			self._recreate_bc('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel9')
 			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel9')
 			lteue_job = self._start_build('oai-lte-ue')
+			attemptedImages += ['oai-lte-ue']
 
 			self._recreate_is_tag('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
 			self._recreate_bc('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel9')
 			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel9')
 			nrue_job = self._start_build('oai-nr-ue')
+			attemptedImages += ['oai-nr-ue']
 
 			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 800)
 			if not wait: logging.error('error during build of nr-cuup/lteUE/nrUE')
 			status = status and wait
 			# recover logs
-			log_files.append(self._retrieveOCLog(ctx, nr_cuup_job, lSourcePath, 'oai-nr-cuup'))
-			log_files.append(self._retrieveOCLog(ctx, lteue_job, lSourcePath, 'oai-lte-ue'))
-			log_files.append(self._retrieveOCLog(ctx, nrue_job, lSourcePath, 'oai-nr-ue'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			self.cmd.run(f'oc logs {nr_cuup_job} &> cmake_targets/log/oai-nr-cuup.log')
+			self.cmd.run(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log')
+			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
 
 		if status:
 			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
 			self._recreate_bc('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-bc.yaml')
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.fhi72.rhel9')
 			ranbuildfhi72_job = self._start_build('ran-build-fhi72')
+			attemptedImages += ['ran-build-fhi72']
 
 			wait = ranbuildfhi72_job is not None and self._wait_build_end([ranbuildfhi72_job], 1200)
 			if not wait: logging.error('error during build of ranbuildfhi72_job')
 			status = status and wait
-			log_files.append(self._retrieveOCLog(ctx, ranbuildfhi72_job, lSourcePath, 'ran-build-fhi72'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
 
 		if status:
 			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
@@ -407,17 +405,19 @@ class Cluster:
 			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
 			self._retag_image_statement('ran-build-fhi72', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build-fhi72', imageTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
 			gnb_fhi72_job = self._start_build('oai-gnb-fhi72')
+			attemptedImages += ['oai-gnb-fhi72']
 
 			wait = gnb_fhi72_job is not None and self._wait_build_end([gnb_fhi72_job], 600)
 			if not wait: logging.error('error during build of gNB-fhi72')
 			status = status and wait
 			# recover logs
-			log_files.append(self._retrieveOCLog(ctx, gnb_fhi72_job, lSourcePath, 'oai-gnb-fhi72'))
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> {build_metrics}')
+			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log')
 
 		# split and analyze logs
 		imageSize = {}
-		for image, _ in log_files:
+		for image in attemptedImages:
+			self.cmd.run(f'mkdir -p cmake_targets/log/{image}')
 			tag = imageTag if image != 'ran-base' else baseTag
 			size = self._get_image_size(image, tag)
 			if size <= 0:
@@ -428,14 +428,12 @@ class Cluster:
 				imageSize[image] = f'{sizeMb:.1f} Mbytes (uncompressed: ~{sizeMb*2.5:.1f} Mbytes)'
 			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')
 
-		archiveArtifact(self.cmd, ctx, build_metrics)
-		logfile = f'{lSourcePath}/cmake_targets/log/image_registry.log'
-		grep_exp = r"\|".join([i for i,f in log_files])
-		self.cmd.run(f'oc get images | grep -e \'{grep_exp}\' &> {logfile}');
-		archiveArtifact(self.cmd, ctx, logfile)
-		logfile = f'{lSourcePath}/cmake_targets/log/build_pod_summary.log'
-		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> {logfile}; done')
-		archiveArtifact(self.cmd, ctx, logfile)
+		grep_exp = r"\|".join(attemptedImages)
+		self.cmd.run(f'oc get images | grep -e \'{grep_exp}\' &> cmake_targets/log/image_registry.log');
+		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> cmake_targets/log/build_pod_summary.log; done')
+
+		build_log_name = f'build_log_{self.testCase_id}'
+		cls_containerize.CopyLogsToExecutor(self.cmd, lSourcePath, build_log_name)
 
 		self.cmd.run('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc delete pod ${pod}; done')
 
@@ -444,7 +442,7 @@ class Cluster:
 		self.cmd.close()
 
 		# Analyze the logs
-		collectInfo = cls_containerize.AnalyzeBuildLogs(log_files, status)
+		collectInfo = cls_containerize.AnalyzeBuildLogs(build_log_name, attemptedImages, status)
 		for img in collectInfo:
 			for f in collectInfo[img]:
 				status = status and collectInfo[img][f]['status']
@@ -460,16 +458,9 @@ class Cluster:
 
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, imageSize)
 
-		# TODO fix groovy script, remove the following.
-		# the groovy scripts expects all logs in
-		# <jenkins-workspace>/<pipeline>/ci-scripts, so copy it there
-		with cls_cmd.LocalCmd() as c:
-			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_id}/')
-			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_id}/')
-
 		return status
 
-	def deploy_oc_physim(self, ctx, HTML, oc_release, svr_id):
+	def deploy_oc_physim(self, HTML, oc_release, svr_id):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {self.ranBranch} ranCommitID {self.ranCommitID}')
@@ -479,13 +470,17 @@ class Cluster:
 		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {self.eNBSourceCodePath}"
 		ret = cls_cmd.runScript(svr_id, script, 600, options)
 		logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+		log_dir = f'{os.getcwd()}/../cmake_targets/log'
+		os.makedirs(log_dir, exist_ok=True)
+		result_junit = f'{oc_release}-run.xml'
+		details_json = f'{oc_release}-tests.json'
 		with cls_cmd.getConnection(svr_id) as ssh:
-			details_json = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-tests.json')
-			result_junit = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-run.xml')
-			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_log.txt')
-			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_pods_summary.txt')
-			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/LastTestsFailed.log')
-		test_status, test_summary, test_result = cls_analysis.Analysis.analyze_oc_physim(result_junit, details_json, ctx.logPath)
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/{details_json}', tgt=f'{log_dir}/{details_json}')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/{result_junit}', tgt=f'{log_dir}/{result_junit}')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/physim_log.txt', tgt=f'{log_dir}/physim_log.txt')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/physim_pods_summary.txt', tgt=f'{log_dir}/physim_pods_summary.txt')
+			ssh.copyin(src=f'{self.eNBSourceCodePath}/ci-scripts/LastTestsFailed.log', tgt=f'{log_dir}/LastTestsFailed.log')
+		test_status, test_summary, test_result = cls_analysis.Analysis.analyze_oc_physim(f'{log_dir}/{result_junit}', f'{log_dir}/{details_json}')
 		if test_summary:
 			if test_status:
 				HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)

ci-scripts/cls_containerize.py

@@ -46,7 +46,6 @@ import cls_cmd
 import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
-from cls_ci_helper import archiveArtifact
 
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -82,26 +81,67 @@ def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
 		tagToUse = f'develop-{shortCommit}'
 	return tagToUse
 
-def AnalyzeBuildLogs(logfiles, globalStatus):
+def CopyLogsToExecutor(cmd, sourcePath, log_name):
+	cmd.cd(f'{sourcePath}/cmake_targets')
+	cmd.run(f'rm -f {log_name}.zip')
+	cmd.run(f'mkdir -p {log_name}')
+	cmd.run(f'mv log/* {log_name}')
+	cmd.run(f'zip -r -qq {log_name}.zip {log_name}')
+
+	# copy zip to executor for analysis
+	if (os.path.isfile(f'./{log_name}.zip')):
+		os.remove(f'./{log_name}.zip')
+	if (os.path.isdir(f'./{log_name}')):
+		shutil.rmtree(f'./{log_name}')
+	cmd.copyin(src=f'{sourcePath}/cmake_targets/{log_name}.zip', tgt=f'{os.getcwd()}/{log_name}.zip')
+	cmd.run(f'rm -f {log_name}.zip')
+	ZipFile(f'{log_name}.zip').extractall('.')
+
+def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 	collectInfo = {}
-	for image, lf in logfiles:
+	for image in images:
 		files = {}
-		errorandwarnings = {}
-		committed = False
-		tagged = False
-		with open(lf, mode='r') as inputfile:
-			for line in inputfile:
-				lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
-				lineHasTag2 = re.search(f'naming to docker.io/library/{image}:', str(line)) is not None
-				tagged = tagged or lineHasTag or lineHasTag2
-				# the OpenShift Cluster builder prepends image registry URL
-				lineHasCommit = re.search(r'COMMIT [a-zA-Z0-9\.:/\-]*' + image, str(line)) is not None
-				committed = committed or lineHasCommit
-		errorandwarnings['errors'] = 0 if committed or tagged else 1
-		errorandwarnings['warnings'] = 0
-		errorandwarnings['status'] = committed or tagged
-		logging.info(f"Analyzing {image}, file {lf}: {errorandwarnings}")
-		files['Target Image Creation'] = errorandwarnings
+		file_list = [f for f in os.listdir(f'{buildRoot}/{image}') if os.path.isfile(os.path.join(f'{buildRoot}/{image}', f)) and f.endswith('.txt')]
+		# Analyze the "sub-logs" of every target image
+		for fil in file_list:
+			errorandwarnings = {}
+			warningsNo = 0
+			errorsNo = 0
+			with open(f'{buildRoot}/{image}/{fil}', mode='r') as inputfile:
+				for line in inputfile:
+					result = re.search(' ERROR ', str(line))
+					if result is not None:
+						errorsNo += 1
+					result = re.search(' error:', str(line))
+					if result is not None:
+						errorsNo += 1
+					result = re.search(' WARNING ', str(line))
+					if result is not None:
+						warningsNo += 1
+					result = re.search(' warning:', str(line))
+					if result is not None:
+						warningsNo += 1
+				errorandwarnings['errors'] = errorsNo
+				errorandwarnings['warnings'] = warningsNo
+				errorandwarnings['status'] = globalStatus
+			files[fil] = errorandwarnings
+		# Analyze the target image
+		if os.path.isfile(f'{buildRoot}/{image}.log'):
+			errorandwarnings = {}
+			committed = False
+			tagged = False
+			with open(f'{buildRoot}/{image}.log', mode='r') as inputfile:
+				for line in inputfile:
+					lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
+					lineHasTag2 = re.search(f'naming to docker.io/library/{image}:', str(line)) is not None
+					tagged = tagged or lineHasTag or lineHasTag2
+					# the OpenShift Cluster builder prepends image registry URL
+					lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
+					committed = committed or lineHasCommit
+			errorandwarnings['errors'] = 0 if committed or tagged else 1
+			errorandwarnings['warnings'] = 0
+			errorandwarnings['status'] = committed or tagged
+			files['Target Image Creation'] = errorandwarnings
 		collectInfo[image] = files
 	return collectInfo
 
@@ -112,6 +152,19 @@ def GetImageName(ssh, svcName, file):
 	else:
 		return ret.stdout.strip()
 
+def GetServiceHealth(ssh, svcName, file):
+	if svcName is None:
+		return False, f"Service {svcName} not found in {file}"
+	image = GetImageName(ssh, svcName, file)
+	if 'db_init' in svcName or 'db-init' in svcName: # exits with 0, there cannot be healthy
+		return True, f"Service {svcName} healthy, image {image}"
+	for _ in range(8):
+		result = ssh.run(f"docker compose -f {file} ps --format json {svcName}  | jq -r 'if type==\"array\" then .[0].Health else .Health end'", silent=True)
+		if result.stdout == 'healthy':
+			return True, f"Service {svcName} healthy, image {image}"
+		time.sleep(5)
+	return False, f"Failed to deploy: service {svcName}"
+
 def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
 	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
 	if ret.returncode != 0:
@@ -162,10 +215,12 @@ def GetServices(ssh, requested, file):
     else:
         return requested
 
-def CopyinServiceLog(ssh, lSourcePath, svcName, wd_yaml, ctx):
-	remote_filename = f"{lSourcePath}/cmake_targets/log/{svcName}.logs"
+def CopyinServiceLog(ssh, lSourcePath, yaml, svcName, wd_yaml, filename):
+	remote_filename = f"{lSourcePath}/cmake_targets/log/{filename}"
 	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
-	return archiveArtifact(ssh, ctx, remote_filename)
+	local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml}"
+	local_filename = f"{local_dir}/{filename}"
+	return ssh.copyin(remote_filename, local_filename)
 
 def GetRunningServices(ssh, file):
 	ret = ssh.run(f'docker compose -f {file} config --services')
@@ -187,13 +242,14 @@ def GetRunningServices(ssh, file):
 	logging.info(f'stopping services: {running_services}')
 	return running_services
 
-def CheckLogs(self, filename, HTML, RAN):
+def CheckLogs(self, yaml, service_name, HTML, RAN):
+	logPath = f'{os.getcwd()}/../cmake_targets/log/{yaml}'
+	filename = f'{logPath}/{service_name}-{HTML.testCase_id}.log'
 	success = True
-	name = os.path.basename(filename)
-	if (any(sub in name for sub in ['oai_ue','oai-nr-ue','lte_ue'])):
+	if (any(sub in service_name for sub in ['oai_ue','oai-nr-ue','lte_ue'])):
 		logging.debug(f'\u001B[1m Analyzing UE logfile {filename} \u001B[0m')
 		logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(filename, HTML, RAN)
-		opt = f"UE log analysis ({name})"
+		opt = f"UE log analysis for service {service_name}"
 		# usage of htmlUEFailureMsg/htmleNBFailureMsg is because Analyze log files
 		# abuse HTML to store their reports, and we here want to put custom options,
 		# which is not possible with CreateHtmlTestRow
@@ -204,13 +260,13 @@ def CheckLogs(self, filename, HTML, RAN):
 		else:
 			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmlUEFailureMsg])
 		HTML.htmlUEFailureMsg = ""
-	elif 'nv-cubb' in name:
+	elif service_name == 'nv-cubb':
 		msg = 'Undeploy PNF/Nvidia CUBB'
 		HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
-	elif (any(sub in name for sub in ['enb','rru','rcc','cu','du','gnb'])):
+	elif (any(sub in service_name for sub in ['enb','rru','rcc','cu','du','gnb'])):
 		logging.debug(f'\u001B[1m Analyzing XnB logfile {filename}\u001B[0m')
 		logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
-		opt = f"xNB log analysis ({name})"
+		opt = f"xNB log analysis for service {service_name}"
 		if (logStatus < 0):
 			HTML.CreateHtmlTestRowQueue(opt, 'KO', [HTML.htmleNBFailureMsg])
 			success = False
@@ -218,9 +274,9 @@ def CheckLogs(self, filename, HTML, RAN):
 			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg])
 		HTML.htmleNBFailureMsg = ""
 	else:
-		logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE")
-		HTML.CreateHtmlTestRowQueue(f"file {name}", 'OK', ["no analysis function"])
-	logging.debug(f"log check: file {filename} passed analysis {success}")
+		logging.info(f'Skipping to analyze log for service name {service_name}')
+		HTML.CreateHtmlTestRowQueue(f"service {service_name}", 'OK', ["no analysis function"])
+	logging.debug(f"log check: service {service_name} passed analysis {success}")
 	return success
 
 #-----------------------------------------------------------
@@ -255,12 +311,26 @@ class Containerize():
 		self.yamlPath = ['', '', '']
 		self.services = ['', '', '']
 		self.deploymentTag = ''
+		self.eNB_logFile = ['', '', '']
+
+		self.testCase_id = ''
 
 		self.cli = ''
 		self.cliBuildOptions = ''
 		self.dockerfileprefix = ''
 		self.host = ''
 
+		self.deployedContainers = []
+		self.tsharkStarted = False
+		self.pingContName = ''
+		self.pingOptions = ''
+		self.pingLossThreshold = ''
+		self.svrContName = ''
+		self.svrOptions = ''
+		self.cliContName = ''
+		self.cliOptions = ''
+
+		self.imageToCopy = ''
 		#checkers from xml
 		self.ran_checkers={}
 		self.num_attempts = 1
@@ -285,12 +355,11 @@ class Containerize():
 			raise ValueError(f'Insufficient Parameter: IP/node {ip}, path {path}')
 		return (ip, path)
 
-	def BuildImage(self, ctx, HTML):
+	def BuildImage(self, HTML):
 		svr = self.eNB_serverId[self.eNB_instance]
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.getConnection(lIpAddr)
-		log_files = []
 	
 		# Checking the hostname to get adapted on cli and dockerfileprefixes
 		cmd.run('hostnamectl')
@@ -346,6 +415,7 @@ class Containerize():
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 		
+		self.testCase_id = HTML.testCase_id
 		cmd.cd(lSourcePath)
 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
@@ -375,24 +445,13 @@ class Containerize():
 		# Let's remove any previous run artifacts if still there
 		cmd.run(f"{self.cli} image prune --force")
 		for image,pattern,name,option in imageNames:
-			cmd.run(f"{self.cli} image rm {name}:{imageTag}", reportNonZero=False)
+			cmd.run(f"{self.cli} image rm {name}:{imageTag}")
 
 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
 			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
-			logfile = f'{lSourcePath}/cmake_targets/log/ran-base.docker.log'
-			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> {logfile}", timeout=1600)
-			t = ("ran-base", archiveArtifact(cmd, ctx, logfile))
-			log_files.append(t)
-
-			# Recover build logs, for the moment only possible when build is successful
-			cmd.run(f"{self.cli} create --name test {baseImage}:{baseTag}")
-			cmd.run("mkdir -p cmake_targets/log/ran-base")
-			logfile = f'{lSourcePath}/cmake_targets/log/ran-base.log'
-			cmd.run(f"{self.cli} cp test:/oai-ran/cmake_targets/log/all.txt {logfile}")
-			cmd.run(f"{self.cli} rm -f test")
-			archiveArtifact(cmd, ctx, logfile)
+			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
 		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		allImagesSize = {}
@@ -407,7 +466,7 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 		else:
-			result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
+			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
 				size = float(result.group("size")) / 1000000
 				imageSizeStr = f'{size:.1f}'
@@ -416,9 +475,17 @@ class Containerize():
 			else:
 				logging.debug('ran-base size is unknown')
 
+		# Recover build logs, for the moment only possible when build is successful
+		cmd.run(f"{self.cli} create --name test {baseImage}:{baseTag}")
+		cmd.run("mkdir -p cmake_targets/log/ran-base")
+		cmd.run(f"{self.cli} cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base")
+		cmd.run(f"{self.cli} rm -f test")
+
 		# Build the target image(s)
 		status = True
+		attemptedImages = ['ran-base']
 		for image,pattern,name,option in imageNames:
+			attemptedImages += [name]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
 			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{self.dockerfileprefix}')
@@ -431,19 +498,16 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc.src.2025.05.20.tar.gz .')
-			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
-			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
-			t = (name, archiveArtifact(cmd, ctx, logfile))
-			log_files.append(t)
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.*.tar.gz .')
+			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc.src.2025.05.20.tar.gz')
-			if image == 'ran-build' or image == 'ran-build-asan' or image == 'ran-build-fhi72':
+				cmd.run('rm -f nvipc_src.*.tar.gz')
+			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
-				logfile = f'{lSourcePath}/{image}.ninja.log'
-				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/all.txt {logfile}")
+				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
 				cmd.run(f"docker rm -f test-log")
-				archiveArtifact(cmd, ctx, logfile)
+			else:
+				cmd.run(f"mkdir -p cmake_targets/log/{name}")
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -454,7 +518,7 @@ class Containerize():
 				allImagesSize[name] = 'N/A -- Build Failed'
 				break
 			else:
-				result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
+				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 				if result is not None:
 					size = float(result.group("size")) / 1000000 # convert to MB
 					imageSizeStr = f'{size:.1f}'
@@ -477,10 +541,13 @@ class Containerize():
 		logging.debug(cmd.run("df -h").stdout)
 		logging.debug(cmd.run("docker system df").stdout)
 
+		# create a zip with all logs
+		build_log_name = f'build_log_{self.testCase_id}'
+		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 		cmd.close()
 
 		# Analyze the logs
-		collectInfo = AnalyzeBuildLogs(log_files, status)
+		collectInfo = AnalyzeBuildLogs(build_log_name, attemptedImages, status)
 		
 		if status:
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
@@ -494,12 +561,13 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 
-	def BuildProxy(self, ctx, HTML):
+	def BuildProxy(self, HTML):
 		svr = self.eNB_serverId[self.eNB_instance]
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
 		ssh = cls_cmd.getConnection(lIpAddr)
 
+		self.testCase_id = HTML.testCase_id
 		oldRanCommidID = self.ranCommitID
 		oldRanRepository = self.ranRepository
 		oldRanAllowMerge = self.ranAllowMerge
@@ -525,10 +593,15 @@ class Containerize():
 			if not success:
 				raise Exception("could not clone proxy repository")
 
-			fullpath = f'{lSourcePath}/proxy_build.log'
+			filename = f'build_log_{self.testCase_id}'
+			fullpath = f'{lSourcePath}/{filename}'
 
 			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
-			archiveArtifact(ssh, ctx, fullpath)
+			ssh.run(f'zip -r -qq {fullpath}.zip {fullpath}')
+			local_file = f"{os.getcwd()}/../cmake_targets/log/{filename}.zip"
+			ssh.copyin(f'{fullpath}.zip', local_file)
+			# don't delete such that we might recover the zips
+			#ssh.run(f'rm -f {fullpath}.zip')
 
 			ssh.run('docker image prune --force')
 			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
@@ -568,7 +641,7 @@ class Containerize():
 		collectInfo = {}
 		collectInfo['proxy'] = files
 		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
+		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
 		# Cleaning any created tmp volume
 		ssh.run('docker volume prune --force')
 		ssh.close()
@@ -590,7 +663,7 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 
-	def BuildRunTests(self, ctx, HTML):
+	def BuildRunTests(self, HTML):
 		svr = self.eNB_serverId[self.eNB_instance]
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
@@ -607,6 +680,7 @@ class Containerize():
 
 		if self.forcedWorkspaceCleanup:
 			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
+		self.testCase_id = HTML.testCase_id
 	
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
@@ -626,10 +700,10 @@ class Containerize():
 
 		# build ran-unittests image
 		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu22"
-		logfile = f'{lSourcePath}/cmake_targets/log/unittest-build.log'
-		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {logfile}')
-		archiveArtifact(cmd, ctx, logfile)
+		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
 		if ret.returncode != 0:
+			build_log_name = f'build_log_{self.testCase_id}'
+			CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 			logging.error(f'Cannot build unit tests')
 			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
 			HTML.CreateHtmlTabFooter(False)
@@ -638,15 +712,10 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
 
 		# it worked, build and execute tests, and close connection
-		# I would like to run it with --rm and mount the ctest result directory to avoid 'docker cp'
-		# below, but then permissions are messed up and we can't remove the directory without sudo
-		# making the next pipeline fail
-		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ran-unittests ran-unittests:{baseTag} ctest --no-label-summary -j$(nproc)')
-		cmd.run('docker cp ran-unittests:/oai-ran/build/Testing/Temporary/LastTest.log .')
-		archiveArtifact(cmd, ctx, f'{lSourcePath}/LastTest.log')
-		cmd.run('docker cp ran-unittests:/oai-ran/build/Testing/Temporary/LastTestsFailed.log .')
-		archiveArtifact(cmd, ctx, f'{lSourcePath}/LastTestsFailed.log')
-		cmd.run('docker rm ran-unittests')
+		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
+		cmd.run(f'docker rmi ran-unittests:{baseTag}')
+		build_log_name = f'build_log_{self.testCase_id}'
+		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 		cmd.close()
 
 		if ret.returncode == 0:
@@ -779,14 +848,18 @@ class Containerize():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["cannot create workspace"])
 		return success
 
-	def DeployObject(self, ctx, HTML):
+	def DeployObject(self, HTML):
 		svr = self.eNB_serverId[self.eNB_instance]
 		num_attempts = self.num_attempts
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug(f'Deploying OAI Object on server: {lIpAddr}')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
+		# creating the log folder by default
+		local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml.split('/')[-1]}"
+		os.system(f'mkdir -p {local_dir}')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
+		yaml_dir = yaml.split('/')[-1]
 		with cls_cmd.getConnection(lIpAddr) as ssh:
 			services = GetServices(ssh, self.services[self.eNB_instance], wd_yaml)
 			if services == [] or services == ' ' or services == None:
@@ -799,36 +872,44 @@ class Containerize():
 			if num_attempts <= 0:
 				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
 			for attempt in range(num_attempts):
+				imagesInfo = []
+				healthInfo = []
 				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 60 -- {services}')
-				info = ssh.run(f"docker compose -f {wd_yaml} ps --all --format=\'table {{{{.Service}}}} [{{{{.Image}}}}] {{{{.Status}}}}\' -- {services} | column -t")
-				deployed = status.returncode == 0
-				if not deployed:
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d -- {services}')
+				if status.returncode != 0:
 					msg = f'cannot deploy services {services}: {status.stdout}'
 					logging.error(msg)
-				else:
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
+					return False
+				for svc in services.split():
+					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
+					logging.info(msg)
+					imagesInfo.append(msg)
+					healthInfo.append(health)
+				deployed = all(healthInfo)
+				if deployed:
 					break
-				if (attempt < num_attempts - 1):
-					warning_msg = (f'Failed to deploy on attempt {attempt}, restart services {services}')
+				elif (attempt < num_attempts - 1):
+					warning_msg = f'Restart services {services}'
 					logging.warning(warning_msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [warning_msg])
+					imagesInfo.append(warning_msg)
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', ['\n'.join(imagesInfo)])
 					for svc in services.split():
-						CopyinServiceLog(ssh, lSourcePath, svc, wd_yaml, ctx)
+						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')
 					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')
-		imagesInfo = info.stdout.splitlines()[1:]
-		logging.debug(f'{info.stdout.splitlines()[1:]}')
 		if deployed:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
 		return deployed
 
-	def UndeployObject(self, ctx, HTML, RAN):
+	def UndeployObject(self, HTML, RAN):
 		svr = self.eNB_serverId[self.eNB_instance]
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
 		wd = f'{lSourcePath}/{yaml}'
+		yaml_dir = yaml.split('/')[-1]
 		with cls_cmd.getConnection(lIpAddr) as ssh:
 			ExistEnvFilePrint(ssh, wd)
 			services = GetRunningServices(ssh, f"{wd}/docker-compose.y*ml")
@@ -836,7 +917,7 @@ class Containerize():
 			if services is not None:
 				all_serv = " ".join([s for s, _ in services])
 				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
-				copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, f"{wd}/docker-compose.y*ml", ctx) for s, _ in services]
+				copyin_res = all(CopyinServiceLog(ssh, lSourcePath, yaml_dir, s, f"{wd}/docker-compose.y*ml", f'{s}-{HTML.testCase_id}.log') for s, c in services)
 			else:
 				logging.warning('could not identify services to stop => no log file')
 			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
@@ -845,7 +926,7 @@ class Containerize():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)'])
 			return False
 		else:
-			log_results = [CheckLogs(self, f, HTML, RAN) for f in copyin_res]
+			log_results = [CheckLogs(self, yaml_dir, s, HTML, RAN) for s, _ in services]
 			success = all(log_results)
 		if success:
 			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')

ci-scripts/cls_corenetwork.py

@@ -29,7 +29,6 @@ import yaml
 import re
 
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 def listify(s):
 	if s is None:
@@ -115,7 +114,8 @@ class CoreNetwork:
 		logging.info(f'deployed core network {self}, pingable IP address {ip}')
 		return True, output
 
-	def _collect_logs(self, ctx):
+	def _collect_logs(self, log_dir):
+		logging.info(f'collecting logs into (local) {log_dir}')
 		remote_dir = "/tmp/cn-undeploy-logs"
 		with cls_cmd.getConnection(self._host) as c:
 			# create a directory for log collection
@@ -134,17 +134,18 @@ class CoreNetwork:
 				logging.error("cannot enumerate log files")
 				return []
 			log_files = []
-			# copy them to the executor one by one
+			# copy them to the executor one by one, and store in log_dir
 			for f in ret.stdout.split("\n"):
-				name = archiveArtifact(c, ctx, f)
-				log_files.append(name)
+				l = f.replace(remote_dir, log_dir)
+				c.copyin(f, l)
+				log_files.append(l)
 			c.run(f'rm -rf {remote_dir}')
 			return log_files
 
-	def undeploy(self, ctx=None):
+	def undeploy(self, log_dir=None):
 		log_files = []
-		if ctx is not None:
-			log_files = self._collect_logs(ctx)
+		if log_dir is not None:
+			log_files = self._collect_logs(log_dir)
 		else:
 			logging.warning("no directory for log collection specified, cannot retrieve core network logs")
 		logging.info(f'undeploy core network {self}')

ci-scripts/cls_module.py

@@ -32,7 +32,6 @@ import re
 import yaml
 
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 class Module_UE:
 
@@ -60,31 +59,26 @@ class Module_UE:
 			}
 			self.interface = m.get('IF')
 			self.MTU = m.get('MTU')
+			self.trace = m.get('trace') == True
+			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
 			logging.info(f'initialized UE {self} from {filename}')
 
-			t = m.get('Tracing')
-			self.trace = t is not None
-			if self.trace:
-				if t.get('Start') is None or t.get('Stop') is None or t.get('Collect')is None :
-					raise ValueError("need to have Start/Stop/Collect for tracing")
-				self.cmd_dict["traceStart"] = t.get('Start')
-				self.cmd_dict["traceStop"] = t.get('Stop')
-				self._logCollect = t.get('Collect')
-				if "%%log_dir%%" not in self._logCollect:
-					raise ValueError(f"(At least one) LogCollect expression for {module_name} must contain \"%%log_dir%%\"")
-
 	def __str__(self):
-		return f"{self.module_name}@{self.host}"
+		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
 
 	def __repr__(self):
 		return self.__str__()
 
-	def _command(self, cmd, silent=False, reportNonZero=True):
+	def _command(self, cmd, silent = False):
 		if cmd is None:
 			raise Exception("no command provided")
-		with cls_cmd.getConnection(self.host) as c:
-			response = c.run(cmd, silent=silent, reportNonZero=reportNonZero)
+		if self.host == "" or self.host == "localhost":
+			c = cls_cmd.LocalCmd()
+		else:
+			c = cls_cmd.RemoteCmd(self.host)
+		response = c.run(cmd, silent=silent)
+		c.close()
 		return response
 
 #-----------------$
@@ -92,23 +86,25 @@ class Module_UE:
 #-----------------$
 
 	def initialize(self):
+		if self.trace:
+			raise Exception("UE tracing not implemented yet")
+			self._enableTrace()
 		# we first terminate to make sure the UE has been stopped
 		if self.cmd_dict["detach"]:
 			self._command(self.cmd_dict["detach"], silent=True)
 		self._command(self.cmd_dict["terminate"], silent=True)
 		ret = self._command(self.cmd_dict["initialize"])
 		logging.info(f'For command: {ret.args} | return output: {ret.stdout} | Code: {ret.returncode}')
-		if self.trace:
-			self._enableTrace()
 		# Here each UE returns differently for the successful initialization, requires check based on UE
 		return ret.returncode == 0
 
 
-	def terminate(self, ctx=None):
+	def terminate(self):
 		self._command(self.cmd_dict["terminate"])
-		if self.trace and ctx is not None:
+		if self.trace:
+			raise Exception("UE tracing not implemented yet")
 			self._disableTrace()
-			return self._collectTrace(ctx)
+			return self._logCollect()
 		return None
 
 	def attach(self, attach_tries = 4, attach_timeout = 60):
@@ -117,11 +113,10 @@ class Module_UE:
 			self._command(self.cmd_dict["attach"])
 			timeout = attach_timeout
 			logging.debug("Waiting for IP address to be assigned")
-			ip = self.getIP(silent=False, reportNonZero=True)
 			while timeout > 0 and not ip:
-				time.sleep(1)
-				timeout -= 1
-				ip = self.getIP(silent=True, reportNonZero=False)
+				time.sleep(5)
+				timeout -= 5
+				ip = self.getIP()
 			if ip:
 				break
 			logging.warning(f"UE did not receive IP address after {attach_timeout} s, detaching")
@@ -165,8 +160,8 @@ class Module_UE:
 			logging.error(message)
 			return False
 
-	def getIP(self, silent=True, reportNonZero=True):
-		output = self._command(self.cmd_dict["getNetwork"], silent=silent, reportNonZero=reportNonZero)
+	def getIP(self):
+		output = self._command(self.cmd_dict["getNetwork"], silent=True)
 		result = re.search(r'inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output.stdout)
 		if result and result.group('ip'):
 			ip = result.group('ip')
@@ -196,33 +191,10 @@ class Module_UE:
 		return self.cmd_prefix if self.cmd_prefix else ""
 
 	def _enableTrace(self):
-		logging.info(f'UE {self}: start UE tracing')
-		self._command(self.cmd_dict["traceStart"])
+		raise Exception("not implemented")
 
 	def _disableTrace(self):
-		logging.info(f'UE {self}: stop UE tracing')
-		self._command(self.cmd_dict["traceStop"])
+		raise Exception("not implemented")
 
-	def _collectTrace(self, ctx):
-		remote_dir = "/tmp/ue-trace-logs"
-		with cls_cmd.getConnection(self.host) as c:
-			# create a directory for log collection
-			c.run(f'rm -rf {remote_dir}')
-			ret = c.run(f'mkdir {remote_dir}')
-			if ret.returncode != 0:
-				logging.error("cannot create directory for log collection")
-				return []
-			log_cmd = self._logCollect.replace('%%log_dir%%', remote_dir)
-			self._command(log_cmd)
-			# enumerate collected files
-			ret = c.run(f'ls {remote_dir}/*')
-			if ret.returncode != 0:
-				logging.error("cannot enumerate log files")
-				return []
-			log_files = []
-			# copy them to the executor one by one, and store in log_dir
-			for f in ret.stdout.split("\n"):
-				name = archiveArtifact(c, ctx, f)
-				log_files.append(name)
-			c.run(f'rm -rf {remote_dir}')
-			return log_files
+	def _logCollect(self):
+		raise Exception("not implemented")

ci-scripts/cls_native.py

@@ -28,24 +28,26 @@ import cls_cmd
 import cls_oai_html
 import cls_analysis
 import constants as CONST
-from cls_ci_helper import archiveArtifact
 
-DPDK_PATH = '/opt/dpdk-t2-22.11.0'
+LOG_PATH_PHYSIM = 'phy_sim_logs'
 
 class Native():
 
-	def Build(ctx, test_case, HTML, host, directory, options):
+	def Build(test_case, HTML, host, directory, options):
 		logging.debug(f'Building on server: {host}')
 		HTML.testCase_id = test_case
 
 		with cls_cmd.getConnection(host) as ssh:
 			base = f"{directory}/cmake_targets"
-			ret = ssh.run(f"C_INCLUDE_PATH={DPDK_PATH}/include/ PKG_CONFIG_PATH={DPDK_PATH}/lib64/pkgconfig/ {base}/build_oai {options} > {base}/build_oai.log", timeout=900)
+			ret = ssh.run(f"{base}/build_oai {options} > {base}/log/build_oai.log", timeout=900)
 			success = ret.returncode == 0
-			logs = ssh.run(f"cat {base}/build_oai.log", silent=True)
+			logs = ssh.run(f"cat {base}/log/build_oai.log", silent=True)
 			logging.debug(f"build finished with code {ret.returncode}, output:\n{logs.stdout}")
 
-			archiveArtifact(ssh, ctx, f'{base}/build_oai.log')
+			# create log directory, and copy build logs
+			target = f"{base}/build_log_{test_case}/"
+			ssh.run(f"mkdir -p {target}")
+			ssh.run(f"mv {base}/log/* {target}")
 
 			# check if build artifacts are there
 			# NOTE: build_oai should fail with exit code if it could not build, but it does not
@@ -65,14 +67,15 @@ class Native():
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
 
-	def Run_Physim(ctx, HTML, host, directory, options, physim_test, threshold):
+	def Run_Physim(HTML, host, directory, options, physim_test, threshold):
 		logging.debug(f'Runnin {physim_test} on server: {host}')
 		workSpacePath = f'{directory}/cmake_targets'
-		runLogFile=f'{workSpacePath}/physim.log'
+		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')
+		runLogFile=f'physim_{HTML.testCase_id}.log'
 		with cls_cmd.getConnection(host) as cmd:
-			cmd.run(f'sudo LD_LIBRARY_PATH=.:{DPDK_PATH}/lib64/ {workSpacePath}/ran_build/build/{physim_test} {options} >> {runLogFile}')
-			physim_file = archiveArtifact(cmd, ctx, runLogFile)
-		success, msg = cls_analysis.Analysis.analyze_physim(physim_file, physim_test, options, threshold)
+			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')
+			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')
+		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)
 		if success:
 			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
 		else:

ci-scripts/cls_oai_html.py

@@ -224,6 +224,7 @@ class HTMLManagement():
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  </div>\n')
 			self.htmlFile.close()
+			time.sleep(1)
 			if passStatus:
 				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
 				subprocess.run(cmd, shell=True)

ci-scripts/cls_oaicitest.py

@@ -47,7 +47,6 @@ import constants as CONST
 import cls_module
 import cls_corenetwork
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -214,7 +213,7 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 			pal_msg += f' (too high! >{iperf_packetloss_threshold}%)'
 		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
 
-def Custom_Command(HTML, node, command):
+def Custom_Command(HTML, node, command, command_fail):
     logging.info(f"Executing custom command on {node}")
     cmd = cls_cmd.getConnection(node)
     ret = cmd.run(command)
@@ -222,20 +221,26 @@ def Custom_Command(HTML, node, command):
     logging.debug(f"Custom_Command: {command} on node: {node} - {'OK, command succeeded' if ret.returncode == 0 else f'Error, return code: {ret.returncode}'}")
     status = 'OK'
     message = []
-    if ret.returncode != 0:
+    if ret.returncode != 0 and not command_fail:
+        message = [ret.stdout]
+        logging.warning(f'Custom_Command output: {message}')
+        status = 'Warning'
+    if ret.returncode != 0 and command_fail:
         message = [ret.stdout]
         logging.error(f'Custom_Command failed: output: {message}')
         status = 'KO'
     HTML.CreateHtmlTestRowQueue(command, status, message)
     return status == 'OK' or status == 'Warning'
 
-def Custom_Script(HTML, node, script):
+def Custom_Script(HTML, node, script, command_fail):
 	logging.info(f"Executing custom script on {node}")
 	ret = cls_cmd.runScript(node, script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
-	if ret.returncode != 0:
+	if ret.returncode != 0 and not command_fail:
+		status = 'Warning'
+	if ret.returncode != 0 and command_fail:
 		status = 'KO'
 	HTML.CreateHtmlTestRowQueue(script, status, message)
 	return status == 'OK' or status == 'Warning'
@@ -257,7 +262,9 @@ class OaiCiTest():
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ''
 
+		self.testCase_id = ''
 		self.testXMLfiles = []
+		self.desc = ''
 		self.ping_args = ''
 		self.ping_packetloss_threshold = ''
 		self.ping_rttavg_threshold =''
@@ -351,7 +358,7 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def Ping_common(self, ctx, cn, ue):
+	def Ping_common(self, cn, ue, logPath):
 		ping_status = 0
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -359,12 +366,13 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return (False, f"CN {cn.getName()} has no IP address")
-		ping_log_file = f'/tmp/ping_{ue.getName()}.log'
+		ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
 		ping_time = re.findall(r"-c *(\d+)",str(self.ping_args))
+		local_ping_log_file = f'{logPath}/{ping_log_file}'
 		if re.search('%cn_ip%', self.ping_args) or re.search(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+', self.ping_args):
 			raise Exception(f"ping_args should not have IP address: {self.ping_args}")
 		interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
-		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {svrIP} 2>&1 | tee {ping_log_file}'
+		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {svrIP} 2>&1 | tee /tmp/{ping_log_file}'
 		cmd = cls_cmd.getConnection(ue.getHost())
 		response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
 		ue_header = f'UE {ue.getName()} ({ueIP})'
@@ -372,7 +380,8 @@ class OaiCiTest():
 			message = ue_header + ': ping crashed: TIMEOUT?'
 			return (False, message)
 
-		local_ping_log_file = archiveArtifact(cmd, ctx, ping_log_file)
+		#copy the ping log file to have it locally for analysis (ping stats)
+		cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=local_ping_log_file)
 		cmd.close()
 
 		with open(local_ping_log_file, 'r') as f:
@@ -412,13 +421,18 @@ class OaiCiTest():
 
 		return (True, message)
 
-	def Ping(self, ctx, HTML, infra_file="ci_infra.yaml"):
+	def Ping(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
+		# Creating destination log folder if needed on the python executor workspace
+		with cls_cmd.getConnection('localhost') as local:
+			ymlPath = CONTAINERS.yamlPath[0].split('/')
+			logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
+			local.run(f'mkdir -p {logPath}', silent=True)
 		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(self.Ping_common, ctx, cn, ue) for ue in ues]
+			futures = [executor.submit(self.Ping_common, cn, ue, logPath) for ue in ues]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -439,7 +453,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
 		return success
 
-	def Iperf_Module(self, ctx, cn, ue, idx, ue_num):
+	def Iperf_Module(self, cn, ue, idx, ue_num, logPath):
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
@@ -452,7 +466,7 @@ class OaiCiTest():
 		serverReport = ""
 		udpIperf = re.search('-u', iperf_opt) is not None
 		bidirIperf = re.search('--bidir', iperf_opt) is not None
-		client_filename = f'/tmp/iperf_client_{ue.getName()}.log'
+		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
 		if udpIperf:
 			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
 			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
@@ -467,11 +481,14 @@ class OaiCiTest():
 			port = 5002 + idx
 			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
 			t = iperf_time * 2.5
-			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
+			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False, silent=True)
 			if cn.runIperf3Server():
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
-			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
+			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=t)
+			# note: copy iperf3 log to the current directory for log analysis and log collection
+			dest_filename = f'{logPath}/{client_filename}'
+			cmd_ue.copyin(f'/tmp/{client_filename}', dest_filename)
+			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False, silent=True)
 		if udpIperf:
 			status, msg = Iperf_analyzeV3UDP(dest_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		elif bidirIperf:
@@ -481,15 +498,20 @@ class OaiCiTest():
 
 		return (status, f'{ue_header}\n{msg}')
 
-	def Iperf(self, ctx, HTML, infra_file="ci_infra.yaml"):
+	def Iperf(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
 		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
+		# create log directory on executor node
+		with cls_cmd.getConnection('localhost') as local:
+			ymlPath = CONTAINERS.yamlPath[0].split('/')
+			logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
+			local.run(f'mkdir -p {logPath}', silent=True)
 		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(self.Iperf_Module, ctx, cn, ue, i, len(ues)) for i, ue in enumerate(ues)]
+			futures = [executor.submit(self.Iperf_Module, cn, ue, i, len(ues), logPath) for i, ue in enumerate(ues)]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -510,7 +532,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 		return success
 
-	def Iperf2_Unidir(self, ctx, HTML, infra_file="ci_infra.yaml"):
+	def Iperf2_Unidir(self, HTML, CONTAINERS, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
 		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip(), infra_file)
@@ -521,17 +543,23 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return False
-		server_filename = f'/tmp/iperf_server_{ue.getName()}.log'
+		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
+		ymlPath = CONTAINERS.yamlPath[0].split('/')
+		logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[-1]}'
 		iperf_time = Iperf_ComputeTime(self.iperf_args)
 		target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(0, 1, self.iperf_profile, self.iperf_args)
 		t = iperf_time*2.5
+		with cls_cmd.getConnection('localhost') as local:
+			local.run(f'mkdir -p {logPath}')
 		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
-			cmd_ue.run(f'rm {server_filename}', reportNonZero=False)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> {server_filename} &', timeout=t)
+			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
+			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> /tmp/{server_filename} &', timeout=t)
 			cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 >> /dev/null', timeout=t)
 			localPath = f'{os.getcwd()}'
-			local = archiveArtifact(cmd_ue, ctx, server_filename)
-		success, msg = Iperf_analyzeV2UDP(local, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+			# note: copy iperf2 log to the directory for log collection
+			cmd_ue.copyin(f'/tmp/{server_filename}', f'{logPath}/{server_filename}')
+			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
+		success, msg = Iperf_analyzeV2UDP(f'{logPath}/{server_filename}', self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		ue_header = f'UE {ue.getName()} ({ueIP})'
 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -813,17 +841,17 @@ class OaiCiTest():
 				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
 		return global_status
 
-	def TerminateUE(self, ctx, HTML):
+	def TerminateUE(self, HTML):
 		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
-			futures = [executor.submit(ue.terminate, ctx) for ue in ues]
+			futures = [executor.submit(ue.terminate) for ue in ues]
 			archives = [f.result() for f in futures]
 		archive_info = [f'Log at: {a}' if a else 'No log available' for a in archives]
 		messages = [f"UE {ue.getName()}: {log}" for (ue, log) in zip(ues, archive_info)]
 		HTML.CreateHtmlTestRowQueue(f'N/A', 'OK', messages)
 		return True
 
-	def DeployCoreNetwork(cn_id, ctx, HTML):
+	def DeployCoreNetwork(cn_id, HTML):
 		core_name = cn_id.strip()
 		cn = cls_corenetwork.CoreNetwork(core_name)
 		success, output = cn.deploy()
@@ -837,11 +865,41 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(core_name, 'KO', [msg])
 		return success
 
-	def UndeployCoreNetwork(cn_id, ctx, HTML):
+	def UndeployCoreNetwork(cn_id, HTML):
+		# Ping, Iperf, DeployObject put logs into a path based on YAML. We
+		# can't do this here (because there is no yaml), so hardcode a path for
+		# "cn_logs" for the moment
+		logPath = f'{os.getcwd()}/../cmake_targets/log/cn_logs'
+		with cls_cmd.getConnection('localhost') as local:
+			local.run(f'mkdir -p {logPath}', silent=True)
 		core_name = cn_id.strip()
 		cn = cls_corenetwork.CoreNetwork(core_name)
-		logs, output = cn.undeploy(ctx=ctx)
+		logs, output = cn.undeploy(log_dir=logPath)
 		logging.info(f"undeployed core network {core_name}, logs {logs}, output:\n{output}")
-		message = "Log files:\n" + "\n".join([os.path.basename(l) for l in logs])
+		message = "Log files: " + ", ".join([os.path.basename(l) for l in logs])
 		HTML.CreateHtmlTestRowQueue(core_name, 'OK', [message])
 		return True
+
+	def LogCollectBuild(self,RAN):
+		# Some pipelines are using "none" IP / Credentials
+		# In that case, just forget about it
+		if RAN.eNBIPAddress == 'none':
+			sys.exit(0)
+
+		if (RAN.eNBIPAddress != '' and RAN.eNBUserName != '' and RAN.eNBPassword != ''):
+			IPAddress = RAN.eNBIPAddress
+			UserName = RAN.eNBUserName
+			Password = RAN.eNBPassword
+			SourceCodePath = RAN.eNBSourceCodePath
+		else:
+			sys.exit('Insufficient Parameter')
+		with cls_cmd.getConnection(IPAddress) as cmd:
+			d = f'{SourceCodePath}/cmake_targets'
+			cmd.run(f'rm -f {d}/build.log.zip')
+			cmd.run(f'cd {d} && zip -r build.log.zip build_log_*/*')
+
+	def ShowTestID(self):
+		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
+		logging.info(f'\u001B[1m Test ID: {self.testCase_id} \u001B[0m')
+		logging.info(f'\u001B[1m {self.desc} \u001B[0m')
+		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')

ci-scripts/cls_static_code_analysis.py

@@ -43,7 +43,6 @@ from pathlib import Path
 import helpreadme as HELP
 import constants as CONST
 import cls_cmd
-from cls_ci_helper import archiveArtifact
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -81,7 +80,7 @@ class StaticCodeAnalysis():
 		self.eNBPassword = ''
 		self.eNBSourceCodePath = ''
 
-	def CppCheckAnalysis(self, ctx, HTML):
+	def CppCheckAnalysis(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
@@ -104,7 +103,7 @@ class StaticCodeAnalysis():
 			full_ran_repo_name = self.ranRepository + '.git'
 
 		cmd.cd(lSourcePath)
-		logDir = f'{lSourcePath}/cmake_targets/log'
+		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
 		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
@@ -113,21 +112,31 @@ class StaticCodeAnalysis():
 		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
 		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
 
-		bionic = archiveArtifact(cmd, ctx, f'{logDir}/cppcheck-bionic.txt')
-		focal = archiveArtifact(cmd, ctx, f'{logDir}/cppcheck-focal.txt')
+		# Analyzing the logs
+		cmd.copyin(f'{logDir}/cppcheck-bionic.txt', 'cppcheck-bionic.txt')
+		cmd.copyin(f'{logDir}/cppcheck-focal.txt', 'cppcheck-focal.txt')
 		cmd.close()
 
 		CCR = CppCheckResults()
 		CCR_ref = CppCheckResults()
 		vId = 0
 		for variant in CCR.variants:
-			filename = ctx.baseFilename() + '-cppcheck-'+ variant + '.txt'
-			logging.info(f"will check file '{filename}'")
-			if not os.path.isfile(filename):
-				raise FileNotFoundError(f"{filename} is not a file")
-			else:
+			refAvailable = False
+			if self.ranAllowMerge:
+				refFolder = str(Path.home()) + '/cppcheck-references'
+				if (os.path.isfile(refFolder + '/cppcheck-'+ variant + '.txt')):
+					refAvailable = True
+					with open(refFolder + '/cppcheck-'+ variant + '.txt', 'r') as refFile:
+						for line in refFile:
+							ret = re.search(' (?P<nb_errors>[0-9\.]+) errors', str(line))
+							if ret is not None:
+								CCR_ref.nbErrors[vId] = int(ret.group('nb_errors'))
+							ret = re.search(' (?P<nb_warnings>[0-9\.]+) warnings', str(line))
+							if ret is not None:
+								CCR_ref.nbWarnings[vId] = int(ret.group('nb_warnings'))
+			if (os.path.isfile('./cppcheck-'+ variant + '.txt')):
 				xmlStart = False
-				with open(filename, 'r') as logfile:
+				with open('./cppcheck-'+ variant + '.txt', 'r') as logfile:
 					for line in logfile:
 						ret = re.search('cppcheck version="(?P<version>[0-9\.]+)"', str(line))
 						if ret is not None:
@@ -176,6 +185,26 @@ class StaticCodeAnalysis():
 			vMsg += '   Wrong Scanf Nb Args:             ' + str(CCR.nbWrongScanfArg[vId]) + '\n'
 			for vLine in vMsg.split('\n'):
 				logging.debug(vLine)
+			if self.ranAllowMerge and refAvailable:
+				if CCR_ref.nbErrors[vId] == CCR.nbErrors[vId]:
+					logging.debug('   No change in number of errors')
+				elif CCR_ref.nbErrors[vId] > CCR.nbErrors[vId]:
+					logging.debug('   Good! Decrease in number of errors')
+				else:
+					logging.debug('   Bad! increase in number of errors')
+				if CCR_ref.nbWarnings[vId] == CCR.nbWarnings[vId]:
+					logging.debug('   No change in number of warnings')
+				elif CCR_ref.nbWarnings[vId] > CCR.nbWarnings[vId]:
+					logging.debug('   Good! Decrease in number of warnings')
+				else:
+					logging.debug('   Bad! increase in number of warnings')
+			# Create new reference file
+			if not self.ranAllowMerge:
+				refFolder = str(Path.home()) + '/cppcheck-references'
+				if not os.path.isdir(refFolder):
+					os.mkdir(refFolder)
+				with open(refFolder + '/cppcheck-'+ variant + '.txt', 'w') as refFile:
+					refFile.write(vMsg)
 			vId += 1
 
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
@@ -184,7 +213,7 @@ class StaticCodeAnalysis():
 
 		return True
 
-	def LicenceAndFormattingCheck(self, ctx, HTML):
+	def LicenceAndFormattingCheck(self, HTML):
 		# Workspace is no longer recreated from scratch.
 		# It implies that this method shall be called last within a build pipeline
 		# where workspace is already created
@@ -209,7 +238,7 @@ class StaticCodeAnalysis():
 			else:
 				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
 
-		logDir = f'{lSourcePath}/cmake_targets/log/'
+		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
@@ -218,11 +247,12 @@ class StaticCodeAnalysis():
 		cmd.run('docker image prune --force')
 		cmd.run('docker volume prune --force')
 
-		file = archiveArtifact(cmd, ctx, f'{logDir}/oai-formatting-check.txt')
+		# Analyzing the logs
+		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
 		cmd.close()
 
 		finalStatus = 0
-		if (os.path.isfile(file)):
+		if (os.path.isfile('./oai-formatting-check.txt')):
 			analyzed = False
 			nbFilesNotFormatted = 0
 			listFiles = False
@@ -233,7 +263,7 @@ class StaticCodeAnalysis():
 			gnuGplLicenceFiles = []
 			suspectLicence = False
 			suspectLicenceFiles = []
-			with open(file, 'r') as logfile:
+			with open('./oai-formatting-check.txt', 'r') as logfile:
 				for line in logfile:
 					ret = re.search('./ci-scripts/checkCodingFormattingRules.sh', str(line))
 					if ret is not None:

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

@@ -58,14 +58,6 @@ gNBs =
   }
 );
 
-pdcp = {
-  drb = {
-    sn_size = "len18bits"
-    t_reordering  = "ms100"
-    discard_timer = "infinity"
-  }
-}
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

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

@@ -34,9 +34,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      absoluteFrequencySSB                                             = 641280; # GSCN: 7929, Freq: 3619.200 MHz
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 641280;
       dl_frequencyBand                                                 = 78;
-      dl_absoluteFrequencyPointA                                       = 640752; # 3611.280 MHz
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -45,12 +47,13 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        initialDLBWPlocationAndBandwidth                               = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 10;
+        initialDLBWPcontrolResourceSetZero                              = 12;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
@@ -65,7 +68,7 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
+        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;
@@ -149,18 +152,6 @@ gNBs =
 
   );
 
-    servingCellConfigDedicated = ({
-      dl_bwp-Id_1 = 1;
-      dl_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
-      dl_bwp1_subcarrierSpacing = 1;
-      firstActiveDownlinkBWP-Id = 1;
-      defaultDownlinkBWP-Id = 1;
-      ul_bwp-Id_1 = 1;
-      ul_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
-      ul_bwp1_subcarrierSpacing = 1;
-      firstActiveUplinkBWP-Id = 1;
-    });
-
 
     # ------- SCTP definitions
     SCTP :
@@ -172,31 +163,6 @@ gNBs =
   }
 );
 
-rlc = {
-  srb = {
-    t_poll_retransmit = "ms45"
-    t_reassembly = "ms25"
-    t_status_prohibit = "ms0"
-    poll_pdu = "infinity"
-    poll_byte = "infinity"
-    max_retx_threshold = "t8"
-    sn_field_length = "size12"
-  }
-  drb_am = {
-    t_poll_retransmit = "ms45"
-    t_reassembly = "ms15"
-    t_status_prohibit = "ms15"
-    poll_pdu = "p64"
-    poll_byte = "kB500"
-    max_retx_threshold = "t32"
-    sn_field_length = "size18"
-  }
-  drb_um = {
-    t_reassembly = "ms15"
-    sn_field_length = "size12"
-  }
-}
-
 MACRLCs = (
   {
     num_cc           = 1;

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

@@ -43,12 +43,19 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
+      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
+      absoluteFrequencySSB                                          = 649920;
+      #652860; #should be 649920
+#647520;
+#647540;
+#649920;
+#650208;
+#647540;
       dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
+      # this is 3300.24 MHz
+      dl_absoluteFrequencyPointA                                    = 646724;
+#649104;
+#646724;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing

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

@@ -31,11 +31,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 4412.64 MHz
-      absoluteFrequencySSB                                             = 694176;
-      dl_frequencyBand                                                 = 79;
-      # this is 4400.94 MHz
-      dl_absoluteFrequencyPointA                                       = 693396;
+      # this is 3319.68 MHz
+      absoluteFrequencySSB                                             = 621312;
+      dl_frequencyBand                                                 = 78;
+      # this is 3300.6 MHz
+      dl_absoluteFrequencyPointA                                       = 620040;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -55,7 +55,7 @@ gNBs =
 
   #uplinkConfigCommon 
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 79;
+      ul_frequencyBand                                                 = 78;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing

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

@@ -31,11 +31,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 4435.68 MHz
-      absoluteFrequencySSB                                             = 695712;
-      dl_frequencyBand                                                 = 79;
-      # this is 4400.94 MHz
-      dl_absoluteFrequencyPointA                                       = 693396;
+      # 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
@@ -55,7 +55,7 @@ gNBs =
 
   #uplinkConfigCommon
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 79;
+      ul_frequencyBand                                                 = 78;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing

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

@@ -33,11 +33,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 4458.72 MHz
-      absoluteFrequencySSB                                             = 697248;
-      dl_frequencyBand                                                 = 79;
-      # this is 4400.94 MHz
-      dl_absoluteFrequencyPointA                                       = 693396;
+      # 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
@@ -57,7 +57,7 @@ gNBs =
 
   #uplinkConfigCommon
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 79;
+      ul_frequencyBand                                                 = 78;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing

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

@@ -169,10 +169,10 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-      GNB_IPV4_ADDRESS_FOR_S1_MME    = "172.21.16.109";
-      GNB_IPV4_ADDRESS_FOR_S1U       = "172.21.16.109";
+      GNB_IPV4_ADDRESS_FOR_S1_MME    = "192.168.68.194";
+      GNB_IPV4_ADDRESS_FOR_S1U       = "192.168.68.194";
       GNB_PORT_FOR_S1U               = 2152; # Spec 2152
-      GNB_IPV4_ADDRESS_FOR_X2C       = "172.21.16.109";
+      GNB_IPV4_ADDRESS_FOR_X2C       = "192.168.68.194";
       GNB_PORT_FOR_X2C               = 36422; # Spec 36422
     };
 

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

@@ -149,8 +149,6 @@ gNBs =
 
   #ext2
     #ntn_Config_r17
-      # This can be of values {s5, s10, s15, s20, s25, s30, s35, s40, s45, s50, s55, s60, s120, s180, s240, s900}
-      ntn-UlSyncValidityDuration-r17                                = 240;
       cellSpecificKoffset_r17                                       = 478;
       ta-Common-r17                                                 = 58629666; # 238.74 ms
       positionX-r17                                                 = 0;
@@ -195,15 +193,6 @@ gNBs =
   }
 );
 
-rlc = {
-  srb = {
-    t_poll_retransmit = "ms2000"
-  }
-  drb_am = {
-    t_poll_retransmit = "ms2000"
-  }
-}
-
 MACRLCs = (
 {
   num_cc                      = 1;

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

@@ -21,6 +21,7 @@ gNBs =
 
     sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
+    beam_weights = [0]; // single SSB -> one analog beam
 
     servingCellConfigCommon = (
     {
@@ -178,7 +179,6 @@ MACRLCs = ({
   set_analog_beamforming      = 1;
   beam_duration               = 1;
   beams_per_period            = 1;
-  beam_weights = [0]; // single SSB -> one analog beam
 });
 
 L1s = (

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

@@ -213,7 +213,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "nea0" );
+  ciphering_algorithms = ( "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -223,7 +223,7 @@ security = {
   # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
   # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
   drb_ciphering = "yes";
-  drb_integrity = "yes";
+  drb_integrity = "no";
 };
 
 log_config :

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

@@ -35,8 +35,8 @@ gNBs =
 # downlinkConfigCommon
     #frequencyInfoDL
       dl_frequencyBand                                               = 78;
-      absoluteFrequencySSB                                           = 628320;
-      dl_absoluteFrequencyPointA                                     = 627062;
+      absoluteFrequencySSB                                           = 634080;
+      dl_absoluteFrequencyPointA                                     = 632808;
       #scs-SpecificCarrierList
       dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -197,7 +197,7 @@ RUs = (
   local_rf       = "yes";
   nb_tx          = 1;
   nb_rx          = 1;
-  att_tx         = 10;
+  att_tx         = 0;
   att_rx         = 0;
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
@@ -212,7 +212,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "nea0" );
+  ciphering_algorithms = ( "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -222,7 +222,7 @@ security = {
   # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
   # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
   drb_ciphering = "yes";
-  drb_integrity = "yes";
+  drb_integrity = "no";
 };
 
 log_config :

ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf

@@ -185,7 +185,6 @@ L1s = (
   num_cc                = 1;
   tr_n_preference       = "local_mac";
   prach_dtx_threshold   = 120;
-  tx_amp_backoff_dB = 30;
 }
 );
 

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -34,11 +34,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3410.400 MHz
-      absoluteFrequencySSB                                             = 627360;
+      # this is 3469.44 MHz => 301 REs from PointA 25 PRBs + 1 RE
+      absoluteFrequencySSB                                             = 631296;
       dl_frequencyBand                                                 = 78;
-      # this is 3401.220 MHz
-      dl_absoluteFrequencyPointA                                       = 626748;
+      # this is 3469.44 - (51*12*30e-3/2) = 3460.26 MHz
+      dl_absoluteFrequencyPointA                                       = 630684;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing

ci-scripts/datalog_rt_stats.100.2x2.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 17.0
   UL Indication : 1.0
   Slot Indication : 13.0
-  feprx : 151.0
-  feptx_ofdm (per port, half_slot) : 57
-  feptx_total : 148
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.25
   UL Indication : 1.00
   Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

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

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 5.0
   UL Indication : 1.0
   Slot Indication : 6.0
-  feprx : 44.0
-  feptx_ofdm (per port, half_slot) : 31
-  feptx_total : 58
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 8.0
   UL Indication : 3.0
   Slot Indication : 9.0
-  feprx : 85.0
-  feptx_ofdm (per port, half_slot) : 31
-  feptx_total : 92
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.35
   UL Indication : 1.00
   Slot Indication : 0.35
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/datalog_rt_stats.default.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 4.0
   UL Indication : 2.0
   Slot Indication : 5.0
-  feprx : 43.0
-  feptx_ofdm (per port, half_slot) : 30
-  feptx_total : 57
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/main.py

@@ -43,10 +43,8 @@ import cls_containerize	 #class Containerize for all container-based operations
 import cls_static_code_analysis  #class for static code analysis
 import cls_cluster		 # class for building/deploying on cluster
 import cls_native        # class for all native/source-based operations
-from cls_ci_helper import TestCaseCtx
 
 import ran
-import cls_cmd
 import cls_oai_html
 
 
@@ -93,7 +91,7 @@ def AssignParams(params_dict):
 		setattr(RAN, key, value)
 		setattr(HTML, key, value)
 
-def ExecuteActionWithParam(action, ctx):
+def ExecuteActionWithParam(action):
 	global RAN
 	global HTML
 	global CONTAINERS
@@ -136,15 +134,15 @@ def ExecuteActionWithParam(action, ctx):
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(ctx, HTML.testCase_id, HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(HTML.testCase_id, HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
-			success = CONTAINERS.BuildImage(ctx, HTML)
+			success = CONTAINERS.BuildImage(HTML)
 		elif action == 'Build_Proxy':
-			success = CONTAINERS.BuildProxy(ctx, HTML)
+			success = CONTAINERS.BuildProxy(HTML)
 		elif action == 'Build_Cluster_Image':
-			success = CLUSTER.BuildClusterImage(ctx, HTML)
+			success = CLUSTER.BuildClusterImage(HTML)
 		elif action == 'Build_Run_Tests':
-			success = CONTAINERS.BuildRunTests(ctx, HTML)
+			success = CONTAINERS.BuildRunTests(HTML)
 
 	elif action == 'Initialize_eNB':
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
@@ -206,7 +204,7 @@ def ExecuteActionWithParam(action, ctx):
 			RAN.air_interface[RAN.eNB_instance] = 'lte-softmodem'
 		else:
 			RAN.air_interface[RAN.eNB_instance] = air_interface.lower() +'-softmodem'
-		success = RAN.TerminateeNB(ctx, HTML)
+		success = RAN.TerminateeNB(HTML)
 
 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
@@ -228,7 +226,7 @@ def ExecuteActionWithParam(action, ctx):
 		elif action == 'Detach_UE':
 			success = CiTestObj.DetachUE(HTML)
 		elif action == 'Terminate_UE':
-			success = CiTestObj.TerminateUE(ctx, HTML)
+			success = CiTestObj.TerminateUE(HTML)
 		elif action == 'CheckStatusUE':
 			success = CiTestObj.CheckStatusUE(HTML)
 		elif action == 'DataEnable_UE':
@@ -255,7 +253,7 @@ def ExecuteActionWithParam(action, ctx):
 			else:
 				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
-		success = CiTestObj.Ping(ctx, HTML)
+		success = CiTestObj.Ping(HTML, CONTAINERS)
 
 	elif action == 'Iperf' or action == 'Iperf2_Unidir':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
@@ -286,9 +284,9 @@ def ExecuteActionWithParam(action, ctx):
 			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
 			CiTestObj.iperf_options = 'check'
 		if action == 'Iperf':
-			success = CiTestObj.Iperf(ctx, HTML)
+			success = CiTestObj.Iperf(HTML, CONTAINERS)
 		elif action == 'Iperf2_Unidir':
-			success = CiTestObj.Iperf2_Unidir(ctx, HTML)
+			success = CiTestObj.Iperf2_Unidir(HTML, CONTAINERS)
 
 	elif action == 'IdleSleep':
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
@@ -297,12 +295,12 @@ def ExecuteActionWithParam(action, ctx):
 	elif action == 'Deploy_Run_PhySim':
 		oc_release = test.findtext('oc_release')
 		svr_id = test.findtext('svr_id') or None
-		success = CLUSTER.deploy_oc_physim(ctx, HTML, oc_release, svr_id)
+		success = CLUSTER.deploy_oc_physim(HTML, oc_release, svr_id)
 
 	elif action == 'DeployCoreNetwork' or action == 'UndeployCoreNetwork':
 		cn_id = test.findtext('cn_id')
 		core_op = getattr(cls_oaicitest.OaiCiTest, action)
-		success = core_op(cn_id, ctx, HTML)
+		success = core_op(cn_id, HTML)
 
 	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
 		eNB_instance=test.findtext('eNB_instance')
@@ -330,9 +328,9 @@ def ExecuteActionWithParam(action, ctx):
 		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
-			success = CONTAINERS.DeployObject(ctx, HTML)
+			success = CONTAINERS.DeployObject(HTML)
 		elif action == 'Undeploy_Object':
-			success = CONTAINERS.UndeployObject(ctx, HTML, RAN)
+			success = CONTAINERS.UndeployObject(HTML, RAN)
 		elif action == 'Create_Workspace':
 			if force_local:
 				# Do not create a working directory when running locally. Current repo directory will be used
@@ -343,13 +341,13 @@ def ExecuteActionWithParam(action, ctx):
 		physim_options = test.findtext('physim_run_args')
 		physim_test = test.findtext('physim_test')
 		physim_threshold = test.findtext('physim_time_threshold') or 'inf'
-		success = cls_native.Native.Run_Physim(ctx, HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold)
+		success = cls_native.Native.Run_Physim(HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold)
 
 	elif action == 'LicenceAndFormattingCheck':
-		success = SCA.LicenceAndFormattingCheck(ctx, HTML)
+		success = SCA.LicenceAndFormattingCheck(HTML)
 
 	elif action == 'Cppcheck_Analysis':
-		success = SCA.CppCheckAnalysis(ctx, HTML)
+		success = SCA.CppCheckAnalysis(HTML)
 
 	elif action == 'Push_Local_Registry':
 		svr_id = test.findtext('svr_id')
@@ -378,12 +376,14 @@ def ExecuteActionWithParam(action, ctx):
 			# Change all execution targets to localhost
 			node = 'localhost'
 		command = test.findtext('command')
-		success = cls_oaicitest.Custom_Command(HTML, node, command)
+		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
+		success = cls_oaicitest.Custom_Command(HTML, node, command, command_fail)
 
 	elif action == 'Custom_Script':
 		node = test.findtext('node')
 		script = test.findtext('script')
-		success = cls_oaicitest.Custom_Script(HTML, node, script)
+		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
+		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)
 
 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
@@ -409,11 +409,10 @@ def test_in_list(test, list):
 def receive_signal(signum, frame):
 	sys.exit(1)
 
-def ShowTestID(ctx, desc):
-    logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
-    logging.info(f'\u001B[1m Test ID: {ctx.test_id} (#{ctx.count}) \u001B[0m')
-    logging.info(f'\u001B[1m {desc} \u001B[0m')
-    logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
+
+
+
+
 
 #-----------------------------------------------------------
 # MAIN PART
@@ -469,7 +468,15 @@ if py_param_file_present == True:
 cwd = os.getcwd()
 
 if re.match('^TerminateeNB$', mode, re.IGNORECASE):
-	logging.warning("Option TerminateeNB ignored")
+	if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '':
+		HELP.GenericHelp(CONST.Version)
+		sys.exit('Insufficient Parameter')
+	if RAN.eNBIPAddress == 'none':
+		sys.exit(0)
+	RAN.eNB_instance=0
+	RAN.eNB_serverId[0]='0'
+	RAN.eNBSourceCodePath='/tmp/'
+	RAN.TerminateeNB(HTML)
 elif re.match('^TerminateHSS$', mode, re.IGNORECASE):
 	logging.warning("Option TerminateHSS ignored")
 elif re.match('^TerminateMME$', mode, re.IGNORECASE):
@@ -477,7 +484,12 @@ elif re.match('^TerminateMME$', mode, re.IGNORECASE):
 elif re.match('^TerminateSPGW$', mode, re.IGNORECASE):
 	logging.warning("Option TerminateSPGW ignored")
 elif re.match('^LogCollectBuild$', mode, re.IGNORECASE):
-	logging.warning("Option LogCollectBuild ignored")
+	if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '':
+		logging.warning("nothing to collect (eNBIPAddress/eNBUserName/eNBPassword/eNBSourceCodePath is '')")
+		sys.exit(0)
+	if RAN.eNBIPAddress == 'none':
+		sys.exit(0)
+	CiTestObj.LogCollectBuild(RAN)
 elif re.match('^LogCollecteNB$', mode, re.IGNORECASE):
 	if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '':
 		HELP.GenericHelp(CONST.Version)
@@ -555,16 +567,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	else:
 		xml_test_file = cwd + "/" + CiTestObj.testXMLfiles[0]
 
-	# directory where all log artifacts will be placed
-	logPath = f"{cwd}/../cmake_targets/log/{CiTestObj.testXMLfiles[0].split('/')[-1]}.d"
-	# we run from within ci-scripts, but the logPath is absolute, so replace
-	# the ci-scripts/..; if it does not exist, nothing will happen
-	logPath = logPath.replace(r'/ci-scripts/..', '')
-	logging.info(f"placing all artifacts for this run in {logPath}/")
-	with cls_cmd.LocalCmd() as c:
-		c.run(f"rm -rf {logPath}")
-		c.run(f"mkdir -p {logPath}")
-
 	xmlTree = ET.parse(xml_test_file)
 	xmlRoot = xmlTree.getroot()
 
@@ -615,35 +617,29 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	task_set_succeeded = True
 	HTML.startTime=int(round(time.time() * 1000))
 
-	i = 0
 	for test_case_id in todo_tests:
 		for test in all_tests:
 			id = test.get('id')
 			if test_case_id != id:
 				continue
-			i += 1
 			CiTestObj.testCase_id = id
-			ctx = TestCaseCtx(i, int(id), logPath)
 			HTML.testCase_id=CiTestObj.testCase_id
-			desc = test.findtext('desc')
+			CiTestObj.desc = test.findtext('desc')
 			always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
-			may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
-			HTML.desc = desc
+			HTML.desc=CiTestObj.desc
 			action = test.findtext('class')
 			if (CheckClassValidity(xml_class_list, action, id) == False):
 				task_set_succeeded = False
 				continue
-			ShowTestID(ctx, desc)
+			CiTestObj.ShowTestID()
 			if not task_set_succeeded and not always_exec:
 				msg = f"skipping test due to prior error"
 				logging.warning(msg)
 				HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
 				break
 			try:
-				test_succeeded = ExecuteActionWithParam(action, ctx)
-				if not test_succeeded and may_fail:
-					logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
-				elif not test_succeeded:
+				test_succeeded = ExecuteActionWithParam(action)
+				if not test_succeeded:
 					logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests")
 					task_set_succeeded = False
 			except Exception as e:

ci-scripts/ran.py

@@ -46,7 +46,6 @@ import cls_cmd
 import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-from cls_ci_helper import archiveArtifact
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -96,6 +95,7 @@ class RANManagement():
 		self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
 		self.node = ''
 		self.command = ''
+		self.command_fail = False
 
 
 #-----------------------------------------------------------
@@ -125,6 +125,7 @@ class RANManagement():
 
 		self.testCase_id = HTML.testCase_id
 		mySSH = SSH.SSHConnection()
+		cwd = os.getcwd()
 		
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath, '\$', 5)
@@ -249,7 +250,42 @@ class RANManagement():
 		logging.debug('\u001B[1m Initialize eNB/gNB Completed\u001B[0m')
 		return enbDidSync
 
-	def TerminateeNB(self, ctx, HTML):
+	def CheckeNBProcess(self, status_queue):
+		# At least the instance 0 SHALL be on!
+		if self.eNBstatuses[0] == 0:
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+		elif self.eNBstatuses[0] == 1:
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+		elif self.eNBstatuses[0] == 2:
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+		else:
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+		if self.air_interface[self.eNB_instance] == '':
+			pattern = 'softmodem'
+		else:
+			pattern = self.air_interface[self.eNB_instance]
+		mySSH.command('stdbuf -o0 ps -aux | grep --color=never ' + pattern + ' | grep -v grep', '\$', 5)
+		result = re.search(pattern, mySSH.getBefore())
+		success = result is not None
+		if not success:
+			logging.debug('\u001B[1;37;41m eNB Process Not Found! \u001B[0m')
+			status_queue.put(CONST.ENB_PROCESS_FAILED)
+		else:
+			status_queue.put(CONST.ENB_PROCESS_OK)
+		mySSH.close()
+		return success
+
+	def TerminateeNB(self, HTML):
 		if self.eNB_serverId[self.eNB_instance] == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
@@ -321,11 +357,13 @@ class RANManagement():
 				fileToAnalyze = self.eNBLogFiles[int(self.eNB_instance)]
 				self.eNBLogFiles[int(self.eNB_instance)] = ''
 			if analyzeFile:
-				with cls_cmd.getConnection(lIpAddr) as cmd:
-					file = archiveArtifact(cmd, ctx, lSourcePath + '/cmake_targets/' + fileToAnalyze)
-					archiveArtifact(cmd, ctx, lSourcePath + '/cmake_targets/nrL1_stats.log')
-					archiveArtifact(cmd, ctx, lSourcePath + '/cmake_targets/nrMAC_stats.log')
-				if file is None:
+				#*stats.log files + pickle + png
+				mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/*stats.log', '.')
+				mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/*.pickle', '.')
+				mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/*.png', '.')
+				#
+				copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + fileToAnalyze, '.')
+				if (copyin_res == -1):
 					logging.debug('\u001B[1;37;41m Could not copy ' + nodeB_prefix + 'NB logfile to analyze it! \u001B[0m')
 					HTML.htmleNBFailureMsg='Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!'
 					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
@@ -338,8 +376,8 @@ class RANManagement():
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './nrL1_stats.log', self.eNBSourceCodePath + '/cmake_targets/')
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './nrMAC_stats.log', self.eNBSourceCodePath + '/cmake_targets/')
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')
-				logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + file)
-				logStatus = self.AnalyzeLogFile_eNB(file, HTML, self.ran_checkers)
+				logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + fileToAnalyze)
+				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze, HTML, self.ran_checkers)
 				if (logStatus < 0):
 					HTML.CreateHtmlTestRow('N/A', 'KO', logStatus)
 					#display rt stats for gNB only
@@ -697,16 +735,11 @@ class RANManagement():
 			datalog_rt_stats = yaml.load(f,Loader=yaml.FullLoader)
 		rt_keys = datalog_rt_stats['Ref'] #we use the keys from the Ref field  
 
-		# nrL1_stats.log/nrMAC_stats.log should be in the same directory as main log file
-		# currently the link is only implicit as below based on pattern matching
-		# I will rework this to give the file explicitly
-		l1_stats_fn = re.sub(r'enb_[0-9]+', 'nrL1_stats', eNBlogFile)
-		mac_stats_fn = re.sub(r'enb_[0-9]+', 'nrMAC_stats', eNBlogFile)
-		if os.path.isfile(l1_stats_fn) and os.path.isfile(mac_stats_fn):
+		if os.path.isfile('./nrL1_stats.log') and os.path.isfile('./nrMAC_stats.log'):
 			# don't use CI-nrL1_stats.log, as this will increase the processing time for
 			# no reason, we just need the last occurence
-			nrL1_stats = open(l1_stats_fn, 'r')
-			nrMAC_stats = open(mac_stats_fn, 'r')
+			nrL1_stats = open('./nrL1_stats.log', 'r')
+			nrMAC_stats = open('./nrMAC_stats.log', 'r')
 			for line in nrL1_stats.readlines():
 				for k in rt_keys:
 					result = re.search(k, line)     
@@ -726,7 +759,7 @@ class RANManagement():
 			nrL1_stats.close()
 			nrMAC_stats.close()
 		else:
-			logging.debug(f"NR Stats files for RT analysis not found: {l1_stats_fn}, {mac_stats_fn}")
+			logging.debug("NR Stats files for RT analysis not found")
 
 		#stdout log file and stat log files analysis completed
 		logging.debug('   File analysis (stdout, stats) completed')

ci-scripts/run_locally.sh

@@ -26,20 +26,8 @@ fi
 docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
 docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
 
-python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
-    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
-    --ranTargetBranch=NONE \
-    --XMLTestFile=xml_files/${TESTCASE} --local
-
 python3 main.py --mode=TesteNB --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
     --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
     --ranTargetBranch=NONE --eNBIPAddress=NONE --eNBUserName=NONE --eNBPassword=NONE \
     --eNBSourceCodePath=${REPO_PATH} \
-    --XMLTestFile=${TESTCASE} --local
-RET=$?
-
-python3 main.py --mode=FinalizeHtml \
-  --local \
-  --eNBIPAddress=NONE --eNBUserName=NONE --eNBPassword=NONE
-
-exit ${RET}
+    --XMLTestFile=xml_files/${TESTCASE} --local

ci-scripts/tests/config/test_module_infra.yaml

@@ -1,34 +0,0 @@
-test:
-  Host: localhost
-  InitScript: ""
-  TermScript: ""
-  AttachScript: "true"
-  DetachScript: "true"
-  NetworkScript: ip a show dev lo
-  IF: lo
-  MTU: 65536
-
-test-fail:
-  Host: localhost
-  InitScript: ""
-  TermScript: ""
-  AttachScript: "false"
-  DetachScript: "true"
-  NetworkScript: ip a show dev TESTDEVICEDOESNOTEXIST
-  IF: TESTDEVICEDOESNOTEXIST
-  MTU: 123
-
-test-trace:
-  Host: localhost
-  InitScript: ""
-  TermScript: ""
-  AttachScript: "true"
-  DetachScript: "true"
-  Tracing:
-    # tttf: temp-trace-test-file
-    Start: "rm -f /tmp/tttf; for i in {1..8}; do echo $i >> /tmp/tttf; sleep 1; done &"
-    Stop: "while [[ $(wc -l /tmp/tttf) < 4 ]]; do sleep 1; done"
-    Collect: "cp /tmp/tttf %%log_dir%%"
-  NetworkScript: ip a show dev lo
-  IF: lo
-  MTU: 65536

ci-scripts/tests/corenetwork.py

@@ -6,22 +6,14 @@ logging.basicConfig(
 	format="[%(asctime)s] %(levelname)8s: %(message)s"
 )
 import os
-import tempfile
 
 import unittest
 
 sys.path.append('./') # to find OAI imports below
 import cls_corenetwork
-from cls_ci_helper import TestCaseCtx
 import cls_cmd
 
 class TestCoreNetwork(unittest.TestCase):
-    def setUp(self):
-        self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
-    def tearDown(self):
-        with cls_cmd.LocalCmd() as c:
-            c.run(f'rm -rf {self.ctx.logPath}')
-
     def test_simple_core(self):
         c = cls_corenetwork.CoreNetwork("test", filename="tests/config/test_core_infra.yaml")
         success, output = c.deploy()
@@ -30,14 +22,14 @@ class TestCoreNetwork(unittest.TestCase):
         # should not have it set in config
         self.assertTrue(c.runIperf3Server())
         self.assertEqual(c.getIP(), "127.0.0.1")
-        log_files, output = c.undeploy(self.ctx)
+        log_files, output = c.undeploy(log_dir="/tmp")
         self.assertEqual(output, "undeploy")
         with cls_cmd.LocalCmd() as cmd:
             # there must be one log file for this (test) core
             self.assertEqual(len(log_files), 1)
-            # undeploy uses archiveArtifact(), which writes to {prefix}-logs
+            # test core writes to %%log_dir%%/logs, which expands to /tmp/logs
             l = log_files[0]
-            self.assertEqual(l, f"{self.ctx.baseFilename()}-logs")
+            self.assertEqual(l, "/tmp/logs")
             ret = cmd.run(f"cat {l}")
             self.assertEqual(ret.returncode, 0) # command must succeed
             self.assertEqual(ret.stdout, "logs") # output should be "logs"
@@ -47,14 +39,14 @@ class TestCoreNetwork(unittest.TestCase):
         success, _ = c.deploy()
         self.assertTrue(success)
         self.assertFalse(c.runIperf3Server())
-        c.undeploy(None)
+        c.undeploy(log_dir="/tmp")
 
     def test_core_fail(self):
         c = cls_corenetwork.CoreNetwork("test_fail", filename="tests/config/test_core_infra.yaml")
         success, _ = c.deploy()
         self.assertFalse(success)
         # undeployment should still work
-        c.undeploy(None)
+        c.undeploy(log_dir="/tmp")
 
     def test_core_script(self):
         c = cls_corenetwork.CoreNetwork("test_script", filename="tests/config/test_core_infra.yaml")

ci-scripts/tests/deployment.py

@@ -6,7 +6,6 @@ logging.basicConfig(
 	format="[%(asctime)s] %(levelname)8s: %(message)s"
 )
 import os
-import tempfile
 os.system(f'rm -rf cmake_targets')
 os.system(f'mkdir -p cmake_targets/log')
 import unittest
@@ -15,7 +14,6 @@ sys.path.append('./') # to find OAI imports below
 import cls_oai_html
 import cls_oaicitest
 import cls_containerize
-from cls_ci_helper import TestCaseCtx
 import ran
 import cls_cmd
 
@@ -50,16 +48,12 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.eNBPassword = None
 		self.cont.eNBSourceCodePath = os.getcwd()
 		self.cont.num_attempts = 3
-		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
-	def tearDown(self):
-		with cls_cmd.LocalCmd() as c:
-			c.run(f'rm -rf {self.ctx.logPath}')
 
 	def test_deploy(self):
 		self.cont.yamlPath[0] = 'tests/simple-dep/'
 		self.cont.deploymentTag = "noble"
-		deploy = self.cont.DeployObject(self.ctx, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.html, self.ran)
+		deploy = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)
 
@@ -67,8 +61,8 @@ class TestDeploymentMethods(unittest.TestCase):
 		# fails reliably
 		old = self.cont.yamlPath
 		self.cont.yamlPath[0] = 'tests/simple-fail/'
-		deploy = self.cont.DeployObject(self.ctx, self.html)
-		self.cont.UndeployObject(self.ctx, self.html, self.ran)
+		deploy = self.cont.DeployObject(self.html)
+		self.cont.UndeployObject(self.html, self.ran)
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old
 
@@ -76,8 +70,8 @@ class TestDeploymentMethods(unittest.TestCase):
 		# fails reliably
 		old = self.cont.yamlPath
 		self.cont.yamlPath[0] = 'tests/simple-fail-2svc/'
-		deploy = self.cont.DeployObject(self.ctx, self.html)
-		self.cont.UndeployObject(self.ctx, self.html, self.ran)
+		deploy = self.cont.DeployObject(self.html)
+		self.cont.UndeployObject(self.html, self.ran)
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old
 
@@ -85,8 +79,8 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
 		self.cont.services[0] = "oai-gnb"
 		self.cont.deploymentTag = 'develop-12345678'
-		deploy = self.cont.DeployObject(self.ctx, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.html, self.ran)
+		deploy = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)
 
@@ -94,8 +88,8 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
 		self.cont.services[0] = "oai-gnb oai-nr-ue"
 		self.cont.deploymentTag = 'develop-12345678'
-		deploy = self.cont.DeployObject(self.ctx, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.html, self.ran)
+		deploy = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)
 
@@ -103,10 +97,10 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
 		self.cont.services[0] = "oai-gnb"
 		self.cont.deploymentTag = 'develop-12345678'
-		deploy1 = self.cont.DeployObject(self.ctx, self.html)
+		deploy1 = self.cont.DeployObject(self.html)
 		self.cont.services[0] = "oai-nr-ue"
-		deploy2 = self.cont.DeployObject(self.ctx, self.html)
-		undeploy = self.cont.UndeployObject(self.ctx, self.html, self.ran)
+		deploy2 = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
 		self.assertTrue(deploy1)
 		self.assertTrue(deploy2)
 		self.assertTrue(undeploy)

ci-scripts/tests/module.py

@@ -1,64 +0,0 @@
-import sys
-import logging
-import tempfile
-logging.basicConfig(
-	level=logging.DEBUG,
-	stream=sys.stdout,
-	format="[%(asctime)s] %(levelname)8s: %(message)s"
-)
-import os
-
-import unittest
-
-sys.path.append('./') # to find OAI imports below
-import cls_module
-from cls_ci_helper import TestCaseCtx
-import cls_cmd
-
-class TestModule(unittest.TestCase):
-    def setUp(self):
-        self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
-    def tearDown(self):
-        with cls_cmd.LocalCmd() as c:
-            c.run(f'rm -rf {self.ctx.logPath}')
-
-    def test_simple_module(self):
-        c = cls_module.Module_UE("test", filename="tests/config/test_module_infra.yaml")
-        self.assertFalse(c.trace)
-        success = c.initialize()
-        self.assertTrue(success)
-        ip = c.attach()
-        self.assertEqual(ip, "127.0.0.1")
-        self.assertTrue(c.checkMTU())
-        c.detach()
-        logs = c.terminate()
-        self.assertEqual(logs, None) # no tracing
-
-    @unittest.skip("this test takes long: it verifies the UE cannot attach")
-    def test_simple_fail(self):
-        c = cls_module.Module_UE("test-fail", filename="tests/config/test_module_infra.yaml")
-        success = c.initialize()
-        self.assertTrue(success)
-        ip = c.attach()
-        self.assertEqual(ip, None)
-        self.assertFalse(c.checkMTU())
-        c.detach()
-        logs = c.terminate()
-        self.assertEqual(logs, None) # no tracing
-
-    def test_simple_trace(self):
-        c = cls_module.Module_UE("test-trace", filename="tests/config/test_module_infra.yaml")
-        self.assertTrue(c.trace)
-        success = c.initialize()
-        self.assertTrue(success)
-        ip = c.attach()
-        self.assertEqual(ip, "127.0.0.1")
-        self.assertTrue(c.checkMTU())
-        c.detach()
-        tmp = tempfile.mkdtemp()
-        log_file = c.terminate(self.ctx)
-        # undeploy uses archiveArtifact(), which writes to {prefix}-logs
-        self.assertEqual(log_file, [f"{self.ctx.baseFilename()}-tttf"]) # matches test-trace UE collection file
-
-if __name__ == '__main__':
-    unittest.main()

ci-scripts/tests/ping-iperf.py

@@ -9,13 +9,11 @@ import os
 os.system(f'rm -rf cmake_targets')
 os.system(f'mkdir -p cmake_targets/log')
 import unittest
-import tempfile
 
 sys.path.append('./') # to find OAI imports below
 import cls_oai_html
-from cls_ci_helper import TestCaseCtx
 import cls_oaicitest
-import cls_cmd
+import cls_containerize
 
 class TestPingIperf(unittest.TestCase):
 	def setUp(self):
@@ -24,10 +22,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.ci.ue_ids = ["test"]
 		self.ci.nodes = ["localhost"]
-		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
-	def tearDown(self):
-		with cls_cmd.LocalCmd() as c:
-			c.run(f'rm -rf {self.ctx.logPath}')
+		self.cont = cls_containerize.Containerize()
 
 	def test_ping(self):
 		self.ci.ping_args = "-c3"
@@ -35,7 +30,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.svr_id = "test"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Ping(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Ping(self.html, self.cont, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf(self):
@@ -50,7 +45,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Iperf(self.html, self.cont, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf2_unidir(self):
@@ -62,7 +57,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf2_Unidir(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Iperf2_Unidir(self.html, self.cont, infra_file=infra_file)
 		self.assertTrue(success)
 
 if __name__ == '__main__':

ci-scripts/tests/test-runner/test.xml

@@ -27,8 +27,6 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  000001
- 000011
- 000012
  000002
  000003
  000004
@@ -40,21 +38,7 @@
                 <desc>This should succeed</desc>
                 <node>localhost</node>
                 <command>true</command>
-        </testCase>
-
-        <testCase id="000011">
-                <class>Custom_Command</class>
-                <desc>This may fail</desc>
-                <may_fail>true</may_fail>
-                <node>localhost</node>
-                <command>false</command>
-        </testCase>
-
-        <testCase id="000012">
-                <class>Custom_Command</class>
-                <desc>This is still executed</desc>
-                <node>localhost</node>
-                <command>true</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000002">
@@ -62,6 +46,7 @@
                 <desc>This should fail</desc>
                 <node>localhost</node>
                 <command>false</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000003">
@@ -69,6 +54,7 @@
                 <desc>This should be skipped</desc>
                 <node>localhost</node>
                 <command>true</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000004">
@@ -77,5 +63,6 @@
                 <always_exec>true</always_exec>
                 <node>localhost</node>
                 <command>true</command>
+                <command_fail>yes</command_fail>
         </testCase>
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -108,16 +108,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -126,9 +126,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -141,8 +141,8 @@
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>acamas</nodes>
-                <svr_node>acamas</svr_node>
+                <nodes>cacofonix</nodes>
+                <svr_node>cacofonix</svr_node>
         </testCase>
 
         <testCase id="030011">
@@ -153,8 +153,8 @@
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>acamas</nodes>
-                <svr_node>acamas</svr_node>
+                <nodes>cacofonix</nodes>
+                <svr_node>cacofonix</svr_node>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -86,9 +86,9 @@
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -97,9 +97,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from eNB</desc>
                 <id>rfsim4g_enb_nos1</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -108,9 +108,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -120,9 +120,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -108,16 +108,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -126,9 +126,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -137,9 +137,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -149,9 +149,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -108,16 +108,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -126,9 +126,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -137,9 +137,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -149,9 +149,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -83,9 +83,9 @@
                 <class>Iperf2_Unidir</class>
                 <desc>Iperf2 UDP DL</desc>
                 <id>rfsim4g_ue_fembms</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_enb_fembms</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 2M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -83,9 +83,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -108,9 +108,9 @@
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -119,9 +119,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -130,9 +130,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -142,9 +142,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -80,16 +80,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix</nodes>
                 <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -93,7 +93,7 @@
         <testCase id="000030">
                 <class>IdleSleep</class>
                 <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
         </testCase>
 
         <testCase id="000031">
@@ -106,7 +106,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="000024">
@@ -122,9 +122,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -132,8 +132,9 @@
         <testCase id="030020">
                 <class>Custom_Command</class>
                 <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>acamas</node>
-                <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
+                <node>cacofonix</node>
+                <command>echo channelmod modify 0 noise_power_dB 3 | nc --send-only 192.168.71.181 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="030021">
@@ -141,9 +142,9 @@
                 <desc>Iperf (DL/5Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 5M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -153,9 +154,9 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -163,17 +164,18 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Trigger Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci force_reestab | ncat 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+                <node>cacofonix</node>
+                <command>echo ci force_reestab | nc 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="020022">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.5 -w25</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -181,57 +183,65 @@
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Verify Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+                <node>cacofonix</node>
+                <command>echo ci get_reestab_count | nc 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040021">
                 <class>Custom_Command</class>
                 <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
-                <node>acamas</node>
-                <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
+                <node>cacofonix</node>
+                <command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040022">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>acamas</node>
-                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
+                <node>cacofonix</node>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040023">
                 <class>Custom_Command</class>
                 <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
-                <node>acamas</node>
-                <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
+                <node>cacofonix</node>
+                <command>echo channelmod modify 0 ploss 20 | nc 192.168.71.181 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040024">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>acamas</node>
-                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
+                <node>cacofonix</node>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040025">
                 <class>Custom_Command</class>
                 <desc>Trigger Handover</desc>
-                <node>acamas</node>
-                <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+                <node>cacofonix</node>
+                <command>echo ci trigger_f1_ho | nc 192.168.71.150 9090</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040026">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>acamas</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+                <node>cacofonix</node>
+                <command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3584"</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040027">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>acamas</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+                <node>cacofonix</node>
+                <command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3585"</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100021">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -73,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -103,9 +103,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -32,6 +32,7 @@
  000001
  000002
  000003
+ 002001
  010000
  000004
  333333
@@ -39,6 +40,7 @@
  010002
  010003
  020005
+ 010013
  002006
  444444
  100002
@@ -48,6 +50,12 @@
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
 
+        <testCase id="002001">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
+
         <testCase id="111110">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
@@ -165,39 +173,43 @@
         </testCase>
 
         <testCase id="010000">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>RC monitoring</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/rc-moni-010000.log</command>
         </testCase>
 
         <testCase id="010001">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>KPM monitoring</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm-moni-010001.log</command>
         </testCase>
 
         <testCase id="010002">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>KPM monitoring and RC control</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm_rc-010002.log</command>
         </testCase>
 
         <testCase id="010003">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>Custom SMs monitoring</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/sms-moni-010003.log</command>
+        </testCase>
+
+        <testCase id="010013">
+                <class>Custom_Command</class>
+                <desc>Custom SMs monitoring</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/sms-moni-010013.log</command>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -133,16 +133,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -151,9 +151,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -162,9 +162,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_ue2</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -173,9 +173,9 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue2</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -184,9 +184,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <nodes>cacofonix cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -195,9 +195,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -207,9 +207,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -219,9 +219,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -230,21 +230,21 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <nodes>cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <nodes>cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="444445">
                 <class>Detach_UE</class>
-                <desc>Detach OAI UE 3 to 10</desc>
+                <desc>Detach OAI UE 2 to 10</desc>
                 <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -91,7 +91,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="000004">
@@ -104,9 +104,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args> -c 20 -i0.5</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -127,9 +127,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -139,9 +139,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -149,15 +149,17 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Force Msg3 C-RNTI RA</desc>
-                <node>acamas</node>
-                <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
+                <node>cacofonix</node>
+                <command>echo ciUE force_crnti_ra | nc 192.168.71.150 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Force RRC_IDLE (UE ID 0)</desc>
-                <node>acamas</node>
-                <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+                <node>cacofonix</node>
+                <command>echo ciUE force_RRC_IDLE | nc 192.168.71.150 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -73,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -103,21 +103,21 @@
                 <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20</iperf_args>
+                <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
+                <iperf_args>-u -b 4M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -49,7 +49,7 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>acamas</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
         </testCase>
         <testCase id="800813">
@@ -80,9 +80,9 @@
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -103,9 +103,9 @@
                 <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -29,7 +29,6 @@
  800813
  000000
  000001
- 000013
  020001
  020002
  100001
@@ -69,20 +68,13 @@
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
 
-        <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-        </testCase>
-
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +83,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -26,17 +26,13 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
+ 100001
  800813
  000001
  000002
  000003
  020001
  020002
- 040001
- 020022
- 040002
- 020001
- 020002
  100001
  222222
         </TestCaseRequestedList>
@@ -77,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -95,40 +91,13 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
-        <testCase id="040001">
-                <class>Custom_Command</class>
-                <desc>Trigger Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
-                <ping_args>-c 20 -i0.5 -w25</ping_args>
-                <ping_packetloss_threshold>80</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040002">
-                <class>Custom_Command</class>
-                <desc>Verify Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
         <testCase id="100001">
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -26,6 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
+ 100001
  800813
  000001
  000002
@@ -72,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -90,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -77,8 +77,9 @@
         <testCase id="000005">
                 <class>Custom_Command</class>
                 <desc>Check that UE synched</desc>
-                <node>acamas</node>
+                <node>cacofonix</node>
                 <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_simple.xml

@@ -1,101 +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>rfsim-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 000001
- 000002
- 000003
- 000008
- 020001
- 444444
- 100001
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-gnb</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000008">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-        </testCase>
-
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="444444">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 1</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-        </testCase>
-
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -30,7 +30,6 @@
  004000
  000000
  000001
- 000030		
  020001
  020002
  100001
@@ -49,7 +48,7 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>acamas</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
         </testCase>
         <testCase id="800813">
@@ -76,19 +75,13 @@
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
 
-        <testCase id="000030">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
-
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -97,9 +90,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -115,6 +108,14 @@
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
 
+        <testCase id="004000">
+                <class>Custom_Command</class>
+                <always_exec>true</always_exec>
+                <desc>Clean-Up any residual volume</desc>
+                <node>cacofonix</node>
+                <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
+        </testCase>
+
         <testCase id="222222">
                 <class>Clean_Test_Server_Images</class>
                 <always_exec>true</always_exec>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -32,8 +32,6 @@
  000003
  020001
  020002
- 000004
- 020003
  030001
  030002
  100001
@@ -75,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -93,27 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="000004">
-                <class>Attach_UE</class>
-                <desc>Verify 2nd PDU session is up</desc>
-                <id>rfsim5g_ue_pdu_2</id>
-                <nodes>acamas</nodes>
-        </testCase>
-
-        <testCase id="020003">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
-                <id>rfsim5g_ue_pdu_2</id>
-                <nodes>acamas</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -123,9 +103,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -135,9 +115,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -70,9 +70,9 @@
 
 	<testCase id = "100000">
 		<class>Custom_Command</class>
-		<desc>Reset USRP on nepes</desc>
+		<desc>Reset USRP</desc>
 		<node>nepes</node>
-		<command>sudo -S /usr/local/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
+		<command>sudo -S /usr/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
 	</testCase>
 
 	<testCase id="200000">

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -35,8 +35,6 @@
                 000011
                 000022
                 000033
-                200022
-                300033
                 000222
                 222222
                 333333
@@ -117,28 +115,6 @@
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
-       <testCase id="200022">
-                <class>Iperf</class>
-                <desc>Optional iperf (DL/UDP/1000M)(30 sec)(single-ue profile)</desc>
-                <may_fail>true</may_fail>
-                <iperf_args>-u -b 1000M -t 30 -R</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="300033">
-                <class>Iperf</class>
-                <desc>Optional iperf (UL/UDP/90M)(30 sec)(single-ue profile)</desc>
-                <may_fail>true</may_fail>
-                <iperf_args>-u -b 90M -t 30 -l 1428</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
         <testCase id="000222">
                 <class>Detach_UE</class>
                 <always_exec>true</always_exec>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -182,7 +182,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/3Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/3Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 45M -t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -193,7 +193,7 @@
 
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_tcp_rate_target>2</iperf_tcp_rate_target>
@@ -202,7 +202,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/1Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/1Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 15M -t 30</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -213,7 +213,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <svr_id>oc-cn5g</svr_id>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>

ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml

@@ -179,7 +179,7 @@
 
   <testCase id="000010">
     <class>Iperf</class>
-    <desc>iperf (DL/4Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/4Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 60M -t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -190,7 +190,7 @@
 
   <testCase id="000030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_tcp_rate_target>3.9</iperf_tcp_rate_target>
@@ -199,7 +199,7 @@
 
   <testCase id="000020">
     <class>Iperf</class>
-    <desc>iperf (UL/1.5Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/1.5Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 22.5M -t 30</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -210,7 +210,7 @@
 
   <testCase id="000040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <svr_id>oc-cn5g</svr_id>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -200,12 +200,14 @@
     <desc>Trigger Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
   </testCase>
   <testCase id="060002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="030201">

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -30,10 +30,11 @@
     310000
     800813
     330101
+    800814
     330102
+    800815
     330103
     310001
-    400001
     350000
     370001
     370000
@@ -146,13 +147,6 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="400001">
-    <class>Custom_Command</class>
-    <desc>Check UE is on dedicated BWP ID 1</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 1 (dedicated) UL BWP ID 1 (dedicated)'</command>
-  </testCase>
-
   <testCase id="370001">
     <class>Iperf</class>
     <desc>iperf (UL/8Mbps/UDP)(30 sec)</desc>
@@ -194,12 +188,14 @@
     <desc>Trigger Reestablishment (on DU)</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
   </testCase>
   <testCase id="360002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment (on CU)</desc>
     <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="100002">

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -233,12 +233,14 @@
     <desc>Trigger Reestablishment (on DU)</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
   </testCase>
   <testCase id="160002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment (on CU)</desc>
     <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="130201">

ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml

@@ -49,6 +49,7 @@
     <desc>Setup sriov and network interfaces Metanoia</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="110000">
@@ -91,7 +92,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/570Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/570Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 570M -t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -102,7 +103,7 @@
 
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -111,7 +112,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 100M -t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -122,7 +123,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -165,6 +166,7 @@
     <desc>Set CPU to idle state, set kernel parameters to default values</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -36,7 +36,6 @@
     100020
     100030
     100040
-    100011
     103000
     100002
     130000
@@ -50,6 +49,7 @@
     <desc>Setup sriov and network interfaces VVDN</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_sriov_vvdn.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="110000">
@@ -90,7 +90,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/600Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/600Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 600M -t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -99,20 +99,9 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="100011">
-    <class>Iperf</class>
-    <desc>Optional iperf (DL/700Mbps/UDP)(30 sec)</desc>
-    <may_fail>true</may_fail>
-    <iperf_args>-u -b 700M -t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
@@ -121,7 +110,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/80Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/80Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 80M -t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -132,7 +121,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
@@ -175,6 +164,7 @@
     <desc>Set CPU to idle state, set kernel parameters to default values</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
 

ci-scripts/xml_files/container_sa_n310_nrue.xml

@@ -105,8 +105,8 @@
 
   <testCase id="000100">
     <class>Iperf</class>
-    <desc>iperf (DL/30Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 30M -t 30 -i 1 -R</iperf_args>
+    <desc>iperf (DL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
     <id>oai_ue_caracal</id>
     <svr_id>oc-cn5g</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -115,8 +115,8 @@
 
   <testCase id="000200">
     <class>Iperf</class>
-    <desc>iperf (UL/20Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 20M -t 30 -i 1 </iperf_args>
+    <desc>iperf (UL/5Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 5M -t 30 -i 1 </iperf_args>
     <id>oai_ue_caracal</id>
     <svr_id>oc-cn5g</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -194,12 +194,14 @@
     <desc>Trigger Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
   </testCase>
   <testCase id="260002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="230201">

ci-scripts/xml_files/gnb_phytest_usrp_run.xml

@@ -45,7 +45,7 @@
 	<testCase id="090101">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB USRP</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 106 -t 23 -D 127 -m 28 -M 106 --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.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 106 -t 23 -D 127 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
     <rt_stats_cfg>datalog_rt_stats.default.yaml</rt_stats_cfg>
 		<air_interface>NR</air_interface>
 		<USRP_IPAddress>192.168.20.2</USRP_IPAddress>

ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml

@@ -45,7 +45,7 @@
   <testCase id="390101">
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
-    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 273 -t 23 -D 127 -m 23 -M 273 -l 2 --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.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 273 -t 23 -D 127 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
     <rt_stats_cfg>datalog_rt_stats.100.2x2.yaml</rt_stats_cfg>
     <air_interface>NR</air_interface>
     <USRP_IPAddress>192.168.20.2</USRP_IPAddress>

ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml

@@ -45,7 +45,7 @@
   <testCase id="190101">
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
-    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 162 -t 23 -D 127 -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.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 162 -t 23 -D 127 -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>

ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml

@@ -45,7 +45,7 @@
   <testCase id="290101">
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
-    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 768 -T 162 -t 23 -D 127 -m 23 -M 162 -l 2 --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.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 768 -T 162 -t 23 -D 127 -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>

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -47,7 +47,6 @@
 	<testCase id="100000">
 		<class>Custom_Command</class>
 		<desc>Reboot USRP</desc>
-		<may_fail>true</may_fail>
 		<node>caracal</node>
 		<command>ssh root@192.168.20.2 reboot</command>
         </testCase>

ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml

@@ -62,7 +62,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_ulsim</physim_test>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -m5 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -m5 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>
 
 	<testCase id="010121">
@@ -80,7 +80,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_ulsim</physim_test>
 		<physim_time_threshold>150</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -m15 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -m15 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>
 
 	<testCase id="010131">
@@ -98,7 +98,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="010211">
@@ -116,7 +116,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>
 
 	<testCase id="010221">
@@ -134,7 +134,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="010231">
@@ -152,7 +152,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>550</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="010311">
@@ -170,7 +170,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="010321">
@@ -188,7 +188,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="010331">
@@ -206,7 +206,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_ulsim</physim_test>
                 <physim_time_threshold>1100</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml

@@ -63,7 +63,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_dlsim</physim_test>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -e5 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -e5 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>
 
 	<testCase id="000121">
@@ -81,7 +81,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_dlsim</physim_test>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -e15 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -e15 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>
 
 	<testCase id="000131">
@@ -99,7 +99,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000211">
@@ -117,7 +117,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>
 
 	<testCase id="000221">
@@ -135,7 +135,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000231">
@@ -153,7 +153,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000311">
@@ -171,7 +171,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000321">
@@ -189,7 +189,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000331">
@@ -207,7 +207,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000411">
@@ -225,7 +225,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000421">
@@ -243,7 +243,7 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 
         <testCase id="000431">
@@ -261,6 +261,6 @@
                 <always_exec>true</always_exec>
                 <physim_test>nr_dlsim</physim_test>
                 <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev af:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
         </testCase>
 </testCaseList>

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

@@ -10,7 +10,7 @@ services:
             CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch
         healthcheck:
             test: /bin/bash -c "nodetool status"
-            interval: 20s
+            interval: 10s
             timeout: 5s
             retries: 5
 

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,16 +61,13 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
 
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -85,8 +78,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -96,8 +87,6 @@ services:
         container_name: rfsim5g-oai-cu
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment: 
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
                                     --rfsimulator.options chanmod
@@ -114,8 +103,6 @@ services:
           - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -125,8 +112,6 @@ services:
         container_name: rfsim5g-oai-du-pci0
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
@@ -145,8 +130,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -156,8 +139,6 @@ services:
         container_name: rfsim5g-oai-du-pci1
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
@@ -180,8 +161,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -194,13 +173,13 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
                                     --rfsimulator.options chanmod
                                     --rfsimulator.serveraddr server
+                                    --rfsimulator.hanging-workaround 1
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
                                     --channelmod.modellist_rfsimu_1.[0].model_name rfsimu_channel_ue0
                                     --channelmod.modellist_rfsimu_1.[1].model_name rfsimu_channel_ue1
@@ -214,8 +193,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -16,8 +15,6 @@ services:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
             interval: 10s
             timeout: 5s
-            start_period: 10s
-            start_interval: 500ms
             retries: 30
         networks:
             public_net:
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -87,8 +80,6 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-            start_period: 10s
-            start_interval: 500ms
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
@@ -108,8 +99,6 @@ services:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
             timeout: 5s
-            start_period: 10s
-            start_interval: 500ms
             retries: 5
         ipc: host
     oai-nr-ue:
@@ -137,8 +126,6 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-            start_period: 10s
-            start_interval: 500ms
         ipc: host
 
 networks:

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

@@ -67,18 +67,6 @@ All the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_r
 For a deployment with the gNB split in CU and DU components, please refer to the `../5g_f1_rfsimulator` folder.
 For a deployment with the gNB split in CU-CP, CU-UP, and DU components, please refer to the `../5g_rfsimulator_e1` folder.
 
-Note: **These instructions require `docker compose` v2.36.0 or later** due to the
-use of the `interface_name` property, which is necessary for ensuring consistent
-IP address assignment to the container interface.
-
-If you're using an older version of `docker compose`, you may encounter the following
-error:
-```
-validating docker-compose.yaml: services.oai-upf.networks.public_net Additional property interface_name is not allowed
-```
-To update to the required version, you can follow the official Docker documentation:
-https://docs.docker.com/compose/install/linux/
-
 ## 2.1. Deploy OAI 5G Core Network ##
 
 ```bash
@@ -558,7 +546,8 @@ section in the file for details. This includes an image build service as well as
 code compilation service. This is necessary as the executable has to be linked
 against the same libraries that are present in the executing image. This might
 take a while the first time but other that that is very fast. Here is a list of
-commands (wait between each command). Tested with `docker compose` v2.36.2.
+commands (wait between each command). Tested with `docker compose` v2.27.0
+
 
 This command deploys OAI 5G Core Network
 ```bash

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,16 +77,12 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
-        cap_add:
-            - SYS_NICE
         cap_drop:
             - ALL
         environment:
@@ -108,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band78.106prb.rfsim.yaml:/opt/oai-gnb/etc/gnb.yaml
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -121,7 +108,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -135,8 +121,6 @@ services:
             - ../../conf_files/nrue.uicc.yaml:/opt/oai-nr-ue/etc/nr-ue.yaml
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -148,7 +132,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -162,8 +145,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -175,7 +156,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -189,8 +169,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -202,7 +180,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -216,8 +193,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -229,7 +204,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -243,8 +217,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -256,7 +228,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -270,8 +241,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -283,7 +252,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -297,8 +265,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -310,7 +276,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -324,8 +289,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -337,7 +300,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -351,8 +313,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -364,7 +324,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -378,8 +337,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -106,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band78.24prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -135,8 +124,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -94,8 +85,6 @@ services:
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -108,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -122,7 +109,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -137,8 +123,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,10 +61,8 @@ services:
         networks:
             core_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
 
     oai-cucp:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
@@ -93,8 +87,6 @@ services:
             - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -124,8 +116,6 @@ services:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -158,8 +148,6 @@ services:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -192,8 +180,6 @@ services:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -223,8 +209,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -257,8 +241,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -291,8 +273,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -321,8 +301,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -351,8 +329,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -382,8 +358,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_flexric/conf/flexric.conf

@@ -1,5 +1,5 @@
 [NEAR-RIC]
 NEAR_RIC_IP = 192.168.70.150
-
 [XAPP]
-DB_DIR = /tmp/
+DB_PATH = /flexric/db/
+DB_NAME = xapp_rnis_db

ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml

@@ -7,79 +7,12 @@ services:
                 ipv4_address: 192.168.70.150
         volumes:
             - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
+            - sharedXappLibs:/usr/local/lib/flexric/
         healthcheck:
             test: /bin/bash -c "pgrep nearRT-RIC"
             interval: 10s
             timeout: 5s
 
-    xapp-rc-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni"
-        container_name: xapp-rc-moni
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.154
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep xapp_rc_moni"
-            interval: 10s
-            timeout: 5s
-
-    xapp-kpm-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni"
-        container_name: xapp-kpm-moni
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.155
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep xapp_kpm_moni"
-            interval: 10s
-            timeout: 5s
-
-    xapp-kpm-rc:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc"
-        container_name: xapp-kpm-rc
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.156
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep xapp_kpm_rc"
-            interval: 10s
-            timeout: 5s
-
-    xapp-gtp-mac-rlc-pdcp-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni"
-        container_name: xapp-gtp-mac-rlc-pdcp-moni
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.157
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep -f xapp_gtp_mac_rlc_pdcp_moni"
-            interval: 10s
-            timeout: 5s
-
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         privileged: true
@@ -94,6 +27,7 @@ services:
                 ipv4_address: 192.168.70.151
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf:/opt/oai-gnb/etc/gnb.conf
+            - sharedXappLibs:/usr/local/lib/flexric/
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -138,6 +72,9 @@ services:
             timeout: 5s
             retries: 5
 
+volumes:
+    sharedXappLibs:
+
 networks:
     public_net:
         name: oai-cn5g-public-net

ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -105,8 +96,6 @@ services:
             - ../../conf_files/gnb.sa.band261.u3.32prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -135,8 +124,6 @@ services:
                 ipv4_address: 192.168.71.150
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -96,9 +87,7 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
-                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.140
-                                    --telnetsrv.shrmod ci
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -108,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -135,8 +122,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml

@@ -13,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -63,10 +61,8 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
@@ -81,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -103,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -137,8 +129,6 @@ services:
             - ../../conf_files/nrue.uicc.ntn-leo.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5