Add RAN-Channel-Simulation into parent CI pipeline

For now, test in the following configuration:
- 16 parallel channels
- channel length of 32
- with 61440 and 122880 samples
- 15 trials per each test (due to CUDA kernel loading delay in first iterations)
- multiple MIMO configurations: 2TX - 2/4/8/32 RX, 2/4/8/32 TX - 2RX

To be added:
- test with greater channel length
- test with more parallel channels

.clang-format

@@ -62,6 +62,7 @@ ForEachMacros:
   - BOOST_FOREACH
   - RB_FOREACH
   - UE_iterator
+  - FOR_EACH_SEQ_ARR
 IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^<ext/.*\.h>'

CHANGELOG.md

@@ -1,5 +1,71 @@
 # RELEASE NOTES: #
 
+## [v2.4.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.4.0) -> December 2025. ##
+
+General new features and improvements (both RAN and UE):
+- Rework LDPC BBdev/AAL interface and support both AMD T2/Intel vRAN Boost
+  (VRB) 1 accelerators
+- Add a taps client for vrtsim real-time simulator (check: vrtsim release?)
+- Add new RFemulator virtual radio driver to emulate radio (including noise
+  generation) for gNB/UE standalone operation
+- RLC AM reception improvements for high-throughput scenarios (!3512)
+- Small NTN fixes (!3659, !3666, !3581, !3652)
+- Improvements to imScope
+
+Stability and bug fixes:
+- RFsimulator: fix concurrency problems during multi-client connection
+- USRP driver: support synchronization of USRP B200
+- MAC scheduler improvements
+- General L1 improvements for efficiency and stability
+- Correct PRS bug and test in CI
+- Upgrade Ubuntu container images to Ubuntu 24.04
+- All build system targets compile (`make/ninja all`)
+- Minor cleanup, harmonization, and performance improvements all over the stack
+- Simplify CI code
+
+RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
+- Support of N2 handover
+- Support of "UL-heavy" TDD patterns, e.g., DSUUU
+- Open Fronthaul M-plane: CM improvements, PM implementation, and additional
+  v16.01 support
+- Improve interoperability with Nvidia Aerial L1 to support 2 layer UL
+- Add O-RAN OSC WLS library as FAPI transport and enable L1/L2 shared memory
+  split
+- Implement FAPI Stop exchange
+- Improve interoperability with srsRAN_Project DU
+- Add new synchronized real-time data recording application (!3462)
+- Support for measurement gaps and general handover fixes
+- Support of RRC PDU session release procedure
+- Add CU-UP load tester
+- Correct BWP scheduling and support multiple BWPs per UE
+
+nrUE changes:
+- Support one additional PDU session (see !3486)
+- L3 measurements for A2 measurement reports
+- Support for type0 PDSCH frequency allocation
+- UE symbol based PDCCH receiver
+
+Regression or removals:
+- No known regressions
+- Unused L2 simulator code has been removed
+- Unused Benetel radio driver code (not FHI 7.2!) has been removed
+
+Configuration file changes:
+- `gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow` is automatically
+  computed and can be removed
+- `gNBs.[0].bwp_list` has been added (moved from entries in
+  `gNBs.[0].servingCellConfigDedicated`)
+- `gNBs.[0].phaseTrackingRS` has been added (moved from entries in
+  `gNBs.[0].servingCellConfigDedicated`)
+- `gNBs.[0].local_s_portc` and `gNBs.[0].remote_s_portc` have no effect and
+  should be removed
+- `gNBs.[0].CSI_report_type` has been added
+- `MACRLCs.[0].ulsch_max_frame_inactivity` is automatically computed and can be
+  removed
+- `MACRLCs.[0].local_n_portc` and `MACRLCs.[0].remote_n_portc` have no effect and
+  should be removed
+- `MACRLCs.[0].stats_max_ue` has been added
+
 ## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##
 
 General new features and improvements (both RAN and UE):

CMakeLists.txt

@@ -23,6 +23,38 @@ cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
 
+option(CUDA_ENABLE "Enable CUDA accelerated channel simulation" OFF)
+if(CUDA_ENABLE)
+    find_package(CUDA REQUIRED)
+    find_package(CUDAToolkit REQUIRED)
+    message(STATUS "CUDA explicitly enabled, building with GPU acceleration support.")
+
+    enable_language(CUDA)
+
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+        set(CMAKE_CUDA_ARCHITECTURES 90)
+    endif()
+
+    option(USE_UNIFIED_MEMORY "Enable CUDA Unified Memory path" OFF)
+    option(USE_ATS_MEMORY "Enable ATS Hybrid Memory path" ON)
+
+    if(USE_UNIFIED_MEMORY AND USE_ATS_MEMORY)
+        message(FATAL_ERROR "Cannot enable both USE_UNIFIED_MEMORY and USE_ATS_MEMORY at the same time.")
+    endif()
+
+    if(USE_UNIFIED_MEMORY)
+        add_compile_definitions(USE_UNIFIED_MEMORY)
+        message(STATUS "CUDA Unified Memory path enabled.")
+    elseif(USE_ATS_MEMORY)
+        add_compile_definitions(USE_ATS_MEMORY)
+        message(STATUS "CUDA ATS Hybrid Memory path enabled.")
+    else()
+        message(STATUS "CUDA Explicit Copy path enabled (default ATS was overridden).")
+    endif()
+
+    add_compile_definitions(ENABLE_CUDA)
+endif()
+
 #########################################################
 # Base directories, compatible with legacy OAI building #
 #########################################################
@@ -267,6 +299,22 @@ if(GIT_FOUND)
   )
 endif()
 
+option(USE_UNIFIED_MEMORY "Enable CUDA Unified Memory path instead of explicit copies" OFF)
+
+option(USE_ATS_MEMORY "Enable Hybrid ATS (CPU->GPU) and Explicit Copy (GPU->CPU) path" OFF)
+
+if(USE_UNIFIED_MEMORY AND USE_ATS_MEMORY)
+  message(FATAL_ERROR "Cannot enable both USE_UNIFIED_MEMORY and USE_ATS_MEMORY at the same time.")
+endif()
+
+if(USE_UNIFIED_MEMORY)
+  add_compile_definitions(USE_UNIFIED_MEMORY)
+  message(STATUS "CUDA Unified Memory path enabled.")
+elseif(USE_ATS_MEMORY)
+  add_compile_definitions(USE_ATS_MEMORY)
+  message(STATUS "CUDA ATS Hybrid Memory path enabled.")
+endif()
+
 # Debug related options
 #########################################
 # asn1c skeletons have hardcoded this flag to make customized debug logs
@@ -464,6 +512,9 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(f1ap PRIVATE E2_AGENT)
+endif()
 
 # LPP
 ##############
@@ -652,7 +703,6 @@ add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
 
 set(SCHED_NR_SRC
-  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
   ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
@@ -939,7 +989,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -978,6 +1027,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ntn_l1.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
@@ -1037,11 +1087,11 @@ pkg_check_modules(lapacke REQUIRED lapacke)
 
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
-# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will
-# be empty for Ubuntu, a no-op
+# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` and
+# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op
 pkg_check_modules(cblas cblas)
 target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
-target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
+target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
@@ -1215,7 +1265,6 @@ set (MAC_SRC
 
 set (MAC_NR_SRC
   ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
-  ${NR_PHY_INTERFACE_DIR}/nr_sched_response.c
   ${NR_GNB_MAC_DIR}/main.c
   ${NR_GNB_MAC_DIR}/config.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler.c
@@ -1283,12 +1332,6 @@ set (MISC_NFAPI_LTE
 
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
 
-set (MISC_NFAPI_NR
- ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
- )
-
-add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
-
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -1297,6 +1340,9 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+if(E2_AGENT)
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
@@ -1312,6 +1358,9 @@ add_library(L2_NR
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -1671,6 +1720,17 @@ set (SIMUSRC
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
 
+option(CHANNEL_SSE "Enable SSE optimizations for channel simulation" OFF)
+if(CHANNEL_SSE)
+    message(STATUS "SSE-optimized channel simulation enabled.")
+    target_compile_definitions(SIMU PRIVATE CHANNEL_SSE)
+endif()
+
+if(CUDA_FOUND)
+  set_property(TARGET SIMU PROPERTY CUDA_ARCHITECTURES ${CMAKE_CUDA_ARCHITECTURES})
+  set_property(TARGET SIMU PROPERTY LINKER_LANGUAGE CXX)
+endif()
+
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -2036,6 +2096,29 @@ target_link_libraries(nr_ulsim PRIVATE
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
+add_executable(nr_srssim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/srssim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
+  )
+
+target_link_libraries(nr_srssim PRIVATE
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc L2_NR -lz -Wl,--end-group
+  m pthread ITTI dl nr_ue_phy_meas physim_common
+  )
+
+if(CUDA_ENABLE)
+  if (TARGET oai_cuda_lib)
+      target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
+      target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
+
+      target_compile_definitions(nr_dlsim PRIVATE ENABLE_CUDA)
+      target_compile_definitions(nr_ulsim PRIVATE ENABLE_CUDA)
+  endif()
+endif()
+
 # these simulators do not compile:
 # dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
 foreach(myExe dlsim ulsim)
@@ -2084,14 +2167,14 @@ if (${T_TRACER})
         nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
         ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
         syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
-        nr_ulschsim ldpctest polartest smallblocktest
+        nr_ulschsim ldpctest polartest smallblocktest nr_srssim
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig
         oai_eth_transpro HASHTABLE UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
-        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
+        MISC_NFAPI_LTE_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
         GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU
@@ -2148,3 +2231,9 @@ add_subdirectory(openair2)
 add_subdirectory(openair3)
 add_subdirectory(radio)
 add_subdirectory(tests)
+
+if(TARGET oai_cuda_lib)
+    message(STATUS "CUDA library 'oai_cuda_lib' found, linking to targets...")
+    target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
+    target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
+endif()

ci-scripts/Jenkinsfile

@@ -0,0 +1,233 @@
+#!/bin/groovy
+/*
+ * 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
+ */
+
+def pythonExecutor = params.pythonExecutor
+def testXMLFile = params.pythonTestXmlFile
+def mainPythonAllXmlFiles = ""
+def buildStageStatus = true
+def JOB_TIMESTAMP
+
+// Choose test stage name or fallback default
+def testStageName = params.pipelineTestStageName != null ? params.pipelineTestStageName : 'Template Test Stage'
+
+// Name of the resource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
+
+// Global Parameters. Normally they should be populated when the master job
+// triggers the slave job with parameters
+
+def sourceRepository = params.eNB_Repository ?: env.GIT_URL
+def sourceBranch = params.eNB_Branch ?: env.GIT_BRANCH
+def targetRepository = params.Target_Repository ?: sourceRepository
+def targetBranch = params.eNB_TargetBranch ?: 'develop'
+def commitID = params.eNB_CommitID ?: env.GIT_COMMIT
+def is_MR = params.eNB_mergeRequest ?: false
+
+def flexricOption = ""
+def runWithOC = false
+
+//-------------------------------------------------------------------------------
+// Pipeline start
+pipeline {
+  agent {
+    label pythonExecutor
+  }
+  options {
+    timestamps()
+    ansiColor('xterm')
+    lock(extra: lockResources)
+  }
+
+  stages {
+    stage("Build Init") {
+      steps {
+        script {
+          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
+          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
+        }
+        // update the build name and description
+        buildName "${params.eNB_MR}"
+        buildDescription "Branch : ${sourceBranch}"
+      }
+    }
+    stage ('Verify Parameters') {
+      steps {
+        script {
+          echo '\u2705 \u001B[94mVerify Parameters\u001B[0m'
+          def allParametersPresent = true
+
+          if (params.LockResources == null) {
+            echo "no LockResources given"
+            allParametersPresent = false
+          }
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.OC_Credentials != null) {
+            echo "This pipeline is configured to run with Opensift Cluster."
+            runWithOC = true
+            if (params.OC_ProjectName == null) {
+              echo "no OC_ProjectName given"
+              allParametersPresent = false
+            }
+          }
+          if (params.Flexric_Tag != null) {
+            echo "This pipeline is configured to run with a FlexRIC deployment."
+            echo "Appending FlexRicTag option to the list of options"
+            flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
+            echo "Using new Flexric option: ${flexricOption}"
+          }
+
+          echo "CI executor node    :   ${pythonExecutor}"
+          echo "Source Repository   :   ${sourceRepository}"
+          echo "Source Branch       :   ${sourceBranch}"
+          echo "Target Repository   :   ${targetRepository}"
+          echo "Target Branch       :   ${targetBranch}"
+          echo "Commit ID           :   ${commitID}"
+
+          if (allParametersPresent) {
+            echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
+            if (is_MR) {
+              sh "git fetch"
+              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${sourceBranch} --src-commit ${commitID} --target-branch ${targetBranch} --target-commit latest"
+            } else {
+              sh "git fetch"
+              sh "git checkout -f ${commitID}"
+            }
+          } else {
+            echo "\u274C Some parameters are missing"
+            sh "./ci-scripts/fail.sh"
+          }
+        }
+      }
+    }
+    stage ("Deploy and Test") {
+      steps {
+        script {
+          dir ('ci-scripts') {
+            echo "\u2705 \u001B[94m Deploy and Test: ${testStageName}\u001B[0m"
+            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+            for (xmlFile in myXmlTestSuite) {
+              if (fileExists(xmlFile)) {
+                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                echo "Test XML file         :   ${xmlFile}"
+              } else {
+                echo "Test XML file ${xmlFile}: no such file"
+              }
+            }
+            sh """
+              python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                              --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                              --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                              ${flexricOption} ${mainPythonAllXmlFiles}
+            """
+            if (runWithOC) {
+              withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
+                sh """
+                  python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                                  --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                  --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                  ${flexricOption} ${mainPythonAllXmlFiles}
+                """
+                for (xmlFile in myXmlTestSuite) {
+                  if (fileExists(xmlFile)) {
+                    try {
+                      timeout (time: 60, unit: 'MINUTES') {
+                        sh """
+                          python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                          --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                          --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                          --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
+                                          --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
+                                          ${flexricOption}
+                        """
+                      }
+                    } catch (Exception e) {
+                      currentBuild.result = 'FAILURE'
+                      buildStageStatus = false
+                    }
+                  }
+                }
+              }
+            } else {
+              for (xmlFile in myXmlTestSuite) {
+                if (fileExists(xmlFile)) {
+                  try {
+                    timeout (time: 60, unit: 'MINUTES') {
+                      sh """
+                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
+                                        ${flexricOption}
+                      """
+                    }
+                  } catch (Exception e) {
+                    currentBuild.result = 'FAILURE'
+                    buildStageStatus = false
+                  }
+                }
+              }
+            }
+          sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
+          }
+        }
+      }
+    }
+    stage ("Log Collection") {
+      steps {
+        script {
+	  echo '\u2705 \u001B[94mLog Collection\u001B[0m'
+          dir ('ci-scripts') {
+            // Zipping all archived log files
+              sh "mkdir test_logs"
+              sh "mv *.log* test_logs || true"
+              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
+              if (fileExists('../cmake_targets/log')) {
+                sh "mv ../cmake_targets/log/* test_logs || true"
+              }
+              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
+              sh "rm -rf *test_log*/"
+              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
+                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
+              }
+            if (fileExists("test_results.html")) {
+              def reportName = "test_results-${env.JOB_NAME}.html"
+              sh "mv test_results.html ${reportName}"
+              sh """
+                sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' \
+                       -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' \
+		       -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' \
+                       -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' \
+                       -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' ${reportName}
+	      """
+              archiveArtifacts artifacts: "${reportName}"
+            }
+          }
+        }
+      }
+    }
+  }
+}

ci-scripts/Jenkinsfile-GitLab-Container

@@ -334,6 +334,29 @@ pipeline {
             }
           }
         }
+        stage ("Channel-Simulation") {
+          when { expression {do5Gtest || do5GUeTest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Channel-Simulation', 'Channel-Simulation')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                channelSimStatus = finalizeSlaveJob('RAN-Channel-Simulation')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += channelSimStatus
+              }
+            }
+          }
+        }
         stage ("PhySim-Cluster-4G") {
           when { expression {do4Gtest} }
           steps {
@@ -380,6 +403,29 @@ pipeline {
             }
           }
         }
+        stage ("VRT-Sim-Test-5G") {
+          when { expression {do5Gtest || do5GUeTest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-VRT-Sim-Test-5G', 'VRT-Sim-Test-5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                vrtSim5GStatus = finalizeSlaveJob('RAN-VRT-Sim-Test-5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += vrtSim5GStatus
+              }
+            }
+          }
+        }
         stage ("RF-Sim-Test-5G") {
           when { expression {do5Gtest || do5GUeTest} }
           steps {

ci-scripts/Jenkinsfile-cluster

@@ -1,228 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-def directoryExistsGlob(fileNameWithGlob) {
-  /* if multiple directories match, will join their names and call fileExists() on that */
-  def dir = sh returnStdout: true, script: 'find . -name \'' + fileNameWithGlob + '\' -type d'
-  dir = dir.replaceAll("\n", "").trim()
-  echo "matching '" + fileNameWithGlob + "' found: '"  + dir + "'"
-  if (dir == "")
-    return false
-  return fileExists(dir)
-}
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            echo "no eNB_SourceCodePath given"
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          } else {
-            echo "no eNB_mergeRequest given - not merging develop"
-          }
-
-          if (params.OC_Credentials == null) {
-            echo "no OC_Credentials given"
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            echo "no OC_ProjectName given"
-            allParametersPresent = false
-          }
-          if (params.pythonTestXmlFile == null) {
-            echo "no pythonTestXmlFile given"
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-            }
-          }
-        }
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            if (directoryExistsGlob("build_log_*")) {
-              sh "zip -r -qq build_log_${env.BUILD_ID}.zip build_log_*/*"
-              sh "rm -rf build_log_*/"
-              archiveArtifacts artifacts: "build_log_${env.BUILD_ID}.zip"
-            }
-            if (directoryExistsGlob("test_log_*")) {
-              sh "zip -r -qq test_log_${env.BUILD_ID}.zip test_log_*/*"
-              sh "rm -rf test_log_*/"
-              archiveArtifacts artifacts: "test_log_${env.BUILD_ID}.zip"
-            }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-nrue

@@ -1,223 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-// Flags
-def scmEvent = false
-def upstreamEvent = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (params.OC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-            }
-          }
-        } 
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }  
-}

ci-scripts/Jenkinsfile-physim-deploy

@@ -1,224 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-// Flags
-def scmEvent = false
-def upstreamEvent = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (params.OC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-            }
-          }
-        } 
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }  
-}  

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -1,250 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Terminate Status
-def termENB = 0
-def termStatusArray = new Boolean[termENB + 1]
-termStatusArray[termENB] = false
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-def doEpcLogCollection = true
-
-
-
-pipeline {
-    agent {
-        label pythonExecutor
-    }
-    options {
-        ansiColor('xterm')
-        lock(extra: lockResources)
-    }
-
-    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already to late to check it
-                    if (params.pythonExecutor != null) {
-                        echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.LockResources == null) {
-                      echo "no LockResources given"
-                      allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    // the following 4 parameters should be pushed by the master trigger
-                    // if not present, take the job GIT variables (used for developing)
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = env.GIT_URL
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository        :   ${eNB_Repository}"
-                    if (params.eNB_Branch == null) {
-                        eNB_Branch = env.GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch            :   ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = env.GIT_COMMIT
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID          :   ${eNB_CommitID}"
-                    if (params.eNB_mergeRequest != null) {
-                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-                        if (eNB_AllowMergeRequestProcess) {
-                            if (params.eNB_TargetBranch != null) {
-                                eNB_TargetBranch = params.eNB_TargetBranch
-                            } else {
-                                eNB_TargetBranch = 'develop'
-                            }
-                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-                        }
-                    }
-
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                        if (eNB_AllowMergeRequestProcess) {
-                            sh "git fetch"
-                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else {
-                            sh "git fetch"
-                            sh "git checkout -f ${eNB_CommitID}"
-                        }
-                    } else {
-                        currentBuild.result = 'ABORTED'
-                        error('Stopping early because some parameters are missing')
-                    }
-                }
-            }
-        }
-        stage ("Build and Test") {
-            steps {
-                script {
-                    dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists(xmlFile)) {
-                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-                    }
-                }
-            }
-        }
-        stage ("Terminate") {
-            parallel {
-                stage('Terminate eNB') {
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                    }
-                    post {
-                        success {
-                            script {
-                                termStatusArray[termENB] = true
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Run)') {
-                    steps {
-                        echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-                            }
-                            if(fileExists("ci-scripts/test_results.html")) {
-                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-                                archiveArtifacts "test_results-${JOB_NAME}.html"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if (params.pipelineZipsConsoleLog != null) {
-                    if (params.pipelineZipsConsoleLog) {
-                        echo "Archiving Jenkins console log"
-                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-                        }
-                    }
-                }
-            }
-        }
-        // Making sure that we really shutdown every thing before leaving
-        failure {
-            script {
-                if (!termStatusArray[termENB]) {
-                    sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                }
-            }
-        }
-    }
-}

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -1,225 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-pipeline {
-    agent {
-        label pythonExecutor
-    }
-    options {
-        ansiColor('xterm')
-        lock(extra: lockResources)
-    }
-    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already to late to check it
-                    if (params.pythonExecutor != null) {
-                        echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.LockResources == null) {
-                      echo "no LockResources given"
-                      allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    // the following 4 parameters should be pushed by the master trigger
-                    // if not present, take the job GIT variables (used for developing)
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = env.GIT_URL
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository        :   ${eNB_Repository}"
-                    if (params.eNB_Branch == null) {
-                        eNB_Branch = env.GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch            :   ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = env.GIT_COMMIT
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID          :   ${eNB_CommitID}"
-                    if (params.eNB_mergeRequest != null) {
-                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-                        if (eNB_AllowMergeRequestProcess) {
-                            if (params.eNB_TargetBranch != null) {
-                                eNB_TargetBranch = params.eNB_TargetBranch
-                            } else {
-                                eNB_TargetBranch = 'develop'
-                            }
-                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-                        }
-                    }
-
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                        if (eNB_AllowMergeRequestProcess) {
-                            sh "git fetch"
-                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else {
-                            sh "git fetch"
-                            sh "git checkout -f ${eNB_CommitID}"
-                        }
-                    } else {
-                        echo "Some parameters are missing"
-                        sh "./ci-scripts/fail.sh"
-                    }
-                }
-            }
-        }
-        stage ("Build and Test") {
-            steps {
-                script {
-                    dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists(xmlFile)) {
-                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-                    }
-                }
-            }
-        }
-        stage ("Terminate") {
-            parallel {
-                stage('Terminate eNB') {
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Run)') {
-                    steps {
-                        echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-                            }
-                            if(fileExists("ci-scripts/test_results.html")) {
-                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-                                archiveArtifacts "test_results-${JOB_NAME}.html"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if (params.pipelineZipsConsoleLog != null) {
-                    if (params.pipelineZipsConsoleLog) {
-                        echo "Archiving Jenkins console log"
-                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,216 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess
-def eNB_TargetBranch
-
-//Status fed to the database
-def StatusForDb = ""
-
-
-pipeline {
-  agent {label pythonExecutor}
-  options {
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-  stages {
-    stage("Build Init") {
-      steps {
-        // update the build name and description
-        buildName "${params.eNB_MR}"
-        buildDescription "Branch : ${params.eNB_Branch}"
-      }
-    }
-    stage ("Verify Parameters") {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest!= null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-    stage ("Build and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file     :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                try {
-                 timeout (time: 60, unit: 'MINUTES') {
-                  sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                 }
-                } catch (Exception e) {
-                  currentBuild.result = 'FAILURE'
-                  buildStageStatus = false
-                }
-              }
-            }
-            sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-          }
-        }
-      }
-    }
-    stage('Log Collection') {
-      parallel {
-        stage('Log Collection (eNB - Run)') {
-          steps {
-            echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-            script {
-              if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  post {
-    always {
-      script {
-        if(fileExists("ci-scripts/test_results.html")) {
-          sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-          sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-          archiveArtifacts "test_results-${JOB_NAME}.html"
-        }
-        if (params.pipelineZipsConsoleLog != null) {
-          if (params.pipelineZipsConsoleLog) {
-            echo "Archiving Jenkins console log"
-            sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-            sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-            if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-              archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-            }
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-tmp-ran

@@ -1,260 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Terminate Status
-def termUE = 0
-def termENB = 1
-def termSPGW = 2
-def termMME = 3
-def termHSS = 4
-def termStatusArray = new Boolean[termHSS + 1]
-termStatusArray[termUE] = false
-termStatusArray[termENB] = false
-termStatusArray[termSPGW] = false
-termStatusArray[termMME] = false
-termStatusArray[termHSS] = false
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-def flexricOption = ""
-
-pipeline {
-    agent {
-        label pythonExecutor
-    }
-    options {
-        ansiColor('xterm')
-        lock(extra: lockResources)
-    }
-    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already to late to check it
-                    if (params.pythonExecutor != null) {
-                        echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.LockResources == null) {
-                      echo "no LockResources given"
-                      allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    // the following 4 parameters should be pushed by the master trigger
-                    // if not present, take the job GIT variables (used for developing)
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = env.GIT_URL
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository        :   ${eNB_Repository}"
-                    if (params.eNB_Branch == null) {
-                        eNB_Branch = env.GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch            :   ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = env.GIT_COMMIT
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID          :   ${eNB_CommitID}"
-                    if (params.eNB_mergeRequest != null) {
-                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-                        if (eNB_AllowMergeRequestProcess) {
-                            if (params.eNB_TargetBranch != null) {
-                                eNB_TargetBranch = params.eNB_TargetBranch
-                            } else {
-                                eNB_TargetBranch = 'develop'
-                            }
-                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-                        }
-                    }
-
-                    if (params.Flexric_Tag != null) {
-                        echo "This pipeline is configured to run with a FlexRIC deployment."
-                        echo "Appending FlexRicTag option to the list of options"
-                        flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-                        echo "Using new Flexric option: ${flexricOption}"
-                    }
-
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                        if (eNB_AllowMergeRequestProcess) {
-                            sh "git fetch"
-                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else if (eNB_CommitID != 'develop') {
-                            sh "git fetch"
-                            sh "git checkout -f ${eNB_CommitID}"
-                        }
-                    } else {
-                        error "Some parameters are missing"
-                    }
-                }
-            }
-        }
-        stage ("Build and Test") {
-            steps {
-                script {
-                    dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} ${mainPythonAllXmlFiles}"
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists(xmlFile)) {
-                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-                    }
-                }
-            }
-        }
-        stage ("Terminate") {
-            parallel {
-                stage('Terminate eNB') {
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                    }
-                    post {
-                        success {
-                            script {
-                                termStatusArray[termENB] = true
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Run)') {
-                    steps {
-                        echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-                            }
-                            if(fileExists("ci-scripts/test_results.html")) {
-                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-                                archiveArtifacts "test_results-${JOB_NAME}.html"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if (params.pipelineZipsConsoleLog != null) {
-                    if (params.pipelineZipsConsoleLog) {
-                        echo "Archiving Jenkins console log"
-                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-                        }
-                    }
-                }
-            }
-        }
-        // Making sure that we really shutdown every thing before leaving
-        failure {
-            script {
-                if (!termStatusArray[termENB]) {
-                    sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                }
-            }
-        }
-    }
-}

ci-scripts/args_parse.py

@@ -43,10 +43,6 @@ import constants as CONST
 
 def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
 
-
-    py_param_file_present = False
-    py_params={}
-
     force_local = False
     while len(argvs) > 1:
         myArgv = argvs.pop(1)	# 0th is this file's name
@@ -172,4 +168,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             HELP.GenericHelp(CONST.Version)
             sys.exit('Invalid Parameter: ' + myArgv)
 
-    return py_param_file_present, py_params, mode, force_local
+    return mode, force_local

ci-scripts/cls_ci_helper.py

@@ -24,15 +24,14 @@ from typing import NamedTuple
 import logging
 
 class TestCaseCtx(NamedTuple):
-    count: int
-    test_id: int
+    test_idx: int
     logPath: str
 
     def Default(logPath):
-        return TestCaseCtx(123, 112233, logPath)
+        return TestCaseCtx(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}"
+        return f"{self.logPath}/{self.test_idx:06d}"
 
 def archiveArtifact(cmd, ctx, remote_path):
     base = os.path.basename(remote_path)

ci-scripts/cls_cluster.py

@@ -164,7 +164,6 @@ class Cluster:
 
 	def PullClusterImage(self, HTML, node, images, tag_prefix):
 		logging.debug(f'Pull OC image {images} to server {node}')
-		self.testCase_id = HTML.testCase_id
 		with cls_cmd.getConnection(node) as cmd:
 			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
 			if not succeeded:
@@ -211,8 +210,6 @@ class Cluster:
 		logging.debug(f'Building on cluster triggered from server: {node}')
 		self.cmd = cls_cmd.RemoteCmd(node)
 
-		self.testCase_id = HTML.testCase_id
-
 		# Workaround for some servers, we need to erase completely the workspace
 		self.cmd.cd(lSourcePath)
 		# to reduce the amount of data send to OpenShift, we
@@ -397,9 +394,9 @@ class Cluster:
 		# Analyze the logs
 		collectInfo = {}
 		for image, lf in log_files:
-			ret = cls_containerize.AnalyzeBuildLogs(image, lf)
-			imgStatus = ret['status']
-			msg = f"size {imageSize[image]}, analysis of {os.path.basename(lf)}: {ret['errors']} errors, {ret['warnings']} warnings"
+			imgStatus, errors = cls_containerize.AnalyzeBuildLogs(image, lf)
+			info = f"Analysis of {os.path.basename(lf)}: {imgStatus=}, size {imageSize[image]}, {len(errors)} errors"
+			msg = "\n".join([info] + errors)
 			HTML.CreateHtmlTestRowQueue(image, 'OK' if imgStatus else 'KO', [msg])
 			status = status and imgStatus
 
@@ -412,7 +409,7 @@ class Cluster:
 		# 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}/')
+			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_idx}/')
+			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_idx}/')
 
 		return status

ci-scripts/cls_containerize.py

@@ -47,6 +47,7 @@ import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
 from cls_ci_helper import archiveArtifact
+from collections import deque
 
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -85,9 +86,9 @@ def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
 	return tagToUse
 
 def AnalyzeBuildLogs(image, lf):
-	errorandwarnings = {}
 	committed = False
 	tagged = False
+	errors = []
 	with open(lf, mode='r') as inputfile:
 		for line in inputfile:
 			lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
@@ -96,11 +97,13 @@ def AnalyzeBuildLogs(image, lf):
 			# 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}")
-	return errorandwarnings
+			if re.search(r'error:|Errors|ERROR', line):
+				errors.append(f"=> {line.strip()}")
+	status = (committed or tagged) and len(errors) == 0
+	logging.info(f"Analyzing {image}, file {lf}: {status=}, {len(errors)} errors")
+	for e in errors:
+		logging.info(e)
+	return status, errors
 
 def GetImageName(ssh, svcName, file):
 	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".image'", silent=True)
@@ -119,7 +122,7 @@ def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
 
 def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
-	registry = "oai-ci" # pull_images() gives us this registry path
+	registry = "oai-ci/" # pull_images() gives us this registry path
 	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
@@ -134,7 +137,8 @@ def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 		# or -asan images. We need to detect which kind we did pull.
 		fullImageName = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
 		image = fullImageName.split("/")[-1].split(":")[0]
-		checkimg = f"{registry}/{image}-asan:{tag}"
+		# registry now includes the trailing slash ("oai-ci/")
+		checkimg = f"{registry}{image}-asan:{tag}"
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
@@ -164,25 +168,26 @@ def CopyinServiceLog(ssh, lSourcePath, svcName, wd_yaml, ctx):
 	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
 	return archiveArtifact(ssh, ctx, remote_filename)
 
-def GetRunningServices(ssh, file):
+def GetDeployedServices(ssh, file):
 	ret = ssh.run(f'docker compose -f {file} config --services')
 	if ret.returncode != 0:
+		logging.error("could not get services")
 		return None
 	allServices = ret.stdout.splitlines()
-	running_services = []
+	deployed_services = []
 	for s in allServices:
-		# outputs the hash if the container is running
-		ret = ssh.run(f'docker compose -f {file} ps --all --quiet -- {s}')
+		# outputs the hash if the container has been deployed (but might be stopped)
+		ret = ssh.run(f'docker compose -f {file} ps --all --quiet -- {s}', silent=True)
 		if ret.returncode != 0:
-			logging.info(f"service {s}: {ret.stdout}")
+			# error: should not happen as we iterate over docker-provided service list
+			logging.error(f"service {s}: {ret.stdout}")
 		elif ret.stdout == "":
-			logging.warning(f"could not retrieve information for service {s}")
+			logging.info(f"service {s} not deployed")
 		else:
 			c = ret.stdout
-			logging.debug(f'running service {s} with container id {c}')
-			running_services.append((s, c))
-	logging.info(f'stopping services: {running_services}')
-	return running_services
+			logging.info(f'service {s} with container id {c}')
+			deployed_services.append(s)
+	return deployed_services
 
 def CheckLogs(self, filename, HTML, RAN):
 	success = True
@@ -204,7 +209,7 @@ def CheckLogs(self, filename, HTML, RAN):
 	elif 'nv-cubb' in name:
 		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 name for sub in ['enb','rru','rcc','cu','du','gnb','vnf'])):
 		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})"
@@ -214,6 +219,24 @@ def CheckLogs(self, filename, HTML, RAN):
 		else:
 			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg])
 		HTML.htmleNBFailureMsg = ""
+	elif 'xapp' in name:
+		opt = f"Undeploy {name}"
+		with open(f'{filename}', "r") as f:
+			last_line = deque(f, maxlen=1).pop()
+		if ('Test xApp run SUCCESSFULLY' in last_line):
+			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["xApp run successfully"])
+		else:
+			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["xApp didn't run successfully"])
+			success = False
+	elif 'RIC' in name:
+		opt = f"Undeploy {name}"
+		with open(f'{filename}', 'r') as f:
+			last_line = deque(f, maxlen=1).pop()
+		if ('Removing E2 Node' in last_line):
+			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["nearRT-RIC run successfully"])
+		else:
+			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["nearRT-RIC didn't run successfully"])
+			success = False
 	else:
 		logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE")
 	logging.debug(f"log check: file {filename} passed analysis {success}")
@@ -439,9 +462,9 @@ class Containerize():
 
 		# Analyze the logs
 		for name, lf in log_files:
-			ret = AnalyzeBuildLogs(name, lf)
-			imgStatus = ret['status']
-			msg = f"size {allImagesSize[name]}, analysis of {os.path.basename(lf)}: {ret['errors']} errors, {ret['warnings']} warnings"
+			imgStatus, errors = AnalyzeBuildLogs(name, lf)
+			info = f"Analysis of {os.path.basename(lf)}: {imgStatus=}, size {allImagesSize[name]}, {len(errors)} errors"
+			msg = "\n".join([info] + errors)
 			HTML.CreateHtmlTestRowQueue(name, 'OK' if imgStatus else 'KO', [msg])
 			status = status and imgStatus
 		
@@ -714,7 +737,6 @@ class Containerize():
 	def DeployObject(self, ctx, node, HTML):
 		num_attempts = self.num_attempts
 		lSourcePath = self.eNBSourceCodePath
-		logging.debug(f'Deploying OAI Object on server: {node}')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
@@ -725,6 +747,7 @@ class Containerize():
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
+			logging.info(f'\u001B[1mDeploying object(s) "{services}" on server {node}\u001B[0m')
 			ExistEnvFilePrint(ssh, wd)
 			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
 			if num_attempts <= 0:
@@ -749,36 +772,68 @@ class Containerize():
 		imagesInfo = info.stdout.splitlines()[1:]
 		logging.debug(f'{info.stdout.splitlines()[1:]}')
 		if deployed:
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
+			HTML.CreateHtmlTestRowQueue(self.services, 'OK', ['\n'.join(imagesInfo)])
+			logging.info('\u001B[1m Deploying objects Pass\u001B[0m')
 		else:
-			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
+			HTML.CreateHtmlTestRowQueue(self.services, 'KO', ['\n'.join(imagesInfo)])
+			logging.error('\u001B[1m Deploying objects Failed\u001B[0m')
 		return deployed
 
+	def StopObject(self, ctx, node, HTML):
+		lSourcePath = self.eNBSourceCodePath
+		if not self.services:
+			raise ValueError(f'no services provided')
+		logging.info(f'\u001B[1m Stopping objects "{self.services}" from server: {node}\u001B[0m')
+		reqServices = self.services.split()
+		yaml = self.yamlPath.strip('/')
+		wd = f'{lSourcePath}/{yaml}'
+		wd_yaml = f'{wd}/docker-compose.y*ml'
+		with cls_cmd.getConnection(node) as ssh:
+			ExistEnvFilePrint(ssh, wd)
+			services = GetDeployedServices(ssh, wd_yaml)
+			success = []
+			fail = []
+			for s in reqServices:
+				if s in services:
+					ssh.run(f'docker compose -f {wd_yaml} stop -- {s}')
+					success.append(s)
+				else:
+					logging.error(f"no such service {s}")
+					fail.append(s)
+		if success == reqServices:
+			logging.info('\u001B[1m Stopping object Pass\u001B[0m')
+			HTML.CreateHtmlTestRowQueue(self.services, 'OK', [f'Stopped {self.services}'])
+		else:
+			logging.error('\u001B[1m Stopping object Failed\u001B[0m')
+			HTML.CreateHtmlTestRowQueue(self.services, 'KO', [f'Failed stopping {" ".join(fail)}, succeeded {" ".join(success)}'])
+		return success
+
 	def UndeployObject(self, ctx, node, HTML, RAN):
 		lSourcePath = self.eNBSourceCodePath
-		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {node}\u001B[0m')
+		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
+		wd_yaml = f'{wd}/docker-compose.y*ml'
 		with cls_cmd.getConnection(node) as ssh:
 			ExistEnvFilePrint(ssh, wd)
-			services = GetRunningServices(ssh, f"{wd}/docker-compose.y*ml")
+			services = GetDeployedServices(ssh, wd_yaml)
 			copyin_res = None
+			ssh.run(f'docker compose -f {wd_yaml} stop')
 			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 = [CopyinServiceLog(ssh, lSourcePath, s, wd_yaml, ctx) for s 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')
+			ssh.run(f'docker compose -f {wd_yaml} down -v')
 			ssh.run(f'rm {wd}/.env')
 		if not copyin_res:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)'])
-			return False
+			logging.error(f"could not copy all files: {copyin_res=} {services=}")
+			success = False
 		else:
 			log_results = [CheckLogs(self, f, HTML, RAN) for f in copyin_res]
 			success = all(log_results)
 		if success:
-			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
+			logging.info('\u001B[1m Undeploying objects Pass\u001B[0m')
 		else:
-			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
+			logging.error('\u001B[1m Undeploying objects Failed\u001B[0m')
 		return success

ci-scripts/cls_module.py

@@ -111,7 +111,7 @@ class Module_UE:
 			return self._collectTrace(ctx)
 		return None
 
-	def attach(self, attach_tries = 4, attach_timeout = 60):
+	def attach(self, attach_tries = 3, attach_timeout = 40):
 		ip = None
 		while attach_tries > 0:
 			self._command(self.cmd_dict["attach"])
@@ -125,6 +125,7 @@ class Module_UE:
 			if ip:
 				break
 			logging.warning(f"UE did not receive IP address after {attach_timeout} s, detaching")
+			attach_timeout += 20
 			attach_tries -= 1
 			self._command(self.cmd_dict["detach"])
 			time.sleep(5)

ci-scripts/cls_native.py

@@ -34,9 +34,8 @@ DPDK_PATH = '/opt/dpdk-t2-22.11.0'
 
 class Native():
 
-	def Build(ctx, node, test_case, HTML, directory, options):
+	def Build(ctx, node, HTML, directory, options):
 		logging.debug(f'Building on server: {node}')
-		HTML.testCase_id = test_case
 
 		with cls_cmd.getConnection(node) as ssh:
 			base = f"{directory}/cmake_targets"

ci-scripts/cls_oai_html.py

@@ -67,7 +67,7 @@ class HTMLManagement():
 		self.htmlUEFailureMsg = ''
 
 		self.startTime = int(round(time.time() * 1000))
-		self.testCase_id = ''
+		self.testCaseIdx = ''
 		self.desc = ''
 
 #-----------------------------------------------------------
@@ -191,7 +191,7 @@ class HTMLManagement():
 			self.htmlFile.write('  <table class="table" border = "1">\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th style="width:5%">Relative Time (s)</th>\n')
-			self.htmlFile.write('        <th style="width:5%">Test Id</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Test Index</th>\n')
 			self.htmlFile.write('        <th>Test Desc</th>\n')
 			self.htmlFile.write('        <th>Test Options</th>\n')
 			self.htmlFile.write('        <th style="width:5%">Test Status</th>\n')
@@ -259,7 +259,7 @@ class HTMLManagement():
 		currentTime = int(round(time.time() * 1000)) - self.startTime
 		self.htmlFile.write('      <tr>\n')
 		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
+		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCaseIdx  + '</td>\n')
 		self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 		self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 		if (str(status) == 'OK'):
@@ -374,7 +374,7 @@ class HTMLManagement():
 			addOrangeBK = False
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
+			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCaseIdx  + '</td>\n')
 			self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 			self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 			if (str(status) == 'OK'):

ci-scripts/cls_oaicitest.py

@@ -233,10 +233,10 @@ def Custom_Command(HTML, node, command):
     HTML.CreateHtmlTestRowQueue(command, status, message)
     return status == 'OK' or status == 'Warning'
 
-def Custom_Script(HTML, node, script):
+def Custom_Script(HTML, node, script, args):
 	logging.info(f"Executing custom script on {node}")
 	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 90)
+		ret = c.exec_script(script, 90, args)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
@@ -255,7 +255,7 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 	logging.debug(f'Running physims on server {node} workdir {workdir}')
 	with cls_cmd.getConnection(node) as c:
 		sys_info = c.exec_script("scripts/sys-info.sh", 5)
-		ret = c.exec_script(script, 1000, options)
+		ret = c.exec_script(script, 1500, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
 	with cls_cmd.getConnection(node) as ssh:
@@ -299,18 +299,16 @@ class OaiCiTest():
 		self.iperf_packetloss_threshold = ''
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
-		self.iperf_options = ''
 		self.iperf_tcp_rate_target = ''
 		self.finalStatus = False
 		self.air_interface=''
 		self.ue_ids = []
-		self.nodes = []
 		self.svr_node = None
 		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
-	def InitializeUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def InitializeUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -321,8 +319,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 		return True
 
-	def AttachUE(self, HTML):
-		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+	def AttachUE(self, node, HTML):
+		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -337,8 +335,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"])
 		return success
 
-	def DetachUE(self, HTML):
-		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+	def DetachUE(self, node, HTML):
+		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -346,8 +344,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def DataDisableUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def DataDisableUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -360,8 +358,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 		return success
 
-	def DataEnableUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def DataEnableUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -375,8 +373,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 		return success
 
-	def CheckStatusUE(self,HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def CheckStatusUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
@@ -446,10 +444,10 @@ class OaiCiTest():
 
 		return (True, message)
 
-	def Ping(self, ctx, HTML, infra_file="ci_infra.yaml"):
+	def Ping(self, ctx, node, HTML, 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")
-		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
 		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]
@@ -503,6 +501,11 @@ class OaiCiTest():
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
 			if cn.runIperf3Server():
+				# Clean up any existing iperf3 server processes on this port.
+				ret = cmd_svr.run(f"{cn.getCmdPrefix()} pkill -f '.*iperf3.*{port}'", reportNonZero=False)
+				# If pkill succeeds, it means there was a leftover iperf3 server.
+				if ret.returncode == 0:
+					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				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)
@@ -515,12 +518,12 @@ class OaiCiTest():
 
 		return (status, f'{ue_header}\n{msg}')
 
-	def Iperf(self, ctx, HTML, 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}"')
+	def Iperf(self, ctx, node, HTML, 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}"')
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
 		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)]
@@ -544,10 +547,10 @@ 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, ctx, node, HTML, 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)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(), node, infra_file)
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -847,8 +850,8 @@ class OaiCiTest():
 				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
 		return global_status
 
-	def TerminateUE(self, ctx, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def TerminateUE(self, ctx, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) 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]
 			archives = [f.result() for f in futures]

ci-scripts/cls_static_code_analysis.py

@@ -88,7 +88,6 @@ class StaticCodeAnalysis():
 			raise ValueError(f"{lSourcePath=} {node=}")
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
-		self.testCase_id = HTML.testCase_id
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
@@ -187,8 +186,6 @@ class StaticCodeAnalysis():
 			raise ValueError(f"{lSourcePath=} {node=}")
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
-		self.testCase_id = HTML.testCase_id
-
 		check_options = ''
 		if self.ranAllowMerge:
 			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'

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

@@ -53,7 +53,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 = ( "nea0" );
+  ciphering_algorithms = ( "nea2", "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -63,7 +63,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 = "no";
+  drb_integrity = "yes";
 };
 
 log_config :

ci-scripts/conf_files/gnb-cucp.sa.e1-ho-n2.conf

@@ -21,10 +21,10 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "192.168.71.150";
+    local_s_address  = "192.168.71.150";
     remote_s_address = "192.168.71.171";
-    local_s_portd   = 2153;
-    remote_s_portd  = 2153;
+    local_s_portd    = 2153;
+    remote_s_portd   = 2153;
 
     # ------- SCTP definitions
     SCTP :
@@ -41,7 +41,7 @@ gNBs =
     E1_INTERFACE =
     (
       {
-        type = "cp";
+        type      = "cp";
         ipv4_cucp = "192.168.71.150";
         port_cucp = 38462;
         ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
@@ -75,8 +75,8 @@ security = {
 
 log_config : {
   global_log_level = "info";
-  pdcp_log_level = "info";
-  rrc_log_level = "info";
-  f1ap_log_level = "info";
-  ngap_log_level = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  f1ap_log_level   = "info";
+  ngap_log_level   = "info";
 };

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

@@ -23,7 +23,6 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime = 2;
-    do_CSIRS     = 1;
     do_SRS       = 1;
 
     servingCellConfigCommon = (
@@ -147,7 +146,11 @@ gNBs =
   );
 
     first_active_bwp = 1;
-    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;});
+    bwp_list = (
+      { scs = 1; bwpStart = 0; bwpSize = 106;},
+      { scs = 1; bwpStart = 0; bwpSize = 36;},
+      { scs = 1; bwpStart = 40; bwpSize = 50;}
+    );
 
     # ------- SCTP definitions
     SCTP :

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

@@ -16,8 +16,6 @@ gNBs =
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
-
-    sib1_tda                                                  = 5;
     min_rxtxtime                                              = 6;
 
     servingCellConfigCommon = (

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

@@ -32,7 +32,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 0;
+    do_SRS                = 1;
     min_rxtxtime          = 2;
 
     servingCellConfigCommon = (
@@ -155,7 +155,7 @@ gNBs =
       nrofUplinkSlots                                               = 3;  #1;
       nrofUplinkSymbols                                             = 0;
 
-      ssPBCH_BlockPower                                             = -25;
+      ssPBCH_BlockPower                                             = -15;
   }
 
   );
@@ -176,8 +176,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.53";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.53";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -195,7 +195,7 @@ MACRLCs = (
   remote_s_portd   = 50010; // pnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200; # 150;
+  pusch_TargetSNRx10          = 280; # 150;
   pucch_TargetSNRx10          = 200; #200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;

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

@@ -24,9 +24,9 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 0;
+    do_SRS                = 1;
     min_rxtxtime          = 2;
-
+    force_UL256qam_off    = 1;
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
@@ -168,8 +168,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.53";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.53";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -187,7 +187,7 @@ MACRLCs = (
   remote_s_portd   = 50010; // pnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 220; # 150;
+  pusch_TargetSNRx10          = 260; # 150;
   pucch_TargetSNRx10          = 200; #200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;

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

@@ -195,6 +195,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 50;
          eNB_instances  = [0];
+         sl_ahead = 3;
          sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
     }
 );  

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

@@ -18,8 +18,6 @@ gNBs =
     tr_s_preference     = "local_mac"
 
     ////////// Physical parameters:
-
-    sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
 
     servingCellConfigCommon = (
@@ -172,7 +170,7 @@ MACRLCs = ({
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
-  set_analog_beamforming      = 1;
+  set_analog_beamforming      = 2;
   beam_duration               = 1;
   beams_per_period            = 1;
   beam_weights = [0]; // single SSB -> one analog beam

ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf

@@ -30,26 +30,26 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3610.56 MHz
-      absoluteFrequencySSB                                             = 679104;
-      dl_frequencyBand                                                 = 77;
+      absoluteFrequencySSB                                          = 679104;
+      dl_frequencyBand                                              = 77;
       # this is 3599.94 MHz
-      dl_absoluteFrequencyPointA                                       = 678388;
+      dl_absoluteFrequencyPointA                                    = 678388;
       #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
+        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 51;
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 51;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
+        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
+        initialDLBWPsubcarrierSpacing                               = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
@@ -197,10 +197,10 @@ RUs = (
   att_rx         = 0;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
+  max_rxgain     = 114;
   eNB_instances  = [0];
-  clock_src = "external";
-  time_src = "external";
+  clock_src      = "external";
+  time_src       = "external";
 }
 );
 
@@ -209,7 +209,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 = ( "nea0" );
+  ciphering_algorithms = ( "nea2", "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -219,7 +219,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 = "no";
+  drb_integrity = "yes";
 };
 
 log_config :

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

@@ -18,8 +18,6 @@ gNBs =
 
  ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
     min_rxtxtime = 6;
 
     servingCellConfigCommon = (

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

@@ -0,0 +1,256 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID = 0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({mcc = 208; mnc = 97; mnc_length = 2;});
+
+    ////////// Physical parameters:
+
+    min_rxtxtime                                              = 6;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+# downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
+      absoluteFrequencySSB                                           = 621312;
+      # this is 3300.60 MHz
+      dl_absoluteFrequencyPointA                                     = 620040;
+      #scs-SpecificCarrierList
+      dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                         = 1;
+        dl_carrierBandwidth                                          = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=0,L=106 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                           = 11;
+        initialDLBWPsearchSpaceZero                                  = 0;
+
+#uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                               = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 106;
+      pMax                                                           = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                   = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                             = 0;
+          prach_msg1_FrequencyStart                                  = 0;
+          zeroCorrelationZoneConfig                                  = 12;
+          preambleReceivedTargetPower                                = -104;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                           = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                             = 1;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen 
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                 = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                    = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                 = 7;
+        rsrp_ThresholdSSB                                            = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                   = 2;
+        prach_RootSequenceIndex                                      = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                       = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                          = 0,
+
+        msg3_DeltaPreamble                                           = 1;
+        p0_NominalWithGrant                                          =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                            = 0;
+        hoppingId                                                    = 40;
+        p0_nominal                                                   = -90;
+
+      ssb_PositionsInBurst_Bitmap                                    = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spar e1
+      ssb_periodicityServingCell                                     = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                            = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                              = 1;
+
+
+#tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                     = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                  = 6;
+      nrofDownlinkSlots                                              = 7;
+      nrofDownlinkSymbols                                            = 6;
+      nrofUplinkSlots                                                = 2;
+      nrofUplinkSymbols                                              = 4;
+
+      ssPBCH_BlockPower                                              = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+
+        NETWORK_INTERFACES :
+        {
+
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
+           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc           = 1;
+  tr_s_preference  = "local_L1";
+  tr_n_preference  = "local_RRC";
+  pusch_TargetSNRx10 = 200;
+  pucch_TargetSNRx10 = 200;
+}
+);
+
+prs_config = (
+{
+  NumPRSResources       = 1;
+  PRSResourceSetPeriod  = [20, 2];
+  SymbolStart           = [7];
+  NumPRSSymbols         = [6];
+  NumRB                 = 106;
+  RBOffset              = 0;
+  CombSize              = 4;
+  REOffset              = [0];
+  PRSResourceOffset     = [0];
+  PRSResourceRepetition = 1;
+  PRSResourceTimeGap    = 1;
+  NPRS_ID               = [0];
+  MutingPattern1        = [];
+  MutingPattern2        = [];
+  MutingBitRepetition   = 1;
+}
+);
+
+L1s = (
+{
+  num_cc              = 1;
+  tr_n_preference     = "local_mac";
+  prach_dtx_threshold = 120;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 1
+  nb_rx          = 1
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain     = 75;
+  sf_extension   = 0;
+  eNB_instances  = [0];
+}
+);
+
+
+rfsimulator :
+{
+  serveraddr = "server";
+  serverport = 4043;
+  options    = (); #("saviq"); or/and "chanmod"
+  modelname  = "AWGN";
+  IQfile     = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  f1ap_log_level   = "debug";
+};

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

@@ -146,6 +146,7 @@ MACRLCs:
     tr_n_preference: local_RRC
     pusch_TargetSNRx10: 200
     pucch_TargetSNRx10: 200
+    stats_max_ue: 17
 
 L1s:
   - num_cc: 1

ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml

@@ -0,0 +1,209 @@
+Active_gNBs:
+ - gnb-rfsim
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity: none
+gNBs:
+    ##### Identification parameters:
+  - gNB_ID: 0xe00
+    gNB_name: gnb-rfsim
+    tracking_area_code: 1
+    plmn_list:
+      - mcc: 208
+        mnc: 99
+        mnc_length: 2
+        snssaiList:
+          - sst: 1
+            sd: 0xffffff
+    nr_cellid: 12345678
+    ##### Physical parameters:
+    min_rxtxtime: 6
+    pusch_AntennaPorts: 2
+    pdsch_AntennaPorts_XP: 2
+
+    servingCellConfigCommon:
+      #spCellConfigCommon
+      - physCellId: 0
+      #  downlinkConfigCommon
+      #frequencyInfoDL
+      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
+        absoluteFrequencySSB: 621312
+        # this is 3300.60 MHz
+        dl_absoluteFrequencyPointA: 620040
+        #scs-SpecificCarrierList
+        dl_offstToCarrier: 0
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing: 1
+        dl_carrierBandwidth: 106
+        #initialDownlinkBWP
+        #genericParameters
+        # this is RBstart=0,L=106 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth: 28875
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing: 1
+        #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero: 11
+        initialDLBWPsearchSpaceZero: 0
+        #uplinkConfigCommon
+        #frequencyInfoUL
+        ul_frequencyBand: 78
+        #scs-SpecificCarrierList
+        ul_offstToCarrier: 0
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        ul_subcarrierSpacing: 1
+        ul_carrierBandwidth: 106
+        pMax: 20
+        #initialUplinkBWP
+        #genericParameters
+        initialULBWPlocationAndBandwidth: 28875
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing: 1
+        #rach-ConfigCommon
+        #rach-ConfigGeneric
+        prach_ConfigurationIndex: 98
+        #prach_msg1_FDM
+        #0 = one, 1=two, 2=four, 3=eight
+        prach_msg1_FDM: 0
+        prach_msg1_FrequencyStart: 0
+        zeroCorrelationZoneConfig: 12
+        preambleReceivedTargetPower: -104
+        #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+        preambleTransMax: 6
+        #powerRampingStep
+        # 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep: 1
+        #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+        #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR: 4
+        #one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB: 15
+        #ra_ContentionResolutionTimer
+        #(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer: 7
+        rsrp_ThresholdSSB: 19
+        #prach-RootSequenceIndex_PR
+        #1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR: 2
+        prach_RootSequenceIndex: 1
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        msg1_SubcarrierSpacing: 1
+        # restrictedSetConfig
+        # 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig: 0
+        msg3_DeltaPreamble: 1
+        p0_NominalWithGrant: -90
+
+        # pucch-ConfigCommon setup :
+        # pucchGroupHopping
+        # 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping: 0
+        hoppingId: 40
+        p0_nominal: -90
+        ssb_PositionsInBurst_Bitmap: 1
+        # ssb_periodicityServingCell
+        # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+        ssb_periodicityServingCell: 2
+        
+        # dmrs_TypeA_position
+        # 0 = pos2, 1 = pos3
+        dmrs_TypeA_Position: 0
+        
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        subcarrierSpacing: 1
+        
+        #tdd-UL-DL-ConfigurationCommon
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        referenceSubcarrierSpacing: 1
+        
+        # pattern1
+        # dl_UL_TransmissionPeriodicity
+        # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+        dl_UL_TransmissionPeriodicity: 6
+        nrofDownlinkSlots: 7
+        nrofDownlinkSymbols: 6
+        nrofUplinkSlots: 2
+        nrofUplinkSymbols: 4
+        ssPBCH_BlockPower: -25
+    SCTP:
+      SCTP_INSTREAMS: 2
+      SCTP_OUTSTREAMS: 2
+
+    ##### AMF parameters:
+    amf_ip_address:
+      - ipv4: 192.168.71.132
+
+    NETWORK_INTERFACES:
+      GNB_IPV4_ADDRESS_FOR_NG_AMF: 192.168.71.140
+      GNB_IPV4_ADDRESS_FOR_NGU: 192.168.71.140
+      GNB_PORT_FOR_S1U: 2152 # Spec 2152
+
+
+MACRLCs:
+  - num_cc: 1
+    tr_s_preference: local_L1
+    tr_n_preference: local_RRC
+    pusch_TargetSNRx10: 200
+    pucch_TargetSNRx10: 200
+
+L1s:
+  - num_cc: 1
+    tr_n_preference:  local_mac
+    prach_dtx_threshold: 200
+    # pucch0_dtx_threshold = 150;
+
+RUs:
+  - local_rf: yes
+    nb_tx: 2
+    nb_rx: 2
+    att_tx: 0
+    att_rx: 0
+    bands: [78]
+    max_pdschReferenceSignalPower: -27
+    max_rxgain: 75
+    eNB_instances: [0]
+    sf_extension: 0
+
+security:
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms: [nea0]
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms: [nia2, nia0]
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering: yes
+  drb_integrity: no
+
+log_config:
+  global_log_level: info
+  hw_log_level: info
+  phy_log_level: info
+  mac_log_level: info
+  rlc_log_level: info
+  pdcp_log_level: info
+  rrc_log_level: info
+  ngap_log_level: debug
+  f1ap_log_level: debug
+
+
+channelmod:
+  max_chan: 10
+  modellist: DefaultChannelList
+  DefaultChannelList:
+   - model_name: server_tx_channel_model
+     type: AWGN
+     ploss_dB: 0
+     noise_power_dB: -100
+     forgetfact: 0
+     offset: 0
+     ds_tdl: 0

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

@@ -16,8 +16,6 @@ gNBs =
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
-
-    sib1_tda = 15;
     min_rxtxtime = 6;
 
     servingCellConfigCommon = (
@@ -196,6 +194,7 @@ RUs = (
   att_tx         = 0
   att_rx         = 0;
   bands          = [78];
+  sl_ahead=3;
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
   sf_extension                  = 0;

ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf

@@ -23,7 +23,6 @@ gNBs =
     pusch_AntennaPorts    = 4;
     do_CSIRS              = 1;
     do_SRS                = 0;
-    sib1_tda			        = 15;
    # force_UL256qam_off    = 1;
 
     servingCellConfigCommon = (

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

@@ -21,10 +21,6 @@ gNBs =
     nr_cellid = 12345678L
 
     ////////// Physical parameters:
-    pdsch_AntennaPorts_XP                                     = 1;
-    pusch_AntennaPorts                                        = 1;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
     uess_agg_levels = [2, 2, 2, 0, 0];
 
     servingCellConfigCommon = (
@@ -186,6 +182,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
+    stats_max_ue = 17;
   }
 );
 

ci-scripts/conf_files/neighbour-config-ho.conf

@@ -42,13 +42,13 @@ nr_measurement_configuration = {
   A2 = {
     enable = 1;
     threshold = 110;
-    timeToTrigger = 1;
+    time_to_trigger = 1;
   };
 
   A3 = ({
-    cell_id = -1; #Default
+    physCellId = -1; #Default
     offset = 10;
     hysteresis = 0;
-    timeToTrigger = 1
+    time_to_trigger = 1
   })
 };

ci-scripts/conf_files/neighbour-config.conf

@@ -57,19 +57,19 @@ nr_measurement_configuration = {
   A2 = {
     enable = 1;
     threshold = 60;
-    timeToTrigger = 1;
+    time_to_trigger = 1;
   };
 
   A3 = ({
     physCellId = -1; #Default
     offset = 10;
     hysteresis = 0;
-    timeToTrigger = 1
+    time_to_trigger = 1
   }, {
     physCellId = 2;
     offset = 5;
     hysteresis = 1;
-    timeToTrigger = 2
+    time_to_trigger = 2
   })
 };
 

ci-scripts/conf_files/nrue.band78.106prb.prs.conf

@@ -0,0 +1,89 @@
+PRSs =
+(
+  {
+    Active_gNBs = 1;
+    prs_config0 = (
+    {
+      gNB_id = 0;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [0];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [0];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+
+    prs_config1 = (
+    {
+      gNB_id = 1;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [1];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [1];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+
+    prs_config2 = (
+    {
+      gNB_id = 2;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [2];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [2];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+
+    prs_config3 = (
+    {
+      gNB_id = 3;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [3];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [3];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+  }
+);

ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml

@@ -0,0 +1,20 @@
+uicc0:
+  imsi: 208990100001100
+  key: fec86ba6eb707ed08905757b1bb44b8f
+  opc: C42449363BBAD02B66D16BC975D77CC1
+  dnn: oai
+  nssai_sst: 1
+
+thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+
+channelmod:
+  max_chan: 10;
+  modellist: DefaultChannelList
+  DefaultChannelList:
+   - model_name: client_tx_channel_model
+     type: AWGN
+     ploss_dB: 0
+     noise_power_dB: -100
+     forgetfact: 0
+     offset: 0
+     ds_tdl: 0

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -17,9 +17,6 @@ gNBs =
 
     ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-
     servingCellConfigCommon = (
     {
  #spCellConfigCommon

ci-scripts/datalog_rt_stats.100.2x2.yaml

@@ -15,7 +15,6 @@ Ref :
   DLSCH encoding : 200.0
   L1 Rx processing : 530.0
   PUSCH inner-receiver : 360.0
-  Schedule Response : 1.0
   DL & UL scheduling timing : 17.0
   UL Indication : 1.0
   Slot Indication : 13.0
@@ -31,7 +30,6 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
   DL & UL scheduling timing : 0.25
   UL Indication : 1.00
   Slot Indication : 0.50

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

@@ -15,7 +15,6 @@ Ref :
   DLSCH encoding : 110.0
   L1 Rx processing : 345.0
   PUSCH inner-receiver : 150.0
-  Schedule Response : 1.0
   DL & UL scheduling timing : 5.0
   UL Indication : 1.0
   Slot Indication : 6.0
@@ -31,7 +30,6 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50

ci-scripts/datalog_rt_stats.2x2.yaml

@@ -15,7 +15,6 @@ Ref :
   DLSCH encoding : 230.0
   L1 Rx processing : 175.0
   PUSCH inner-receiver : 100.0
-  Schedule Response : 3.0
   DL & UL scheduling timing : 11.0
   UL Indication : 3.0
   Slot Indication : 14.0
@@ -28,7 +27,6 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.25

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -15,7 +15,6 @@ Ref :
   DLSCH encoding : 140.0
   L1 Rx processing : 345.0
   PUSCH inner-receiver : 155.0
-  Schedule Response : 1.0
   DL & UL scheduling timing : 8.0
   UL Indication : 3.0
   Slot Indication : 9.0
@@ -31,7 +30,6 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
   DL & UL scheduling timing : 0.35
   UL Indication : 1.00
   Slot Indication : 0.35

ci-scripts/datalog_rt_stats.default.yaml

@@ -15,7 +15,6 @@ Ref :
   DLSCH encoding : 90.0
   L1 Rx processing : 290.0
   PUSCH inner-receiver : 115.0
-  Schedule Response : 1.0
   DL & UL scheduling timing : 4.0
   UL Indication : 2.0
   Slot Indication : 5.0
@@ -31,7 +30,6 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50

ci-scripts/docker/Dockerfile.physim.ubuntu

@@ -24,24 +24,29 @@
 #   Valid for Ubuntu 24.04
 #
 #---------------------------------------------------------------------
-
+FROM nvidia/cuda:12.9.1-devel-ubuntu22.04 AS cuda-image
 FROM ran-base:develop AS ran-tests
 
-#RUN apt-get update && \
-#    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
-#    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-#        libgtest-dev \
-#        libyaml-cpp-dev
-
 RUN rm -Rf /oai-ran
+COPY --from=cuda-image /usr/local/cuda/ /usr/local/cuda/
+
+# Set the LD_LIBRARY_PATH to ensure the system can find the copied libraries.
+# This is crucial for applications that use CUDA.
+ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/targets/sbsa-linux/lib
+ENV PATH=/usr/local/cuda/bin:$PATH
+ENV C_INCLUDE_PATH=/usr/local/cuda/include
+
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-# TODO should SANITIZE be ON? it makes it compile much longer
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
+RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
+        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake;ThresholdsCuda.cmake" \
+        -DCUDA_ENABLE=ON \
+        -DUSE_UNIFIED_MEMORY=ON \
+        -DUSE_ATS_MEMORY=OFF \
+        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \
         .. && \
-    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim test_channel_scalability

ci-scripts/main.py

@@ -58,7 +58,7 @@ import re		# reg
 import time		# sleep
 import os
 import subprocess
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 import logging
 import signal
 import traceback
@@ -85,15 +85,7 @@ def CheckClassValidity(xml_class_list,action,id):
 		resp=True
 	return resp
 
-#assigning parameters to object instance attributes (even if the attributes do not exist !!)
-def AssignParams(params_dict):
-
-	for key,value in params_dict.items():
-		setattr(CiTestObj, key, value)
-		setattr(RAN, key, value)
-		setattr(HTML, key, value)
-
-def ExecuteActionWithParam(action, ctx):
+def ExecuteActionWithParam(action, ctx, node):
 	global RAN
 	global HTML
 	global CONTAINERS
@@ -102,12 +94,11 @@ def ExecuteActionWithParam(action, ctx):
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
-		node = test.findtext('node')
 		proxy_commit = test.findtext('proxy_commit')
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(ctx, node, HTML.testCase_id, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(ctx, node, HTML)
 		elif action == 'Build_Proxy':
@@ -118,7 +109,6 @@ def ExecuteActionWithParam(action, ctx):
 			success = CONTAINERS.BuildRunTests(ctx, node, HTML)
 
 	elif action == 'Initialize_eNB':
-		node = test.findtext('node')
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
 		if datalog_rt_stats_file is None:
 			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -139,7 +129,6 @@ def ExecuteActionWithParam(action, ctx):
 		success = RAN.InitializeeNB(ctx, node, HTML)
 
 	elif action == 'Terminate_eNB':
-		node = test.findtext('node')
 		#retx checkers
 		string_field = test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -158,68 +147,35 @@ def ExecuteActionWithParam(action, ctx):
 
 	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(' ')
-		if force_local:
-			# Change all execution targets to localhost
-			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
-		else:
-			if test.findtext('nodes'):
-				CiTestObj.nodes = test.findtext('nodes').split(' ')
-				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-					logging.error('Number of Nodes are not equal to the total number of UEs')
-					sys.exit("Mismatch in number of Nodes and UIs")
-			else:
-				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if action == 'Initialize_UE':
-			success = CiTestObj.InitializeUE(HTML)
+			success = CiTestObj.InitializeUE(node, HTML)
 		elif action == 'Attach_UE':
-			success = CiTestObj.AttachUE(HTML)
+			success = CiTestObj.AttachUE(node, HTML)
 		elif action == 'Detach_UE':
-			success = CiTestObj.DetachUE(HTML)
+			success = CiTestObj.DetachUE(node, HTML)
 		elif action == 'Terminate_UE':
-			success = CiTestObj.TerminateUE(ctx, HTML)
+			success = CiTestObj.TerminateUE(ctx, node, HTML)
 		elif action == 'CheckStatusUE':
-			success = CiTestObj.CheckStatusUE(HTML)
+			success = CiTestObj.CheckStatusUE(node, HTML)
 		elif action == 'DataEnable_UE':
-			success = CiTestObj.DataEnableUE(HTML)
+			success = CiTestObj.DataEnableUE(node, HTML)
 		elif action == 'DataDisable_UE':
-			success = CiTestObj.DataDisableUE(HTML)
+			success = CiTestObj.DataDisableUE(node, HTML)
 
 	elif action == 'Ping':
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
+		CiTestObj.svr_id = test.findtext('svr_id')
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
-		if force_local:
-			# Change all execution targets to localhost
-			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
-		else:
-			if test.findtext('nodes'):
-				CiTestObj.nodes = test.findtext('nodes').split(' ')
-				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-					logging.error('Number of Nodes are not equal to the total number of UEs')
-					sys.exit("Mismatch in number of Nodes and UIs")
-			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(ctx, node, HTML)
 
 	elif action == 'Iperf' or action == 'Iperf2_Unidir':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
-		if force_local:
-			# Change all execution targets to localhost
-			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
-		else:
-			if test.findtext('nodes'):
-				CiTestObj.nodes = test.findtext('nodes').split(' ')
-				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-					logging.error('Number of Nodes are not equal to the total number of UEs')
-					sys.exit("Mismatch in number of Nodes and UIs")
-			else:
-				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
+		CiTestObj.svr_id = test.findtext('svr_id')
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
@@ -229,14 +185,10 @@ def ExecuteActionWithParam(action, ctx):
 		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
 			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
-		CiTestObj.iperf_options = test.findtext('iperf_options') or 'check'
-		if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
-			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(ctx, node, HTML)
 		elif action == 'Iperf2_Unidir':
-			success = CiTestObj.Iperf2_Unidir(ctx, HTML)
+			success = CiTestObj.Iperf2_Unidir(ctx, node, HTML)
 
 	elif action == 'IdleSleep':
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
@@ -244,7 +196,6 @@ def ExecuteActionWithParam(action, ctx):
 
 	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
-		node = test.findtext('node') or None
 		script = "scripts/oc-deploy-physims.sh"
 		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
 		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
@@ -252,7 +203,6 @@ def ExecuteActionWithParam(action, ctx):
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
-		node = test.findtext('node') or None
 		ctest_opt = test.findtext('ctest-opt') or ''
 		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
 		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
@@ -264,8 +214,7 @@ def ExecuteActionWithParam(action, ctx):
 		core_op = getattr(cls_oaicitest.OaiCiTest, action)
 		success = core_op(cn_id, ctx, HTML)
 
-	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
-		node = test.findtext('node')
+	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace" or action == "Stop_Object":
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		string_field=test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -278,6 +227,8 @@ def ExecuteActionWithParam(action, ctx):
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(ctx, node, HTML)
+		elif action == 'Stop_Object':
+			success = CONTAINERS.StopObject(ctx, node, HTML)
 		elif action == 'Undeploy_Object':
 			success = CONTAINERS.UndeployObject(ctx, node, HTML, RAN)
 		elif action == 'Create_Workspace':
@@ -287,15 +238,12 @@ def ExecuteActionWithParam(action, ctx):
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
 	elif action == 'LicenceAndFormattingCheck':
-		node = test.findtext('node')
 		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)
 
 	elif action == 'Cppcheck_Analysis':
-		node = test.findtext('node')
 		success = SCA.CppCheckAnalysis(ctx, node, HTML)
 
 	elif action == 'Push_Local_Registry':
-		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		success = CONTAINERS.Push_Image_to_Local_Registry(node, HTML, tag_prefix)
 
@@ -303,7 +251,6 @@ def ExecuteActionWithParam(action, ctx):
 		if force_local:
 			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup
 			return True
-		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
 		# hack: for FlexRIC, we need to overwrite the tag to use
@@ -316,26 +263,21 @@ def ExecuteActionWithParam(action, ctx):
 			success = CONTAINERS.Clean_Test_Server_Images(HTML, node, images, tag=tag)
 
 	elif action == 'Custom_Command':
-		node = test.findtext('node')
-		if force_local:
-			# Change all execution targets to localhost
-			node = 'localhost'
 		command = test.findtext('command')
 		# Allow referencing repository workspace path in XML via %%workspace%%
 		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)
 
 	elif action == 'Custom_Script':
-		node = test.findtext('node')
 		script = test.findtext('script')
+		args = test.findtext('args')
 		# Allow referencing repository workspace path in XML via %%workspace%%
 		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
-		success = cls_oaicitest.Custom_Script(HTML, node, script)
+		success = cls_oaicitest.Custom_Script(HTML, node, script, args)
 
 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
-		node = test.findtext('node')
 		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)
 
 	else:
@@ -353,13 +295,21 @@ def test_in_list(test, list):
 			return True
 	return False
 
+test_runner_abort = False
 def receive_signal(signum, frame):
-	sys.exit(1)
+    global test_runner_abort
+    if not test_runner_abort:
+        logging.warning("received signal, canceling steps")
+        logging.info("send signal again to exit immediately")
+        test_runner_abort = True
+    else:
+        logging.warning("received signal again, exiting")
+        sys.exit(1)
 
-def ShowTestID(ctx, desc):
+def ShowTestID(ctx, desc, file, line):
     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 Test #{ctx.test_idx} ({file}:{line})   \u001B[0m')
+    logging.info(f'\u001B[1m {desc}                                 \u001B[0m')
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
 
 #-----------------------------------------------------------
@@ -399,16 +349,7 @@ CLUSTER = cls_cluster.Cluster()
 import args_parse
 # Force local execution, move all execution targets to localhost
 force_local = False
-py_param_file_present, py_params, mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
-
-
-
-#-----------------------------------------------------------
-# TEMPORARY params management (UNUSED)
-#-----------------------------------------------------------
-#temporary solution for testing:
-if py_param_file_present == True:
-	AssignParams(py_params)
+mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
 
 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
@@ -514,90 +455,54 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	xmlTree = ET.parse(xml_test_file)
 	xmlRoot = xmlTree.getroot()
 
-	exclusion_tests=xmlRoot.findtext('TestCaseExclusionList',default='')
-	requested_tests=xmlRoot.findtext('TestCaseRequestedList',default='')
 	if (HTML.nbTestXMLfiles == 1):
 		HTML.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-0'))
 		HTML.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-0'))
 	all_tests=xmlRoot.findall('testCase')
 
-	exclusion_tests=exclusion_tests.split()
-	requested_tests=requested_tests.split()
-
-	#check that exclusion tests are well formatted
-	#(6 digits or less than 6 digits followed by +)
-	for test in exclusion_tests:
-		if     (not re.match('^[0-9]{6}$', test) and
-				not re.match('^[0-9]{1,5}\\+$', test)):
-			logging.error('exclusion test is invalidly formatted: ' + test)
-			sys.exit(1)
-		else:
-			logging.info(test)
-
-	#check that requested tests are well formatted
-	#(6 digits or less than 6 digits followed by +)
-	#be verbose
-	for test in requested_tests:
-		if     (re.match('^[0-9]{6}$', test) or
-				re.match('^[0-9]{1,5}\\+$', test)):
-			logging.info('test group/case requested: ' + test)
-		else:
-			logging.error('requested test is invalidly formatted: ' + test)
-			sys.exit(1)
-
-	#get the list of tests to be done
-	todo_tests=[]
-	for test in requested_tests:
-		if    (test_in_list(test, exclusion_tests)):
-			logging.info('test will be skipped: ' + test)
-		else:
-			#logging.info('test will be run: ' + test)
-			todo_tests.append(test)
-
-	signal.signal(signal.SIGUSR1, receive_signal)
+	signal.signal(signal.SIGINT, receive_signal)
 
 	HTML.CreateHtmlTabHeader()
 
 	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')
-			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
-			action = test.findtext('class')
-			if (CheckClassValidity(xml_class_list, action, id) == False):
+	for index, test in enumerate(all_tests, start=1):
+		if test_runner_abort:
+			task_set_succeeded = False
+		test_case_idx = f"{index:06d}"
+		ctx = TestCaseCtx(int(test_case_idx), logPath)
+		HTML.testCaseIdx = test_case_idx
+		desc = test.findtext('desc')
+		node = test.findtext('node') if not force_local else 'localhost'
+		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
+		action = test.findtext('class')
+		if not CheckClassValidity(xml_class_list, action, test_case_idx):
+			task_set_succeeded = False
+			continue
+		file = os.path.basename(xml_test_file)
+		line = test.find('class').sourceline
+		ShowTestID(ctx, desc, file, line)
+		if not task_set_succeeded and not always_exec:
+			msg = f"skipping test due to prior error"
+			logging.warning(msg)
+			HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
+			continue
+		try:
+			test_succeeded = ExecuteActionWithParam(action, ctx, node)
+			if not test_succeeded and may_fail:
+				logging.warning(f"test ID {test_case_idx} action {action} may or may not fail, proceeding despite error")
+			elif not test_succeeded:
+				logging.error(f"test ID {test_case_idx} action {action} failed ({test_succeeded}), skipping next tests")
 				task_set_succeeded = False
-				continue
-			ShowTestID(ctx, desc)
-			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:
-					logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests")
-					task_set_succeeded = False
-			except Exception as e:
-				s = traceback.format_exc()
-				logging.error(f'while running CI, an exception occurred:\n{s}')
-				HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
-				task_set_succeeded = False
-				break
+		except Exception as e:
+			s = traceback.format_exc()
+			logging.error(f'while running CI, an exception occurred:\n{s}')
+			HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
+			task_set_succeeded = False
+			continue
 
 	if not task_set_succeeded:
 		logging.error('\u001B[1;37;41mScenario failed\u001B[0m')

ci-scripts/ran.py

@@ -67,7 +67,6 @@ class RANManagement():
 		self.eNBOptions = ['', '', '']
 		self.eNBmbmsEnables = [False, False, False]
 		self.eNBstatuses = [-1, -1, -1]
-		self.testCase_id = ''
 		self.runtime_stats= ''
 		self.datalog_rt_stats={}
 		self.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -88,7 +87,6 @@ class RANManagement():
 			raise ValueError(f"{node=}")
 		logging.debug('Starting eNB/gNB on server: ' + node)
 
-		self.testCase_id = HTML.testCase_id
 		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
 		

ci-scripts/scripts/docker-build-and-deploy-physims.sh

@@ -33,7 +33,7 @@ JSON_RES=$?
 # run the actual tests: we don't suppy --rm as we have to copy the files
 # similar to unit tests, we can't mount the file where we write physims-5g-run.xml to
 # as it would write a file as root, but this script is run as a normal user
-docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
+docker run -a STDOUT --gpus all --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
 RUN_RES=$?
 docker cp ${CONTAINER}:/oai-ran/build/results-run.xml ${RESULT_DIR}/
 docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTestsFailed.log ${RESULT_DIR}/

ci-scripts/scripts/set-and-verify-distance-prs.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+[[ $# -lt 1 ]] && { echo "Usage: $0 <distance_in_meters...>"; exit 1; }
+DISTANCES=("$@")
+
+IP=192.168.71.150
+PORT=8091
+NCAT_TIMEOUT=1 #s
+SLEEP_WAIT=4 #s
+MAX_RETRIES=3
+
+set_and_verify_distance() {
+  local distance=$1
+  echo "Testing PRS ToA estimation for distance: $distance m"
+
+  # it seems that grep returns immediately with this syntax, but not echo | ncat | grep
+  # so prefer this to receive new distance immediately. We use --idle to keep
+  # ncat open for some additional time
+  local setdist_resp="$(grep --max-count 1 new_offset <(echo rfsimu setdistance rfsimu_channel_enB0 $distance | ncat --idle ${NCAT_TIMEOUT} ${IP} ${PORT}))"
+  echo "> response: ${setdist_resp}"
+
+  local gettoa_resp="$(echo "ciUE get_max_dl_toa" | ncat ${IP} ${PORT} | grep "UE max PRS DL ToA")"
+  echo "> response: ${gettoa_resp}"
+
+  [[ -z "$setdist_resp" || -z "$gettoa_resp" ]] && return 1
+
+  # Extract ToA values 
+  [[ "$setdist_resp" =~ new_offset\ ([0-9]+) ]] && local set_toa="${BASH_REMATCH[1]}" || { echo "> Set ToA extraction failed for distance: $distance m"; return 1; }
+
+  [[ "$gettoa_resp" =~ UE\ max\ PRS\ DL\ ToA\ ([0-9]+) ]] && local est_toa="${BASH_REMATCH[1]}" || { echo "> Estimated ToA extraction failed for distance: $distance m"; return 1; }
+
+  # Compare extracted ToA values
+  [[ $set_toa == $est_toa ]] && echo "PRS SUCCESS for distance: $distance m" || { echo "PRS FAILURE for distance: $distance m (Actual ToA=$set_toa, Estimated ToA=$est_toa)" ; return 1; }
+
+}
+
+test_distance() {
+  local distance=$1 retries=0
+
+  # retry loop incase we didn't receive the response
+  while (( retries < MAX_RETRIES )); do
+    echo "  Attempt $((retries + 1))/$MAX_RETRIES"
+
+    # Always reset to 0 m before testing target distance
+    if ! set_and_verify_distance 0; then
+      echo " Set distance 0 m failed during attempt $((retries + 1))"
+    else
+      sleep "$SLEEP_WAIT"
+      # Now test the actual target distance
+      if set_and_verify_distance "$distance"; then
+        return 0
+      fi
+    fi
+
+    ((retries++))
+    if (( retries < MAX_RETRIES )); then
+      sleep "$SLEEP_WAIT"
+    else
+      echo " ERROR: No valid response after $MAX_RETRIES retries for distance: $distance m"
+      return 1
+    fi
+  done
+}
+
+num_success=0
+num_fail=0
+
+for d in "${DISTANCES[@]}"; do
+  if test_distance "$d"; then
+    ((num_success++))
+  else
+    ((num_fail++))
+  fi
+  sleep "$SLEEP_WAIT"
+done
+
+# ---- Summary ----
+echo
+echo "==================== SUMMARY ===================="
+echo "Total tests run : ${#DISTANCES[@]}"
+echo "Successful tests: ${num_success}"
+echo "Failed tests    : ${num_fail}"
+echo "================================================="
+
+if [ $num_success -gt 0 ]; then
+  exit 0
+else
+  exit 1
+fi

ci-scripts/tests/build.py

@@ -17,7 +17,7 @@ import cls_cmd
 class TestBuild(unittest.TestCase):
 	def setUp(self):
 		self.html = cls_oai_html.HTMLManagement()
-		self.html.testCase_id = "000000"
+		self.html.testCaseIdx = "000000"
 		self.cont = cls_containerize.Containerize()
 		self._d = tempfile.mkdtemp()
 		logging.warning(f"temporary directory: {self._d}")

ci-scripts/tests/deployment.py

@@ -60,6 +60,33 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)
 
+	def test_stop_services(self):
+		self.cont.yamlPath = 'tests/simple-undep/'
+		self.cont.deploymentTag = "noble"
+		# should deploy both testA and testB
+		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
+		# should fail (no such service)
+		self.cont.services = "testC"
+		stopC = self.cont.StopObject(self.ctx, self.node, self.html)
+		# should stop testA
+		self.cont.services = "testA"
+		stopA = self.cont.StopObject(self.ctx, self.node, self.html)
+		# should (re-)stop testA (no-op)
+		self.cont.services = "testA"
+		stopA2 = self.cont.StopObject(self.ctx, self.node, self.html)
+		# should deploy testB
+		self.cont.services = "testB"
+		stopB = self.cont.StopObject(self.ctx, self.node, self.html)
+		# should not undeploy anything (everything already stopped)
+		self.cont.services = None
+		undeployAll = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
+		self.assertTrue(deploy)
+		self.assertFalse(stopC)
+		self.assertTrue(stopA)
+		self.assertTrue(stopA2)
+		self.assertTrue(stopB)
+		self.assertTrue(undeployAll)
+
 	def test_deployfails(self):
 		# fails reliably
 		old = self.cont.yamlPath

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_performance_baselines.yaml

@@ -0,0 +1,183 @@
+# --- Test Suite 1: Scalability vs. Channel Count ---
+Channels_16_Batch:
+  'Total GPU Time (us)': 5265.72
+  'Avg Time per Channel - GPU (us)': 329.11
+  'Threshold': 100.00
+
+Channels_16_Stream:
+  'Total GPU Time (us)': 5265.72
+  'Avg Time per Channel - GPU (us)': 329.11
+  'Threshold': 100.00
+
+Channels_16_Serial:
+  'Total GPU Time (us)': 5265.72
+  'Avg Time per Channel - GPU (us)': 329.11
+  'Threshold': 100.00
+
+Channels_256_Batch:
+  'Total GPU Time (us)': 85696.71
+  'Avg Time per Channel - GPU (us)': 334.75
+  'Threshold': 100.00
+
+Channels_256_Stream:
+  'Total GPU Time (us)': 85696.71
+  'Avg Time per Channel - GPU (us)': 334.75
+  'Threshold': 100.00
+
+Channels_256_Serial:
+  'Total GPU Time (us)': 85696.71
+  'Avg Time per Channel - GPU (us)': 334.75
+  'Threshold': 100.00
+
+Channels_1024_Batch:
+  'Total GPU Time (us)': 337217.10
+  'Avg Time per Channel - GPU (us)': 329.31
+  'Threshold': 100.00
+
+Channels_1024_Stream:
+  'Total GPU Time (us)': 337217.10
+  'Avg Time per Channel - GPU (us)': 329.31
+  'Threshold': 100.00 
+
+Channels_1024_Serial:
+  'Total GPU Time (us)': 337217.10
+  'Avg Time per Channel - GPU (us)': 329.31
+  'Threshold': 100.00
+
+# --- Test Suite 2: Performance vs. Channel Complexity ---
+Length_16_Batch:
+  'Total GPU Time (us)': 319082.56
+  'Avg Time per Channel - GPU (us)': 311.60
+  'Threshold': 100.00
+
+Length_16_Stream:
+  'Total GPU Time (us)': 319082.56
+  'Avg Time per Channel - GPU (us)': 311.60
+  'Threshold': 100.00
+
+Length_16_Serial:
+  'Total GPU Time (us)': 319082.56
+  'Avg Time per Channel - GPU (us)': 311.60
+  'Threshold': 100.00
+
+Length_64_Batch:
+  'Total GPU Time (us)': 366564.52
+  'Avg Time per Channel - GPU (us)': 357.97
+  'Threshold': 100.00
+
+Length_64_Stream:
+  'Total GPU Time (us)': 366564.52
+  'Avg Time per Channel - GPU (us)': 357.97
+  'Threshold': 100.00
+
+Length_64_Serial:
+  'Total GPU Time (us)': 366564.52
+  'Avg Time per Channel - GPU (us)': 357.97
+  'Threshold': 100.00
+
+Length_128_Batch:
+  'Total GPU Time (us)': 425883.51
+  'Avg Time per Channel - GPU (us)': 415.90
+  'Threshold': 100.00
+
+Length_128_Stream:
+  'Total GPU Time (us)': 425883.51
+  'Avg Time per Channel - GPU (us)': 415.90
+  'Threshold': 100.00 
+
+Length_128_Serial:
+  'Total GPU Time (us)': 425883.51
+  'Avg Time per Channel - GPU (us)': 415.90
+  'Threshold': 100.00
+
+# --- Test Suite 3: Performance vs. MIMO Configuration ---
+MIMO_2x2_Batch:
+  'Total GPU Time (us)': 158999.06
+  'Avg Time per Channel - GPU (us)': 155.27
+  'Threshold': 100.00
+
+MIMO_2x2_Stream:
+  'Total GPU Time (us)': 158999.06
+  'Avg Time per Channel - GPU (us)': 155.27
+  'Threshold': 100.00
+
+MIMO_2x2_Serial:
+  'Total GPU Time (us)': 158999.06
+  'Avg Time per Channel - GPU (us)': 155.27
+  'Threshold': 100.00
+
+MIMO_4x4_Batch:
+  'Total GPU Time (us)': 336377.55
+  'Avg Time per Channel - GPU (us)': 328.49
+  'Threshold': 100.00
+
+MIMO_4x4_Stream:
+  'Total GPU Time (us)': 336377.55
+  'Avg Time per Channel - GPU (us)': 328.49
+  'Threshold': 100.00
+
+MIMO_4x4_Serial:
+  'Total GPU Time (us)': 336377.55
+  'Avg Time per Channel - GPU (us)': 328.49
+  'Threshold': 100.00
+
+MIMO_8x8_Batch:
+  'Total GPU Time (us)': 718312.46
+  'Avg Time per Channel - GPU (us)': 701.48
+  'Threshold': 100.00
+
+MIMO_8x8_Stream:
+  'Total GPU Time (us)': 718312.46
+  'Avg Time per Channel - GPU (us)': 701.48
+  'Threshold': 100.00
+
+MIMO_8x8_Serial:
+  'Total GPU Time (us)': 718312.46
+  'Avg Time per Channel - GPU (us)': 701.48
+  'Threshold': 100.00
+
+# --- Test Suite 4: Performance vs. Signal Samples ---
+Samples_30720_Batch:
+  'Total GPU Time (us)': 84702.49
+  'Avg Time per Channel - GPU (us)': 82.72
+  'Threshold': 100.00
+
+Samples_30720_Stream:
+  'Total GPU Time (us)': 84702.49
+  'Avg Time per Channel - GPU (us)': 82.72
+  'Threshold': 100.00
+
+Samples_30720_Serial:
+  'Total GPU Time (us)': 84702.49
+  'Avg Time per Channel - GPU (us)': 82.72
+  'Threshold': 100.00
+
+Samples_61440_Batch:
+  'Total GPU Time (us)': 168761.94
+  'Avg Time per Channel - GPU (us)': 164.81
+  'Threshold': 100.00
+
+Samples_61440_Stream:
+  'Total GPU Time (us)': 168761.94
+  'Avg Time per Channel - GPU (us)': 164.81
+  'Threshold': 100.00
+
+Samples_61440_Serial:
+  'Total GPU Time (us)': 168761.94
+  'Avg Time per Channel - GPU (us)': 164.81
+  'Threshold': 100.00
+
+Samples_122880_Batch:
+  'Total GPU Time (us)': 336500.40
+  'Avg Time per Channel - GPU (us)': 328.61
+  'Threshold': 100.00
+
+Samples_122880_Stream:
+  'Total GPU Time (us)': 336500.40
+  'Avg Time per Channel - GPU (us)': 328.61
+  'Threshold': 100.00
+
+Samples_122880_Serial:
+  'Total GPU Time (us)': 336500.40
+  'Avg Time per Channel - GPU (us)': 328.61
+  'Threshold': 100.00

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_test_driver.py

@@ -0,0 +1,65 @@
+import argparse
+import os
+import subprocess
+import sys
+import yaml
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Test driver for the GPU benchmark suite.")
+    parser.add_argument("--executable", required=True, help="Path to the test_channel_scalability executable")
+    cli_args = parser.parse_args()
+
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+    matrix_file_path = os.path.join(script_dir, "gpu_test_matrix.yaml")
+
+    try:
+        with open(matrix_file_path) as f:
+            test_matrix = yaml.safe_load(f)
+    except FileNotFoundError:
+        print(f"ERROR: Test matrix file not found at {matrix_file_path}")
+        sys.exit(1)
+
+    failed_tests = []
+
+    for test_case in test_matrix["tests"]:
+        name = test_case["name"]
+        args = test_case["args"]
+
+        print(f"\n{'='*80}")
+        print(f"--- Running Test Case: {name} ---")
+        print(f"{'='*80}\n")
+
+        command = [
+            "python3",
+            os.path.join(script_dir, "run_gpu_benchmark.py"),
+            "--executable",
+            cli_args.executable,
+            "--args",
+            args,
+            "--test-case-name",
+            name,
+        ]
+
+        result = subprocess.run(command)
+
+        if result.returncode != 0:
+            print(f"\n--- !!! Test Case FAILED: {name} !!! ---\n")
+            failed_tests.append(name)
+        else:
+            print(f"\n--- Test Case PASSED: {name} ---\n")
+
+    print(f"\n{'='*80}")
+    print("--- Test Suite Summary ---")
+    if not failed_tests:
+        print("\033[92mAll test cases PASSED.\033[0m")
+        sys.exit(0)
+    else:
+        print(f"\033[91mThe following {len(failed_tests)} test case(s) FAILED:\033[0m")
+        for test_name in failed_tests:
+            print(f"  - {test_name}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_test_matrix.yaml

@@ -0,0 +1,76 @@
+tests:
+  # --- Test Suite 1: Scalability vs. Channel Count ---
+  - name: "Channels_16_Batch"
+    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Channels_16_Stream"
+    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Channels_16_Serial"
+    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+  - name: "Channels_256_Batch"
+    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Channels_256_Stream"
+    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Channels_256_Serial"
+    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+  - name: "Channels_1024_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Channels_1024_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Channels_1024_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+
+  # --- Test Suite 2: Performance vs. Channel Complexity ---
+  - name: "Length_16_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 16 -m batch -n 25"
+  - name: "Length_64_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m batch -n 25"
+  - name: "Length_64_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m stream -n 25"
+  - name: "Length_64_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m serial -n 25"
+  - name: "Length_128_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m batch -n 25"
+  - name: "Length_128_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m stream -n 25"
+  - name: "Length_128_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m serial -n 25"
+
+  # --- Test Suite 3: Performance vs. MIMO Configuration ---
+  - name: "MIMO_2x2_Batch"
+    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m batch -n 25"
+  - name: "MIMO_2x2_Stream"
+    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m stream -n 25"
+  - name: "MIMO_2x2_Serial"
+    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m serial -n 25"
+  - name: "MIMO_4x4_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "MIMO_4x4_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "MIMO_4x4_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
+  - name: "MIMO_8x8_Batch"
+    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m batch -n 25"
+  - name: "MIMO_8x8_Stream"
+    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m stream -n 25"
+  - name: "MIMO_8x8_Serial"
+    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m serial -n 25"
+
+  # --- Test Suite 4: Performance vs. Signal Samples ---
+  - name: "Samples_30720_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m batch -n 25"
+  - name: "Samples_30720_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m stream -n 25"
+  - name: "Samples_30720_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m serial -n 25"
+  - name: "Samples_61440_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m batch -n 25"
+  - name: "Samples_61440_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m stream -n 25"
+  - name: "Samples_61440_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m serial -n 25"
+  - name: "Samples_122880_Batch"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
+  - name: "Samples_122880_Stream"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
+  - name: "Samples_122880_Serial"
+    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"

ci-scripts/tests/nr_physim_gpu_benchmark/run_gpu_benchmark.py

@@ -0,0 +1,130 @@
+import argparse
+import json
+import os
+import re
+import subprocess
+import sys
+import time
+import yaml
+
+
+def parse_benchmark_output(log_text):
+    metrics = {}
+    pattern = re.compile(r"\|\s*(?P<key>[\w\s\(\)\-]+?)\s*\|\s*(?P<value>[\d\.]+)x?\s*\|")
+    for line in log_text.splitlines():
+        match = pattern.search(line)
+        if match:
+            key = match.group("key").strip()
+            value = float(match.group("value"))
+            metrics[key] = value
+    return metrics
+
+
+def analyze_gpu_log(log_file):
+    util_vals, power_vals = [], []
+    try:
+        with open(log_file, "r") as f:
+            for line in f:
+                if "utilization.gpu" in line:
+                    continue
+                parts = line.strip().split(",")
+                if len(parts) >= 2:
+                    try:
+                        util_vals.append(float(parts[0].strip()))
+                        power_vals.append(float(parts[1].strip()))
+                    except (ValueError, IndexError):
+                        continue
+    except FileNotFoundError:
+        return "N/A", "N/A"
+    if not util_vals or not power_vals:
+        return "N/A", "N/A"
+    avg_util = sum(util_vals) / len(util_vals)
+    max_util = max(util_vals)
+    avg_power = sum(power_vals) / len(power_vals)
+    max_power = max(power_vals)
+    return (f"Avg: {avg_util:.1f}%, Max: {max_util:.1f}%", f"Avg: {avg_power:.1f}W, Max: {max_power:.1f}W")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Run a single GPU benchmark and compare against a baseline.")
+    parser.add_argument("--executable", required=True, help="Path to the test_channel_scalability executable")
+    parser.add_argument("--args", required=True, help="Arguments to pass to the executable, in quotes")
+    parser.add_argument("--test-case-name", required=True, help="The name of the test case to look up in the baseline file")
+    cli_args = parser.parse_args()
+
+    gpu_log_file = "nvidia-smi.log"
+    monitor_command = f"nvidia-smi --query-gpu=utilization.gpu,power.draw --format=csv,noheader,nounits -l 1 > {gpu_log_file}"
+    monitor_process = subprocess.Popen(monitor_command, shell=True)
+    command = [cli_args.executable] + cli_args.args.split()
+    print(f"Running command: {' '.join(command)}")
+    result = subprocess.run(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    monitor_process.terminate()
+    time.sleep(1)
+
+    if result.returncode != 0:
+        print("--- Benchmark FAILED to run ---")
+        print(result.stdout)
+        print(result.stderr)
+        sys.exit(1)
+
+    print("--- Benchmark Ran Successfully ---")
+    print(result.stdout)
+
+    gpu_util_summary, gpu_power_summary = analyze_gpu_log(gpu_log_file)
+    print("\n--- GPU Monitoring Summary ---")
+    print(f"GPU Utilization: {gpu_util_summary}")
+    print(f"GPU Power Draw:  {gpu_power_summary}")
+
+    measured_metrics = parse_benchmark_output(result.stdout)
+    if not measured_metrics:
+        print("ERROR: Could not parse any metrics from the benchmark's text output.")
+        sys.exit(1)
+
+    try:
+        script_dir = os.path.dirname(os.path.realpath(__file__))
+        baseline_file_path = os.path.join(script_dir, "gpu_performance_baselines.yaml")
+        with open(baseline_file_path) as f:
+            all_baselines = yaml.safe_load(f)
+    except FileNotFoundError:
+        print(f"ERROR: Master baseline file not found at {baseline_file_path}")
+        sys.exit(1)
+
+    baseline_metrics = all_baselines.get(cli_args.test_case_name)
+    if not baseline_metrics:
+        print(f"ERROR: Could not find baseline entry for '{cli_args.test_case_name}' in {baseline_file_path}")
+        sys.exit(1)
+
+    all_metrics_ok = True
+    print("\n--- Performance Validation ---")
+    for key, baseline_value in baseline_metrics.items():
+        if key == "Threshold":
+            continue
+
+        if key in measured_metrics:
+            measured_value = measured_metrics[key]
+            threshold = baseline_metrics.get("Threshold", 0.25)
+            upper_bound = baseline_value * (1 + threshold)
+
+            print(f"Metric: '{key}'")
+            print(f"  - Measured: {measured_value:.2f}")
+            print(f"  - Baseline: {baseline_value:.2f}")
+            print(f"  - Allowed Upper Bound: {upper_bound:.2f}")
+
+            if measured_value > upper_bound:
+                print("  - STATUS: \033[91mFAILED (Exceeded threshold)\033[0m")
+                all_metrics_ok = False
+            else:
+                print("  - STATUS: \033[92mPASSED\033[0m")
+        else:
+            print(f"Metric '{key}' from baseline not found in run output. SKIPPING.")
+
+    if all_metrics_ok:
+        print("\nOverall Performance: PASSED")
+        sys.exit(0)
+    else:
+        print("\nOverall Performance: FAILED due to regression.")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

ci-scripts/tests/ping-iperf.py

@@ -23,7 +23,7 @@ class TestPingIperf(unittest.TestCase):
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.ci.ue_ids = ["test"]
-		self.ci.nodes = ["localhost"]
+		self.node = "localhost"
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
 	def tearDown(self):
 		with cls_cmd.LocalCmd() as c:
@@ -35,7 +35,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.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf(self):
@@ -50,7 +50,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.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf2_unidir(self):
@@ -62,7 +62,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.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf_highrate(self):
@@ -77,7 +77,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.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 if __name__ == '__main__':

ci-scripts/tests/simple-undep/docker-compose.yml

@@ -0,0 +1,23 @@
+services:
+  testA:
+    image: ubuntu:${TAG:-jammy}
+    container_name: test_container_A
+    cap_drop:
+      - ALL
+    entrypoint: /bin/bash -c "sleep infinity"
+    healthcheck:
+      test: /bin/bash -c "true"
+      interval: 1s
+      timeout: 1s
+      retries: 1
+  testB:
+    image: ubuntu:${TAG:-jammy}
+    container_name: test_container_B
+    cap_drop:
+      - ALL
+    entrypoint: /bin/bash -c "sleep infinity"
+    healthcheck:
+      test: /bin/bash -c "true"
+      interval: 1s
+      timeout: 1s
+      retries: 1

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

@@ -22,60 +22,51 @@
 -->
 
 <testCaseList>
-        <htmlTabRef>test</htmlTabRef>
-        <htmlTabName>Manual testing</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 000001
- 000011
- 000012
- 000002
- 000003
- 000004
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test</htmlTabRef>
+  <htmlTabName>Manual testing</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>This should succeed</desc>
+    <node>localhost</node>
+    <command>true</command>
+  </testCase>
 
-        <testCase id="000001">
-                <class>Custom_Command</class>
-                <desc>This should succeed</desc>
-                <node>localhost</node>
-                <command>true</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>This may fail</desc>
+    <may_fail>true</may_fail>
+    <node>localhost</node>
+    <command>false</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>
+    <class>Custom_Command</class>
+    <desc>This is still executed</desc>
+    <node>localhost</node>
+    <command>true</command>
+  </testCase>
 
-        <testCase id="000012">
-                <class>Custom_Command</class>
-                <desc>This is still executed</desc>
-                <node>localhost</node>
-                <command>true</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>This should fail</desc>
+    <node>localhost</node>
+    <command>false</command>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Custom_Command</class>
-                <desc>This should fail</desc>
-                <node>localhost</node>
-                <command>false</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>This should be skipped</desc>
+    <node>localhost</node>
+    <command>true</command>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Custom_Command</class>
-                <desc>This should be skipped</desc>
-                <node>localhost</node>
-                <command>true</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>This should be executed because marked so</desc>
+    <always_exec>true</always_exec>
+    <node>localhost</node>
+    <command>true</command>
+  </testCase>
 
-        <testCase id="000004">
-                <class>Custom_Command</class>
-                <desc>This should be executed because marked so</desc>
-                <always_exec>true</always_exec>
-                <node>localhost</node>
-                <command>true</command>
-        </testCase>
 </testCaseList>

ci-scripts/xml_class_list.yml

@@ -20,6 +20,7 @@
   - Build_Image
   - Build_Run_Tests
   - Deploy_Object
+  - Stop_Object
   - Undeploy_Object
   - Cppcheck_Analysis
   - Deploy_Run_OC_PhySim

ci-scripts/xml_files/cluster_image_build.xml

@@ -21,23 +21,20 @@
 -->
 
 <testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build Images on Cluster</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-	000002
-	000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-	<testCase id="000002">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace</desc>
-		<node>poseidon</node>
-	</testCase>
-	<testCase id="000001">
-		<class>Build_Cluster_Image</class>
-		<desc>Build Images on OpenShift Cluster</desc>
-		<node>poseidon</node>
-	</testCase>
+  <htmlTabRef>build-tab</htmlTabRef>
+  <htmlTabName>Build Images on Cluster</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>poseidon</node>
+  </testCase>
+
+  <testCase>
+    <class>Build_Cluster_Image</class>
+    <desc>Build Images on OpenShift Cluster</desc>
+    <node>poseidon</node>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -21,136 +21,122 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>l2sim-4glte-tdd</htmlTabRef>
-        <htmlTabName>Testing 4G LTE L2 sim - FDD eNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000000
- 000001
- 000002
- 000003
- 000004
- 020001
- 020002
- 030011
- 030012
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>l2sim-4glte-tdd</htmlTabRef>
+  <htmlTabName>Testing 4G LTE L2 sim - FDD eNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb oai-lte-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000000">
-                <class>Deploy_Object</class>
-                <desc>Deploy Cassandra Database</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-                <services>cassandra db_init</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb oai-lte-ue</images>
+  </testCase>
 
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-                <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB L2 sim</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-                <services>oai_enb</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy Cassandra Database</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
+    <services>cassandra db_init</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI L2 sim 4G LTE-UE 1 and Proxy</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-                <services>proxy oai_ue1</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
+    <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+  </testCase>
 
-        <testCase id="000004">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE</desc>
-                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB L2 sim</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
+    <services>oai_enb</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping trf-gen from LTE-UE 1</desc>
-                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI L2 sim 4G LTE-UE 1 and Proxy</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
+    <services>proxy oai_ue1</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping LTE-UE 1 from trf-gen</desc>
-                <id>l2sim4g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>l2sim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE</desc>
+    <id>l2sim4g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP Downlink</desc>
-                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_args>-u -t 30 -b 1M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping trf-gen from LTE-UE 1</desc>
+    <id>l2sim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>l2sim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP Uplink</desc>
-                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_args>-u -t 30 -b 3M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping LTE-UE 1 from trf-gen</desc>
+    <id>l2sim4g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>l2sim4g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <node>localhost</node>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP Downlink</desc>
+    <id>l2sim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>l2sim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_args>-u -t 30 -b 1M -R</iperf_args>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb oai-lte-ue</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP Uplink</desc>
+    <id>l2sim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>l2sim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_args>-u -t 30 -b 3M</iperf_args>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <node>localhost</node>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb oai-lte-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -21,151 +21,140 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd05mhz</htmlTabRef>
-        <htmlTabName>Monolithic eNB - FDD 05MHz</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000015
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <htmlTabRef>rfsim-4glte-fdd05mhz</htmlTabRef>
+  <htmlTabName>Monolithic eNB - FDD 05MHz</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="000011">
-                <class>Deploy_Object</class>
-                <desc>Deploy Cassandra Database</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-                <services>cassandra db_init</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy Cassandra Database</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+    <services>cassandra db_init</services>
+  </testCase>
 
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-                <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+    <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000015">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <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>localhost</nodes>
-                <svr_node>localhost</svr_node>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>localhost</nodes>
-                <svr_node>localhost</svr_node>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Traffic-Gen from LTE-UE</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping LTE-UE from Traffic-Gen</desc>
+    <id>rfsim4g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP UL</desc>
+    <id>rfsim4g_ue</id>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <iperf_args>-u -t 30 -b 1M</iperf_args>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <node>localhost</node>
+    <svr_node>localhost</svr_node>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <iperf_args>-u -t 30 -b 2M -R</iperf_args>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <node>localhost</node>
+    <svr_node>localhost</svr_node>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -21,124 +21,111 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd05mhz-noS1</htmlTabRef>
-        <htmlTabName>Monolithic eNB - FDD 05MHz - noS1</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
-800813
- 000013
- 000002
- 000014
- 000001
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-4glte-fdd05mhz-noS1</htmlTabRef>
+  <htmlTabName>Monolithic eNB - FDD 05MHz - noS1</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping LTE-UE from eNB</desc>
-                <id>rfsim4g_enb_nos1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Traffic-Gen from LTE-UE</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_enb_nos1</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping LTE-UE from eNB</desc>
+    <id>rfsim4g_enb_nos1</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_enb_nos1</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP UL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_enb_nos1</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -21,151 +21,140 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd10mhz</htmlTabRef>
-        <htmlTabName>Monolithic eNB - FDD 10MHz</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000015
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-4glte-fdd10mhz</htmlTabRef>
+  <htmlTabName>Monolithic eNB - FDD 10MHz</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000011">
-                <class>Deploy_Object</class>
-                <desc>Deploy Cassandra Database</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-                <services>cassandra db_init</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy Cassandra Database</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+    <services>cassandra db_init</services>
+  </testCase>
 
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-                <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (FDD 10MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+    <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (FDD 10MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000015">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (FDD 10MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (FDD 10MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Traffic-Gen from LTE-UE</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping LTE-UE from Traffic-Gen</desc>
+    <id>rfsim4g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP UL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -21,151 +21,140 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd20mhz</htmlTabRef>
-        <htmlTabName>Monolithic eNB - FDD 20MHz</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000015
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-4glte-fdd20mhz</htmlTabRef>
+  <htmlTabName>Monolithic eNB - FDD 20MHz</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000011">
-                <class>Deploy_Object</class>
-                <desc>Deploy Cassandra Database</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-                <services>cassandra db_init</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy Cassandra Database</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+    <services>cassandra db_init</services>
+  </testCase>
 
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-                <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (FDD 20MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+    <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (FDD 20MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000015">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (FDD 20MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (FDD 20MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Traffic-Gen from LTE-UE</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping LTE-UE from Traffic-Gen</desc>
+    <id>rfsim4g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP UL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -21,87 +21,77 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-fembms</htmlTabRef>
-        <htmlTabName>Monolithic eNB - FeMBMS</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000013
- 000002
- 000014
- 000001
- 030011
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-4glte-fembms</htmlTabRef>
+  <htmlTabName>Monolithic eNB - FeMBMS</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (FeMBMS)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (FeMBMS)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (FeMBMS)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf2_Unidir</class>
-                <desc>Iperf2 UDP DL</desc>
-                <id>rfsim4g_ue_fembms</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_enb_fembms</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (FeMBMS)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf2_Unidir</class>
+    <desc>Iperf2 UDP DL</desc>
+    <id>rfsim4g_ue_fembms</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_enb_fembms</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -21,87 +21,77 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-mbms</htmlTabRef>
-        <htmlTabName>Monolithic eNB - MBMS</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000013
- 000002
- 000014
- 000001
- 030011
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-4glte-mbms</htmlTabRef>
+  <htmlTabName>Monolithic eNB - MBMS</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (MBMS)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (MBMS)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (MBMS)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (MBMS)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb-asan oai-lte-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_enb_nos1</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb-asan oai-lte-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -21,144 +21,139 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
-        <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000002
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
+  <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-enb oai-lte-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000011">
-                <class>Deploy_Object</class>
-                <desc>Deploy Cassandra Database</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-                <services>cassandra db_init</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-enb oai-lte-ue</images>
+  </testCase>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy Cassandra Database</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+    <services>cassandra db_init</services>
+  </testCase>
 
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-                <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G eNB RF sim (TDD 05MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-                <services>oai_enb0</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+    <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
+  </testCase>
 
-        <testCase id="000014">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 4G LTE-UE RF sim (TDD 05MHz)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-                <services>oai_ue0</services>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G eNB RF sim (TDD 05MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+    <services>oai_enb0</services>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 4G LTE-UE RF sim (TDD 05MHz)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+    <services>oai_ue0</services>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Traffic-Gen from LTE-UE</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-enb oai-lte-ue</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping LTE-UE from Traffic-Gen</desc>
+    <id>rfsim4g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP UL</desc>
+    <id>rfsim4g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <svr_node>localhost</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>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 4G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-enb oai-lte-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -21,91 +21,81 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-e1</htmlTabRef>
-        <htmlTabName>CUCP-CUUP-DU E1+F1 split</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000021
- 000022
- 000023
- 000024
- 020021
- 100021
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-e1</htmlTabRef>
+  <htmlTabName>CUCP-CUUP-DU E1+F1 split</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000021">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
+  </testCase>
 
-        <testCase id="000022">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000023">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf</services>
+  </testCase>
 
-        <testCase id="000024">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>localhost localhost localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
+    <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
+  </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>localhost localhost localhost</nodes>
-                <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
+    <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
+  </testCase>
 
-        <testCase id="100021">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <node>localhost</node>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from all NR-UEs</desc>
+    <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <node>localhost</node>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -21,235 +21,306 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-f1</htmlTabRef>
-        <htmlTabName>CU-DU F1 split</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000021
- 000022
- 000023
- 020021
- 030020
- 030021
- 030022
- 040001
- 020022
- 040002
- 030021
- 030022
- 040021
- 000030
- 040022
- 040023
- 020022
- 040024
- 000024
- 000030
- 040025
- 000031
- 030021
- 040027
- 040025
- 000031
- 020022
- 040026
- 040025
- 000031
- 020022
- 040027
- 100021
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-f1</htmlTabRef>
+  <htmlTabName>CU-DU F1 split</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000021">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="000022">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU + DU-PCI0 + UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-cu oai-du-pci0 oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000030">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000031">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CU + DU-PCI0 + UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+    <services>oai-cu oai-du-pci0 oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="000023">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000024">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G (target) DU-PCI1 RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-du-pci1</services>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from all NR-UEs</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020021">
-                <class>Ping</class>
-                <desc>Ping ext-dn from all NR-UEs</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Simulate a DL radio channel with noise (3 dB)</desc>
+    <node>localhost</node>
+    <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
+  </testCase>
 
-        <testCase id="030020">
-                <class>Custom_Command</class>
-                <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>localhost</node>
-                <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="030021">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="030022">
-                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment</desc>
+    <node>localhost</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>
+  </testCase>
 
-        <testCase id="040001">
-                <class>Custom_Command</class>
-                <desc>Trigger Reestablishment</desc>
-                <node>localhost</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>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.5 -w25</ping_args>
-                <ping_packetloss_threshold>80</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment</desc>
+    <node>localhost</node>
+    <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+  </testCase>
 
-        <testCase id="040002">
-                <class>Custom_Command</class>
-                <desc>Verify Reestablishment</desc>
-                <node>localhost</node>
-                <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="040021">
-                <class>Custom_Command</class>
-                <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
-                <node>localhost</node>
-                <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="040022">
-                <class>Custom_Command</class>
-                <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
-                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
+    <node>localhost</node>
+    <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
+  </testCase>
 
-        <testCase id="040023">
-                <class>Custom_Command</class>
-                <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
-                <node>localhost</node>
-                <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="040024">
-                <class>Custom_Command</class>
-                <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
-                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Get UE sync state (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
+  </testCase>
 
-        <testCase id="040025">
-                <class>Custom_Command</class>
-                <desc>Trigger Handover</desc>
-                <node>localhost</node>
-                <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
+    <node>localhost</node>
+    <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
+  </testCase>
 
-        <testCase id="040026">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="040027">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Get UE sync state (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
+  </testCase>
 
-        <testCase id="100021">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <d_retx_th>30,100,100,100</d_retx_th>
-                <u_retx_th>30,100,100,100</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G (target) DU-PCI1 RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+    <services>oai-du-pci1</services>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 0?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+    <d_retx_th>30,100,100,100</d_retx_th>
+    <u_retx_th>30,100,100,100</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -21,120 +21,108 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
-        <htmlTabName>Monolithic FDD gNB with SDAP</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000012
- 000013
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
+  <htmlTabName>Monolithic FDD gNB with SDAP</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000011">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
 
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 3M -t 30 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-ue</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 3M -t 30</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -21,173 +21,206 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-flexric</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD gNB and FlexRic Integration</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>1</repeatCount>
-        <TestCaseRequestedList>
- 111110
- 111111
- 111112
- 000001
- 000002
- 000003
- 010000
- 000004
- 333333
- 010001
- 010002
- 010003
- 020005
- 002006
- 444444
- 100002
- 100001
- 222221
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-flexric</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD gNB and FlexRic Integration</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111110">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-ue</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-flexric</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-flexric</images>
+  </testCase>
 
-        <testCase id="222221">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-ue</images>
-                <always_exec>true</always_exec>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Updating CN5G images</desc>
+    <node>localhost</node>
+    <command>docker compose -f ../doc/tutorial_resources/oai-cn5g/docker-compose.yaml pull</command>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-flexric</images>
-                <always_exec>true</always_exec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
+    <services>mysql oai-nrf oai-udr oai-udm oai-ausf oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="111112">
-                <class>Custom_Command</class>
-                <desc>Updating CN5G images</desc>
-                <node>localhost</node>
-                <command>docker compose -f ../doc/tutorial_resources/oai-cn5g/docker-compose.yaml pull</command>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI nearRT-RIC</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>nearRT-RIC</services>
+  </testCase>
 
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
-                <services>mysql oai-nrf oai-udr oai-udm oai-ausf oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB in RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>oai-gnb</services>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI FlexRIC</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-flexric</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy RC monitoring</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-rc-moni</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB in RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy 2 OAI 5G NR-UEs in RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>oai-nr-ue oai-nr-ue2</services>
+  </testCase>
 
-        <testCase id="000004">
-                <class>Deploy_Object</class>
-                <desc>Deploy 2 OAI 5G NR-UEs in RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2</services>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>carabe</node>
+  </testCase>
 
-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>carabe carabe</nodes>
-                <svr_id>oai_ext_dn</svr_id>
-                <svr_node>carabe</svr_node>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy KPM monitoring</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-kpm-moni</services>
+  </testCase>
 
-        <testCase id="333333">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>carabe carabe</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy KPM monitoring and RC control</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-kpm-rc</services>
+  </testCase>
 
-        <testCase id="444444">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>carabe carabe</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy custom SMs monitoring</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-gtp-mac-rlc-pdcp-moni</services>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy Core Network</desc>
-                <node>localhost</node>
-                <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
-                <always_exec>true</always_exec>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from both UEs</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>carabe</node>
+    <svr_id>oai_ext_dn</svr_id>
+    <svr_node>carabe</svr_node>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy RAN and Flexric</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <always_exec>true</always_exec>
-        </testCase>
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>carabe</node>
+  </testCase>
 
-        <testCase id="010000">
-                <class>Deploy_Object</class>
-                <desc>RC monitoring</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
-        </testCase>
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop RC monitoring xApp</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-rc-moni</services>
+  </testCase>
 
-        <testCase id="010001">
-                <class>Deploy_Object</class>
-                <desc>KPM monitoring</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
-        </testCase>
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop KPM monitoring xApp</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-kpm-moni</services>
+  </testCase>
 
-        <testCase id="010002">
-                <class>Deploy_Object</class>
-                <desc>KPM monitoring and RC control</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-        </testCase>
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop KPM monitoring and RC control xApp</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-kpm-rc</services>
+  </testCase>
 
-        <testCase id="010003">
-                <class>Deploy_Object</class>
-                <desc>Custom SMs monitoring</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
-        </testCase>
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop custom SMs monitoring xApp</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-gtp-mac-rlc-pdcp-moni</services>
+  </testCase>
+
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop OAI UEs</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>oai-nr-ue oai-nr-ue2</services>
+  </testCase>
+
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop OAI gNB</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>oai-gnb</services>
+  </testCase>
+
+  <testCase>
+    <class>Stop_Object</class>
+    <desc>Stop nearRT-RIC</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>nearRT-RIC</services>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <desc>Undeploy RAN and FlexRIC</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <always_exec>true</always_exec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <desc>Undeploy Core Network</desc>
+    <node>localhost</node>
+    <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
+    <always_exec>true</always_exec>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+    <always_exec>true</always_exec>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-flexric</images>
+    <always_exec>true</always_exec>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -21,240 +21,238 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 000004
- 000005
- 000006
- 000007
- 000008
- 020001
- 020002
- 020003
- 020004
- 020105
- 444445
- 030001
- 030002
- 444444
- 333333
- 020005
- 444444
- 333333
- 020005
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000004">
-                <class>Deploy_Object</class>
-                <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue2</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>oai-gnb</services>
+  </testCase>
 
-        <testCase id="000005">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="000006">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>oai-nr-ue2</services>
+  </testCase>
 
-        <testCase id="000007">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue9 oai-nr-ue10</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
+  </testCase>
 
-        <testCase id="000008">
-                <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>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+    <services>oai-nr-ue9 oai-nr-ue10</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <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>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="020003">
-                <class>Ping</class>
-                <desc>Ping ext-dn from Second NR-UE</desc>
-                <id>rfsim5g_ue2</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020004">
-                <class>Ping</class>
-                <desc>Ping Second NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue2</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>localhost localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from Second NR-UE</desc>
+    <id>rfsim5g_ue2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020105">
-                <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>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Second NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue2</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <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>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UE 3 to 10</desc>
+    <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="333333">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>localhost localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="444444">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>localhost localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="444445">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 3 to 10</desc>
-                <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <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>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from both UEs</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from both UEs</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <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>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -21,156 +21,250 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-24prb-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD gNB 24PRB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 030001
- 030002
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040001
- 000004
- 020001
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-24prb-5gnr-tdd</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD gNB 24PRB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000004">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args> -c 20 -i0.5</ping_args>
-                <ping_packetloss_threshold>80</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="040001">
-                <class>Custom_Command</class>
-                <desc>Force Msg3 C-RNTI RA</desc>
-                <node>localhost</node>
-                <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="040002">
-                <class>Custom_Command</class>
-                <desc>Force RRC_IDLE (UE ID 0)</desc>
-                <node>localhost</node>
-                <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force Msg3 C-RNTI RA</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -21,120 +21,108 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-tdd-2x2</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD 2x2 gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 030001
- 030002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-tdd-2x2</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD 2x2 gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 10M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_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>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 10M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -21,120 +21,108 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-fdd-phytest</htmlTabRef>
-        <htmlTabName>Monolithic FDD phytest gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 004000
- 000010
- 000011
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-fdd-phytest</htmlTabRef>
+  <htmlTabName>Monolithic FDD phytest gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000010">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000011">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
-                <services>oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Clean-Up any residual volume</desc>
+    <node>localhost</node>
+    <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
+  </testCase>
 
-        <testCase id="020011">
-                <class>Ping</class>
-                <desc>Ping gNB from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c20 -i0.2</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+    <services>oai-gnb</services>
+  </testCase>
 
-        <testCase id="020012">
-                <class>Ping</class>
-                <desc>Ping NR-UE from gNB</desc>
-                <id>rfsim5g_gnb_nos1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c20 -i0.2</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+    <services>oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <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>localhost</nodes>
-                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping gNB from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_gnb_nos1</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c20 -i0.2</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <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>localhost</nodes>
-                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from gNB</desc>
+    <id>rfsim5g_gnb_nos1</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c20 -i0.2</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
-                <d_retx_th>10,100,100,100</d_retx_th> <!-- phytest: will fail at start! -->
-                <u_retx_th>10,100,100,100</u_retx_th> <!-- phytest: will fail at start! -->
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_gnb_nos1</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_gnb_nos1</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -21,96 +21,84 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic FR2 gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000000
- 000001
- 000013
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
+  <htmlTabName>Monolithic FR2 gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000000">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI gNB</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI gNB</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI NR-UE</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI NR-UE</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.2</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.2</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.2</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.2</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <d_retx_th>10,0,0,0</d_retx_th>
-                <u_retx_th>10,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+    <d_retx_th>10,0,0,0</d_retx_th>
+    <u_retx_th>10,0,0,0</u_retx_th>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_multiue.xml

@@ -21,185 +21,156 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-tdd-multiue</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD gNB multiue</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 000008
- 020001
- 020002
- 020003
- 020004
- 020105
- 444445
- 030001
- 030002
- 444444
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-tdd-multiue</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD gNB multiue</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
-                <services>oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000008">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
+    <services>oai-gnb</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
+    <services>oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_multiue1</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="020003">
-                <class>Ping</class>
-                <desc>Ping ext-dn from Second NR-UE</desc>
-                <id>rfsim5g_multiue2</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_multiue1</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020004">
-                <class>Ping</class>
-                <desc>Ping Second NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_multiue2</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_multiue1</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2</id>
-                <nodes>localhost localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from Second NR-UE</desc>
+    <id>rfsim5g_multiue2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020105">
-                <class>Ping</class>
-                <desc>Ping ext-dn from all UEs</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping Second NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_multiue2</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from all UEs</desc>
+    <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_multiue1</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="444444">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UEs</desc>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_multiue1</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </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_multiue</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-                <node>localhost</node>
-        </testCase>
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UEs</desc>
+    <id>rfsim5g_multiue1</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue</images>
-        </testCase>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -21,179 +21,222 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-f1-n2-ho</htmlTabRef>
-        <htmlTabName>F1 SA TDD N2 Handover</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 000004
- 040001
- 050001
- 020001
- 020002
- 050002
- 030001
- 030002
- 050003
- 020001
- 020002
- 050004
- 050001
- 020001
- 020002
- 050002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-f1-n2-ho</htmlTabRef>
+  <htmlTabName>F1 SA TDD N2 Handover</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+    <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000004">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 50 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+    <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 50 -i 0.25</ping_args>
-                <ping_packetloss_threshold>10</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger N2 Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
+    <command_fail>yes</command_fail>
+  </testCase>
 
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="040001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>10</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="050001">
-                <class>Custom_Command</class>
-                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
-                <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
-                <command_fail>yes</command_fail>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+  </testCase>
 
-        <testCase id="050002">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="050003">
-                <class>Custom_Command</class>
-                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
-                <command>echo ci trigger_n2_ho 0,1 | ncat 192.168.71.180 9090</command>
-                <command_fail>yes</command_fail>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="050004">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger N2 Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_n2_ho 0,1 | ncat 192.168.71.180 9090</command>
+    <command_fail>yes</command_fail>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <d_retx_th>10,100,100,100</d_retx_th>
-                <u_retx_th>10,100,100,100</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>10</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 0?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger N2 Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>10</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -21,125 +21,131 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-ntn-geo</htmlTabRef>
-        <htmlTabName>Monolithic SA NTN GEO gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 040001
- 020022
- 040002
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-ntn-geo</htmlTabRef>
+  <htmlTabName>Monolithic SA NTN GEO gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</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>localhost</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>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i0.5 -w25</ping_args>
-                <ping_packetloss_threshold>80</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment</desc>
+    <node>localhost</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="040002">
-                <class>Custom_Command</class>
-                <desc>Verify Reestablishment</desc>
-                <node>localhost</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>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment</desc>
+    <node>localhost</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="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -21,93 +21,131 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-ntn-Leo</htmlTabRef>
-        <htmlTabName>Monolithic SA NTN LEO gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-ntn-Leo</htmlTabRef>
+  <htmlTabName>Monolithic SA NTN LEO gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment</desc>
+    <node>localhost</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>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment</desc>
+    <node>localhost</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>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_prs.xml

@@ -0,0 +1,89 @@
+<!--
+
+ 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-prs</htmlTabRef>
+  <htmlTabName>Monolithic gNB with PRS</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Script</class>
+    <always_exec>true</always_exec>
+    <desc>Set and verify distance at 50, 100, 150 m</desc>
+    <node>localhost</node>
+    <script>scripts/set-and-verify-distance-prs.sh</script>
+    <args>50 100 150</args>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
+    <d_retx_th>30,100,100,100</d_retx_th>
+    <u_retx_th>30,100,100,100</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -21,79 +21,68 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-sidelink</htmlTabRef>
-        <htmlTabName>Sidelink test</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000002
- 000003
- 000004
- 000005
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-sidelink</htmlTabRef>
+  <htmlTabName>Sidelink test</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G UE 1</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
-                <services>oai-nr-ue-1</services>
-        </testCase>
-        
-        <testCase id="000003"> 
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G UE 2</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
-                <services>oai-nr-ue-2</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G UE 1</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
+    <services>oai-nr-ue-1</services>
+  </testCase>
 
-        <testCase id="000004">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G UE 2</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
+    <services>oai-nr-ue-2</services>
+  </testCase>
 
-        <testCase id="000005">
-                <class>Custom_Command</class>
-                <desc>Check that UE synched</desc>
-                <node>localhost</node>
-                <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check that UE synched</desc>
+    <node>localhost</node>
+    <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_simple.xml

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

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -21,102 +21,97 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-tdd-dora-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic do-ra TDD gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 004000
- 000000
- 000001
- 000030		
- 020001
- 020002
- 100001
- 004000
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-tdd-dora-5gnr-tdd</htmlTabRef>
+  <htmlTabName>Monolithic do-ra TDD gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000000">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI gNB</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI NR-UE</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
-                <services>oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Clean-Up any residual volume</desc>
+    <node>localhost</node>
+    <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
+  </testCase>
 
-        <testCase id="000030">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI gNB</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+    <services>oai-gnb</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping gNB from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c20 -i0.2</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI NR-UE</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+    <services>oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from gNB</desc>
-                <id>rfsim5g_gnb_nos1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c20 -i0.2</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
-                <d_retx_th>0,0,0,0</d_retx_th>
-                <u_retx_th>0,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping gNB from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_gnb_nos1</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c20 -i0.2</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from gNB</desc>
+    <id>rfsim5g_gnb_nos1</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c20 -i0.2</ping_args>
+    <ping_packetloss_threshold>0</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+    <d_retx_th>0,0,0,0</d_retx_th>
+    <u_retx_th>0,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Clean-Up any residual volume</desc>
+    <node>localhost</node>
+    <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -21,141 +21,169 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-fdd-u0-25prb</htmlTabRef>
-        <htmlTabName>VNF-PNF nFAPI FDD u0 25PRB gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 000004
- 020003
- 030001
- 030002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-fdd-u0-25prb</htmlTabRef>
+  <htmlTabName>VNF-PNF nFAPI FDD u0 25PRB gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G VNF+PNF+nrUE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-vnf oai-pnf oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G VNF+PNF+nrUE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+    <services>oai-vnf oai-pnf oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000004">
-                <class>Attach_UE</class>
-                <desc>Verify 2nd PDU session is up</desc>
-                <id>rfsim5g_ue_pdu_2</id>
-                <nodes>localhost</nodes>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </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>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Verify 2nd PDU session is up</desc>
+    <id>rfsim5g_ue_pdu_2</id>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
+    <id>rfsim5g_ue_pdu_2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <services>oai-vnf oai-pnf</services>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger PDU Session Release via gNB telnet</desc>
+    <node>acamas</node>
+    <command>echo ci pdu_session_release 2 | ncat 192.168.71.140 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Add PDU Session via UE telnet</desc>
+    <node>acamas</node>
+    <command>echo ci add_pdu_session 6,7 | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger PDU Session Release via gNB telnet</desc>
+    <node>acamas</node>
+    <command>echo ci pdu_session_release 6 | ncat 192.168.71.140 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_vrtsim_chanmod.xml

@@ -0,0 +1,128 @@
+<!--
+
+ 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>vrtsim-5gnr-chanmod</htmlTabRef>
+  <htmlTabName>Monolithic gNB vrtsim + chanmod</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_vrtsim_chanmod_gh.xml

@@ -0,0 +1,129 @@
+<!--
+
+ 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>vrtsim-5gnr-chanmod-gh</htmlTabRef>
+  <htmlTabName>Monolithic gNB vrtsim + chanmod</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+    <tag_prefix>arm_</tag_prefix>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 3M -t 30 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 1M -t 30</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_build_run_tests.xml

@@ -21,19 +21,15 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>build-run-test-tab</htmlTabRef>
-	<htmlTabName>Build and Run Unit Tests</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>build-run-test-tab</htmlTabRef>
+  <htmlTabName>Build and Run Unit Tests</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-	<testCase id="030201">
-		<class>Build_Run_Tests</class>
-		<desc>Build and Run UnitTests</desc>
-		<node>obelix</node>
-		<kind>all</kind>
-	</testCase>
+  <testCase>
+    <class>Build_Run_Tests</class>
+    <desc>Build and Run UnitTests</desc>
+    <node>obelix</node>
+    <kind>all</kind>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_image_build.xml

@@ -21,32 +21,27 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build Container Images</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 800813
- 000001
- 000010
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>build-tab</htmlTabRef>
+  <htmlTabName>Build Container Images</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-	<testCase id="800813">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace for server 0</desc>
-		<node>obelix</node>
-	</testCase>
-	<testCase id="000001">
-		<class>Build_Image</class>
-		<desc>Build all Images</desc>
-		<node>obelix</node>
-		<kind>all</kind>
-	</testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>obelix</node>
+  </testCase>
 
-	<testCase id="000010">
-		<class>Push_Local_Registry</class>
-		<desc>Push Images to Local Registry</desc>
-		<node>obelix</node>
-	</testCase>
+  <testCase>
+    <class>Build_Image</class>
+    <desc>Build all Images</desc>
+    <node>obelix</node>
+    <kind>all</kind>
+  </testCase>
+
+  <testCase>
+    <class>Push_Local_Registry</class>
+    <desc>Push Images to Local Registry</desc>
+    <node>obelix</node>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_image_build_arm.xml

@@ -21,33 +21,28 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build Container Images for ARM</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 800813
- 000001
- 000010
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>build-tab</htmlTabRef>
+  <htmlTabName>Build Container Images for ARM</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-	<testCase id="800813">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace for server 0</desc>
-		<node>gracehopper3-oai</node>
-	</testCase>
-	<testCase id="000001">
-		<class>Build_Image</class>
-		<desc>Build all Images</desc>
-		<node>gracehopper3-oai</node>
-		<kind>native_armv9</kind>
-	</testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>gracehopper3-oai</node>
+  </testCase>
 
-        <testCase id="000010">
-                <class>Push_Local_Registry</class>
-                <desc>Push Images to Local Registry</desc>
-                <node>gracehopper3-oai</node>
-                <tag_prefix>arm_</tag_prefix>
-        </testCase>
+  <testCase>
+    <class>Build_Image</class>
+    <desc>Build all Images</desc>
+    <node>gracehopper3-oai</node>
+    <kind>native_armv9</kind>
+  </testCase>
+
+  <testCase>
+    <class>Push_Local_Registry</class>
+    <desc>Push Images to Local Registry</desc>
+    <node>gracehopper3-oai</node>
+    <tag_prefix>arm_</tag_prefix>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_image_build_cross.xml

@@ -21,24 +21,21 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build Container Images</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 100001
- 000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-	<testCase id="100001">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace</desc>
-		<node>alambix</node>
-	</testCase>
-	<testCase id="000001">
-		<class>Build_Image</class>
-		<desc>Cross-Compile for ARM64</desc>
-		<kind>build_cross_arm64</kind>
-		<node>alambix</node>
-	</testCase>
+  <htmlTabRef>build-tab</htmlTabRef>
+  <htmlTabName>Build Container Images</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>alambix</node>
+  </testCase>
+
+  <testCase>
+    <class>Build_Image</class>
+    <desc>Cross-Compile for ARM64</desc>
+    <kind>build_cross_arm64</kind>
+    <node>alambix</node>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_image_build_jetson.xml

@@ -21,33 +21,28 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>build-tab</htmlTabRef>
-        <htmlTabName>Build Container Images for ARM</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 800813
- 000001
- 000010
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>build-tab</htmlTabRef>
+  <htmlTabName>Build Container Images for ARM</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace for server 0</desc>
-                <node>jetson3-oai</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Build_Image</class>
-                <desc>Build all Images</desc>
-                <node>jetson3-oai</node>
-                <kind>native_armv8</kind>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>jetson3-oai</node>
+  </testCase>
 
-        <testCase id="000010">
-                <class>Push_Local_Registry</class>
-                <desc>Push Images to Local Registry</desc>
-                <node>jetson3-oai</node>
-                <tag_prefix>armv8_</tag_prefix>
-        </testCase>
+  <testCase>
+    <class>Build_Image</class>
+    <desc>Build all Images</desc>
+    <node>jetson3-oai</node>
+    <kind>native_armv8</kind>
+  </testCase>
+
+  <testCase>
+    <class>Push_Local_Registry</class>
+    <desc>Push Images to Local Registry</desc>
+    <node>jetson3-oai</node>
+    <tag_prefix>armv8_</tag_prefix>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -21,19 +21,15 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
-        <htmlTabName>Build L2sim proxy image</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 000001
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
+  <htmlTabName>Build L2sim proxy image</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="000001">
-                <class>Build_Proxy</class>
-                <desc>Build L2sim Proxy Image</desc>
-                <node>localhost</node>
-                <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
-        </testCase>
+  <testCase>
+    <class>Build_Proxy</class>
+    <desc>Build L2sim Proxy Image</desc>
+    <node>localhost</node>
+    <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -23,195 +23,182 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-05-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-05MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-300000
-040101 
-800813
-030101
-040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
-030201
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-05-tm1</htmlTabRef>
+  <htmlTabName>Test-FDD-05MHz-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="300000">
-        <class>Custom_Command</class>
-        <desc>Reset USRP</desc>
-        <node>hutch</node>
-        <command>sudo -S b2xx_fx3_utils --reset-device</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030101">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Reset USRP</desc>
+    <node>hutch</node>
+    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
 
-    <testCase id="030201">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040501">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
+  </testCase>
 
-    <testCase id="040603">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UEs</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040604">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040605">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040606">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040607">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040641">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040642">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040643">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 9M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040644">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 9M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UEs</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -21,178 +21,166 @@
 
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-05-tm1-if4-5</htmlTabRef>
-    <htmlTabName>Test-FDD-05MHz-TM1-IF4.5</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-300000
-040101
-800813
-030131
-030132
-040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
-030231
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-05-tm1-if4-5</htmlTabRef>
+  <htmlTabName>Test-FDD-05MHz-TM1-IF4.5</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="300000">
-        <class>Custom_Command</class>
-        <desc>Reset USRP</desc>
-        <node>hutch</node>
-        <command>sudo -S b2xx_fx3_utils --reset-device</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030131">
-        <class>Deploy_Object</class>
-        <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-        <services>rru_fdd</services>
-    </testCase>
-    <testCase id="030132">
-        <class>Deploy_Object</class>
-        <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-        <services>rcc_fdd</services>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Reset USRP</desc>
+    <node>hutch</node>
+    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
 
-    <testCase id="030231">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy RCC/RRU</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040531">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+    <services>rru_fdd</services>
+  </testCase>
 
-    <testCase id="040633">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+    <services>rcc_fdd</services>
+  </testCase>
 
-    <testCase id="040634">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UEs</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040636">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040671">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040672">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040673">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 9M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 9M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UEs</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy RCC/RRU</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -23,161 +23,155 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
 
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-05-rrc-inactivity</htmlTabRef>
-    <htmlTabName>Test-FDD-05MHz-TM1-RRC-Inactivity</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030102
-000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
-030202
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-05-rrc-inactivity</htmlTabRef>
+  <htmlTabName>Test-FDD-05MHz-TM1-RRC-Inactivity</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030102">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="030202">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Waiting for 55 seconds</desc>
-        <idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="000002">
-        <class>IdleSleep</class>
-        <desc>Waiting for 10 seconds</desc>
-        <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
+  </testCase>
 
-    <testCase id="000010">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status before attachment</desc>
-        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status before attachment</desc>
+    <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="000011">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status before data disabling</desc>
-        <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="000012">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status after data disabling</desc>
-        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="000013">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status after data re-enabling</desc>
-        <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status before data disabling</desc>
+    <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040302">
-        <class>DataDisable_UE</class>
-        <desc>Disabling Data Service on UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>DataDisable_UE</class>
+    <desc>Disabling Data Service on UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040303">
-        <class>DataEnable_UE</class>
-        <desc>Enabling Data Service on UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Waiting for 55 seconds</desc>
+    <idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
+  </testCase>
 
-    <testCase id="040502">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status after data disabling</desc>
+    <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040503">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>DataEnable_UE</class>
+    <desc>Enabling Data Service on UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Waiting for 10 seconds</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status after data re-enabling</desc>
+    <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-