Wraparound buffer for modulo-free mapping/demapping in FFT buffers.

Added an implementation of a wraparound buffer using virtual address mapping.
With the wraparound buffer a physical address is mapped a second time to virtual
memory right after the initial mapping. That makes it so that:

  buf[i] == buff[i + size]

The offset operation is undertaken by the processor MMU instead.

.gitignore

@@ -20,14 +20,6 @@ GRTAGS
 GTAGS
 tags
 
-# Package conffiles
-
-tools/packages/oai-lte/conffiles
-tools/packages/oai-nr/conffiles
-tools/packages/liboai-common/conffiles
-tools/packages/liboai-usrp/conffiles
-
-
 # others
 nfapi_nr_interface_scf
 *.log

CMakeLists.txt

@@ -22,7 +22,6 @@
 cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
-set(OAI_VERSION 2.4.0)
 
 #########################################################
 # Base directories, compatible with legacy OAI building #
@@ -62,15 +61,6 @@ endif()
 ###################################
 include(FindPkgConfig)
 
-
-option(PACKAGING_RPM "By default will create debian packages, with this option willl create rpm packages" OFF)
-option(PACKAGING_NR "Will produce a package containing nr target, configuration files and docs" OFF)
-option(PACKAGING_LTE "Will produce a package containing lte target, configuration files and docs" OFF)
-option(PACKAGING_COMMON "Will produce a package containing common target, configuration files and docs" OFF)
-option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
-option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)
-
-
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
@@ -97,6 +87,8 @@ set (NFAPI_USER_DIR  ${OPENAIR_DIR}/nfapi/oai_integration)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
+set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
+set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)
 
 project (OpenAirInterface)
 
@@ -230,16 +222,9 @@ endif()
 
 add_definitions("-DASN_DISABLE_OER_SUPPORT -DHAVE_CONFIG_H -DHAVE_CONFIG_H_")
 
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_RPATH ${CMAKE_CURRENT_BINARY_DIR})
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH "")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-
-if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
-  set(CMAKE_SKIP_INSTALL_RPATH TRUE)
-endif()
-
+#########################
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}")
+#########################
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
@@ -994,7 +979,6 @@ 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
@@ -1054,11 +1038,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` and
-# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op
+# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will
+# be empty for Ubuntu, a no-op
 pkg_check_modules(cblas cblas)
 target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
-target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
+target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
@@ -1804,24 +1788,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIE
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
 
-# nr RRU
-add_executable(nr-oru
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
-  ${OPENAIR_DIR}/radio/COMMON/record_player.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR_DIR}/executables/main_nr_ru.c
-)
-target_link_libraries(nr-oru PRIVATE
-  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU PHY_NR shlib_loader z dl)
-target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
-target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
-
 # nr-softmodem
 ###################################################
 
@@ -1905,7 +1871,6 @@ add_executable(nr-uesoftmodem
   ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
   ${OPENAIR_DIR}/executables/position_interface.c
   ${OPENAIR_DIR}/executables/nr-ue.c
-  ${OPENAIR_DIR}/executables/nr-ue-ru.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
@@ -2071,19 +2036,6 @@ 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
-  )
-
 # these simulators do not compile:
 # dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
 foreach(myExe dlsim ulsim)
@@ -2132,7 +2084,7 @@ 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_srssim
+        nr_ulschsim ldpctest polartest smallblocktest
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig
@@ -2196,8 +2148,3 @@ add_subdirectory(openair2)
 add_subdirectory(openair3)
 add_subdirectory(radio)
 add_subdirectory(tests)
-
-
-if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
-  include("tools/packages/packages.cmake")
-endif()

ci-scripts/Jenkinsfile

@@ -115,7 +115,6 @@ pipeline {
             } else {
               sh "git fetch"
               sh "git checkout -f ${commitID}"
-              sh "git reset --hard origin/${commitID}"
             }
           } else {
             echo "\u274C Some parameters are missing"

ci-scripts/Jenkinsfile-GitLab-Container

@@ -380,29 +380,6 @@ 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

@@ -0,0 +1,228 @@
+#!/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

@@ -0,0 +1,223 @@
+#!/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

@@ -0,0 +1,224 @@
+#!/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

@@ -0,0 +1,250 @@
+#!/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

@@ -0,0 +1,225 @@
+#!/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

@@ -0,0 +1,216 @@
+#!/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

@@ -0,0 +1,260 @@
+#!/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/cls_ci_helper.py

@@ -24,14 +24,15 @@ from typing import NamedTuple
 import logging
 
 class TestCaseCtx(NamedTuple):
-    test_idx: int
+    count: int
+    test_id: int
     logPath: str
 
     def Default(logPath):
-        return TestCaseCtx(112233, logPath)
+        return TestCaseCtx(123, 112233, logPath)
     def baseFilename(self):
         # typically, the test ID is of form 001234 (6 digits)
-        return f"{self.logPath}/{self.test_idx:06d}"
+        return f"{self.logPath}/{self.count}-{self.test_id:06d}"
 
 def archiveArtifact(cmd, ctx, remote_path):
     base = os.path.basename(remote_path)

ci-scripts/cls_cluster.py

@@ -164,6 +164,7 @@ 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:
@@ -210,6 +211,8 @@ 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
@@ -409,7 +412,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_idx}/')
-			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_idx}/')
+			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_id}/')
+			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_id}/')
 
 		return status

ci-scripts/cls_containerize.py

@@ -209,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','vnf'])):
+	elif (any(sub in name for sub in ['enb','rru','rcc','cu','du','gnb'])):
 		logging.debug(f'\u001B[1m Analyzing XnB logfile {filename}\u001B[0m')
 		logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
 		opt = f"xNB log analysis ({name})"
@@ -304,7 +304,7 @@ class Containerize():
 		result = re.search('gNB', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-		result = re.search('x86', self.imageKind)
+		result = re.search('all', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -315,6 +315,7 @@ class Containerize():
 				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
 			if self.host == 'Ubuntu':
 				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
+				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
@@ -324,7 +325,6 @@ class Containerize():
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
 				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
-				imageNames.append(('oai-nr-oru', 'nrORU.fhi72', 'oai-nr-oru', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu.cross-arm64'
@@ -413,18 +413,18 @@ class Containerize():
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name or name == "oai-nr-oru":
+			elif "fhi72" in name:
 				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.10.09.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2026.01.07.tar.gz')
+				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -582,7 +582,7 @@ class Containerize():
 		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		if ret.returncode != 0:
 			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
 		# build ran-unittests image

ci-scripts/cls_module.py

@@ -111,10 +111,11 @@ class Module_UE:
 			return self._collectTrace(ctx)
 		return None
 
-	def attach(self, attach_tries = 3, attach_timeout = 40):
+	def attach(self, attach_tries = 3, attach_timeout = 0):
 		ip = None
 		while attach_tries > 0:
 			self._command(self.cmd_dict["attach"])
+			attach_timeout += 20
 			timeout = attach_timeout
 			logging.debug("Waiting for IP address to be assigned")
 			ip = self.getIP(silent=False, reportNonZero=True)
@@ -125,7 +126,6 @@ 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,8 +34,9 @@ DPDK_PATH = '/opt/dpdk-t2-22.11.0'
 
 class Native():
 
-	def Build(ctx, node, HTML, directory, options):
+	def Build(ctx, node, test_case, 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.testCaseIdx = ''
+		self.testCase_id = ''
 		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 Index</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Test Id</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.testCaseIdx  + '</td>\n')
+		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</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.testCaseIdx  + '</td>\n')
+			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</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_static_code_analysis.py

@@ -88,6 +88,7 @@ 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:
@@ -186,6 +187,8 @@ 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/enb.band38.25prb.rfsim.conf

@@ -200,11 +200,9 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT = (
   {

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

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

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

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

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

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

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

@@ -233,11 +233,9 @@ RUs =
   }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT =
 (

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

@@ -362,11 +362,9 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 THREAD_STRUCT = (
   {

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.rfsim.conf

@@ -197,15 +197,13 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
-    serveraddr = "server";
+rfsimulator: {
+serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+    IQfile = "/tmp/rfsimulator.iqs"
+}
 
 log_config: {
   global_log_level = "info";

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

@@ -149,7 +149,7 @@ gNBs =
     bwp_list = (
       { scs = 1; bwpStart = 0; bwpSize = 106;},
       { scs = 1; bwpStart = 0; bwpSize = 36;},
-      { scs = 1; bwpStart = 40; bwpSize = 50;}
+      { scs = 1; bwpStart = 36; bwpSize = 70;}
     );
 
     # ------- SCTP definitions

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

@@ -27,15 +27,14 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 log_config: {
   global_log_level = "info";

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

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

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

@@ -13,7 +13,16 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 97;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                    }
+                  );
+                  });
 
     nr_cellid = 12345678L;
 
@@ -177,19 +186,19 @@ gNBs =
 
 MACRLCs = (
 {
-  num_cc             = 1;
-  remote_s_address   = "127.0.0.1"; // pnf addr [!]
-  local_s_address    = "127.0.0.2"; // vnf addr
-  local_s_portc      = 50001; // vnf p5 port
-  remote_s_portc     = 50000; // pnf p5 port [!]
-  local_s_portd      = 50011; // vnf p7 port [!]
-  remote_s_portd     = 50010; // pnf p7 port [!]
-  tr_s_preference    = "aerial";
-  tr_n_preference    = "local_RRC";
-  pusch_TargetSNRx10 = 280; # 150;
-  pucch_TargetSNRx10 = 200; #200;
-  dl_max_mcs         = 28;
-  ul_max_mcs         = 28;
+  num_cc           = 1;
+  remote_s_address = "127.0.0.1"; // pnf addr [!]
+  local_s_address  = "127.0.0.2"; // vnf addr
+  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
+  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
+  tr_s_preference             = "aerial";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 280; # 150;
+  pucch_TargetSNRx10          = 200; #200;
+  dl_max_mcs = 28;
+  ul_max_mcs = 28;
 }
 );
 
@@ -213,13 +222,13 @@ security = {
 
 log_config :
 {
-  global_log_level ="info";
-  hw_log_level     ="info";
-  phy_log_level    ="info";
-  mac_log_level    ="info";
-  rlc_log_level    ="info";
-  pdcp_log_level   ="info";
-  rrc_log_level    ="info";
-  ngap_log_level   ="debug";
-  f1ap_log_level   ="debug";
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
 };

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

@@ -191,11 +191,10 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
+
 
 security = {
   # preferred ciphering algorithms

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

@@ -200,11 +200,10 @@ RUs = (
     }
 );  
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
+
 
 security = {
   # preferred ciphering algorithms

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

@@ -234,15 +234,14 @@ RUs = (
     }
 );
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = ("chanmod"); #("saviq"); or/and "chanmod"
   prop_delay = 20;
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 channelmod = {
   max_chan=10;

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

@@ -242,15 +242,14 @@ RUs = (
     }
 );
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   prop_delay = 238.74;
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -18,6 +18,8 @@ gNBs =
     tr_s_preference     = "local_mac"
 
     ////////// Physical parameters:
+
+    sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
 
     servingCellConfigCommon = (
@@ -29,40 +31,40 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 2078299;
-      dl_frequencyBand                                                 = 257;
+      absoluteFrequencySSB                                             = 2071387;
+      dl_frequencyBand                                                 = 261;
       # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2077963;
+      dl_absoluteFrequencyPointA                                       = 2071001;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         dl_subcarrierSpacing                                           = 3;
-        dl_carrierBandwidth                                            = 66;
+        dl_carrierBandwidth                                            = 32;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6349;
+        initialDLBWPlocationAndBandwidth                                        = 8525;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 4;
+        initialDLBWPcontrolResourceSetZero                                      = 1;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 257;
+      ul_frequencyBand                                                 = 261;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
       ul_subcarrierSpacing                                           = 3;
-      ul_carrierBandwidth                                            = 66;
+      ul_carrierBandwidth                                            = 32;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6349;
+        initialULBWPlocationAndBandwidth                                        = 8525;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 3;
@@ -143,11 +145,6 @@ gNBs =
 
   );
 
-    first_active_bwp = 1;
-    bwp_list = (
-      { scs = 3; bwpStart = 0; bwpSize = 66;}
-    );
-
     # ------- SCTP definitions
     SCTP :
     {
@@ -175,7 +172,7 @@ MACRLCs = ({
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
-  set_analog_beamforming      = 2;
+  set_analog_beamforming      = 1;
   beam_duration               = 1;
   beams_per_period            = 1;
   beam_weights = [0]; // single SSB -> one analog beam
@@ -202,11 +199,9 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -205,15 +205,14 @@ RUs = (
 );
 
 
-rfsimulator = (
-  {
+rfsimulator :
+{
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -251,7 +251,7 @@ fhi_72 = {
   io_core = 1;
   worker_cores = (2);
   ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9216;
+  mtu = 9600;
   fh_config = ({
     T1a_cp_dl = (285, 470);
     T1a_cp_ul = (285, 429);

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

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

@@ -208,11 +208,9 @@ RUs = (
 );
 
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -197,11 +197,9 @@ RUs = (
     }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -204,15 +204,13 @@ RUs = ({
 });
 
 
-rfsimulator = (
-{
+rfsimulator: {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
 }
-);
 
 security = {
 # preferred ciphering algorithms

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

@@ -155,8 +155,8 @@ gNBs =
         NETWORK_INTERFACES :
         {
 
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+           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
         };
 
@@ -217,15 +217,14 @@ RUs = (
 );
 
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options    = (); #("saviq"); or/and "chanmod"
   modelname  = "AWGN";
   IQfile     = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -63,7 +63,7 @@ gNBs:
         prach_ConfigurationIndex: 98
         #prach_msg1_FDM
         #0 = one, 1=two, 2=four, 3=eight
-        prach_msg1_FDM: 1
+        prach_msg1_FDM: 0
         prach_msg1_FrequencyStart: 0
         zeroCorrelationZoneConfig: 12
         preambleReceivedTargetPower: -104
@@ -99,7 +99,7 @@ gNBs:
         pucchGroupHopping: 0
         hoppingId: 40
         p0_nominal: -90
-        ssb_PositionsInBurst_Bitmap: 2
+        ssb_PositionsInBurst_Bitmap: 1
         # ssb_periodicityServingCell
         # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
         ssb_periodicityServingCell: 2
@@ -168,7 +168,7 @@ RUs:
     sdr_addrs: serial=XXXXXXX
 
 rfsimulator:
-  - serveraddr: server
+  serveraddr: server
 
 security:
   # preferred ciphering algorithms

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

@@ -1,209 +0,0 @@
-Active_gNBs:
- - gnb-rfsim
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity: none
-gNBs:
-    ##### Identification parameters:
-  - gNB_ID: 0xe00
-    gNB_name: gnb-rfsim
-    tracking_area_code: 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,6 +16,8 @@ gNBs =
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
+
+    sib1_tda = 15;
     min_rxtxtime = 6;
 
     servingCellConfigCommon = (
@@ -203,11 +205,10 @@ RUs = (
 }
 );
 
-rfsimulator = (
-  {
+rfsimulator: {
     serveraddr = "server";
-  }
-);
+};
+
 
 security = {
   # preferred ciphering algorithms

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

@@ -23,6 +23,7 @@ gNBs =
     pusch_AntennaPorts    = 4;
     do_CSIRS              = 1;
     do_SRS                = 0;
+    sib1_tda			        = 15;
    # force_UL256qam_off    = 1;
 
     servingCellConfigCommon = (
@@ -258,7 +259,7 @@ fhi_72 = {
   io_core = 1;
   worker_cores = (2);
   ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9216;
+  mtu = 9600;
   fh_config = ({
     T1a_cp_dl = (419, 470);
     T1a_cp_ul = (285, 336);

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

@@ -203,15 +203,14 @@ RUs = (
 );
 
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/lteue.rfsim.conf

@@ -1,5 +0,0 @@
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);

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

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

ci-scripts/conf_files/neighbour-config.conf

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

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

@@ -12,7 +12,8 @@ uicc0 = {
 imsi = "208990100001100";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+dnn= "oai";
+nssai_sst=1;
 }
 
 MACRLCs = (

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

@@ -87,9 +87,3 @@ PRSs =
     );
   }
 );
-
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);

ci-scripts/conf_files/nrue.uicc.2pdu.conf

@@ -1,17 +0,0 @@
-uicc0 = {
-  imsi = "208990100001100";
-  key = "fec86ba6eb707ed08905757b1bb44b8f";
-  opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = (
-    { id = 1; dnn = "oai"; nssai_sst = 1; },
-    { id = 2; dnn = "oai"; nssai_sst = 1; }
-  )
-}
-
-thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);

ci-scripts/conf_files/nrue.uicc.conf

@@ -2,7 +2,8 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
 position0 = {
@@ -13,12 +14,6 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator = (
-  {
-    serveraddr = "127.0.0.1";
-  }
-);
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
@@ -45,4 +40,4 @@ channelmod = {
       ds_tdl         = 0;
     }
   );
-};
+};

ci-scripts/conf_files/nrue.uicc.ntn-leo.conf

@@ -2,7 +2,8 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
 position0 = {
@@ -13,40 +14,6 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator = (
-    {
-        prop_delay = 20;
-        options = ("chanmod");
-    }
-);
-
-RUs = (
-    {
-        nb_tx      = 1;
-        nb_rx      = 1;
-        att_tx     = 0;
-        att_rx     = 0;
-        max_rxgain = 114;
-        sdr_addrs  = "type=x300";
-        clock_src  = "internal";
-        time_src   = "internal";
-        # if_freq    = 3700000000L;
-        # if_offset  = 1000000;
-    }
-);
-
-cells = (
-    {
-        ru_id      = 0;
-        band       = 254;
-        rf_freq    = 2488400000L;
-        rf_offset  = -873500000L;
-        numerology = 0;
-        N_RB_DL    = 25;
-        ssb_start  = 60;
-    }
-);
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/nrue.uicc.yaml

@@ -2,15 +2,11 @@ uicc0:
   imsi: 208990100001100
   key: fec86ba6eb707ed08905757b1bb44b8f
   opc: C42449363BBAD02B66D16BC975D77CC1
-  pdu_sessions:
-    - dnn: oai
-      nssai_sst: 1
+  dnn: oai
+  nssai_sst: 1
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
-rfsimulator:
-  - serveraddr: "127.0.0.1"
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

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

@@ -1,21 +0,0 @@
-uicc0:
-  imsi: 208990100001100
-  key: fec86ba6eb707ed08905757b1bb44b8f
-  opc: C42449363BBAD02B66D16BC975D77CC1
-  pdu_sessions:
-    - 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/ue.sa.conf

@@ -2,7 +2,8 @@ uicc0 = {
   imsi = "208970100001127";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "c42449363bbad02b66d16bc975d77cc1";
-  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
+  dnn= "oai";
+  nssai_sst=1;
 }
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

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

@@ -12,7 +12,9 @@ uicc0 = {
 imsi = "208950000000031";
 key = "0c0a34601d4f07677303652c0462535b";
 opc= "63bfa50ee6523365ff14c1f45f88737d";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 222; nssai_sd = 123; });
+dnn= "oai";
+nssai_sst=222;
+nssai_sd=123;
 }
 
 MACRLCs = (

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

@@ -12,7 +12,9 @@ uicc0 = {
 imsi = "2089900007487";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; nssai_sd = 1; });
+dnn= "oai";
+nssai_sst=1;
+nssai_sd=1;
 }
 
 MACRLCs = (

ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -205,15 +205,14 @@ RUs = (
 );
 
 
-rfsimulator = (
-  {
+rfsimulator :
+{
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-  }
-);
+};
 
 security = {
   # preferred ciphering algorithms

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

@@ -200,15 +200,14 @@ RUs = (
 );
 
 
-rfsimulator = (
+rfsimulator :
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-}
-);
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/docker/Dockerfile.physim.ubuntu

@@ -44,4 +44,4 @@ RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
         -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
         .. && \
-    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim

ci-scripts/main.py

@@ -58,7 +58,7 @@ import re		# reg
 import time		# sleep
 import os
 import subprocess
-import lxml.etree as ET
+import xml.etree.ElementTree as ET
 import logging
 import signal
 import traceback
@@ -98,7 +98,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, node, HTML.testCase_id, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(ctx, node, HTML)
 		elif action == 'Build_Proxy':
@@ -306,10 +306,10 @@ def receive_signal(signum, frame):
         logging.warning("received signal again, exiting")
         sys.exit(1)
 
-def ShowTestID(ctx, desc, file, line):
+def ShowTestID(ctx, desc):
     logging.info(f'\u001B[1m----------------------------------------\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 Test ID: {ctx.test_id} (#{ctx.count}) \u001B[0m')
+    logging.info(f'\u001B[1m {desc} \u001B[0m')
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
 
 #-----------------------------------------------------------
@@ -455,11 +455,46 @@ 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.SIGINT, receive_signal)
 
 	HTML.CreateHtmlTabHeader()
@@ -467,42 +502,46 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	task_set_succeeded = True
 	HTML.startTime=int(round(time.time() * 1000))
 
-	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")
+	i = 0
+	for test_case_id in todo_tests:
+		for test in all_tests:
+			if test_runner_abort:
 				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
-			continue
+			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')
+			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 (CheckClassValidity(xml_class_list, action, id) == False):
+				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, node)
+				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
 
 	if not task_set_succeeded:
 		logging.error('\u001B[1;37;41mScenario failed\u001B[0m')

ci-scripts/ran.py

@@ -67,6 +67,7 @@ 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'
@@ -87,6 +88,7 @@ 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/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.testCaseIdx = "000000"
+		self.html.testCase_id = "000000"
 		self.cont = cls_containerize.Containerize()
 		self._d = tempfile.mkdtemp()
 		logging.warning(f"temporary directory: {self._d}")

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

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

@@ -21,20 +21,23 @@
 -->
 
 <testCaseList>
-  <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>
+	<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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -21,122 +21,136 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>l2sim-4glte-tdd</htmlTabRef>
-  <htmlTabName>Testing 4G LTE L2 sim - FDD eNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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 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="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 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="000004">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE</desc>
+                <id>l2sim4g_ue</id>
+                <node>localhost</node>
+        </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="020001">
+                <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>
-    <class>Attach_UE</class>
-    <desc>Attach OAI UE</desc>
-    <id>l2sim4g_ue</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="020002">
+                <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>
-    <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="030011">
+                <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>
-    <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="030012">
+                <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>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="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 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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -21,140 +21,151 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-fdd05mhz</htmlTabRef>
-  <htmlTabName>Monolithic eNB - FDD 05MHz</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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>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="000002">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </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>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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="000015">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim4g_ue</id>
+                <node>localhost</node>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </testCase>
+        <testCase id="020011">
+                <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>
-    <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="020012">
+                <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>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 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>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="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>
+                <node>localhost</node>
+                <svr_node>localhost</svr_node>
+        </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="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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -21,111 +21,124 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-fdd05mhz-noS1</htmlTabRef>
-  <htmlTabName>Monolithic eNB - FDD 05MHz - noS1</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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 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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="020011">
+                <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>
-    <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 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>
-    <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="030011">
+                <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>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="030012">
+                <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>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="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 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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -21,140 +21,151 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-fdd10mhz</htmlTabRef>
-  <htmlTabName>Monolithic eNB - FDD 10MHz</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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>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="000002">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </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>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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="000015">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim4g_ue</id>
+                <node>localhost</node>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </testCase>
+        <testCase id="020011">
+                <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>
-    <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="020012">
+                <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>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 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>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="030012">
+                <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>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="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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -21,140 +21,151 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-fdd20mhz</htmlTabRef>
-  <htmlTabName>Monolithic eNB - FDD 20MHz</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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>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="000002">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </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>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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="000015">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim4g_ue</id>
+                <node>localhost</node>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </testCase>
+        <testCase id="020011">
+                <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>
-    <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="020012">
+                <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>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 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>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="030012">
+                <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>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="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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -21,77 +21,87 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-fembms</htmlTabRef>
-  <htmlTabName>Monolithic eNB - FeMBMS</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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 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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="030011">
+                <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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</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_fembms</yaml_path>
+        </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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -21,77 +21,87 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-mbms</htmlTabRef>
-  <htmlTabName>Monolithic eNB - MBMS</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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 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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="030011">
+                <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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</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_mbms</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>
-    <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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -21,139 +21,144 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
-  <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>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>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="000002">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-  </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>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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </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>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="020011">
+                <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>
-    <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>
+                <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>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="030011">
+                <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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </testCase>
+        <testCase id="030012">
+                <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>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_tdd_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>
-    <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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -21,81 +21,91 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-e1</htmlTabRef>
-  <htmlTabName>CUCP-CUUP-DU E1+F1 split</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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 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="000024">
+                <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>
-    <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="020021">
+                <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>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="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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -21,306 +21,235 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-f1</htmlTabRef>
-  <htmlTabName>CU-DU F1 split</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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 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="000031">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+        </testCase>
 
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="000023">
+                <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 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="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>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="020021">
+                <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>
-    <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="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 (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="030021">
+                <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>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="030022">
+                <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>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="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>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="020022">
+                <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>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="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 (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="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>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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-  </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>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="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>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="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>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="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>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="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>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="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>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 | 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 | 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 | 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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -21,108 +21,120 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
-  <htmlTabName>Monolithic FDD gNB with SDAP</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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-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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="000013">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <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_fdd_rfsimulator</yaml_path>
-    <services>oai-gnb oai-nr-ue</services>
-  </testCase>
+        <testCase id="020011">
+                <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>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="020012">
+                <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>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="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>
+                <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>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="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>
+                <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 (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="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 (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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -21,206 +21,236 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-flexric</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD gNB and FlexRic Integration</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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
+ 100003
+ 100004
+ 100005
+ 100006
+ 100007
+ 100008
+ 100009
+ 100001
+ 222221
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-  <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="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-flexric</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>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="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>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="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 nearRT-RIC</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-    <services>nearRT-RIC</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 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="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 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="000002">
+                <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>
-    <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="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>Attach_UE</class>
-    <desc>Attach OAI UE 1 and 2</desc>
-    <id>rfsim5g_ue rfsim5g_ue2</id>
-    <node>carabe</node>
-  </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>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="020005">
+                <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>
-    <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="333333">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <node>carabe</node>
+        </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="444444">
+                <class>Detach_UE</class>
+                <desc>Detach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <node>carabe</node>
+        </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="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>Detach_UE</class>
-    <desc>Detach OAI UE 1 and 2</desc>
-    <id>rfsim5g_ue rfsim5g_ue2</id>
-    <node>carabe</node>
-  </testCase>
+        <testCase id="100002">
+                <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>
-    <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="100003">
+                <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>
-    <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="100004">
+                <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>
-    <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="100005">
+                <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 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 id="100006">
+                <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 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 id="100007">
+                <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 OAI gNB</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-    <services>oai-gnb</services>
-  </testCase>
+        <testCase id="100008">
+                <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>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 id="100009">
+                <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 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 id="010000">
+                <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>
-    <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 id="010001">
+                <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>
-    <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 id="010002">
+                <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>
-    <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 id="010003">
+                <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -21,238 +21,240 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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 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="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 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="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 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="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 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="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 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="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 (#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="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>
+                <node>localhost</node>
+        </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="020001">
+                <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>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="020002">
+                <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>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 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>
-    <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="020004">
+                <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>
-    <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="020005">
+                <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>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="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>
+                <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>
-    <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="030001">
+                <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>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="030002">
+                <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>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="333333">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <node>localhost</node>
+        </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="444444">
+                <class>Detach_UE</class>
+                <desc>Detach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <node>localhost</node>
+        </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="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>
+                <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 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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -21,250 +21,156 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-24prb-5gnr-tdd</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD gNB 24PRB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <node>localhost</node>
+        </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="000004">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+        </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>
+                <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>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="020002">
+                <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>
-    <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="030001">
+                <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 (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="030002">
+                <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>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="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>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="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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>1</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_24prb</yaml_path>
+        </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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -21,108 +21,120 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-tdd-2x2</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD 2x2 gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <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_2x2</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>
+                <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>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>
+                <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>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="030001">
+                <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>
-    <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="030002">
+                <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>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="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 (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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -21,108 +21,120 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-fdd-phytest</htmlTabRef>
-  <htmlTabName>Monolithic FDD phytest gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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>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="020011">
+                <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>
-    <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="020012">
+                <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>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="030011">
+                <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>
-    <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="030012">
+                <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>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="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 (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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -0,0 +1,116 @@
+<!--
+
+ 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-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>
+
+        <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="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 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 id="000013">
+                <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>
+                <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>
+                <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 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>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml

@@ -1,104 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>rfsim-fr2-66prb-5gnr-tdd</htmlTabRef>
-  <htmlTabName>Monolithic FR2 gNB</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 gNB</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
-    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</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_66prb</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 -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>
-    <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_66prb</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>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,156 +21,185 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-tdd-multiue</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD gNB multiue</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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 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="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>
+                <node>localhost</node>
+        </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="020001">
+                <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>
-    <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="020002">
+                <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>
-    <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="020003">
+                <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>
-    <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="020004">
+                <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>
-    <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="020005">
+                <class>Ping</class>
+                <desc>Ping ext-dn from both UEs</desc>
+                <id>rfsim5g_multiue1 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>
-    <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="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>
+                <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>
-    <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="030001">
+                <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>
-    <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="030002">
+                <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>
-    <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="444444">
+                <class>Detach_UE</class>
+                <desc>Detach OAI UEs</desc>
+                <id>rfsim5g_multiue1</id>
+                <node>localhost</node>
+        </testCase>
 
-  <testCase>
-    <class>Detach_UE</class>
-    <desc>Detach OAI UEs</desc>
-    <id>rfsim5g_multiue1</id>
-    <node>localhost</node>
-  </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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -21,222 +21,179 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-f1-n2-ho</htmlTabRef>
-  <htmlTabName>F1 SA TDD N2 Handover</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="800813">
+                <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_rfsimulator_n2_ho</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 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 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="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>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="000003">
+                <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 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="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>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="020001">
+                <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>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
+        <testCase id="020002">
+                <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>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="030001">
+                <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>
-    <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="030002">
+                <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>
-    <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="040001">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+        </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 | ncat 192.168.71.180 9090 | grep "1234"</command>
-  </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>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="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 (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="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>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="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>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="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 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 | 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 | 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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -21,131 +21,125 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-ntn-geo</htmlTabRef>
-  <htmlTabName>Monolithic SA NTN GEO gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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 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="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <node>localhost</node>
+        </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>
+                <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 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="020002">
+                <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>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="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>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="020022">
+                <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>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="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>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="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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -21,131 +21,93 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-ntn-Leo</htmlTabRef>
-  <htmlTabName>Monolithic SA NTN LEO gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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 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="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <node>localhost</node>
+        </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>
+                <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 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="020002">
+                <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>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_ntn_leo</yaml_path>
+        </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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_prs.xml

@@ -21,69 +21,80 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
-  <htmlTabName>Monolithic gNB with PRS</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
+        <htmlTabName>Monolithic gNB with PRS</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 111111
+ 800813
+ 000012
+ 000013
+ 040001
+ 040023
+ 100011
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="800813">
+                <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 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_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 id="000013">
+                <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 id="040001">
+                <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 id="040023">
+		<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 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_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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -21,68 +21,79 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-sidelink</htmlTabRef>
-  <htmlTabName>Sidelink test</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <htmlTabRef>rfsim-5gnr-sidelink</htmlTabRef>
+        <htmlTabName>Sidelink test</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 111111
+ 800813
+ 000002
+ 000003
+ 000004
+ 000005
+ 100001
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Create new Workspace</desc>
+                <node>localhost</node>
+        </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="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 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="000004">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+        </testCase>
 
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-  </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>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="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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_simple.xml

@@ -21,67 +21,77 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
+        <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 000001
+ 000002
+ 000003
+ 000008
+ 020001
+ 444444
+ 100001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase>
-    <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="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 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="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 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="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>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="000008">
+                <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 id="020001">
+                <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>Detach_UE</class>
-    <desc>Detach OAI UE 1</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="444444">
+                <class>Detach_UE</class>
+                <desc>Detach OAI UE 1</desc>
+                <id>rfsim5g_ue</id>
+                <node>localhost</node>
+        </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 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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -21,97 +21,102 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-tdd-dora-5gnr-tdd</htmlTabRef>
-  <htmlTabName>Monolithic do-ra TDD gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="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>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="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 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="020001">
+                <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>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
+        <testCase id="020002">
+                <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>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="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 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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -21,169 +21,166 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-5gnr-fdd-u0-25prb</htmlTabRef>
-  <htmlTabName>VNF-PNF nFAPI FDD u0 25PRB gNB</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+        <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
+ 050001
+ 050002
+ 050003
+ 020001
+ 020002
+ 100001
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
 
-  <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="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>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </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>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="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <node>localhost</node>
+        </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="020001">
+                <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>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>
+                <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>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="000004">
+                <class>Attach_UE</class>
+                <desc>Verify 2nd PDU session is up</desc>
+                <id>rfsim5g_ue_pdu_2</id>
+                <node>localhost</node>
+        </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="020003">
+                <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>
-    <class>Attach_UE</class>
-    <desc>Verify 2nd PDU session is up</desc>
-    <id>rfsim5g_ue_pdu_2</id>
-    <node>localhost</node>
-  </testCase>
+        <testCase id="030001">
+                <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>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="030002">
+                <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>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="050001">
+                <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>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="050002">
+                <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 2 | ncat 192.168.71.140 9090</command>
-  </testCase>
+        <testCase id="050003">
+                <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>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 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_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>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>
+        <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>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_vrtsim_chanmod.xml

@@ -1,128 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>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

@@ -1,129 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>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,14 +21,19 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>build-run-test-tab</htmlTabRef>
-  <htmlTabName>Build and Run Unit Tests</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+	<htmlTabRef>build-run-test-tab</htmlTabRef>
+	<htmlTabName>Build and Run Unit Tests</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase>
-    <class>Build_Run_Tests</class>
-    <desc>Build and Run UnitTests</desc>
-    <node>obelix</node>
-  </testCase>
+	<testCase id="030201">
+		<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,27 +21,32 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>build-tab</htmlTabRef>
-  <htmlTabName>Build Container Images</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+	<htmlTabRef>build-tab</htmlTabRef>
+	<htmlTabName>Build Container Images</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 800813
+ 000001
+ 000010
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace for server 0</desc>
-    <node>obelix</node>
-  </testCase>
+	<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>Build_Image</class>
-    <desc>Build all Images</desc>
-    <node>obelix</node>
-    <kind>x86</kind>
-  </testCase>
-
-  <testCase>
-    <class>Push_Local_Registry</class>
-    <desc>Push Images to Local Registry</desc>
-    <node>obelix</node>
-  </testCase>
+	<testCase id="000010">
+		<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,28 +21,33 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>build-tab</htmlTabRef>
-  <htmlTabName>Build Container Images for ARM</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
+	<htmlTabRef>build-tab</htmlTabRef>
+	<htmlTabName>Build Container Images for ARM</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 800813
+ 000001
+ 000010
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace for server 0</desc>
-    <node>gracehopper3-oai</node>
-  </testCase>
+	<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>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>
+        <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>
 
 </testCaseList>