before big

Integration `2026.w04`

* !3787 CI: disable aerial x86 build pipeline
* !3820 Integrate F1AP messages required for NRPPa
* !3789 fix A3 event configuration
* !3861 add a csv T tracer
* !3669 NR UE: add neighboring cell measurements and measurement report of event A3
* !3866 nr-softmodem: ensure RU is ready before L1 init in NFAPI PNF mode
* !3402 Test FDM PRACH in CI
* !3852 Cleanup nr_slot_fep_ul
* !3782 Improvements to support CSET0 multiplexing pattern 3 for FR2
* !3862 Check for PDSCH overlapping CORESET during RA
* !3430 NR gNB handling TCI state indication for beam switching
* !3872 Fix compilation issues with vrtsim taps client
* !3687 Standardize Documentation Formatting and Navigation for MkDocs

Closes #705

See merge request oai/openairinterface5g!3867

.dockerignore

@@ -5,4 +5,3 @@ common/utils/T/T_IDs.h
 common/utils/T/T_messages.txt.h
 common/utils/T/genids
 common/utils/T/genids.o
-artifacts

CHANGELOG.md

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

CMakeLists.txt

@@ -464,6 +464,9 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(f1ap PRIVATE E2_AGENT)
+endif()
 
 # LPP
 ##############
@@ -870,6 +873,7 @@ set(PHY_SRC_RU
   ${OPENAIR1_DIR}/PHY/MODULATION/gen_75KHz.cpp
   ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
   ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_antenna_state.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
   ${OPENAIR1_DIR}/PHY/INIT/nr_init_ru.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
@@ -945,6 +949,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_antenna_control.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
@@ -976,6 +981,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ntn_l1.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
@@ -1035,11 +1041,11 @@ pkg_check_modules(lapacke REQUIRED lapacke)
 
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
-# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will
-# be empty for Ubuntu, a no-op
+# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` and
+# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op
 pkg_check_modules(cblas cblas)
 target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
-target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
+target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
@@ -1288,6 +1294,9 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+if(E2_AGENT)
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
@@ -1303,6 +1312,9 @@ add_library(L2_NR
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -2027,6 +2039,19 @@ 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)
@@ -2075,7 +2100,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_ulschsim ldpctest polartest smallblocktest nr_srssim
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig

build-flexric.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ $(/usr/bin/id -u) -ne 0 ]]; then
-    echo "Not running as root"
-    exit
-fi
-
-cd openair2/E2AP/flexric/
-rm -rf build && mkdir build && \
-    cd build && cmake -DE2AP_VERSION=E2AP_V2 -DKPM_VERSION=KPM_V2_03 .. && make -j16 && sudo make install
-
-cd ~/OAI/openairinterface5g/
-
-cp -r /usr/local/etc/flexric/ flexric/etc/
-cp -r /usr/local/lib/flexric/ flexric/lib/

ci-scripts/Jenkinsfile-GitLab-Container

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

ci-scripts/Jenkinsfile-cluster

@@ -1,228 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-def directoryExistsGlob(fileNameWithGlob) {
-  /* if multiple directories match, will join their names and call fileExists() on that */
-  def dir = sh returnStdout: true, script: 'find . -name \'' + fileNameWithGlob + '\' -type d'
-  dir = dir.replaceAll("\n", "").trim()
-  echo "matching '" + fileNameWithGlob + "' found: '"  + dir + "'"
-  if (dir == "")
-    return false
-  return fileExists(dir)
-}
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            echo "no eNB_SourceCodePath given"
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          } else {
-            echo "no eNB_mergeRequest given - not merging develop"
-          }
-
-          if (params.OC_Credentials == null) {
-            echo "no OC_Credentials given"
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            echo "no OC_ProjectName given"
-            allParametersPresent = false
-          }
-          if (params.pythonTestXmlFile == null) {
-            echo "no pythonTestXmlFile given"
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-            }
-          }
-        }
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            if (directoryExistsGlob("build_log_*")) {
-              sh "zip -r -qq build_log_${env.BUILD_ID}.zip build_log_*/*"
-              sh "rm -rf build_log_*/"
-              archiveArtifacts artifacts: "build_log_${env.BUILD_ID}.zip"
-            }
-            if (directoryExistsGlob("test_log_*")) {
-              sh "zip -r -qq test_log_${env.BUILD_ID}.zip test_log_*/*"
-              sh "rm -rf test_log_*/"
-              archiveArtifacts artifacts: "test_log_${env.BUILD_ID}.zip"
-            }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-nrue

@@ -1,223 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-// Flags
-def scmEvent = false
-def upstreamEvent = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (params.OC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-            }
-          }
-        } 
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }  
-}

ci-scripts/Jenkinsfile-physim-deploy

@@ -1,224 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-// Flags
-def scmEvent = false
-def upstreamEvent = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (params.OC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
-            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-            }
-          }
-        } 
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }  
-}  

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -1,250 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Terminate Status
-def termENB = 0
-def termStatusArray = new Boolean[termENB + 1]
-termStatusArray[termENB] = false
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-def doEpcLogCollection = true
-
-
-
-pipeline {
-    agent {
-        label pythonExecutor
-    }
-    options {
-        ansiColor('xterm')
-        lock(extra: lockResources)
-    }
-
-    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already to late to check it
-                    if (params.pythonExecutor != null) {
-                        echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.LockResources == null) {
-                      echo "no LockResources given"
-                      allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    // the following 4 parameters should be pushed by the master trigger
-                    // if not present, take the job GIT variables (used for developing)
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = env.GIT_URL
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository        :   ${eNB_Repository}"
-                    if (params.eNB_Branch == null) {
-                        eNB_Branch = env.GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch            :   ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = env.GIT_COMMIT
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID          :   ${eNB_CommitID}"
-                    if (params.eNB_mergeRequest != null) {
-                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-                        if (eNB_AllowMergeRequestProcess) {
-                            if (params.eNB_TargetBranch != null) {
-                                eNB_TargetBranch = params.eNB_TargetBranch
-                            } else {
-                                eNB_TargetBranch = 'develop'
-                            }
-                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-                        }
-                    }
-
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                        if (eNB_AllowMergeRequestProcess) {
-                            sh "git fetch"
-                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else {
-                            sh "git fetch"
-                            sh "git checkout -f ${eNB_CommitID}"
-                        }
-                    } else {
-                        currentBuild.result = 'ABORTED'
-                        error('Stopping early because some parameters are missing')
-                    }
-                }
-            }
-        }
-        stage ("Build and Test") {
-            steps {
-                script {
-                    dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists(xmlFile)) {
-                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-                    }
-                }
-            }
-        }
-        stage ("Terminate") {
-            parallel {
-                stage('Terminate eNB') {
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                    }
-                    post {
-                        success {
-                            script {
-                                termStatusArray[termENB] = true
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Run)') {
-                    steps {
-                        echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-                            }
-                            if(fileExists("ci-scripts/test_results.html")) {
-                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-                                archiveArtifacts "test_results-${JOB_NAME}.html"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if (params.pipelineZipsConsoleLog != null) {
-                    if (params.pipelineZipsConsoleLog) {
-                        echo "Archiving Jenkins console log"
-                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-                        }
-                    }
-                }
-            }
-        }
-        // Making sure that we really shutdown every thing before leaving
-        failure {
-            script {
-                if (!termStatusArray[termENB]) {
-                    sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                }
-            }
-        }
-    }
-}

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -1,225 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-pipeline {
-    agent {
-        label pythonExecutor
-    }
-    options {
-        ansiColor('xterm')
-        lock(extra: lockResources)
-    }
-    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already to late to check it
-                    if (params.pythonExecutor != null) {
-                        echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.LockResources == null) {
-                      echo "no LockResources given"
-                      allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    // the following 4 parameters should be pushed by the master trigger
-                    // if not present, take the job GIT variables (used for developing)
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = env.GIT_URL
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository        :   ${eNB_Repository}"
-                    if (params.eNB_Branch == null) {
-                        eNB_Branch = env.GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch            :   ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = env.GIT_COMMIT
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID          :   ${eNB_CommitID}"
-                    if (params.eNB_mergeRequest != null) {
-                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-                        if (eNB_AllowMergeRequestProcess) {
-                            if (params.eNB_TargetBranch != null) {
-                                eNB_TargetBranch = params.eNB_TargetBranch
-                            } else {
-                                eNB_TargetBranch = 'develop'
-                            }
-                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-                        }
-                    }
-
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                        if (eNB_AllowMergeRequestProcess) {
-                            sh "git fetch"
-                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else {
-                            sh "git fetch"
-                            sh "git checkout -f ${eNB_CommitID}"
-                        }
-                    } else {
-                        echo "Some parameters are missing"
-                        sh "./ci-scripts/fail.sh"
-                    }
-                }
-            }
-        }
-        stage ("Build and Test") {
-            steps {
-                script {
-                    dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists(xmlFile)) {
-                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-                    }
-                }
-            }
-        }
-        stage ("Terminate") {
-            parallel {
-                stage('Terminate eNB') {
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Run)') {
-                    steps {
-                        echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-                            }
-                            if(fileExists("ci-scripts/test_results.html")) {
-                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-                                archiveArtifacts "test_results-${JOB_NAME}.html"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if (params.pipelineZipsConsoleLog != null) {
-                    if (params.pipelineZipsConsoleLog) {
-                        echo "Archiving Jenkins console log"
-                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,216 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess
-def eNB_TargetBranch
-
-//Status fed to the database
-def StatusForDb = ""
-
-
-pipeline {
-  agent {label pythonExecutor}
-  options {
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-  stages {
-    stage("Build Init") {
-      steps {
-        // update the build name and description
-        buildName "${params.eNB_MR}"
-        buildDescription "Branch : ${params.eNB_Branch}"
-      }
-    }
-    stage ("Verify Parameters") {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest!= null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-    stage ("Build and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file     :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
-                }
-              }
-            }
-            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                try {
-                 timeout (time: 60, unit: 'MINUTES') {
-                  sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                 }
-                } catch (Exception e) {
-                  currentBuild.result = 'FAILURE'
-                  buildStageStatus = false
-                }
-              }
-            }
-            sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-          }
-        }
-      }
-    }
-    stage('Log Collection') {
-      parallel {
-        stage('Log Collection (eNB - Run)') {
-          steps {
-            echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-            script {
-              if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  post {
-    always {
-      script {
-        if(fileExists("ci-scripts/test_results.html")) {
-          sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-          sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-          archiveArtifacts "test_results-${JOB_NAME}.html"
-        }
-        if (params.pipelineZipsConsoleLog != null) {
-          if (params.pipelineZipsConsoleLog) {
-            echo "Archiving Jenkins console log"
-            sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-            sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-            if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-              archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-            }
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-tmp-ran

@@ -1,260 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Terminate Status
-def termUE = 0
-def termENB = 1
-def termSPGW = 2
-def termMME = 3
-def termHSS = 4
-def termStatusArray = new Boolean[termHSS + 1]
-termStatusArray[termUE] = false
-termStatusArray[termENB] = false
-termStatusArray[termSPGW] = false
-termStatusArray[termMME] = false
-termStatusArray[termHSS] = false
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-def flexricOption = ""
-
-pipeline {
-    agent {
-        label pythonExecutor
-    }
-    options {
-        ansiColor('xterm')
-        lock(extra: lockResources)
-    }
-    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already to late to check it
-                    if (params.pythonExecutor != null) {
-                        echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.LockResources == null) {
-                      echo "no LockResources given"
-                      allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    // the following 4 parameters should be pushed by the master trigger
-                    // if not present, take the job GIT variables (used for developing)
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = env.GIT_URL
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository        :   ${eNB_Repository}"
-                    if (params.eNB_Branch == null) {
-                        eNB_Branch = env.GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch            :   ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = env.GIT_COMMIT
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID          :   ${eNB_CommitID}"
-                    if (params.eNB_mergeRequest != null) {
-                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-                        if (eNB_AllowMergeRequestProcess) {
-                            if (params.eNB_TargetBranch != null) {
-                                eNB_TargetBranch = params.eNB_TargetBranch
-                            } else {
-                                eNB_TargetBranch = 'develop'
-                            }
-                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-                        }
-                    }
-
-                    if (params.Flexric_Tag != null) {
-                        echo "This pipeline is configured to run with a FlexRIC deployment."
-                        echo "Appending FlexRicTag option to the list of options"
-                        flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-                        echo "Using new Flexric option: ${flexricOption}"
-                    }
-
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                        if (eNB_AllowMergeRequestProcess) {
-                            sh "git fetch"
-                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else if (eNB_CommitID != 'develop') {
-                            sh "git fetch"
-                            sh "git checkout -f ${eNB_CommitID}"
-                        }
-                    } else {
-                        error "Some parameters are missing"
-                    }
-                }
-            }
-        }
-        stage ("Build and Test") {
-            steps {
-                script {
-                    dir ('ci-scripts') {
-                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} ${mainPythonAllXmlFiles}"
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists(xmlFile)) {
-                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
-                                } catch (Exception e) {
-                                    currentBuild.result = 'FAILURE'
-                                    buildStageStatus = false
-                                }
-                            }
-                        }
-                        sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-                    }
-                }
-            }
-        }
-        stage ("Terminate") {
-            parallel {
-                stage('Terminate eNB') {
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                    }
-                    post {
-                        success {
-                            script {
-                                termStatusArray[termENB] = true
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Run)') {
-                    steps {
-                        echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                        sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
-                            }
-                            if(fileExists("ci-scripts/test_results.html")) {
-                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
-                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-                                archiveArtifacts "test_results-${JOB_NAME}.html"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if (params.pipelineZipsConsoleLog != null) {
-                    if (params.pipelineZipsConsoleLog) {
-                        echo "Archiving Jenkins console log"
-                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
-                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
-                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
-                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
-                        }
-                    }
-                }
-            }
-        }
-        // Making sure that we really shutdown every thing before leaving
-        failure {
-            script {
-                if (!termStatusArray[termENB]) {
-                    sh "python3 ci-scripts/main.py --mode=TerminateeNB"
-                }
-            }
-        }
-    }
-}

ci-scripts/cls_ci_helper.py

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

ci-scripts/cls_cluster.py

@@ -164,7 +164,6 @@ class Cluster:
 
 	def PullClusterImage(self, HTML, node, images, tag_prefix):
 		logging.debug(f'Pull OC image {images} to server {node}')
-		self.testCase_id = HTML.testCase_id
 		with cls_cmd.getConnection(node) as cmd:
 			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
 			if not succeeded:
@@ -211,8 +210,6 @@ class Cluster:
 		logging.debug(f'Building on cluster triggered from server: {node}')
 		self.cmd = cls_cmd.RemoteCmd(node)
 
-		self.testCase_id = HTML.testCase_id
-
 		# Workaround for some servers, we need to erase completely the workspace
 		self.cmd.cd(lSourcePath)
 		# to reduce the amount of data send to OpenShift, we
@@ -412,7 +409,7 @@ class Cluster:
 		# the groovy scripts expects all logs in
 		# <jenkins-workspace>/<pipeline>/ci-scripts, so copy it there
 		with cls_cmd.LocalCmd() as c:
-			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_id}/')
-			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_id}/')
+			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_idx}/')
+			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_idx}/')
 
 		return status

ci-scripts/cls_containerize.py

@@ -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'])):
+	elif (any(sub in name for sub in ['enb','rru','rcc','cu','du','gnb','vnf'])):
 		logging.debug(f'\u001B[1m Analyzing XnB logfile {filename}\u001B[0m')
 		logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
 		opt = f"xNB log analysis ({name})"
@@ -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('all', self.imageKind)
+		result = re.search('x86', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -315,7 +315,6 @@ 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"'))
@@ -582,7 +581,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(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
 		# build ran-unittests image

ci-scripts/cls_module.py

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

ci-scripts/cls_native.py

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

ci-scripts/cls_oai_html.py

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

ci-scripts/cls_static_code_analysis.py

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

ci-scripts/conf_files/channelmod_rfsimu.conf

@@ -9,29 +9,20 @@ channelmod = {
         model_name                       = "rfsimu_channel_enB0"
       	type                             = "AWGN";			  
       	ploss_dB                         = 0;
-        noise_power_dB                   = -60; 
-        # forgetfact                       = 0;  
-        # offset                           = 0;      
-        # ds_tdl                           = 0;      
+        noise_power_dB                   = -10; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
     },
     {
         model_name                       = "rfsimu_channel_ue0"
       	type                             = "AWGN";			  
-      	# ploss_dB                         = 0;
-        # noise_power_dB                   = -30; 
-        # forgetfact                       = 0;  
-        # offset                           = 0;      
-        # ds_tdl                           = 0;      
-    },    
-    {
-        model_name                       = "rfsimu_channel_ue2"
-      	type                             = "AWGN";			  
-      	# ploss_dB                         = 0;
-        # noise_power_dB                   = 0; 
-        # forgetfact                       = 0;  
-        # offset                           = 0;      
-        # ds_tdl                           = 0;      
-    }  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
   );
   modellist_rfsimu_2 = (
     {

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

@@ -40,6 +40,7 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
+
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152

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

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

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

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

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

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

ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf

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

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

@@ -30,26 +30,26 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3610.56 MHz
-      absoluteFrequencySSB                                             = 679104;
-      dl_frequencyBand                                                 = 77;
+      absoluteFrequencySSB                                          = 679104;
+      dl_frequencyBand                                              = 77;
       # this is 3599.94 MHz
-      dl_absoluteFrequencyPointA                                       = 678388;
+      dl_absoluteFrequencyPointA                                    = 678388;
       #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
+        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 51;
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 51;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
+        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
+        initialDLBWPsubcarrierSpacing                               = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
@@ -197,10 +197,10 @@ RUs = (
   att_rx         = 0;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
+  max_rxgain     = 114;
   eNB_instances  = [0];
-  clock_src = "external";
-  time_src = "external";
+  clock_src      = "external";
+  time_src       = "external";
 }
 );
 

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

@@ -1,332 +0,0 @@
-Active_gNBs = ("gnb-rfsim");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-e2_agent = {
-   enabled = "yes";
-   near_ric_ip_addr = "192.168.71.21";
-   near_ric_port = 36421;
-   sm_dir = "/usr/local/lib/flexric/";
-}
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gnb-rfsim";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    # plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0xffffff; }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 2;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
-    min_rxtxtime = 6;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-      absoluteFrequencySSB                                             = 621312; # 641280
-      dl_frequencyBand                                                 = 78;
-      # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                       = 620040; # 640008
-      #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=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12956; # 6366 12925 12956 28875 12952
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                  = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                             = 12;
-        initialDLBWPsearchSpaceZero                                    = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12956;
-# 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                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        # ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -70;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-# Dedicated Serving Cell Configuration
-servingCellConfigDedicated = ({
-  # BWP-Downlink
-    # BWP 1 Configuration
-      dl_bwp-Id_1 = 1;
-      dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_bwp1_subcarrierSpacing = 1;
-
-    # BWP 2 Configuration
-      dl_bwp-Id_2 = 2;
-      dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_bwp2_subcarrierSpacing = 1;
-
-    # BWP 3 Configuration
-      dl_bwp-Id_3 = 3;
-      dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_bwp3_subcarrierSpacing = 1;
-
-    firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-    defaultDownlinkBWP-Id     = 1;  #BWP-Id
-
-    # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
-    #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
-    #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
-    #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
-
-  # UplinkConfig
-    # BWP-Uplink
-      # BWP 1 Configuration
-        ul_bwp-Id_1 = 1;
-        ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_bwp1_subcarrierSpacing = 1;
-
-      # BWP 2 Configuration
-        ul_bwp-Id_2 = 2;
-        ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_bwp2_subcarrierSpacing = 1;
-
-      # BWP 3 Configuration
-        ul_bwp-Id_3 = 3;
-        ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_bwp3_subcarrierSpacing = 1;
-
-      firstActiveUplinkBWP-Id = 1;  #BWP-Id
-  }
-);
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        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         = 150;
-  #pucch_TargetSNRx10         = 200;
-  ulsch_max_frame_inactivity  = 0;
-  dl_max_mcs                  = 16; # there are retransmissions if more
-}
-);
-
-L1s = (
-{
-  num_cc                = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  #pucch0_dtx_threshold = 120;
-}
-);
-
-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];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  # sdr_addrs = "mgmt_addr=192.168.10.2,addr=192.168.10.2,clock_source=internal,time_source=internal"
-  sdr_addrs = "serial=XXXXXXX";
-}
-);
-
-THREAD_STRUCT = (
-{
-  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-  parallel_config    = "PARALLEL_SINGLE_THREAD";
-  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-  worker_config      = "WORKER_ENABLE";
-}
-);
-
-rfsimulator :
-{
-  serveraddr = "server";
-};
-
-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";
-};

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

@@ -150,12 +150,12 @@ gNBs =
     };
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address = ({ ipv4 = "192.168.70.132"; });
 
     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              = "192.168.70.151";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.151";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -169,7 +169,6 @@ MACRLCs = (
     tr_n_preference    = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
-    min_grant_prb = 1;
   }
 );
 
@@ -231,7 +230,7 @@ log_config : {
 };
 
 e2_agent = {
-  near_ric_ip_addr = "192.168.71.21";
+  near_ric_ip_addr = "192.168.70.150";
   #sm_dir = "/path/where/the/SMs/are/located/"
   sm_dir = "/usr/local/lib/flexric/"
 };

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

@@ -1,12 +1,5 @@
 Active_gNBs:
  - gnb-rfsim
-
-e2_agent:
-  enabled: "yes"
-  near_ric_ip_addr: 192.168.71.21
-  e2ap_server_port: 36422
-  sm_dir: "/usr/local/lib/flexric/"
-  
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity: none
 gNBs:
@@ -70,7 +63,7 @@ gNBs:
         prach_ConfigurationIndex: 98
         #prach_msg1_FDM
         #0 = one, 1=two, 2=four, 3=eight
-        prach_msg1_FDM: 0
+        prach_msg1_FDM: 1
         prach_msg1_FrequencyStart: 0
         zeroCorrelationZoneConfig: 12
         preambleReceivedTargetPower: -104
@@ -106,7 +99,7 @@ gNBs:
         pucchGroupHopping: 0
         hoppingId: 40
         p0_nominal: -90
-        ssb_PositionsInBurst_Bitmap: 1
+        ssb_PositionsInBurst_Bitmap: 2
         # ssb_periodicityServingCell
         # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
         ssb_periodicityServingCell: 2
@@ -146,13 +139,13 @@ gNBs:
       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
-    min_grant_prb: 5
     stats_max_ue: 17
 
 L1s:
@@ -200,6 +193,6 @@ log_config:
   mac_log_level: info
   rlc_log_level: info
   pdcp_log_level: info
-  rrc_log_level: debug
+  rrc_log_level: info
   ngap_log_level: debug
   f1ap_log_level: debug

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

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

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

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

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

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

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

@@ -1,14 +1,7 @@
-Active_gNBs = ("gNB-OAI");
+Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
-e2_agent = {
-   enabled = "yes";
-   near_ric_ip_addr = "192.168.71.21";
-   near_ric_port = 36421;
-   sm_dir = "/usr/local/lib/flexric/";
-}
-
 gNBs =
 (
  {
@@ -205,7 +198,7 @@ RUs = (
   max_rxgain                    = 75;
   eNB_instances  = [0];
   #clock_src = "internal";
-  # sdr_addrs = "mgmt_addr=192.168.10.2,addr=192.168.10.2,clock_source=internal,time_source=internal"
+  sdr_addrs = "mgmt_addr=192.168.10.2,addr=192.168.10.2,clock_source=internal,time_source=internal"
 }
 );
 
@@ -213,7 +206,7 @@ RUs = (
 rfsimulator :
 {
   serveraddr = "server";
-  # serverport = 4043;
+  serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";

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

@@ -11,8 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0xffffff}) });
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
@@ -188,8 +187,8 @@ L1s = (
 RUs = (
 {
   local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
+  nb_tx          = 4;
+  nb_rx          = 4;
   att_tx         = 14;
   att_rx         = 14;
   bands          = [78];
@@ -200,6 +199,14 @@ RUs = (
 }
 );
 
+rfsimulator :
+{
+    serveraddr = "server";
+    serverport = "4043";
+    # options = ("saviq", "chanmod"); #("saviq"); or/and "chanmod"
+    # modelname = "AWGN";
+    IQfile = "/tmp/rfsimulator.iqs";
+};
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf

@@ -1,279 +0,0 @@
-Active_gNBs = ("gNB-Eurecom-5GNRBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-e2_agent = {
-  enabled = "yes";
-  near_ric_ip_addr = "192.168.71.21";
-  sm_dir = "/usr/local/lib/flexric/"
-  e2ap_server_port: 36422
-};
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    pusch_AntennaPorts                                        = 4;
-
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
-      #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=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 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                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.70.132";});
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.140/24";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.140/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-    {
-        num_cc                      = 1;
-        tr_s_preference             = "local_L1";
-        tr_n_preference             = "local_RRC";
-        pusch_TargetSNRx10          = 150;
-        pucch_TargetSNRx10          = 200;
-    }
-);
-
-L1s = (
-    {
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-	pusch_proc_threads = 8;
-	prach_dtx_threshold = 120;
-    pucch0_dtx_threshold = 150;
-    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-    }
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 4
-         nb_rx          = 4
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 114;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
-         clock_src = "internal";
-    }
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator :
-{
-    serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-};
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
-       hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
-       phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
-       mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
-       rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
-       pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
-       rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
-       ngap_log_level                         ="info";
-       ngap_log_verbosity                     ="medium";
-    };
-
-@include "channelmod_rfsimu.conf"

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

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

ci-scripts/conf_files/neighbour-config.conf

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

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

@@ -1,52 +0,0 @@
-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";
-};
-
-uicc0 = {
-imsi = "001010000000002";
-key = "fec86ba6eb707ed08905757b1bb44b8f";
-opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
-nssai_sd=16777215;
-}
-
-MACRLCs = (
-        {
-        num_cc = 1;
-        tr_n_preference = "nfapi";
-        local_n_if_name  = "eno1";
-        remote_n_address = "127.0.0.1"; //Proxy IP
-        local_n_address  = "127.0.0.1";
-        local_n_portc    = 50600;
-        remote_n_portc   = 50601;
-        local_n_portd    = 50610;
-        remote_n_portd   = 50611;
-        }
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 5;
-  att_rx         = 5;
-  bands          = [78];
-  # max_pdschReferenceSignalPower = -27;
-  # max_rxgain                    = 114;
-  # eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  # bf_weights = [0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000];
-  # bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
-  clock_src = "internal";
-}
-);
-
-@include "channelmod_rfsimu.conf"

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

@@ -1,34 +0,0 @@
-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";
-};
-
-uicc0 = {
-imsi = "001010000000001";
-key = "fec86ba6eb707ed08905757b1bb44b8f";
-opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
-nssai_sd=16777215;
-}
-
-MACRLCs = (
-        {
-        num_cc = 1;
-        tr_n_preference = "nfapi";
-        local_n_if_name  = "eno1";
-        remote_n_address = "127.0.0.1"; //Proxy IP
-        local_n_address  = "127.0.0.1";
-        local_n_portc    = 50600;
-        remote_n_portc   = 50601;
-        local_n_portd    = 50610;
-        remote_n_portd   = 50611;
-        }
-);
-
-@include "channelmod_rfsimu.conf"

ci-scripts/conf_files/nrue.uicc.conf

@@ -1,4 +1,5 @@
-uicc0 = { # imsi is omitted
+uicc0 = {
+  imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
   dnn= "oai";
@@ -13,6 +14,13 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator :
+{
+  serveraddr = "192.168.71.140";  // gNB IP address
+  serverport = 4043;
+  options = ("chanmod");  // Enable channel modeling
+};
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
@@ -24,7 +32,7 @@ channelmod = {
       model_name     = "rfsimu_channel_enB0"
       type           = "AWGN";
       ploss_dB       = 20;
-      noise_power_dB = -4;
+      noise_power_dB = -2;
       forgetfact     = 0;
       offset         = 0;
       ds_tdl         = 0;
@@ -32,8 +40,8 @@ channelmod = {
     { # UL, modify on gNB side
       model_name     = "rfsimu_channel_ue0"
       type           = "AWGN";
-      ploss_dB       = 20;
-      noise_power_dB = -2;
+      ploss_dB       = 0;
+      noise_power_dB = -100;
       forgetfact     = 0;
       offset         = 0;
       ds_tdl         = 0;

ci-scripts/conf_files/nrue.uicc.yaml

@@ -4,7 +4,6 @@ uicc0:
   opc: C42449363BBAD02B66D16BC975D77CC1
   dnn: oai
   nssai_sst: 1
-  pdu_type: IPV4
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
@@ -25,7 +24,7 @@ channelmod:
     - model_name: rfsimu_channel_ue0
       type: AWGN
       ploss_dB: 20
-      noise_power_dB: -2
+      nose_power_dB: -2
       forgetfact: 0
       offset: 0
       ds_tdl: 0

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

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

ci-scripts/conf_files/test_4x4.conf

@@ -13,46 +13,48 @@ gNBs =
     tracking_area_code  =  1;
     plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
 
-    nr_cellid = 12345678L;
+    nr_cellid = 1;
 
     ////////// Physical parameters:
 
     pdsch_AntennaPorts_XP = 2;
     pdsch_AntennaPorts_N1 = 1;
-    pusch_AntennaPorts                                        = 2;
-
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    maxMIMO_layers        = 2;
+    pusch_AntennaPorts    = 4;
+    do_CSIRS              = 1;
+    do_SRS                = 0;
+   # force_UL256qam_off    = 1;
 
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
 
       physCellId                                                    = 0;
-
+     # n_TimingAdvanceOffset                                         = 0;
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
+      # center frequency = 3350.01 MHz
+      # selected SSB frequency = 3349.92 MHz
+      absoluteFrequencySSB                                          = 623328;
+      dl_frequencyBand                                              = 78;
+      # frequency point A = 3300.87 MHz
+      dl_absoluteFrequencyPointA                                    = 620052;
       #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
+        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
+       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
+        initialDLBWPsubcarrierSpacing                               = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
+        initialDLBWPcontrolResourceSetZero                          = 11;
+        initialDLBWPsearchSpaceZero                                 = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
@@ -62,36 +64,33 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 20;
+      ul_carrierBandwidth                                           = 273;
+      pMax                                                          = 23;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
+        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;
       #rach-ConfigCommon
         #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
+          prach_ConfigurationIndex                                  = 152;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
           prach_msg1_FDM                                            = 0;
           prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
+          preambleTransMax                                          = 8;
 #powerRampingStep
 # 0=dB0,1=dB2,2=dB4,3=dB6
         powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#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;
@@ -107,19 +106,18 @@ gNBs =
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
         restrictedSetConfig                                         = 0,
 
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -96;
 
 # pucch-ConfigCommon setup :
 # pucchGroupHopping
 # 0 = neither, 1= group hopping, 2=sequence hopping
         pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
@@ -147,7 +145,7 @@ gNBs =
       nrofUplinkSlots                                               = 2;
       nrofUplinkSymbols                                             = 4;
 
-      ssPBCH_BlockPower                                             = -25;
+  ssPBCH_BlockPower                                                 = -15;
   }
 
   );
@@ -163,23 +161,14 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
+        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
     };
-
   }
 );
 
@@ -188,9 +177,13 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 150;
+  pusch_TargetSNRx10          = 100;
   pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
+  dl_bler_target_upper        = .35;
+  dl_bler_target_lower        = .15;
+  ul_bler_target_upper        = .35;
+  ul_bler_target_lower        = .15;
+  pusch_FailureThres          = 1000;
   ul_max_mcs                  = 28;
 }
 );
@@ -198,48 +191,37 @@ MACRLCs = (
 L1s = (
 {
   num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 90;
+  pucch0_dtx_threshold = 80;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 15;
+  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
+  L1_rx_thread_core = 3;
+  L1_tx_thread_core = 4;
+  phase_compensation = 0; # needs to match O-RU configuration
 }
 );
 
 RUs = (
 {
-  local_rf       = "yes"
-  nb_tx          = 2
-  nb_rx          = 2
-  att_tx         = 12;
-  att_rx         = 12;
+  local_rf       = "yes";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0;
+  att_rx         = 0;
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
   eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  # bf_weights = [0x00007fff, 0x0000, 0x0000, 0x00007fff];
-  clock_src = "internal";
+  ru_thread_core = 5;
+  sl_ahead       = 10;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding   = 0; # needs to match O-RU configuration
 }
 );
 
-THREAD_STRUCT = (
-{
-  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-  parallel_config    = "PARALLEL_SINGLE_THREAD";
-  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-  worker_config      = "WORKER_ENABLE";
-}
-);
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = "4043";
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
@@ -259,21 +241,22 @@ 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   = "info";
+  f1ap_log_level   = "info";
 };
 
-e2_agent = {
-  near_ric_ip_addr = "127.0.0.1";
-  #sm_dir = "/path/where/the/SMs/are/located/"
-  sm_dir = "/usr/local/lib/flexric/"
+rfsimulator :
+{
+  serveraddr = "server";
+  serverport = 4043;
+  options = (); #("saviq"); or/and "chanmod"
+  modelname = "AWGN";
+  IQfile = "/tmp/rfsimulator.iqs";
 };
-
-@include "channelmod_rfsimu.conf"

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
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim

ci-scripts/main.py

@@ -58,7 +58,7 @@ import re		# reg
 import time		# sleep
 import os
 import subprocess
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 import logging
 import signal
 import traceback
@@ -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.testCase_id, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(ctx, node, HTML)
 		elif action == 'Build_Proxy':
@@ -306,10 +306,10 @@ def receive_signal(signum, frame):
         logging.warning("received signal again, exiting")
         sys.exit(1)
 
-def ShowTestID(ctx, desc):
+def ShowTestID(ctx, desc, file, line):
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
-    logging.info(f'\u001B[1m Test ID: {ctx.test_id} (#{ctx.count}) \u001B[0m')
-    logging.info(f'\u001B[1m {desc} \u001B[0m')
+    logging.info(f'\u001B[1m Test #{ctx.test_idx} ({file}:{line})   \u001B[0m')
+    logging.info(f'\u001B[1m {desc}                                 \u001B[0m')
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
 
 #-----------------------------------------------------------
@@ -455,46 +455,11 @@ 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()
@@ -502,46 +467,42 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	task_set_succeeded = True
 	HTML.startTime=int(round(time.time() * 1000))
 
-	i = 0
-	for test_case_id in todo_tests:
-		for test in all_tests:
-			if test_runner_abort:
+	for index, test in enumerate(all_tests, start=1):
+		if test_runner_abort:
+			task_set_succeeded = False
+		test_case_idx = f"{index:06d}"
+		ctx = TestCaseCtx(int(test_case_idx), logPath)
+		HTML.testCaseIdx = test_case_idx
+		desc = test.findtext('desc')
+		node = test.findtext('node') if not force_local else 'localhost'
+		always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
+		may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
+		HTML.desc = desc
+		action = test.findtext('class')
+		if not CheckClassValidity(xml_class_list, action, test_case_idx):
+			task_set_succeeded = False
+			continue
+		file = os.path.basename(xml_test_file)
+		line = test.find('class').sourceline
+		ShowTestID(ctx, desc, file, line)
+		if not task_set_succeeded and not always_exec:
+			msg = f"skipping test due to prior error"
+			logging.warning(msg)
+			HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
+			continue
+		try:
+			test_succeeded = ExecuteActionWithParam(action, ctx, node)
+			if not test_succeeded and may_fail:
+				logging.warning(f"test ID {test_case_idx} action {action} may or may not fail, proceeding despite error")
+			elif not test_succeeded:
+				logging.error(f"test ID {test_case_idx} action {action} failed ({test_succeeded}), skipping next tests")
 				task_set_succeeded = False
-			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
+		except Exception as e:
+			s = traceback.format_exc()
+			logging.error(f'while running CI, an exception occurred:\n{s}')
+			HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
+			task_set_succeeded = False
+			continue
 
 	if not task_set_succeeded:
 		logging.error('\u001B[1;37;41mScenario failed\u001B[0m')

ci-scripts/ran.py

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

ci-scripts/tests/build.py

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

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

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

ci-scripts/xml_files/cluster_image_build.xml

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

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

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

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

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

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

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

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

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

ci-scripts/xml_files/container_5g_e1_rfsim.xml

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

ci-scripts/xml_files/container_5g_f1_rfsim.xml

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

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

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

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

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

ci-scripts/xml_files/container_5g_rfsim.xml

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

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

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

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

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

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

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

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -1,116 +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-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

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

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

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

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -21,125 +21,131 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-ntn-geo</htmlTabRef>
-        <htmlTabName>Monolithic SA NTN GEO gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 040001
- 020022
- 040002
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-ntn-geo</htmlTabRef>
+  <htmlTabName>Monolithic SA NTN GEO gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <node>localhost</node>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <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="040001">
-                <class>Custom_Command</class>
-                <desc>Trigger Reestablishment</desc>
-                <node>localhost</node>
-                <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-                <command_fail>yes</command_fail>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <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>Trigger Reestablishment</desc>
+    <node>localhost</node>
+    <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
 
-        <testCase id="040002">
-                <class>Custom_Command</class>
-                <desc>Verify Reestablishment</desc>
-                <node>localhost</node>
-                <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-                <command_fail>yes</command_fail>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment</desc>
+    <node>localhost</node>
+    <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -21,93 +21,131 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-5gnr-ntn-Leo</htmlTabRef>
-        <htmlTabName>Monolithic SA NTN LEO gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>rfsim-5gnr-ntn-Leo</htmlTabRef>
+  <htmlTabName>Monolithic SA NTN LEO gNB</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
 
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <node>localhost</node>
-        </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
 
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <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="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
-        </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
 
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment</desc>
+    <node>localhost</node>
+    <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment</desc>
+    <node>localhost</node>
+    <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_prs.xml

@@ -21,80 +21,69 @@
 
 -->
 <testCaseList>
-        <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>
+  <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
+  <htmlTabName>Monolithic gNB with PRS</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
 
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-	</testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-	</testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
 
-        <testCase id="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>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="000013">
-                <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="040001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
-        </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </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>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="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>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="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

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

ci-scripts/xml_files/container_5g_rfsim_simple.xml

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

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

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

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

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

ci-scripts/xml_files/container_5g_vrtsim_chanmod.xml

@@ -0,0 +1,128 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+  <htmlTabRef>vrtsim-5gnr-chanmod</htmlTabRef>
+  <htmlTabName>Monolithic gNB vrtsim + chanmod</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_vrtsim_chanmod_gh.xml

@@ -0,0 +1,129 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+  <htmlTabRef>vrtsim-5gnr-chanmod-gh</htmlTabRef>
+  <htmlTabName>Monolithic gNB vrtsim + chanmod</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+    <tag_prefix>arm_</tag_prefix>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 3M -t 30 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 1M -t 30</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_vrtsim_chanmod</yaml_path>
+    <d_retx_th>1,0,0,0</d_retx_th>
+    <u_retx_th>1,0,0,0</u_retx_th>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb oai-nr-ue</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_build_run_tests.xml

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

ci-scripts/xml_files/container_image_build.xml

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

ci-scripts/xml_files/container_image_build_arm.xml

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

ci-scripts/xml_files/container_image_build_cross.xml

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

ci-scripts/xml_files/container_image_build_jetson.xml

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

ci-scripts/xml_files/container_l2sim_proxy.xml

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

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

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

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

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

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

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

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -24,189 +24,166 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030111
-000001
-040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
-030211
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
+  <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030111">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="030211">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040511">
-        <class>Ping</class>
-        <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
+  </testCase>
 
-    <testCase id="040613">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
 
-    <testCase id="040614">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040615">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (10MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040616">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040617">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040651">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 18M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+    <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040652">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 18M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 18M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040653">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 18M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040654">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -23,122 +23,115 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-10-cdrx-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-10MHz-CDRX-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030112
-040301 040302 040512 040612 040650 040401
-040201
-030212
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-10-cdrx-tm1</htmlTabRef>
+  <htmlTabName>Test-FDD-10MHz-CDRX-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-            <class>Custom_Command</class>
-            <always_exec>true</always_exec>
-            <desc>Enable Sleep States</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030112">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="030212">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040512">
-        <class>Ping</class>
-        <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040612">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
+  </testCase>
 
-    <testCase id="040650">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 20M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (10MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 20M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -21,180 +21,164 @@
 
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-100001
-111110
-111111
-800813
-030111
-000001
-800814
-030311
-000002
-040511 040613 040616 040651
-030411
-000001
-030211
-200000
-200001
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
+  <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="111111">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>carabe</node>
-        <images>oai-lte-ue</images>
-    </testCase>
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States (hutch)</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="100001">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States (carabe)</desc>
-        <node>carabe</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States (hutch)</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="200001">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States (carabe)</desc>
-        <node>carabe</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030111">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="800814">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 1</desc>
-        <node>carabe</node>
-    </testCase>
-    <testCase id="030311">
-        <class>Deploy_Object</class>
-        <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>
-        <node>carabe</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (hutch)</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (carabe)</desc>
+    <node>carabe</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="000002">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="030211">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>carabe</node>
+    <images>oai-lte-ue</images>
+  </testCase>
 
-    <testCase id="030411">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy LTE-UE</desc>
-        <node>carabe</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040511">
-        <class>Ping</class>
-        <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040613">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
-    </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
 
-    <testCase id="040616">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 1</desc>
+    <node>carabe</node>
+  </testCase>
 
-    <testCase id="040651">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>
+    <node>carabe</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
+  </testCase>
 
-    <testCase id="040654">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
-    </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on eNB Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (10MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>lte_oai_ue_carabe</id>
+    <svr_id>nano-cn4g</svr_id>
+  </testCase>
 
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on LTE-UE Test Server</desc>
-        <node>carabe</node>
-        <images>oai-lte-ue</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 10M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>lte_oai_ue_carabe</id>
+    <svr_id>nano-cn4g</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>lte_oai_ue_carabe</id>
+    <svr_id>nano-cn4g</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 10M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>lte_oai_ue_carabe</id>
+    <svr_id>nano-cn4g</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy LTE-UE</desc>
+    <node>carabe</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (hutch)</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (carabe)</desc>
+    <node>carabe</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on eNB Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on LTE-UE Test Server</desc>
+    <node>carabe</node>
+    <images>oai-lte-ue</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -23,190 +23,139 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 
 -->
 <testCaseList>
-    <htmlTabRef>test-fdd-20-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-20MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030121
-000001
-040301 040521 040623 040624 040625 040662 040401 040201
-030221
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-fdd-20-tm1</htmlTabRef>
+  <htmlTabName>Test-FDD-20MHz-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-            <class>Custom_Command</class>
-            <always_exec>true</always_exec>
-            <desc>Enable Sleep States</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>hutch</node>
-    </testCase>
-    <testCase id="030121">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/20MHz/B200) in a container</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="030221">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>hutch</node>
+  </testCase>
 
-    <testCase id="040521">
-        <class>Ping</class>
-        <desc>ping (20MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/20MHz/B200) in a container</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
+  </testCase>
 
-    <testCase id="040623">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 70M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
 
-    <testCase id="040624">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 70M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040625">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-        <iperf_args>-u -b 70M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (20MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040626">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
+    <iperf_args>-u -b 70M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040627">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 70M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040661">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 12M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+    <iperf_args>-u -b 70M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040662">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 17M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 17M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040663">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040664">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>hutch</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

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

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -21,193 +21,175 @@
 
 -->
 <testCaseList>
-    <htmlTabRef>test-tdd-05-if4-5</htmlTabRef>
-    <htmlTabName>Test-TDD-05MHz-TM1-IF4.5</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-300000
-100000
-111110
-800813
-030134
-030135
-040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
-030231
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-tdd-05-if4-5</htmlTabRef>
+  <htmlTabName>Test-TDD-05MHz-TM1-IF4.5</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Reset USRP</desc>
+    <node>starsky</node>
+    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="300000">
-        <class>Custom_Command</class>
-        <desc>Reset USRP</desc>
-        <node>starsky</node>
-        <command>sudo -S b2xx_fx3_utils --reset-device</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>starsky</node>
-    </testCase>
-    <testCase id="030134">
-        <class>Deploy_Object</class>
-        <desc>Deploy RRU (TDD/Band40/5MHz/B200) in a container</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-        <services>rru_tdd</services>
-    </testCase>
-    <testCase id="030135">
-        <class>Deploy_Object</class>
-        <desc>Deploy RCC (TDD/Band40/5MHz) in a container</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-        <services>rcc_tdd</services>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>starsky</node>
+  </testCase>
 
-    <testCase id="030231">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy RRU/RCC</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy RRU (TDD/Band40/5MHz/B200) in a container</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
+    <services>rru_tdd</services>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy RCC (TDD/Band40/5MHz) in a container</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
+    <services>rcc_tdd</services>
+  </testCase>
 
-    <testCase id="040532">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040631">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040632">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040634">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040635">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040681">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040682">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040684">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040685">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy RRU/RCC</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -23,197 +23,186 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
 
 -->
 <testCaseList>
-    <htmlTabRef>test-tdd-10-tm1</htmlTabRef>
-    <htmlTabName>Test-TDD-10MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030114
-040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
-030214
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-tdd-10-tm1</htmlTabRef>
+  <htmlTabName>Test-TDD-10MHz-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>starsky</node>
-    </testCase>
-    <testCase id="030114">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (TDD/Band40/10MHz/B200) in a container</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="030214">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>starsky</node>
+  </testCase>
 
-    <testCase id="040511">
-        <class>Ping</class>
-        <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (TDD/Band40/10MHz/B200) in a container</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
+  </testCase>
 
-    <testCase id="040611">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040612">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (10MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040613">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040614">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040615">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040651">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040652">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040653">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040654">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040655">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -23,195 +23,132 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
 
 -->
 <testCaseList>
-    <htmlTabRef>test-tdd-20-tm1</htmlTabRef>
-    <htmlTabName>Test-TDD-20MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030124
-040301 040521 040622 040621 040623 040662 040401 040201
-030224
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-tdd-20-tm1</htmlTabRef>
+  <htmlTabName>Test-TDD-20MHz-TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-            <class>Custom_Command</class>
-            <always_exec>true</always_exec>
-            <desc>Enable Sleep States</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>starsky</node>
-    </testCase>
-    <testCase id="030124">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="030224">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>starsky</node>
+  </testCase>
 
-    <testCase id="040521">
-        <class>Ping</class>
-        <desc>ping (20MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
+  </testCase>
 
-    <testCase id="040621">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040622">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (20MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040623">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040624">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040625">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040661">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 2M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040662">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040663">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040664">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
+  </testCase>
 
-    <testCase id="040665">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -23,200 +23,188 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
 
 -->
 <testCaseList>
-    <htmlTabRef>test-tdd-20-tm1-def-sched</htmlTabRef>
-    <htmlTabName>Test-TDD-20MHz-TM1-Default-Scheduler</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030125
-040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
-030225
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>test-tdd-20-tm1-def-sched</htmlTabRef>
+  <htmlTabName>Test-TDD-20MHz-TM1-Default-Scheduler</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Create new Workspace for server 0</desc>
-        <node>starsky</node>
-    </testCase>
-    <testCase id="030125">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="030225">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
-    </testCase>
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>starsky</node>
+  </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
+  </testCase>
 
-    <testCase id="040522">
-        <class>Ping</class>
-        <desc>ping (20MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
 
-    <testCase id="040626">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (20MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>25</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040627">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040628">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040629">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+    <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040630">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040666">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040667">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 7M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040668">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
+    <iperf_args>-u -b 7M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040669">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
+    <iperf_args>-u -b 7M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_profile>unbalanced</iperf_profile>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="040670">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
 
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images on Test Server</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>starsky</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml

@@ -25,71 +25,54 @@
   <htmlTabRef>TEST-LTE-2x2-N3XX-TM1</htmlTabRef>
   <htmlTabName>2.6 Ghz TDD LTE 2x2 TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
 
-111111
-100000
-010010
-800833
-030101
-010001
-000001
-050000
-050001
-070000
-070001
-010010
-030201
-333333
-
-</TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>obelix</node>
     <images>oai-enb</images>
   </testCase>
 
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>obelix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>obelix</node>
-    <command>sudo cpupower idle-set -E</command>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
   </testCase>
-  <testCase id="800833">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>obelix</node>
   </testCase>
-  <testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="010001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="050000">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
     <id>up2</id>
@@ -99,7 +82,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
- <testCase id="050001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
     <id>up2</id>
@@ -107,9 +90,9 @@
     <ping_args>-c 100 -s 1024 -i 0.2</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
-   </testCase>
+  </testCase>
 
-  <testCase id="070000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 26M -t 60 -R</iperf_args>
@@ -117,44 +100,39 @@
     <svr_id>porcepix-cn4g</svr_id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-   </testCase>
+  </testCase>
 
-   <testCase id="070001">
-     <class>Iperf</class>
-     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
-     <iperf_args>-u -b 7M -t 60</iperf_args>
-     <id>up2</id>
-     <svr_id>porcepix-cn4g</svr_id>
-     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-   </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 7M -t 60</iperf_args>
+    <id>up2</id>
+    <svr_id>porcepix-cn4g</svr_id>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+  </testCase>
 
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="030201">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
-    <!-- <d_retx_th>1,100,100,100</d_retx_th>
-	    <u_retx_th>1,100,100,100</u_retx_th>
-		    ?
-    -->
   </testCase>
 
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images</desc>
-        <node>obelix</node>
-        <images>oai-enb</images>
-    </testCase>
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images</desc>
+    <node>obelix</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml

@@ -25,71 +25,54 @@
   <htmlTabRef>TEST-LTE-2x2-N3XXi-TM2</htmlTabRef>
   <htmlTabName>2.6 Ghz TDD LTE 2x2 TM2</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
 
-111111
-100000
-010010
-800833
-031101
-010001
-000001
-051000
-051001
-071000
-071001
-010010
-031201
-333333
-
-</TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>obelix</node>
     <images>oai-enb</images>
   </testCase>
 
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>obelix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>obelix</node>
-    <command>sudo cpupower idle-set -E</command>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
   </testCase>
-  <testCase id="800833">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>obelix</node>
   </testCase>
-  <testCase id="031101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="010001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="051000">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
     <id>up2</id>
@@ -99,7 +82,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
- <testCase id="051001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
     <id>up2</id>
@@ -107,9 +90,9 @@
     <ping_args>-c 100 -s 1024 -i 0.2</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
-   </testCase>
+  </testCase>
 
-  <testCase id="071000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 1M -t 60 -R</iperf_args>
@@ -117,45 +100,39 @@
     <svr_id>porcepix-cn4g</svr_id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-   </testCase>
+  </testCase>
 
-   <testCase id="071001">
-     <class>Iperf</class>
-     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
-     <iperf_args>-u -b 7M -t 60</iperf_args>
-     <id>up2</id>
-     <svr_id>porcepix-cn4g</svr_id>
-     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-   </testCase>
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 7M -t 60</iperf_args>
+    <id>up2</id>
+    <svr_id>porcepix-cn4g</svr_id>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+  </testCase>
 
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="031201">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
-    <!-- <d_retx_th>1,100,100,100</d_retx_th>
-	    <u_retx_th>1,100,100,100</u_retx_th>
-		    ?
-    -->
   </testCase>
 
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <always_exec>true</always_exec>
-        <desc>Clean Test Images</desc>
-        <node>obelix</node>
-        <images>oai-enb</images>
-    </testCase>
-
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images</desc>
+    <node>obelix</node>
+    <images>oai-enb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -21,261 +21,226 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>TEST-NSA-FR1-TM1-B200</htmlTabRef>
-	<htmlTabName>NSA SanityCheck with QUECTEL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 200000
- 100000
- 500000
- 111110
- 111111
- 000100
- 010000
- 800833
- 030101
- 800834
- 030102
- 010001
- 050000
- 050001
- 070001
- 070000
- 070002
- 050002
- 050003
- 010010
- 010002
- 030202
- 030201
- 060000
- 300000
- 600000
- 222220
- 222221
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
+  <htmlTabRef>TEST-NSA-FR1-TM1-B200</htmlTabRef>
+  <htmlTabName>NSA SanityCheck with QUECTEL</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
-	<testCase id="111110">
-		<class>Pull_Local_Registry</class>
-		<desc>Pull Images from Local Registry</desc>
-		<node>nepes</node>
-		<images>oai-enb</images>
-	</testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (nepes)</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-	<testCase id="111111">
-		<class>Pull_Local_Registry</class>
-		<desc>Pull Images from Local Registry</desc>
-		<node>ofqot</node>
-		<images>oai-gnb</images>
-	</testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Reset USRP on nepes</desc>
+    <node>nepes</node>
+    <command>sudo -S /usr/local/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
+  </testCase>
 
-	<testCase id = "100000">
-		<class>Custom_Command</class>
-		<desc>Reset USRP on nepes</desc>
-		<node>nepes</node>
-		<command>sudo -S /usr/local/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
-	</testCase>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (ofqot)</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
 
-	<testCase id="200000">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States (nepes)</desc>
-		<node>nepes</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-	<testCase id="300000">
-		<class>Custom_Command</class>
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>nepes</node>
+    <images>oai-enb</images>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>ofqot</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Start EPC</desc>
+    <cn_id>ltebox-nepes</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>nepes</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
+    <node>nepes</node>
+    <yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>ofqot</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
+    <node>ofqot</node>
+    <yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/8Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 8M -t 60</iperf_args>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 70M -t 60 -R</iperf_args>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
+    <iperf_args>-t 10 --bidir</iperf_args>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
     <always_exec>true</always_exec>
-		<desc>Enable Sleep States (nepes)</desc>
-		<node>nepes</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
-	<testCase id="500000">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States (ofqot)</desc>
-		<node>ofqot</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-	<testCase id="600000">
-		<class>Custom_Command</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
     <always_exec>true</always_exec>
-		<desc>Enable Sleep States (ofqot)</desc>
-		<node>ofqot</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
 
-	<testCase id="000100">
-		<class>DeployCoreNetwork</class>
-		<desc>Start EPC</desc>
-		<cn_id>ltebox-nepes</cn_id>
-	</testCase>
-
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>idefix</id>
-	</testCase>
-	<testCase id="010002">
-		<class>Terminate_UE</class>
+  <testCase>
+    <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
-		<desc>Terminate Quectel</desc>
-		<id>idefix</id>
-	</testCase>
-	<testCase id="010001">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-		<id>idefix</id>
-  	</testCase>
-	<testCase id= "010010">
-		<class>Detach_UE</class>
+    <desc>Undeploy gNB</desc>
+    <node>ofqot</node>
+    <yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</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>Undeploy_Object</class>
     <always_exec>true</always_exec>
-		<desc>Detach UE</desc>
-		<id>idefix</id>
-	</testCase>
-	<testCase id="800833">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace</desc>
-		<node>nepes</node>
-	</testCase>
-	<testCase id="030101">
-		<class>Deploy_Object</class>
-		<desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
-		<node>nepes</node>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
-	</testCase>
-	<testCase id="800834">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace</desc>
-		<node>ofqot</node>
-	</testCase>
-	<testCase id="030102">
-		<class>Deploy_Object</class>
-		<desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
-		<node>ofqot</node>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
-	</testCase>
+    <desc>Undeploy eNB</desc>
+    <node>nepes</node>
+    <yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
+  </testCase>
 
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>15</ping_rttavg_threshold>
-	</testCase>
-
-	<testCase id="050001">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>15</ping_rttavg_threshold>
-	</testCase>
-
-	<testCase id="050002">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>15</ping_rttavg_threshold>
-	</testCase>
-
-	<testCase id="050003">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>15</ping_rttavg_threshold>
-	</testCase>
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 60 -R</iperf_args>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-	</testCase>
-
-	<testCase id="070001">
-		<class>Iperf</class>
-		<desc>iperf (UL/8Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 8M -t 60</iperf_args>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<iperf_packetloss_threshold>1</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-	</testCase>
-
-    <testCase id="070002">
-        <class>Iperf</class>
-        <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
-        <iperf_args>-t 10 --bidir</iperf_args>
-        <id>idefix</id>
-	<svr_id>ltebox-nepes</svr_id>
-    </testCase>
-
-    <testCase id="030201">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>nepes</node>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
-    </testCase>
-
-    <testCase id="060000">
-      <class>UndeployCoreNetwork</class>
-      <desc>Terminate EPC</desc>
-      <always_exec>true</always_exec>
-      <cn_id>ltebox-nepes</cn_id>
-    </testCase>
-
-    <testCase id="030202">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy gNB</desc>
-        <node>ofqot</node>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
-        <d_retx_th>10,100,100,100</d_retx_th>
-        <u_retx_th>10,100,100,100</u_retx_th>
-    </testCase>
-
-	<testCase id="222220">
-		<class>Clean_Test_Server_Images</class>
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <desc>Terminate EPC</desc>
     <always_exec>true</always_exec>
-		<desc>Clean Test Images on Test Server</desc>
-		<node>nepes</node>
-		<images>oai-enb</images>
-	</testCase>
+    <cn_id>ltebox-nepes</cn_id>
+  </testCase>
 
-	<testCase id="222221">
-		<class>Clean_Test_Server_Images</class>
+  <testCase>
+    <class>Custom_Command</class>
     <always_exec>true</always_exec>
-		<desc>Clean Test Images on Test Server</desc>
-		<node>ofqot</node>
-		<images>oai-gnb</images>
-	</testCase>
+    <desc>Enable Sleep States (nepes)</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (ofqot)</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>nepes</node>
+    <images>oai-enb</images>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>ofqot</node>
+    <images>oai-gnb</images>
+  </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_aerial_cn_start.xml

@@ -21,17 +21,14 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-CN-START</htmlTabRef>
-        <htmlTabName>Deploy 5GC</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                555000
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="555000">
-                <class>DeployCoreNetwork</class>
-                <desc>Initialize 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
-</testCaseList>
+  <htmlTabRef>TEST-AERIAL-SA-CN-START</htmlTabRef>
+  <htmlTabName>Deploy 5GC</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
 
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-aerial</cn_id>
+  </testCase>
+
+</testCaseList>