update tutorial

change config to 2 Tx [Dantenna ports
Update tutorial and config file
2026-07-15 05:30:29 +00:00 · 2023-03-21 10:50:40 +01:00 · 2023-03-09 16:01:45 +01:00 · 2023-03-09 15:54:10 +01:00 · 2023-02-24 09:08:57 +01:00 · 2023-02-24 09:08:01 +01:00
879 changed files with 69405 additions and 59407 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -9,10 +9,9 @@ AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowAllArgumentsOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
@@ -45,7 +44,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakStringLiterals: true
-ColumnLimit:     132
+ColumnLimit:     200
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/README.md
+++ b/README.md
@@ -4,12 +4,8 @@

 <p align="center">
    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
-    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
-    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
-    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
-    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
-    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS"></a>
+    <a href="https://www.redhat.com/en/enterprise-linux-8"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS"></a>
 </p>

 <p align="center">
@@ -17,10 +13,10 @@
 </p>

 <p align="center">
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-gnb?label=gNB%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-enb?label=eNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-gnb?label=gNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
 </p>

 # OpenAirInterface License #
@@ -36,12 +32,12 @@ Please see [NOTICE](NOTICE.md) file for third party software that is included in

 # Where to Start #

- *  [General overview of documentation](./doc/README.md)
 *  [The implemented features](./doc/FEATURE_SET.md)
 *  [How to build](./doc/BUILD.md)
 *  [How to run the modems](./doc/RUNMODEM.md)

-Not all information is available in a central place, and information for
+More information and documentation can be found in the [doc folder](./doc).
+Unfortunately, not all information is available there, and information for
 specific sub-systems might be available in the corresponding sub-directories.
 To find all READMEs, this command might be handy:

@@ -55,20 +51,52 @@ The OpenAirInterface (OAI) software is composed of the following parts:

 ```
 openairinterface5g
-├── charts
 ├── ci-scripts        : Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
-├── CMakeLists.txt    : Top-level CMakeLists.txt for building
 ├── cmake_targets     : Build utilities to compile (simulation, emulation and real-time platforms), and generated build files.
-├── common            : Some common OAI utilities, some other tools can be found at openair2/UTILS.
-├── doc               : Documentation
-├── docker            : Dockerfiles to build for Ubuntu and RHEL
-├── executables       : Top-level executable source files (gNB, eNB, ...)
+├── common            : Some common OAI utilities, other tools can be found at openair2/UTILS.
+├── doc               : Contains an up-to-date feature set list and starting tutorials.
+├── executables       : Top-level executable source files.
+├── LICENSE           : License file.
 ├── maketags          : Script to generate emacs tags.
-├── nfapi             : (n)FAPI code for MAC-PHY interface
+├── nfapi             : Contains the NFAPI code. A local Readme file provides more details.
 ├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+│   ├── PHY
+│   ├── SCHED
+│   ├── SCHED_NBIOT
+│   ├── SCHED_NR
+│   ├── SCHED_NR_UE
+│   ├── SCHED_UE
+│   └── SIMULATION    : PHY RF simulation.
 ├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+│   ├── COMMON
+│   ├── DOCS
+│   ├── ENB_APP
+│   ├── F1AP
+│   ├── GNB_APP
+│   ├── LAYER2/RLC/   : with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0.
+│   ├── LAYER2/PDCP/PDCP_v10.1.0
+│   ├── M2AP
+│   ├── MCE_APP
+│   ├── NETWORK_DRIVER
+│   ├── NR_PHY_INTERFACE
+│   ├── NR_UE_PHY_INTERFACE
+│   ├── PHY_INTERFACE
+│   ├── RRC
+│   ├── UTIL
+│   └── X2AP
 ├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
-├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
-└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
+│   ├── COMMON
+│   ├── DOCS
+│   ├── GTPV1-U
+│   ├── M3AP
+│   ├── MME_APP
+│   ├── NAS
+│   ├── S1AP
+│   ├── SCTP
+│   ├── SECU
+│   ├── TEST
+│   ├── UDP
+│   └── UTILS
+├── radio             : drivers for various radios such as USRP, AW2S, RFsim, ...
+└── targets           : Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
 ```
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -385,47 +385,6 @@ pipeline {
            }
          }
        }
-        stage ("LTE-TDD-2x2-Container") {
-          when { expression {do4Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-LTE-TDD-2x2-Container', 'LTE-TDD-2x2-Container')
-            }
-          }
-          post {
-            always {
-              script {
-                finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-              }
-            }
-          }
-        }
-        stage ("SA-AW2S-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-AW2S-CN5G', 'SA-AW2S-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                finalizeSlaveJob('RAN-SA-AW2S-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-              }
-            }
-          }
-        }
-
        //avra is offline, re-enable once it is available
        //stage ("T1-Offload-Test") {
        //  when { expression {do5Gtest} }
--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -155,6 +155,14 @@ pipeline {
            allParametersPresent = false
          }

+          if (params.ADB_IPAddress == null) {
+            echo "no ADB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.ADB_Credentials == null) {
+            echo "no ADB_IPAddress given"
+            allParametersPresent = false
+          }
          if (params.OC_Credentials == null) {
            echo "no OC_Credentials given"
            allParametersPresent = false
@@ -199,13 +207,14 @@ pipeline {
            withCredentials([
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
              [$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}"
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -140,6 +140,12 @@ pipeline {
            allParametersPresent = false
          }

+          if (params.ADB_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.ADB_Credentials == null) {
+            allParametersPresent = false
+          }
          if (params.OC_Credentials == null) {
            allParametersPresent = false
          }
@@ -186,14 +192,15 @@ pipeline {
            withCredentials([
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
              [$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}"
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
@@ -211,16 +218,10 @@ pipeline {
        script {
          dir ('ci-scripts') {
            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.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_logs_CN.zip")){
-                sh "mv test_logs_CN.zip test_logs_CN_${env.BUILD_ID}.zip"
-                archiveArtifacts artifacts: "test_logs_CN_${env.BUILD_ID}.zip"
+            sh "zip -r -qq physim_deploytest_logs_${env.BUILD_ID}.zip physim_test_logs_*/*"
+            sh "rm -rf physim_test_logs_*/"
+            if (fileExists("physim_deploytest_logs_${env.BUILD_ID}.zip")) {
+              archiveArtifacts artifacts: "physim_deploytest_logs_${env.BUILD_ID}.zip"
            }
            if (fileExists("test_results.html")) {
              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -155,6 +155,13 @@ pipeline {
                        allParametersPresent = false
                    }

+                    if (params.ADB_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.ADB_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
                    if (allParametersPresent) {
                        echo "All parameters are present"
                        if (eNB_AllowMergeRequestProcess) {
@@ -195,13 +202,14 @@ pipeline {
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -150,6 +150,13 @@ pipeline {
                        allParametersPresent = false
                    }

+                    if (params.ADB_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.ADB_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
                    if (allParametersPresent) {
                        echo "All parameters are present"
                        if (eNB_AllowMergeRequestProcess) {
@@ -191,13 +198,14 @@ pipeline {
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                            for (xmlFile in myXmlTestSuite) {
                                if (fileExists(xmlFile)) {
                                    try {
-                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
                                    } catch (Exception e) {
                                        currentBuild.result = 'FAILURE'
                                        buildStageStatus = false
@@ -212,6 +220,20 @@ pipeline {
        }
        stage ("Terminate") {
            parallel {
+                stage('Terminate UE') {
+                    // Bypassing this stage if there are no abd server defined
+                    when {
+                      expression { params.ADB_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate UE\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateUE --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password}"
+                        }
+                    }
+                }
                stage('Terminate eNB') {
                    steps {
                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -24,6 +24,7 @@

 // Location of the python executor node shall be in the same subnet as the others servers
 def pythonExecutor = params.pythonExecutor
+def DataBaseHost = params.DataBaseHost

 // Location of the test XML file to be run
 def testXMLFile = params.pythonTestXmlFile
@@ -168,6 +169,16 @@ pipeline {
            allParametersPresent = false
          }

+          if (params.ADB_IPAddress == null) {
+            allParametersPresent = false
+          }
+          if (params.ADB_Credentials == null) {
+            allParametersPresent = false
+          }
+          if (params.DataBaseHost == "none") {
+            DataBaseHost = pythonExecutor
+          }
+
          if (allParametersPresent) {
            echo "All parameters are present"
            if (eNB_AllowMergeRequestProcess) {
@@ -209,14 +220,15 @@ pipeline {
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
            ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
+                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
@@ -352,6 +364,18 @@ pipeline {
            }
          }
        }
+        stage ("SQL Collect"){
+          when {
+            expression { params.DataBaseHost != "none" }
+          }
+          agent {label DataBaseHost}
+          steps {
+            script {
+              if (currentBuild.result=='FAILURE') {StatusForDb = 'FAIL'} else {StatusForDb = 'PASS'}
+              sh "python3 /home/oaicicd/mysql/sql_connect.py ${JOB_NAME} ${params.eNB_MR} ${params.eNB_Branch} ${env.BUILD_ID} ${env.BUILD_URL} ${StatusForDb} ''"
+            }
+          }
+        }
      }
    }
  }
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -89,6 +89,10 @@ pipeline {
        string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
        credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
        string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
+
+        //ADB server parameters
+        string(name: 'ADB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of ADB server')
+        credentials(name: 'ADB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for ADB')
    }
    */

@@ -167,6 +171,13 @@ pipeline {
                        allParametersPresent = false
                    }

+                    if (params.ADB_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.ADB_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
                    if (allParametersPresent) {
                        echo "All parameters are present"
                        if (eNB_AllowMergeRequestProcess) {
@@ -206,13 +217,14 @@ pipeline {
                        withCredentials([
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
@@ -227,6 +239,27 @@ pipeline {
        }
        stage ("Terminate") {
            parallel {
+                stage('Terminate UE') {
+                    // Bypassing this stage if there are no abd server defined
+                    when {
+                      expression { params.ADB_IPAddress != "none" }
+                    }
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate UE\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateUE --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termUE] = true
+                            }
+                        }
+                    }
+                }
                stage('Terminate eNB') {
                    steps {
                        echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
@@ -484,6 +517,13 @@ pipeline {
        // Making sure that we really shutdown every thing before leaving
        failure {
            script {
+                if ((!termStatusArray[termUE]) && (params.ADB_IPAddress != "none")) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateUE --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password}"
+                    }
+                }
                if (!termStatusArray[termENB]) {
                    withCredentials([
                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
--- a/ci-scripts/Jenkinsfile-tmp-ue
+++ b/ci-scripts/Jenkinsfile-tmp-ue
@@ -142,6 +142,13 @@ pipeline {
                        allParametersPresent = false
                    }
 */
+                    if (params.ADB_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.ADB_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
                    if (allParametersPresent) {
                        echo "All parameters are present"
                        if (eNB_AllowMergeRequestProcess) {
@@ -180,13 +187,14 @@ pipeline {
                        }
                        withCredentials([
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                    sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -197,7 +197,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
                SCA.eNBSourceCodePath=matchReg.group(1)
                PHYSIM.eNBSourceCodePath=matchReg.group(1)
                CLUSTER.eNBSourceCodePath=matchReg.group(1)
-                EPC.eNBSourceCodePath=matchReg.group(1)
            elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNB1SourceCodePath=matchReg.group(1)
@@ -220,21 +219,31 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            EPC.SourceCodePath=matchReg.group(1)
        elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
-            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE) or re.match('OC-OAI-CN5G', matchReg.group(1), re.IGNORECASE):
+            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE):
                EPC.Type=matchReg.group(1)
            else:
-                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker or OC-OAI-CN5G)')
+                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker)')
        elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
            EPC.ContainerPrefix=matchReg.group(1)
        elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBIPAddress parameter")
+            matchReg = re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.ADBIPAddress = matchReg.group(1)
        elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBUserName parameter")
+            matchReg = re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.ADBUserName = matchReg.group(1)
        elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBType parameter")
+            matchReg = re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE)
+            if re.match('centralized', matchReg.group(1), re.IGNORECASE) or re.match('distributed', matchReg.group(1), re.IGNORECASE):
+                if re.match('distributed', matchReg.group(1), re.IGNORECASE):
+                    CiTestObj.ADBCentralized = False
+                else:
+                    CiTestObj.ADBCentralized = True
+            else:
+                sys.exit('Invalid ADB Type: ' + matchReg.group(1) + ' -- (should be centralized or distributed)')
        elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBPassword parameter")
+            matchReg = re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.ADBPassword = matchReg.group(1)
        elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
            CiTestObj.testXMLfiles.append(matchReg.group(1))
@@ -261,17 +270,14 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            matchReg = re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCUserName = matchReg.group(1)
            CLUSTER.OCUserName = matchReg.group(1)
-            EPC.OCUserName = matchReg.group(1)
        elif re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCPassword = matchReg.group(1)
            CLUSTER.OCPassword = matchReg.group(1)
-            EPC.OCPassword = matchReg.group(1)
        elif re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCProjectName = matchReg.group(1)
            CLUSTER.OCProjectName = matchReg.group(1)
-            EPC.OCProjectName = matchReg.group(1)
        elif re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE)
            CLUSTER.OCUrl = matchReg.group(1)
--- a/ci-scripts/as_ue/aw2s-asue.cfg
+++ b/ci-scripts/as_ue/aw2s-asue.cfg
@@ -1,183 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue1.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-                    
-cell_groups: [{
-    group_type: "nr",
-    multi_ue: true,
-    cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-#if TDD == 1
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-  }],
-       
-  ue_list: [
-    {
-      /* UE capabilities */
-      /* USIM data */
-      "ue_id" : 1,
-      "imsi": "001010000000100",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      /* UE capabilities */
-      /* USIM data */
-      "ue_id" : 2,
-      "imsi": "001010000000101",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      /* UE capabilities */
-      /* USIM data */
-      "ue_id" : 3,
-      "imsi": "001010000000102",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, sd: 66051, }, ],
-      default_pdu_session_snssai: { sst: 1, sd: 66051, },
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      /* UE capabilities */
-      /* USIM data */
-      "ue_id" : 4,
-      "imsi": "001010000000103",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, sd: 66051, }, ],
-      default_pdu_session_snssai: { sst: 1, sd: 66051, },
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      /* UE capabilities */
-      /* USIM data */
-      "ue_id" : 5,
-      "imsi": "001010000000104",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, sd: 66051, }, ],
-      default_pdu_session_snssai: { sst: 1, sd: 66051, },
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      /* UE capabilities */
-      /* USIM data */
-      "ue_id" : 6,
-      "imsi": "001010000000105",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, sd: 66051, }, ],
-      default_pdu_session_snssai: { sst: 1, sd: 66051, },
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      /* UE capabilities */
-   
-      /* USIM data */
-      "ue_id" : 7,
-      "imsi": "001010000000106",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, sd: 66051, }, ],
-      default_pdu_session_snssai: { sst: 1, sd: 66051, },
-
-
-      /* Enable it to allow sim_events to be handled remotely */
-      //rue_addr: "127.1.0.0",
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-    },
-  ],
-}
-
--- a/ci-scripts/as_ue/oaicicd-3xue-noPing-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-3xue-noPing-SATest.cfg
@@ -0,0 +1,172 @@
+/* UE simulator configuration */
+
+
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define TDD 1
+#define CELL_BANDWIDTH 40
+#define UE_COUNT 3 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
+
+
+log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue0.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and allow dynamic UE creation from remote API */
+                    
+cell_groups: [{
+    group_type: "nr",
+    multi_ue: true,
+    cells: [{
+      rf_port: 0,
+      bandwidth: CELL_BANDWIDTH,
+#if TDD == 1
+      band: 78,
+      dl_nr_arfcn:621312,
+      ssb_nr_arfcn:621312,
+
+      //band: 41,
+      //dl_nr_arfcn:517020,
+      //ssb_nr_arfcn:516990,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+}],
+
+    
+/* Enable it to allow sim_events to be handled remotely */
+//rue_bind_addr: "127.0.10.11",
+
+
+
+ue_list: [
+  {
+    /* UE capabilities */ 
+    /* USIM data */    
+    "ue_id" : 0,
+    "imsi": "208970100001127",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  }, /*end UE object 0*/
+  {
+    /* UE capabilities */ 
+    /* USIM data */  
+    "ue_id" : 1, 
+    "imsi": "208970100001128",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  }, /*end UE object 1*/
+  {
+    /* UE capabilities */
+    /* USIM data */
+    "ue_id" : 2,
+    "imsi": "208970100001129",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      },
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  } /*end UE object 2*/
+  ],/*end UE list*/
+}/*end json*/
+
--- a/ci-scripts/as_ue/oaicicd-multi-ue-1xPing-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-multi-ue-1xPing-SATest.cfg
@@ -0,0 +1,142 @@
+/* UE simulator configuration */
+
+
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define TDD 1
+#define CELL_BANDWIDTH 40
+#define UE_COUNT 2 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
+
+
+log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue0.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and allow dynamic UE creation from remote API */
+                    
+cell_groups: [{
+    group_type: "nr",
+    multi_ue: true,
+    cells: [{
+      rf_port: 0,
+      bandwidth: CELL_BANDWIDTH,
+#if TDD == 1
+      band: 78,
+      dl_nr_arfcn:621312,
+      ssb_nr_arfcn:621312,
+
+      //band: 41,
+      //dl_nr_arfcn:517020,
+      //ssb_nr_arfcn:516990,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+}],
+
+    
+/* Enable it to allow sim_events to be handled remotely */
+//rue_bind_addr: "127.0.10.11",
+
+
+
+ue_list: [
+  {
+    /* UE capabilities */ 
+    /* USIM data */    
+    "ue_id" : 1,
+    "imsi": "208970100001127",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  }, /*end UE object 0*/
+  {
+    /* UE capabilities */ 
+    /* USIM data */  
+    "ue_id" : 2, 
+    "imsi": "208970100001128",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+       "tag": "ping",
+       "prog":"oai_ext_app.sh",
+        start_time: 15,
+        end_time: 25,
+        "args":["ping 192.168.70.136"],
+        "event":"ext_app"              
+      },
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  } /*end UE object 1*/
+  ],/*end UE list*/
+}/*end json*/
--- a/ci-scripts/as_ue/oaicicd-multi-ue-2xPing-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-multi-ue-2xPing-SATest.cfg
@@ -0,0 +1,150 @@
+/* UE simulator configuration */
+
+
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define TDD 1
+#define CELL_BANDWIDTH 40
+#define UE_COUNT 2 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
+
+
+log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue0.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and allow dynamic UE creation from remote API */
+                    
+cell_groups: [{
+    group_type: "nr",
+    multi_ue: true,
+    cells: [{
+      rf_port: 0,
+      bandwidth: CELL_BANDWIDTH,
+#if TDD == 1
+      band: 78,
+      dl_nr_arfcn:621312,
+      ssb_nr_arfcn:621312,
+
+      //band: 41,
+      //dl_nr_arfcn:517020,
+      //ssb_nr_arfcn:516990,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+}],
+
+    
+/* Enable it to allow sim_events to be handled remotely */
+//rue_bind_addr: "127.0.10.11",
+
+
+
+ue_list: [
+  {
+    /* UE capabilities */ 
+    /* USIM data */    
+    "ue_id" : 1,
+    "imsi": "208970100001127",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+       "tag": "ping",
+       "prog":"oai_ext_app.sh",
+        start_time: 15,
+        end_time: 25,
+        "args":["ping 192.168.70.136"],
+        "event":"ext_app"              
+      },
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  }, /*end UE object 0*/
+  {
+    /* UE capabilities */ 
+    /* USIM data */  
+    "ue_id" : 2, 
+    "imsi": "208970100001128",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+       "tag": "ping",
+       "prog":"oai_ext_app.sh",
+        start_time: 15,
+        end_time: 25,
+        "args":["ping 192.168.70.136"],
+        "event":"ext_app"              
+      },
+      {
+        event: "power_off",
+        start_time: 30,
+      }
+    ] /*end sim events */
+  } /*end UE object 1*/
+  ],/*end UE list*/
+}/*end json*/
--- a/ci-scripts/as_ue/oaicicd-multi-ue-2xPingSeq-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-multi-ue-2xPingSeq-SATest.cfg
@@ -0,0 +1,150 @@
+/* UE simulator configuration */
+
+
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define TDD 1
+#define CELL_BANDWIDTH 40
+#define UE_COUNT 2 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
+
+
+log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue0.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and allow dynamic UE creation from remote API */
+                    
+cell_groups: [{
+    group_type: "nr",
+    multi_ue: true,
+    cells: [{
+      rf_port: 0,
+      bandwidth: CELL_BANDWIDTH,
+#if TDD == 1
+      band: 78,
+      dl_nr_arfcn:621312,
+      ssb_nr_arfcn:621312,
+
+      //band: 41,
+      //dl_nr_arfcn:517020,
+      //ssb_nr_arfcn:516990,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+}],
+
+    
+/* Enable it to allow sim_events to be handled remotely */
+//rue_bind_addr: "127.0.10.11",
+
+
+
+ue_list: [
+  {
+    /* UE capabilities */ 
+    /* USIM data */    
+    "ue_id" : 1,
+    "imsi": "208970100001127",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      },
+      {
+       "tag": "ping",
+       "prog":"oai_ext_app.sh",
+        start_time: 20,
+        end_time: 30,
+        "args":["ping 192.168.70.136"],
+        "event":"ext_app"
+      },
+      {
+        event: "power_off",
+        start_time: 60,
+      }
+    ] /*end sim events */
+  }, /*end UE object 0*/
+  {
+    /* UE capabilities */ 
+    /* USIM data */  
+    "ue_id" : 2, 
+    "imsi": "208970100001128",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+      {
+      sst: 1,
+      sd: 66051,
+      },
+    ],
+    default_pdu_session_snssai: {
+      sst: 1,
+      sd: 66051,
+    },
+    /* Enable it to allow sim_events to be handled remotely */
+    //rue_addr: "127.1.0.0",
+    /* Enable it to create a TUN interface for each UE PDN */
+    tun_setup_script: "ue-ifup",
+    sim_events: [
+      {
+        event: "power_on",
+        start_time: 5,
+      }, 
+      {
+       "tag": "ping",
+       "prog":"oai_ext_app.sh",
+        start_time: 40,
+        end_time: 50,
+        "args":["ping 192.168.70.136"],
+        "event":"ext_app"              
+      },
+      {
+        event: "power_off",
+        start_time: 60,
+      }
+    ] /*end sim events */
+  } /*end UE object 1*/
+  ],/*end UE list*/
+}/*end json*/
--- a/ci-scripts/as_ue/oaicicd-ue-Ping-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-ue-Ping-SATest.cfg
@@ -0,0 +1,113 @@
+/* UE simulator configuration */
+
+
+
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define TDD 1
+#define CELL_BANDWIDTH 40
+
+
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+  log_filename: "/tmp/ue1.log",
+
+  /* Enable remote API and Web interface */
+  com_addr: "0.0.0.0:9002",
+
+  include "rf_driver/1chan.cfg",
+
+      /* If true, allow the simulation of several UEs at the same time and
+         allow dynamic UE creation from remote API */
+                    
+cell_groups: [{
+    group_type: "nr",
+    multi_ue: false,
+    cells: [{
+      rf_port: 0,
+      bandwidth: CELL_BANDWIDTH,
+#if TDD == 1
+      band: 78,
+      dl_nr_arfcn:621312,
+      ssb_nr_arfcn:621312,
+
+      //band: 41,
+      //dl_nr_arfcn:517020,
+      //ssb_nr_arfcn:516990,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+  }],
+
+
+
+       
+  /* Enable it to allow sim_events to be handled remotely */
+  //rue_bind_addr: "127.0.10.11",
+
+  ue_list: [
+    {
+      /* UE capabilities */
+   
+    /* USIM data */
+
+
+    "imsi": "208970100001127",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+
+
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+    {
+    sst: 1,
+    sd: 66051,
+    },
+    ],
+
+    default_pdu_session_snssai: {
+    sst: 1,
+    sd: 66051,
+    },
+
+
+      /* Enable it to allow sim_events to be handled remotely */
+      //rue_addr: "127.1.0.0",
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+
+      sim_events: [{
+        event: "power_on",
+        start_time: 5,
+      }, {
+       "tag": "ping",
+       "prog":"oai_ext_app.sh",
+        start_time: 15,
+        end_time: 25,
+        "args":["ping 192.168.70.136"],
+        "event":"ext_app"
+              
+      },
+      {
+        event: "power_off",
+        start_time: 30,
+      }]
+    }
+  ],
+}
--- a/ci-scripts/as_ue/oaicicd-ue-iperf-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-ue-iperf-SATest.cfg
@@ -0,0 +1,109 @@
+/* UE simulator configuration */
+
+
+
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define TDD 1
+#define CELL_BANDWIDTH 20
+
+
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+  log_filename: "/tmp/ue0.log",
+
+  /* Enable remote API and Web interface */
+  com_addr: "0.0.0.0:9002",
+
+  include "rf_driver/1chan.cfg",
+
+      /* If true, allow the simulation of several UEs at the same time and
+         allow dynamic UE creation from remote API */
+                    
+cell_groups: [{
+    group_type: "nr",
+    multi_ue: false,
+    cells: [{
+      rf_port: 0,
+      bandwidth: CELL_BANDWIDTH,
+#if TDD == 1
+     // band: 78,
+     // dl_nr_arfcn:621312,
+     // ssb_nr_arfcn:621312,*/
+
+      band: 41,
+      dl_nr_arfcn:517020,
+      ssb_nr_arfcn:516990,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+  }],
+
+
+
+       
+  /* Enable it to allow sim_events to be handled remotely */
+  //rue_bind_addr: "127.0.10.11",
+
+  ue_list: [
+    {
+      /* UE capabilities */
+   
+    /* USIM data */
+     
+    "imsi": "208970100001127",
+    "K": "fec86ba6eb707ed08905757b1bb44b8f",
+    "sim_algo":"milenage",
+    "op": "1006020f0a478bf6b699f15c062e42b3",
+
+
+    as_release: 15,
+    ue_category: "nr",
+    apn:"oai",
+    attach_pdn_type:"ipv4",
+    default_nssai: [
+    {
+    sst: 1,
+    sd: 1,
+    },
+    ],
+
+    default_pdu_session_snssai: {
+    sst: 1,
+    sd: 1,
+    },
+
+
+      /* Enable it to allow sim_events to be handled remotely */
+      //rue_addr: "127.1.0.0",
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+
+      sim_events: [{
+        event: "power_on",
+        start_time: 5,
+      }, {
+        event: "ext_app",
+        start_time: 15,
+        end_time: 25,
+        prog: "ext_app.sh",
+        args: ["iperf", " -c  172.21.10.5", " -u"," -b 1M"," -i 1"," -t 10"]
+      }, {
+        event: "power_off",
+        start_time: 30,
+      }]
+    }
+  ],
+}
--- a/ci-scripts/build_fr1_from_yaml.py
+++ b/ci-scripts/build_fr1_from_yaml.py
@@ -39,6 +39,10 @@ def main():
           '--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \
           '--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \
           \
+           '--ADBIPAddress=' + params['ADB']['ADBIPAddress'] + ' ' + \
+           '--ADBUserName=' + params['ADB']['ADBUserName'] + ' ' + \
+           '--ADBPassword=' + params['ADB']['ADBPassword'] + ' ' + \
+           \
           '--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \
           '--UEUserName=' + params['UE']['UEUserName'] + ' ' + \
           '--UEPassword=' + params['UE']['UEPassword'] + ' ' + \
--- a/ci-scripts/build_fr1_template.yaml
+++ b/ci-scripts/build_fr1_template.yaml
@@ -12,6 +12,12 @@ steps:
  - TesteNB,xml_files/fr1_nsa_base_next.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate
  - TesteNB,xml_files/fr1_epc_closure.xml

+
+ADB: #on Caracal
+  ADBIPAddress : 172.21.16.132
+  ADBUserName : oaici
+  ADBPassword : KkexF6CErOi1fNuebCPsuIVK
+
 RAN:
    - eNBIPAddress : 192.168.18.199 #eNB on Minimassive
      eNBUserName : oaicicd
--- a/ci-scripts/ci_ctl_adb.sh
+++ b/ci-scripts/ci_ctl_adb.sh
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-usage() {
-  echo "usage: $0 <command> <id>"
-  echo "available commands: initialize, attach, detach, terminate, check"
-}
-
-if [ $# -ne 2 ]; then
-  usage
-  exit 1
-fi
-
-cmd=$1
-id=$2
-
-flightmode_off() {
-  set +x
-  adb -s $id shell "/data/local/tmp/on"
-}
-
-flightmode_on() {
-  set +x
-  adb -s $id shell "/data/local/tmp/off"
-}
-
-initialize() {
-  set +x
-  adb -s $id shell "svc data enable"   # make sure data services are enabled
-  flightmode_on
-}
-
-terminate() {
-  echo "terminate: does nothing"
-}
-
-check() {
-  declare -A service=( ["0"]="IN_SERVICE" ["1"]="OUT_OF_SERVICE" ["2"]="EMERGENCY_ONLY" ["3"]="RADIO_POWERED_OFF")
-  declare -A data=( ["0"]="DISCONNECTED" ["1"]="CONNECTING" ["2"]="CONNECTED" ["3"]="SUSPENDED")
-  serv_idx=$(adb -s $id shell "dumpsys telephony.registry" | sed -n 's/.*mServiceState=\([0-3]\).*/\1/p')
-  data_idx=$(adb -s $id shell "dumpsys telephony.registry" | sed -n 's/.*mDataConnectionState=\([0-3]\).*/\1/p')
-  data_reason=$(adb -s $id shell "dumpsys telephony.registry" | sed -n 's/.*mDataConnectionReason=\([0-9a-zA-Z_]\+\).*/\1/p')
-  #echo "Status Check UE $id"
-  echo "Service State: ${service[$serv_idx]}"
-  echo "Data State:    ${data[$data_idx]}"
-  echo "Data Reason:   ${data_reason}"
-}
-
-case "${cmd}" in
-  initialize) initialize;;
-  attach) flightmode_off;;
-  detach) flightmode_on;;
-  terminate) terminate;;
-  check) check;;
-  *) echo "Invalid command $cmd"; usage; exit 1;;
-esac
--- a/ci-scripts/ci_ctl_qtel.py
+++ b/ci-scripts/ci_ctl_qtel.py
@@ -33,6 +33,7 @@ import sys
 import time
 import serial

+
 class qtel_ctl:
 	#---------------
 	#private methods
@@ -74,15 +75,12 @@ class qtel_ctl:
        self.__set_modem_state(self.modem,'0')


+
+
 if __name__ == "__main__":
    #argv[1] : usb port
    #argv[2] : qtel command (see function pointers dict "wup", "detach" etc ...)
-	if len(sys.argv) >= 3:
-		command = sys.argv[2]
-		print(command)
-		Module=qtel_ctl(sys.argv[1])
+    command = sys.argv[2]
+    Module=qtel_ctl(sys.argv[1])
    #calling the function to be applied
-		Module.cmd_dict[command]()
-		print(Module.cmd_dict[command])
-	else:
-		print("To many arguments")
+    Module.cmd_dict[command]()
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -1,128 +1,106 @@
 idefix:
-  Host: idefix
-  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quectel-cm.log &
-  TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
-  UENetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-  Trace: True
-  LogStore: /media/usb-drive/ci_qlogs
+  ID: idefix
+  State : enabled
+  Kind : quectel
+  Process : 
+    Name : quectel-CM
+    Cmd : /home/oaicicd/quectel-CM/quectel-CM -4 -s
+    Apn :
+      ltebox : oai.ipv4
+  WakeupScript : ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript : ci_ctl_qtel.py /dev/ttyUSB2 detach
+  LogStore : /media/usb-drive/ci_qlogs
+  PLMN : 22201
+  UENetwork : wwan0 
+  HostIPAddress : 172.21.16.135
+  HostUsername : oaicicd
+  HostPassword : oaicicd
+  HostSourceCodePath : none
+  MTU : 1500
 nrmodule2_quectel:
-  Host: nrmodule2
-  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
-  TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
-  UENetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-  LogStore: /media/ci_qlogs
+  ID: nrmodule2_quectel
+  State : enabled
+  Kind : quectel
+  Process :
+    Name : quectel-CM
+    Cmd : /home/nrmodule2/quectel-CM/quectel-CM -4 -s
+    Apn :
+      OAICN5G : oai
+      OAI-Rel14-Docker : oai.ipv4
+  WakeupScript : ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript : ci_ctl_qtel.py /dev/ttyUSB2 detach
+  LogStore : /media/ci_qlogs  
+  PLMN : 20897
+  UENetwork : wwan0
+  HostIPAddress : 172.21.16.139
+  HostUsername : nrmodule2 
+  HostPassword : linux 
+  HostSourceCodePath : none
+  StartCommands :
+    - sudo -S ip link set dev wwan1 mtu 1500
+  MTU : 1500

-adb_ue_1:
-  Host: nano
-  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
-  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate R3CM40LZPHT
-  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach R3CM40LZPHT
-  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach R3CM40LZPHT
-  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check R3CM40LZPHT
-  DataEnableScript: adb -s R3CM40LZPHT shell "svc data enable"
-  DataDisableScript: adb -s R3CM40LZPHT shell "svc data disable"
-  UENetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
-  CmdPrefix: adb -s R3CM40LZPHT shell
-  MTU: 1500
-  LogStore: /media/usb-drive/ci_adb_1-logs
-adb_ue_2:
-  Host: nano
-  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
-  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200c00db4413517
-  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200c00db4413517
-  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200c00db4413517
-  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517
-  DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable"
-  DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable"
-  UENetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
-  CmdPrefix: adb -s 5200c00db4413517 shell
-  MTU: 1500
-  LogStore: /media/usb-drive/ci_adb_2-logs
-
-amarisoft_ue:
-  Host: amariue
-  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-asue.cfg &
-  TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
+# CAUTION: 192.168.18.89 address has to be changed when the server is moved
+#single UE single ping
 amarisoft_ue_1:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
-  UENetworkScript: ip netns exec ue1 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue1
-  MTU: 1500
-amarisoft_ue_2:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
-  UENetworkScript: ip netns exec ue2 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue2
-  MTU: 1500
-amarisoft_ue_3:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
-  UENetworkScript: ip netns exec ue3 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue3
-  MTU: 1500
-amarisoft_ue_4:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
-  UENetworkScript: ip netns exec ue4 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue4
-  MTU: 1500
-amarisoft_ue_5:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
-  UENetworkScript: ip netns exec ue5 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue5
-  MTU: 1500
-amarisoft_ue_6:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
-  UENetworkScript: ip netns exec ue6 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue6
-  MTU: 1500
-amarisoft_ue_7:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
-  UENetworkScript: ip netns exec ue7 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue7
-  MTU: 1500
-amarisoft_ue_8:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
-  UENetworkScript: ip netns exec ue8 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue8
-  MTU: 1500
-amarisoft_ue_9:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
-  UENetworkScript: ip netns exec ue9 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue9
-  MTU: 1500
-amarisoft_ue_10:
-  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
-  UENetworkScript: ip netns exec ue10 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue10
-  MTU: 1500
+  ID: amarisoft_ue_1
+  State : enabled
+  Kind : amarisoft
+  #not required for AS config but needed for py script
+  WakeupScript : none
+  DetachScript : none
+  #end 
+  Cmd : /root/NV18-06-2022/ue/lteue
+  Config : /root/NV17-12-21/ue/config/oaicicd-ue-Ping-SATest.cfg 
+  Duration : 60
+  Ping : /tmp/test_ue1.log
+  UELog : /tmp/ue1.log
+  HostIPAddress : 172.21.16.144
+  HostUsername : root
+  HostPassword : toor 
+  HostSourceCodePath : /tmp
+
+
+#an other scenario example
+#notice : this will not work as such, only suggestion for multi ue scenario
+amarisoft_ue_2:
+  ID: amarisoft_ue_2
+  State : enabled
+  Kind : amarisoft
+  #not required for AS config but needed for py script
+  WakeupScript : none
+  DetachScript : none
+  #end 
+  Cmd : /root/NV18-06-2022/ue/lteue
+  Config : /root/NV17-12-21/ue/config/xxxxxxx.cfg #to be updated for an other scenario 
+  Duration : 60
+  Ping :
+    - /tmp/test_ue1.log #to be updated fo an other scenario
+    - /tmp/test_ue2.log #could be a list for a multi ue scenario
+  UELog :
+    - /tmp/ue1.log
+    - /tmp/ue1.log
+  HostIPAddress : 192.168.18.89
+  HostUsername : root
+  HostPassword : toor 
+  HostSourceCodePath : /tmp
+
+
+#do not remove
+dummy:
+  ID: ''
+  State : ''
+  Kind : ''
+  Process : 
+    Name : ''
+    Cmd : ''
+  WakeupScript : ''
+  DetachScript : ''
+  PLMN : 22201
+  UENetwork : wwan0
+  HostIPAddress : 172.21.16.135
+  HostUsername : oaicicd
+  HostPassword : oaicicd
+  HostSourceCodePath : none
+

-oai_ue_obelix:
-  Host: obelix
-  UENetworkScript: ip a show dev oaitun_ue1
-  IF: oaitun_ue1
--- a/ci-scripts/cls_amarisoft_ue.py
+++ b/ci-scripts/cls_amarisoft_ue.py
@@ -0,0 +1,81 @@
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+#   Required Python Version
+#     Python 3.x
+#
+#---------------------------------------------------------------------
+
+#to use isfile
+import os
+import sys
+import logging
+#to create a SSH object locally in the methods
+import sshconnection
+#time.sleep
+import time
+
+
+import re
+import subprocess
+
+from datetime import datetime
+
+
+class AS_UE:
+
+	def __init__(self,Module):
+		#create attributes as in the UE dictionary
+		for k, v in Module.items():
+			setattr(self, k, v)
+	
+
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+	def WaitEndScenario(self):
+		logging.debug('waiting for scenario duration')
+		time.sleep(int(self.Duration))
+
+	def KillASUE(self):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		mySSH.command('killall --signal SIGKILL lteue-avx2', '\$', 5)
+		mySSH.close()
+
+	def RunScenario(self):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+
+		logging.debug("Deleting old artifacts :")
+		cmd='rm -rf ' + self.Ping + ' ' + self.UELog 
+		mySSH.command(cmd, '\$',5)
+		logging.debug("Running scenario :")
+		cmd='echo $USER; nohup '+self.Cmd + ' ' + self.Config + ' &'
+		mySSH.command(cmd, '\$',5)
+
+		mySSH.close()
+
+
+
--- a/docker/Dockerfile.clang.rhel8.2
+++ b/docker/Dockerfile.clang.rhel8.2
@@ -1,4 +1,3 @@
-#/*
 # * 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.
@@ -20,24 +19,39 @@
 # */
 #---------------------------------------------------------------------
 #
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for RHEL8
+#   Required Python Version
+#     Python 3.x
 #
 #---------------------------------------------------------------------

-FROM ran-base:latest AS oai-clang
+#to use isfile
+import os
+import sys
+import logging
+#to create a SSH object locally in the methods
+import sshconnection
+#time.sleep
+import time
+#to load ue infrastructure dictionary
+import yaml
+
+class InfraUE:
+	def __init__(self):
+		self.ci_ue_infra ={}
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+	#This method reads the yaml file describing the multi-UE infrastructure
+	#and stores the infra permanently in the related class attribute self.ci_ue_infra
+	def Get_UE_Infra(self,ue_infra_filename):
+		f_yaml=ue_infra_filename
+		with open(f_yaml,'r') as file:
+			logging.debug('Loading UE infrastructure from file '+f_yaml)
+			#load it permanently in the class attribute
+			self.ci_ue_infra = yaml.load(file,Loader=yaml.FullLoader)

-RUN rm -Rf /oai-ran
-WORKDIR /oai-ran
-COPY . .

-#only install LLVM (clang, ...) for this container, the others don't need it
-RUN yum install -y llvm-toolset

-#run build_oai to build the target image
-RUN /bin/sh oaienv && \
-    cd cmake_targets && \
-    mkdir -p log && \
-    export CC=/usr/bin/clang && \
-    export CXX=/usr/bin/clang++ && \
-    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -40,29 +40,6 @@ import cls_cmd

 IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
-OCUrl = "https://api.oai.cs.eurecom.fr:6443"
-OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
-
-
-def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
-	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
-		HELP.GenericHelp(CONST.Version)
-		sys.exit('Insufficient Parameter: no OC Credentials')
-	if OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
-		sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and end on a slash /')
-	ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}')
-	if ret.returncode != 0:
-		logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-		return False
-	ret = cmd.run(f'oc project {ocProjectName}')
-	if ret.returncode != 0:
-		logging.error(f'\u001B[1mUnable to access OC project {ocProjectName}\u001B[0m')
-		OC_logout(cmd)
-		return False
-	return True
-
-def OC_logout(cmd):
-	cmd.run(f'oc logout')

 class Cluster:
 	def __init__(self):
@@ -80,7 +57,7 @@ class Cluster:
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
-		self.imageToPull = ''
+

 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
@@ -193,47 +170,11 @@ class Cluster:
 	def _undeploy_pod(self, filename):
 		self.cmd.run(f'oc delete -f {filename}')

-	def PullClusterImage(self, HTML, RAN):
-		if self.imageToPull == '':
-			HELP.GenericHelp(CONST.Version)
-			HELP.EPCSrvHelp(self.imageToPull)
-			sys.exit('Insufficient eNB Parameters')
-		lIpAddr = self.eNBIPAddress
-		self.testCase_id = HTML.testCase_id
-		cmd = cls_cmd.getConnection(lIpAddr)
-		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, self.OCProjectName)
-		if not succeeded:
-			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			return False
-		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
-		if ret.returncode != 0:
-			logging.error(f'\u001B[1m Unable to access OC project {ocProjectName}\u001B[0m')
-			OC_logout(cmd)
-			cmd.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			return False
-		for image in self.imageToPull:
-			imagePrefix = f'{self.OCRegistry}{self.OCProjectName}'
-			imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
-			if ret.returncode != 0:
-				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
-				OC_logout(cmd)
-				cmd.close()
-				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
-				return False
-			cmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
-			cmd.run(f'docker rmi {imagePrefix}/{imageTag}')
-		OC_logout(cmd)
-		cmd.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		return True
-
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
@@ -263,6 +204,7 @@ class Cluster:

 		baseTag = 'develop'
 		forceBaseImageBuild = False
+		imageTag = 'develop'
 		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
 			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == 'develop':
@@ -272,7 +214,6 @@ class Cluster:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 		else:
-			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True

 		# logging to OC Cluster and then switch to corresponding project
@@ -332,18 +273,11 @@ class Cluster:
 			ranbuild_job = self._start_build('ran-build')
 			attemptedImages += ['ran-build']

-			self._recreate_is_tag('oai-clang', imageTag, 'openshift/oai-clang-is.yaml')
-			self._recreate_bc('oai-clang', imageTag, 'openshift/oai-clang-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.clang.rhel8.2')
-			clang_job = self._start_build('oai-clang')
-			attemptedImages += ['oai-clang']
-
-			wait = ranbuild_job is not None and physim_job is not None and clang_job is not None and self._wait_build_end([ranbuild_job, physim_job, clang_job], 1200)
-			if not wait: logging.error('error during build of ranbuild_job or physim_job or clang_job')
+			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end([ranbuild_job, physim_job], 1200)
+			if not wait: logging.error('error during build of ranbuild_job or physim_job')
 			status = status and wait
 			self.cmd.run(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log')
 			self.cmd.run(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log')
-			self.cmd.run(f'oc logs {clang_job} &> cmake_targets/log/oai-clang.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)

 		if status:
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -32,17 +32,10 @@ import os
 import paramiko
 import uuid

-# helper that returns either LocalCmd or RemoteCmd based on passed host name
-def getConnection(host, d=None):
-	if host is None or host.lower() in ["", "none", "localhost"]:
-		return LocalCmd(d=d)
-	else:
-		return RemoteCmd(host, d=d)
-
 # provides a partial interface for the legacy SSHconnection class (getBefore(), command())
 class Cmd(metaclass=abc.ABCMeta):
 	def cd(self, d, silent=False):
-		if d == None or d == '':
+		if d == None or d == '' or d == []:
 			self.cwd = None
 		elif d[0] == '/':
 			self.cwd = d
@@ -58,13 +51,9 @@ class Cmd(metaclass=abc.ABCMeta):
 	def run(self, line, timeout=300, silent=False):
 		return

-	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
-		splitted = commandline.split(' ')
-		if splitted[0] == 'cd':
-			self.cd(' '.join(splitted[1:]), silent)
-		else:
-			self.run(commandline, timeout, silent)
-		return 0
+	@abc.abstractmethod
+	def command(self, commandline, expectedline, timeout, silent=False, resync=False):
+		return

 	@abc.abstractmethod
 	def close(self):
@@ -93,12 +82,7 @@ class LocalCmd(Cmd):
 		if not silent:
 			logging.info(line)
 		try:
-			if line.strip().endswith('&'):
-				# if we wait for stdout, subprocess does not return before the end of the command
-				# however, we don't want to wait for commands with &, so just return fake command
-				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
-			else:
-				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
+			ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
 			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
 		if ret.stdout is None:
@@ -109,6 +93,14 @@ class LocalCmd(Cmd):
 		self.cp = ret
 		return ret

+	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
+		line = [s for s in commandline.split(' ') if len(s) > 0]
+		if line[0] == 'cd':
+			self.cd(line[1], silent)
+		else:
+			self.run(line, timeout, silent)
+		return 0
+
 	def close(self):
 		pass

@@ -116,14 +108,16 @@ class LocalCmd(Cmd):
 		return self.cp.stdout

 	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
+		logging.warning("LocalCmd emulating sshconnection.copyin() function")
 		self.run(f'cp -r {src} {tgt}')

 	def copyout(self, scpIp, scpUser, scpPw, src, tgt):
+		logging.warning("LocalCmd emulating sshconnection.copyout() function")
 		self.run(f'cp -r {src} {tgt}')

 class RemoteCmd(Cmd):
 	def __init__(self, hostname, d=None):
-		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
+		logging.getLogger('paramiko').setLevel(logging.INFO) # prevent spamming through Paramiko
 		self.client = paramiko.SSHClient()
 		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
@@ -152,27 +146,33 @@ class RemoteCmd(Cmd):
 		return cfg

 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
+		if type(line) is list:
+			line = ' '.join(line)
 		if not silent:
-			logging.info(line)
+			logging.debug(line)
 		if self.cwd:
 			line = f"cd {self.cwd} && {line}"
+		args = line.split(' ')
 		try:
-			if line.strip().endswith('&'):
-				# if we wait for stdout, Paramiko does not return before the end of the command
-				# however, we don't want to wait for commands with &, so just return fake command
-				self.client.exec_command(line, timeout = 5)
-				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
-			else:
-				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
-				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
+			stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
+			ret = sp.CompletedProcess(args=args, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
 		except Exception as e:
-			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
+			ret = sp.CompletedProcess(args=args, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
 		ret.stdout = ret.stdout.decode('utf-8').strip()
 		if reportNonZero and ret.returncode != 0:
-			logging.warning(f'command "{line}" returned non-zero returncode {ret.returncode}: output:\n{ret.stdout}')
+			cmd = ' '.join(ret.args)
+			logging.warning(f'command "{cmd}" returned non-zero returncode {ret.returncode}: output:\n{ret.stdout}')
 		self.cp = ret
 		return ret

+	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
+		line = [s for s in commandline.split(' ') if len(s) > 0]
+		if line[0] == 'cd':
+			self.cd(line[1], silent)
+		else:
+			self.run(line, timeout, silent)
+		return 0
+
 	def close(self):
 		self.client.close()

@@ -180,6 +180,7 @@ class RemoteCmd(Cmd):
 		return self.cp.stdout

 	def copyout(self, src, tgt, recursive=False):
+		logging.warning("RemoteCmd emulating sshconnection.copyout() function, ignoring scpIp")
 		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
@@ -197,6 +198,7 @@ class RemoteCmd(Cmd):
 			sftp.close()

 	def copyin(self, src, tgt, recursive=False):
+		logging.warning("RemoteCmd emulating sshconnection.copyout() function")
 		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -31,8 +31,8 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
-import sys	      # arg
-import re	       # reg
+import sys              # arg
+import re               # reg
 import logging
 import os
 import shutil
@@ -47,7 +47,6 @@ from zipfile import ZipFile
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
-import cls_cluster as OC
 import cls_cmd
 import sshconnection as SSH
 import helpreadme as HELP
@@ -66,8 +65,6 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 	sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
 	sshSession.command('cd ' + sourcePath, '\$', 5)
 	# Recent version of git (>2.20?) should handle missing .git extension # without problems
-	if ranTargetBranch == 'null':
-		ranTargetBranch = 'develop'
 	baseBranch = re.sub('origin/', '', ranTargetBranch)
 	sshSession.command(f'git clone --filter=blob:none -n -b {baseBranch} {ranRepository} .', '\$', 60)
 	if sshSession.getBefore().count('error') > 0 or sshSession.getBefore().count('error') > 0:
@@ -91,15 +88,6 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 		logging.debug(f'Merging with the target branch: {ranTargetBranch}')
 		sshSession.command(f'git merge --ff origin/{ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)

-def ImageTagToUse(imageName, ranCommitID, ranBranch, ranAllowMerge):
-	shortCommit = ranCommitID[0:8]
-	if ranAllowMerge:
-		tagToUse = f'{ranBranch}-{shortCommit}'
-	else:
-		tagToUse = f'develop-{shortCommit}'
-	fullTag = f'{imageName}:{tagToUse}'
-	return fullTag
-
 def CopyLogsToExecutor(cmd, sourcePath, log_name):
 	cmd.cd(f'{sourcePath}/cmake_targets')
 	cmd.run(f'rm -f {log_name}.zip')
@@ -197,7 +185,7 @@ def AnalyzeIperf(cliOptions, clientReport, serverReport):
 			reportLine = clientReportLines[l+1]
 			logging.debug(f'found server report: "{reportLine}"')

-	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
+	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ ..\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
 	# if we do not find a server report in the client logs, check the server logs
 	# and use the last line which is typically close/identical to server report
 	if reportLine is None:
@@ -316,6 +304,7 @@ class Containerize():
 		self.registrySvrId = ''
 		self.testSvrId = ''
 		self.imageToPull = []
+
 		#checkers from xml
 		self.ran_checkers={}

@@ -354,7 +343,7 @@ class Containerize():
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu20'
+			self.dockerfileprefix = '.ubuntu18'
 			self.cliBuildOptions = '--no-cache'
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
@@ -392,7 +381,7 @@ class Containerize():
 	
 		CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

-		# if asterix, copy the entitlement and subscription manager configurations
+ 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
 			cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
 			cmd.run('cp /etc/rhsm/rhsm.conf ./rhsm-conf/')
@@ -658,6 +647,15 @@ class Containerize():
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)

+	def ImageTagToUse(self, imageName):
+		shortCommit = self.ranCommitID[0:8]
+		if self.ranAllowMerge:
+			tagToUse = f'{self.ranBranch}-{shortCommit}'
+		else:
+			tagToUse = f'develop-{shortCommit}'
+		fullTag = f'porcepix.sboai.cs.eurecom.fr/{imageName}:{tagToUse}'
+		return fullTag
+
 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
 			lIpAddr = self.eNBIPAddress
@@ -680,8 +678,8 @@ class Containerize():
 		logging.debug('Pushing images from server: ' + lIpAddr)
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
-		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
-		mySSH.command(f'docker login -u oaicicd -p oaicicd {imagePrefix}', '\$', 5)
+
+		mySSH.command('docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5)
 		if re.search('Login Succeeded', mySSH.getBefore()) is None:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
@@ -694,9 +692,9 @@ class Containerize():
 			orgTag = 'ci-temp'
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{tagToUse}', '\$', 5)
-			mySSH.command(f'docker push {imagePrefix}/{tagToUse}', '\$', 120)
+			tagToUse = self.ImageTagToUse(image)
+			mySSH.command(f'docker image tag {image}:{orgTag} {tagToUse}', '\$', 5)
+			mySSH.command(f'docker push {tagToUse}', '\$', 120)
 			if re.search(': digest:', mySSH.getBefore()) is None:
 				logging.debug(mySSH.getBefore())
 				msg = f'Could not push {image} to local registry : {tagToUse}'
@@ -704,9 +702,9 @@ class Containerize():
 				mySSH.close()
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-			mySSH.command(f'docker rmi {imagePrefix}/{tagToUse} {image}:{orgTag}', '\$', 30)
+			mySSH.command(f'docker rmi {tagToUse} {image}:{orgTag}', '\$', 30)

-		mySSH.command(f'docker logout {imagePrefix}', '\$', 5)
+		mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5)
 		if re.search('Removing login credentials', mySSH.getBefore()) is None:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
@@ -739,18 +737,25 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		myCmd = cls_cmd.getConnection(lIpAddr)
-		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
-		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
+		if lIpAddr != 'none':
+			logging.debug('Pulling images onto server: ' + lIpAddr)
+			myCmd = cls_cmd.RemoteCmd(lIpAddr)
+		else:
+			logging.debug('Pulling images locally')
+			myCmd = cls_cmd.LocalCmd()
+
+		cmd = 'docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr'
+		response = myCmd.run(cmd)
 		if response.returncode != 0:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
 			myCmd.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
+
 		for image in self.imageToPull:
-			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			cmd = f'docker pull {imagePrefix}/{tagToUse}'
+			tagToUse = self.ImageTagToUse(image)
+			cmd = f'docker pull {tagToUse}'
 			response = myCmd.run(cmd, timeout=120)
 			if response.returncode != 0:
 				logging.debug(response)
@@ -759,15 +764,16 @@ class Containerize():
 				myCmd.close()
 				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-			myCmd.run(f'docker tag {imagePrefix}/{tagToUse} oai-ci/{tagToUse}')
-			myCmd.run(f'docker rmi {imagePrefix}/{tagToUse}')
-		response = myCmd.run(f'docker logout {imagePrefix}')
+
+		cmd = 'docker logout porcepix.sboai.cs.eurecom.fr'
+		response = myCmd.run(cmd)
 		if response.returncode != 0:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
 			myCmd.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
+
 		myCmd.close()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
@@ -802,8 +808,7 @@ class Containerize():

 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			cmd = f'docker rmi oai-ci/{imageTag}'
+			cmd = f'docker rmi {self.ImageTagToUse(image)}'
 			myCmd.run(cmd, reportNonZero=False)

 		myCmd.close()
@@ -837,11 +842,11 @@ class Containerize():
 		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-		mySSH.command('cp docker-compose.y*ml ci-docker-compose.yml', '\$', 5)
-		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s']
+		mySSH.command('cp docker-compose.yml ci-docker-compose.yml', '\$', 5)
+		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup']
 		for image in imagesList:
-			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2)
+			imageToUse = self.ImageTagToUse(image)
+			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: {imageToUse}#" ci-docker-compose.yml', '\$', 2)
 		localMmeIpAddr = EPC.MmeIPAddress
 		mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)

@@ -920,21 +925,24 @@ class Containerize():
 			mySSH.copyin(lIpAddr, lUserName, lPassWord, logfilename, '.')
 		mySSH.close()

-		message = ''
+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">\n'
 		if usedImage != '':
-			message += f'Used Image = {usedImage} :\n'
-			message += imageInfo
+			html_cell += f'Used Image = {usedImage} :\n'
+			html_cell += imageInfo
 		else:
-			message += 'Could not retrieve used image info!\n'
+			html_cell += 'Could not retrieve used image info!\n'
 		if status:
-			message += '\nHealthy deployment!\n'
+			html_cell += '\nHealthy deployment!\n'
 		else:
-			message += '\nUnhealthy deployment! -- Check logs for reason!\n'
+			html_cell += '\nUnhealthy deployment! -- Check logs for reason!\n'
+		html_cell += '</pre>'
+		html_queue.put(html_cell)
 		if status:
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [message])
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', CONST.ENB_PROCESS_OK, html_queue)
 		else:
 			self.exitStatus = 1
-			HTML.CreateHtmlTestRowQueue('N/A', 'KO', [message])
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', CONST.ENB_PROCESS_OK, html_queue)


 	def UndeployObject(self, HTML, RAN):
@@ -959,7 +967,6 @@ class Containerize():
 		logging.debug('\u001B[1m Undeploying OAI Object from server: ' + lIpAddr + '\u001B[0m')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
-
 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)

 		svcName = self.services[self.eNB_instance]
@@ -974,8 +981,8 @@ class Containerize():
 		services = []
 		for s in allServices:
 			mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
-			running = mySSH.getBefore().split('\r\n')[2:-1]
-			logging.debug(f'running services: {running}')
+			running = mySSH.getBefore().split('\r\n')[3:-1]
+			#logging.debug(f'running services: {running}')
 			if len(running) > 0: # something is running for that service
 				services.append(s)
 		logging.info(f'stopping services {services}')
@@ -1044,12 +1051,13 @@ class Containerize():
 			myCmd.close()
 			HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK)
 			return
+
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
 		myCmd.run(cmd, silent=self.displayedNewTags)
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
+			tagToUse = self.ImageTagToUse(image)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True

@@ -1106,30 +1114,37 @@ class Containerize():
 			else:
 				time.sleep(10)

-		html_cell = ''
+		imagesInfo = ''
 		for newCont in newContainers:
 			if newCont == 'rfsim4g-db-init':
 				continue
 			cmd = 'docker inspect -f "{{.Config.Image}}" ' + newCont
 			imageInspect = myCmd.run(cmd, timeout=30, silent=True)
 			imageName = str(imageInspect.stdout).strip()
-			cmd = 'docker image inspect --format \'{{.RepoTags}}\t{{.Size}} bytes\t{{index (split .Created ".") 0}}\n{{.Id}}\' ' + imageName
+			cmd = 'docker image inspect --format "{{.RepoTags}}\t{{.Size}} bytes\t{{.Created}}\t{{.Id}}" ' + imageName
 			imageInspect = myCmd.run(cmd, 30, silent=True)
-			html_cell += imageInspect.stdout + '\n'
+			imagesInfo += imageInspect.stdout.strip()
 		myCmd.close()

+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">\n'
+		for imageInfo in imagesInfo.split('\n'):
+			html_cell += imageInfo[:-11] + '\n'
+		html_cell += '\n'
 		for cState in containerStatus:
 			html_cell += cState + '\n'
+		html_cell += '</pre>'
+		html_queue.put(html_cell)
 		if count == 100 and healthy == self.nb_healthy[0]:
 			if self.tsharkStarted == False:
 				logging.debug('Starting tshark on public network')
 				self.CaptureOnDockerNetworks()
-			HTML.CreateHtmlTestRowQueue('n/a', 'OK', [html_cell])
+			HTML.CreateHtmlTestRowQueue('n/a', 'OK', 1, html_queue)
 			for cState in containerStatus:
 				logging.debug(cState)
 			logging.info('\u001B[1m Deploying OAI Object(s) PASS\u001B[0m')
 		else:
-			HTML.CreateHtmlTestRowQueue('Could not deploy in time', 'KO', [html_cell])
+			HTML.CreateHtmlTestRowQueue('Could not deploy in time', 'KO', 1, html_queue)
 			for cState in containerStatus:
 				logging.debug(cState)
 			logging.error('\u001B[1m Deploying OAI Object(s) FAILED\u001B[0m')
@@ -1186,12 +1201,13 @@ class Containerize():
 		ymlPath = self.yamlPath[0].split('/')
 		logPath = '../cmake_targets/log/' + ymlPath[1]
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
+
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
 		myCmd.run(cmd, silent=self.displayedNewTags)
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
+			tagToUse = self.ImageTagToUse(image)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True

@@ -1339,7 +1355,10 @@ class Containerize():
 				message += statLine + '\n'
 		myCmd.close()

-		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">\n' + message + '</pre>'
+		html_queue.put(html_cell)
+		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', 1, html_queue)

 	def PingFromContainer(self, HTML, RAN, UE):
 		myCmd = cls_cmd.LocalCmd()
@@ -1398,11 +1417,14 @@ class Containerize():
 			logging.info('\u001B[1m Ping Test PASS\u001B[0m')

 	def PingExit(self, HTML, RAN, UE, status, message):
+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>'
+		html_queue.put(html_cell)
 		if status:
-			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', 1, html_queue)
 		else:
 			logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', [message])
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', 1, html_queue)
 			# Automatic undeployment
 			logging.warning('----------------------------------------')
 			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
@@ -1451,12 +1473,14 @@ class Containerize():
 		self.IperfExit(HTML, RAN, UE, iperfStatus, msg)

 	def IperfExit(self, HTML, RAN, UE, status, message):
-		html_cell = f'UE\n{message}'
+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>'
+		html_queue.put(html_cell)
 		if status:
-			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', [html_cell])
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', 1, html_queue)
 		else:
 			logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', [html_cell])
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', 1, html_queue)
 			# Automatic undeployment
 			logging.warning('----------------------------------------')
 			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
@@ -1482,6 +1506,11 @@ class Containerize():
 			result = re.search('172.21.16.128', mySSH.getBefore())
 			if result is None:
 				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev eno1', '\$', 10)
+			# Check if route to nepes gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
+			result = re.search('172.21.16.137', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.137 dev eno1', '\$', 10)
 			# Check if forwarding is enabled
 			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
 			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
@@ -1551,28 +1580,16 @@ class Containerize():
 			mySSH.close()
 		if svrName == 'nepes':
 			mySSH.open(ipAddr, userName, password)
-			# Check if route to ofqot gnb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
-			result = re.search('172.21.16.109', mySSH.getBefore())
+			# Check if route to porcepix epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
 			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.109 dev enp0s31f6', '\$', 10)
-			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
-			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
-			# Check if iptables forwarding is accepted
-			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
-			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
-			mySSH.close()
-		if svrName == 'ofqot':
-			mySSH.open(ipAddr, userName, password)
-			# Check if X2 route to nepes enb/epc exists
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev enp0s31f6', '\$', 10)
+			# Check if X2 route to obelix enb exists
 			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
-			result = re.search('172.21.16.137', mySSH.getBefore())
+			result = re.search('172.21.16.128', mySSH.getBefore())
 			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.137 dev enp2s0', '\$', 10)
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev enp0s31f6', '\$', 10)
 			# Check if forwarding is enabled
 			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
 			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
--- a/ci-scripts/cls_cots_ue.py
+++ b/ci-scripts/cls_cots_ue.py
@@ -0,0 +1,138 @@
+# * 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
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#to use isfile
+import os
+import sys
+#to use logging.info()
+import logging
+#to create a SSH object locally in the methods
+import sshconnection
+#time.sleep
+import time
+#to load cots_ue dictionary
+import yaml
+
+class CotsUe:
+	def __init__(self,ADBIPAddr,ADBUserName,ADBPassWord):
+		self.cots_id = '' #cots id from yaml oppo, s10 etc...
+		self.ADBIPAddr = ADBIPAddr 
+		self.ADBUserName = ADBUserName
+		self.ADBPassWord = ADBPassWord
+		self.cots_run_mode = '' #on of off to toggle airplane mode on/off
+		self.__cots_cde_dict_file = 'cots_ue_ctl.yaml'
+		self.__SetAirplaneRetry = 3
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+	def Check_Airplane(self):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
+		status=mySSH.cde_check_value('adb shell settings get global airplane_mode_on ', ['0','1'],5)
+		mySSH.close()
+		return status
+
+	#simply check if the device id exists in the dictionary
+	#returns true if it exists, false otherwise
+	def Check_Exists(self,target_id):
+		#load cots commands dictionary
+		if (os.path.isfile(self.__cots_cde_dict_file)):
+			yaml_file=self.__cots_cde_dict_file
+		elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
+			yaml_file='ci-scripts/'+self.__cots_cde_dict_file
+		else:
+			logging.error("COTS UE dictionary yaml file cannot be found")
+			sys.exit("COTS UE dictionary yaml file cannot be found")
+		
+		#load cots commands dictionary
+		with open(yaml_file,'r') as file:
+			cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
+		#check if ue id is in the dictionary
+		if target_id in cots_ue_ctl:
+			return True
+		else:
+			return False
+
+	def Set_Airplane(self, target_id, target_state_str):
+		#loading cots commands dictionary
+
+		if (os.path.isfile(self.__cots_cde_dict_file)):
+			yaml_file=self.__cots_cde_dict_file
+		elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
+			yaml_file='ci-scripts/'+self.__cots_cde_dict_file
+		else:
+			logging.error("COTS UE dictionary yaml file cannot be found")
+			sys.exit("COTS UE dictionary yaml file cannot be found")
+		
+		#load cots commands dictionary
+		with open(yaml_file,'r') as file:
+			cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
+		#check if ue id is in the dictionary
+		if target_id in cots_ue_ctl:
+			mySSH = sshconnection.SSHConnection()
+			mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
+			logging.info(str(self.ADBIPAddr)+' '+str(self.ADBUserName)+' '+str(self.ADBPassWord))
+			mySSH.command('adb start-server','\$',5)
+			mySSH.command('adb devices','\$',5)
+			logging.info("Toggling COTS UE Airplane mode to : "+target_state_str)
+			#get current state
+			current_state = self.Check_Airplane()
+			if target_state_str.lower()=="on": 
+				target_state=1
+			else:
+				target_state=0
+			if current_state != target_state:
+				#toggle state
+				retry = 0 
+				while (current_state!=target_state) and (retry < self.__SetAirplaneRetry):
+					#loop over the command list from dictionary for the selected ue, to switch to required state
+					for i in range (0,len(cots_ue_ctl[target_id])):
+						mySSH.command(cots_ue_ctl[target_id][i], '\$', 5)
+					time.sleep(1)
+					current_state = self.Check_Airplane()
+					retry+=1
+				#could not toggle despite the retry
+				if current_state != target_state:
+					logging.error("ATTENTION : Could not toggle to : "+target_state_str)
+					logging.error("Current state is : "+ str(current_state))
+			else:
+				logging.info("Airplane mode is already "+ target_state_str)
+			mySSH.command('adb kill-server','\$',5)
+			mySSH.close()
+		#ue id is NOT in the dictionary
+		else:
+			logging.error("COTS UE Id from XML could not be found in UE YAML dictionary " + self.__cots_cde_dict_file)
+			sys.exit("COTS UE Id from XML could not be found in UE YAML dictionary " + self.__cots_cde_dict_file)
+
+
+
+
--- a/ci-scripts/cls_module_ue.py
+++ b/ci-scripts/cls_module_ue.py
@@ -28,197 +28,177 @@
 import os
 import sys
 import logging
+#to create a SSH object locally in the methods
+import sshconnection
 #time.sleep
 import time
+
+
 import re
 import subprocess
+
 from datetime import datetime
-import yaml

 #for log rotation mgt
 import cls_log_mgt
-import cls_cmd

 class Module_UE:

-	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
-		with open(filename, 'r') as f:
-			all_ues = yaml.load(f, Loader=yaml.FullLoader)
-			m = all_ues.get(module_name)
-			if m is None:
-				raise Exception(f'no such module name "{module_name}" in "{filename}"')
-			self.module_name = module_name
-			self.host = m['Host']
-			self.cmd_dict = {
-				"attach": m.get('AttachScript'),
-				"detach": m.get('DetachScript'),
-				"initialize": m.get('InitScript'),
-				"terminate": m.get('TermScript'),
-				"getNetwork": m.get('UENetworkScript'),
-				"check": m.get('CheckStatusScript'),
-				"dataEnable": m.get('DataEnableScript'),
-				"dataDisable": m.get('DataDisableScript'),
-			}
-			self.interface = m.get('IF')
-			self.MTU = m.get('MTU')
-			self.trace = m.get('trace') == True
-			self.logStore = m.get('LogStore')
-			self.cmd_prefix = m.get('CmdPrefix')
-			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')
+	def __init__(self,Module):
+		#create attributes as in the Module dictionary
+		for k, v in Module.items():
+			setattr(self, k, v)
+		self.UEIPAddress = ""
+		#dictionary linking command names and related module scripts
+		self.cmd_dict= {"wup": self.WakeupScript,"detach":self.DetachScript}#dictionary of function scripts
+		self.ue_trace=''		

-	def __str__(self):
-		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"

-	def __repr__(self):
-		return self.__str__()
-
-	def _command(self, cmd, silent = False):
-		if cmd is None:
-			raise Exception("no command provided")
-		if self.host == "" or self.host == "localhost":
-			c = cls_cmd.LocalCmd()
-		else:
-			c = cls_cmd.RemoteCmd(self.host)
-		response = c.run(cmd, silent=silent)
-		c.close()
-		return response.stdout

 #-----------------$
 #PUBLIC Methods$
 #-----------------$

-	def initialize(self):
-		if self.trace:
-			raise Exception("UE tracing not implemented yet")
-			self._enableTrace()
-		# we first terminate to make sure the UE has been stopped
-		if self.cmd_dict["detach"]:
-			self._command(self.cmd_dict["detach"], silent=True)
-		self._command(self.cmd_dict["terminate"], silent=True)
-		self._command(self.cmd_dict["initialize"])
-
-	def terminate(self):
-		self._command(self.cmd_dict["terminate"])
-		if self.trace:
-			raise Exception("UE tracing not implemented yet")
-			self._disableTrace()
-			return self._logCollect()
-		return None
-
-	def attach(self, attach_tries = 4, attach_timeout = 60):
-		ip = None
-		while attach_tries > 0:
-			self._command(self.cmd_dict["attach"])
-			timeout = attach_timeout
-			logging.debug("Waiting for IP address to be assigned")
-			while timeout > 0 and not ip:
-				time.sleep(5)
-				timeout -= 5
-				ip = self.getIP()
-			if ip:
-				break
-			logging.warning(f"UE did not receive IP address after {attach_timeout} s, detaching")
-			attach_tries -= 1
-			self._command(self.cmd_dict["detach"])
+	#this method checks if the specified Process is running on the server hosting the module
+	#if not it will be started
+	def CheckCMProcess(self,CNType):
+		HOST=self.HostUsername+'@'+self.HostIPAddress
+		COMMAND="ps aux | grep --colour=never " + self.Process['Name'] + " | grep -v grep "
+		logging.debug(COMMAND)
+		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		result = ssh.stdout.readlines()
+		if len(result)!=0:
+			logging.debug(self.Process['Name'] + " process found")
+			return True 
+		else:#start process and check again  
+			logging.debug(self.Process['Name'] + " process NOT found")
+			#starting the process
+			logging.debug('Starting ' + self.Process['Name'])
+			mySSH = sshconnection.SSHConnection()
+			mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+			mySSH.command('echo ' + self.HostPassword + ' | sudo -S rm -f /tmp/quectel-cm.log','\$',5)
+			mySSH.command('echo $USER; echo ' + self.HostPassword + ' | nohup sudo -S stdbuf -o0 ' + self.Process['Cmd'] + ' ' +  self.Process['Apn'][CNType]  + ' > /tmp/quectel-cm.log 2>&1 &','\$',5)
+			mySSH.close()
+			#checking the process
 			time.sleep(5)
-		if ip:
-			logging.debug(f'\u001B[1mUE IP Address is {ip}\u001B[0m')
-		else:
-			logging.debug('\u001B[1;37;41mUE IP Address Not Found!\u001B[0m')
-		return ip
+			HOST=self.HostUsername+'@'+self.HostIPAddress
+			COMMAND="ps aux | grep --colour=never " + self.Process['Name'] + " | grep -v grep "
+			logging.debug(COMMAND)
+			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+			result = ssh.stdout.readlines()
+			if len(result)!=0:
+				logging.debug(self.Process['Name'] + " process found")
+				return True
+			else:
+				logging.debug(self.Process['Name'] + " process NOT found")
+				return False 

-	def detach(self):
-		self._command(self.cmd_dict["detach"])
-
-	def check(self):
-		cmd = self.cmd_dict["check"]
-		if cmd:
-			return self._command(cmd)
-		else:
-			logging.warning(f"requested status check of UE {self.getName()}, but operation is not supported")
-			return f"UE {self.getName()} does not support status checking"
-
-	def dataEnable(self):
-		cmd = self.cmd_dict["dataEnable"]
-		if cmd:
-			self._command(cmd)
-			return True
-		else:
-			message = f"requested enabling data of UE {self.getName()}, but operation is not supported"
-			logging.error(message)
-			return False
-
-	def dataDisable(self):
-		cmd = self.cmd_dict["dataDisable"]
-		if cmd:
-			self._command(cmd)
-			return True
-		else:
-			message = f"requested disabling data of UE {self.getName()}, but operation is not supported"
-			logging.error(message)
-			return False
-
-	def getIP(self):
-		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output)
-		if result and result.group('ip'):
-			ip = result.group('ip')
-			return ip
-		return None
-
-	def checkMTU(self):
-		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('mtu (?P<mtu>[0-9]+)', output)
-		if result and result.group('mtu') and int(result.group('mtu')) == self.MTU:
-			logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
-			return True
-		else:
-			logging.debug('\u001B[1;37;41m Incorrect Module NIC MTU or MTU not found! Expected: ' + str(self.MTU) + '\u001B[0m')
-			return False
-
-	def getName(self):
-		return self.module_name
-
-	def getIFName(self):
-		return self.interface
-
-	def getHost(self):
-		return self.host
-
-	def getCmdPrefix(self):
-		return self.cmd_prefix if self.cmd_prefix else ""
-
-	def _enableTrace(self):
-		raise Exception("not implemented")
+	#Generic command function, using function pointers dictionary
+	def Command(self,cmd):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		#delete old artifacts
-		mySSH.command('echo ' + ' '  + ' | sudo -S rm -rf ci_qlog','\$',5)
-		#start Trace, artifact is created in home dir
-		mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
-		mySSH.close()
-
-	def _disableTrace(self):
-		raise Exception("not implemented")
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		mySSH.command('echo ' + ' '  + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5)
+		mySSH.command('echo ' + self.HostPassword + ' | sudo -S python3 ' + self.cmd_dict[cmd],'\$',10)
+		time.sleep(5)
+		logging.debug("Module "+ cmd)
 		mySSH.close()


-	def _logCollect(self):
-		raise Exception("not implemented")
+	#this method retrieves the Module IP address (not the Host IP address) 
+	def GetModuleIPAddress(self):
+		HOST=self.HostUsername+'@'+self.HostIPAddress
+		response= []
+		tentative = 8
+		while (len(response)==0) and (tentative>0):
+			COMMAND="ip a show dev " + self.UENetwork + " | grep --colour=never inet | grep " + self.UENetwork
+			if tentative == 8:
+				logging.debug(COMMAND)
+			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+			response = ssh.stdout.readlines()
+			tentative-=1
+			time.sleep(2)
+		if (tentative==0) and (len(response)==0):
+			logging.debug('\u001B[1;37;41m Module IP Address Not Found! Time expired \u001B[0m')
+			return -1
+		else: #check response
+			result = re.search('inet (?P<moduleipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', response[0].decode("utf-8") )
+			if result is not None: 
+				if result.group('moduleipaddress') is not None: 
+					self.UEIPAddress = result.group('moduleipaddress')
+					logging.debug('\u001B[1mUE Module IP Address is ' + self.UEIPAddress + '\u001B[0m')
+					return 0
+				else:
+					logging.debug('\u001B[1;37;41m Module IP Address Not Found! \u001B[0m')
+					return -1
+			else:
+				logging.debug('\u001B[1;37;41m Module IP Address Not Found! \u001B[0m')
+				return -1
+
+	def CheckModuleMTU(self):
+		HOST=self.HostUsername+'@'+self.HostIPAddress
+		response= []
+		tentative = 3 
+		while (len(response)==0) and (tentative>0):
+			COMMAND="ip a show dev " + self.UENetwork + " | grep --colour=never mtu"
+			logging.debug(COMMAND)
+			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+			response = ssh.stdout.readlines()
+			tentative-=1
+			time.sleep(10)
+		if (tentative==0) and (len(response)==0):
+			logging.debug('\u001B[1;37;41m Module NIC MTU Not Found! Time expired \u001B[0m')
+			return -1
+		else: #check response
+			result = re.search('mtu (?P<mtu>[0-9]+)', response[0].decode("utf-8") )
+			if result is not None: 
+				if (result.group('mtu') is not None) and (str(result.group('mtu'))==str(self.MTU)) : 
+					logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
+					return 0
+				else:
+					logging.debug('\u001B[1;37;41m Incorrect Module NIC MTU ' + str(result.group('mtu')) + '! Expected : ' + str(self.MTU) + '\u001B[0m')
+					return -1
+			else:
+				logging.debug('\u001B[1;37;41m Module NIC MTU Not Found! \u001B[0m')
+				return -1
+
+	def EnableTrace(self):
+		if self.ue_trace=="yes":
+			mySSH = sshconnection.SSHConnection()
+			mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+			#delete old artifacts
+			mySSH.command('echo ' + self.HostPassword + ' | sudo -S rm -rf ci_qlog','\$',5)
+			#start Trace, artifact is created in home dir
+			mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
+			mySSH.close()
+
+	def DisableTrace(self):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		#archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix
-		now=datetime.now()
-		now_string = now.strftime("%Y%m%d-%H%M")
-		source='ci_qlog'
-		destination= self.LogStore + '/ci_qlog_'+now_string+'.zip'
-		#qlog artifact is zipped into the target folder
-		mySSH.command('echo $USER; echo ' + ' '  + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10)
+		mySSH.command('echo ' + self.HostPassword + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5)
 		mySSH.close()
-		#post action : log cleaning to make sure enough space is reserved for the next run
-		Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore)
+
+
+	def DisableCM(self):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		mySSH.command('echo ' + self.HostPassword + ' | sudo -S killall --signal SIGKILL *'+self.Process['Name']+'*', '\$', 5)
+		mySSH.close()
+
+
+	def LogCollect(self):
+		if self.ue_trace=="yes":
+			mySSH = sshconnection.SSHConnection()
+			mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+			#archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix
+			now=datetime.now()
+			now_string = now.strftime("%Y%m%d-%H%M")
+			source='ci_qlog'
+			destination= self.LogStore + '/ci_qlog_'+now_string+'.zip'
+			#qlog artifact is zipped into the target folder
+			mySSH.command('echo $USER; echo ' + self.HostPassword + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10)
+			mySSH.close()
+			#post action : log cleaning to make sure enough space is reserved for the next run
+			Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore)
+			Log_Mgt.LogRotation()
+		else:
+			destination=""
 		return destination
-
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -84,6 +84,16 @@ class HTMLManagement():
 		self.CpuModel = ['', '']
 		self.CpuMHz = ['', '']

+#-----------------------------------------------------------
+# Setters and Getters
+#-----------------------------------------------------------
+
+	def SethtmlUEConnected(self, nbUEs):
+		if nbUEs > 0:
+			self.htmlUEConnected = nbUEs
+		else:
+			self.htmlUEConnected = 1
+


 #-----------------------------------------------------------
@@ -91,7 +101,7 @@ class HTMLManagement():
 #-----------------------------------------------------------


-	def CreateHtmlHeader(self):
+	def CreateHtmlHeader(self, ADBIPAddress):
 		if (not self.htmlHeaderCreated):
 			logging.info('\u001B[1m----------------------------------------\u001B[0m')
 			logging.info('\u001B[1m  Creating HTML header \u001B[0m')
@@ -106,7 +116,7 @@ class HTMLManagement():
 			self.htmlFile.write('  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>\n')
 			self.htmlFile.write('  <title>Test Results for TEMPLATE_JOB_NAME job build #TEMPLATE_BUILD_ID</title>\n')
 			self.htmlFile.write('</head>\n')
-			self.htmlFile.write('<body><div class="container-fluid" style="margin-left:1em; margin-right:1em">\n')
+			self.htmlFile.write('<body><div class="container">\n')
 			self.htmlFile.write('  <br>\n')
 			self.htmlFile.write('  <table style="border-collapse: collapse; border: none;">\n')
 			self.htmlFile.write('    <tr style="border-collapse: collapse; border: none;">\n')
@@ -173,6 +183,15 @@ class HTMLManagement():
 				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')

+			if (ADBIPAddress != 'none') and (ADBIPAddress != 'modules'):
+				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_Smartphones) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
+				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_CATM_Modules) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
+			elif (ADBIPAddress == 'modules'):
+				self.htmlUEConnected = 1
+				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> 1 commercial module is connected to CI bench</h2>\n')
+			else:
+				self.htmlUEConnected = 1
+				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> 1 OAI UE(s) is(are) connected to CI bench</h2>\n')
 			self.htmlFile.write('  <br>\n')
 			self.htmlFile.write('  <ul class="nav nav-pills">\n')
 			count = 0
@@ -206,13 +225,16 @@ class HTMLManagement():
 				self.htmlFile.write('  <div id="build-tab" class="tab-pane fade">\n')
 			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>Relative Time (s)</th>\n')
+			self.htmlFile.write('        <th>Test Id</th>\n')
 			self.htmlFile.write('        <th>Test Desc</th>\n')
 			self.htmlFile.write('        <th>Test Options</th>\n')
-			self.htmlFile.write('        <th style="width:5%">Test Status</th>\n')
+			self.htmlFile.write('        <th>Test Status</th>\n')

-			self.htmlFile.write('        <th>Info</th>\n')
+			i = 0
+			while (i < self.htmlUEConnected):
+				self.htmlFile.write('        <th>UE' + str(i) + ' Status</th>\n')
+				i += 1
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 		self.htmlHeaderCreated = True
@@ -225,14 +247,14 @@ class HTMLManagement():
 					testOkEvenIfUnstable = True
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <th bgcolor = "#33CCFF" colspan="3">Final Tab Status</th>\n')
+			self.htmlFile.write('        <th bgcolor = "#33CCFF" colspan=3>Final Tab Status</th>\n')
 			if passStatus:
-				self.htmlFile.write('        <th bgcolor = "green" colspan="3"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
 			else:
 				if testOkEvenIfUnstable:
-					self.htmlFile.write('        <th bgcolor = "orange" colspan="3"><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
+					self.htmlFile.write('        <th bgcolor = "orange" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
 				else:
-					self.htmlFile.write('        <th bgcolor = "red" colspan="3"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+					self.htmlFile.write('        <th bgcolor = "red" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  </div>\n')
@@ -265,12 +287,45 @@ class HTMLManagement():
 			self.htmlFile.write('  <p></p>\n')
 			self.htmlFile.write('  <table class="table table-condensed">\n')

+			machines = [ 'eNB', 'UE' ]
+			for machine in machines:
+				if machine == 'eNB':
+					idx = 0
+				else:
+					idx = 1
+				if self.OsVersion[idx] == '':
+					continue
+
+				self.htmlFile.write('      <tr>\n')
+				self.htmlFile.write('        <th colspan=8>' + str(machine) + ' Server Characteristics</th>\n')
+				self.htmlFile.write('      </tr>\n')
+				self.htmlFile.write('      <tr>\n')
+				self.htmlFile.write('        <td>OS Version</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.OsVersion[idx] + '</span></td>\n')
+				self.htmlFile.write('        <td>Kernel Version</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.KernelVersion[idx] + '</span></td>\n')
+				self.htmlFile.write('        <td>UHD Version</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.UhdVersion[idx] + '</span></td>\n')
+				self.htmlFile.write('        <td>USRP Board</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.UsrpBoard[idx] + '</span></td>\n')
+				self.htmlFile.write('      </tr>\n')
+				self.htmlFile.write('      <tr>\n')
+				self.htmlFile.write('        <td>Nb CPUs</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuNb[idx] + '</span></td>\n')
+				self.htmlFile.write('        <td>CPU Model Name</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuModel[idx] + '</span></td>\n')
+				self.htmlFile.write('        <td>CPU Frequency</td>\n')
+				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuMHz[idx] + '</span></td>\n')
+				self.htmlFile.write('        <td></td>\n')
+				self.htmlFile.write('        <td></td>\n')
+				self.htmlFile.write('      </tr>\n')
+
 			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <th colspan="5" bgcolor = "#33CCFF">Final Status</th>\n')
+			self.htmlFile.write('        <th colspan=5 bgcolor = "#33CCFF">Final Status</th>\n')
 			if passStatus:
-				self.htmlFile.write('        <th colspan="3" bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
+				self.htmlFile.write('        <th colspan=3 bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
 			else:
-				self.htmlFile.write('        <th colspan="3" bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+				self.htmlFile.write('        <th colspan=3 bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  <p></p>\n')
@@ -283,7 +338,7 @@ class HTMLManagement():
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()

@@ -349,7 +404,7 @@ class HTMLManagement():
 				result = re.search('showed|Reestablishment|Could not copy eNB logfile', self.htmleNBFailureMsg)
 				if result is not None:
 					cellBgColor = 'orange'
-			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan="1"><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
+			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
 			self.htmleNBFailureMsg = ''
 		elif (len(str(self.htmlUEFailureMsg)) > 2):
 			cellBgColor = 'white'
@@ -360,10 +415,13 @@ class HTMLManagement():
 				result = re.search('showed|Could not copy UE logfile|oaitun_ue1 interface is either NOT mounted or NOT configured', self.htmlUEFailureMsg)
 				if result is not None:
 					cellBgColor = 'orange'
-			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan="1"><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
+			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
 			self.htmlUEFailureMsg = ''
 		else:
-			self.htmlFile.write('        <td>-</td>\n')
+			i = 0
+			while (i < self.htmlUEConnected):
+				self.htmlFile.write('        <td>-</td>\n')
+				i += 1
 		self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()

@@ -374,7 +432,7 @@ class HTMLManagement():
 		self.htmlFile = open('test_results.html', 'a')
 		if bool(collectInfo) == False:
 			self.htmlFile.write('      <tr bgcolor = "red" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> ----IMAGES BUILDING FAILED - Unable to recover the image logs ---- </b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ----IMAGES BUILDING FAILED - Unable to recover the image logs ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 		else:
 			for image in collectInfo:
@@ -386,13 +444,13 @@ class HTMLManagement():
 					self.htmlFile.write('      <tr bgcolor = "red" >\n')
 				else:
 					self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-				self.htmlFile.write('        <td colspan="6"><b> ---- ' + image  + ' IMAGE STATUS ----> Size ' + allImagesSize[image] + ' </b></td>\n')
+				self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- ' + image  + ' IMAGE STATUS ----> Size ' + allImagesSize[image] + ' </b></td>\n')
 				self.htmlFile.write('      </tr>\n')
 				self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 				self.htmlFile.write('        <th colspan="2">Element</th>\n')
 				self.htmlFile.write('        <th>Nb Errors</th>\n')
 				self.htmlFile.write('        <th>Nb Warnings</th>\n')
-				self.htmlFile.write('        <th colspan="2">Status</th>\n')
+				self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>Status</th>\n')
 				self.htmlFile.write('      </tr>\n')

 				for fil in files:
@@ -411,11 +469,11 @@ class HTMLManagement():
 					else:
 						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
 					if (parameters['errors'] == 0) and (parameters['warnings'] == 0):
-						self.htmlFile.write('        <th colspan="2" bgcolor = "green" ><font color="white">OK </font></th>\n')
+						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" ><font color="white">OK </font></th>\n')
 					elif (parameters['errors'] == 0):
-						self.htmlFile.write('        <th colspan="2" bgcolor = "orange" ><font color="white">OK </font></th>\n')
+						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "orange" ><font color="white">OK </font></th>\n')
 					else:
-						self.htmlFile.write('        <th colspan="2" bgcolor = "red" > NOT OK  </th>\n')
+						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" > NOT OK  </th>\n')
 					self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()

@@ -427,12 +485,12 @@ class HTMLManagement():
 		
        # TabHeader 
 		self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-		self.htmlFile.write('        <td colspan="6"><b> ---- ' + DataLog['Title'] + ' ---- </b></td>\n')
+		self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- ' + DataLog['Title'] + ' ---- </b></td>\n')
 		self.htmlFile.write('      </tr>\n')
 		self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 		self.htmlFile.write('        <th colspan="3">'+ DataLog['ColNames'][0] +'</th>\n')
 		self.htmlFile.write('        <th colspan="2">' + DataLog['ColNames'][1] + '</th>\n')
-		self.htmlFile.write('        <th colspan="2">'+ DataLog['ColNames'][2] +'</th>\n')
+		self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>'+ DataLog['ColNames'][2] +'</th>\n')
 		self.htmlFile.write('      </tr>\n')

 		for k in DataLog['Data']:
@@ -448,7 +506,7 @@ class HTMLManagement():
 		self.htmlFile.close()


-	def CreateHtmlTestRowQueue(self, options, status, infoList):
+	def CreateHtmlTestRowQueue(self, options, status, ue_status, ue_queue):
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile = open('test_results.html', 'a')
 			currentTime = int(round(time.time() * 1000)) - self.startTime
@@ -459,20 +517,25 @@ class HTMLManagement():
 			self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 			self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 			if (str(status) == 'OK'):
-				self.htmlFile.write(f'        <td bgcolor = "lightgreen" >{status}</td>\n')
+				self.htmlFile.write('        <td bgcolor = "lightgreen" >' + str(status)  + '</td>\n')
 			elif (str(status) == 'KO'):
-				self.htmlFile.write(f'        <td bgcolor = "lightcoral" >{status}</td>\n')
+				self.htmlFile.write('        <td bgcolor = "lightcoral" >' + str(status)  + '</td>\n')
 			else:
 				addOrangeBK = True
-				self.htmlFile.write(f'        <td bgcolor = "orange" >{status}</td>\n')
-			if (addOrangeBK):
-				self.htmlFile.write('        <td bgcolor = "orange" >')
-			else:
-				self.htmlFile.write('        <td>')
-			for i in infoList:
-				self.htmlFile.write(f'         <pre>{i}</pre>')
-
-			self.htmlFile.write('                </td>')
+				self.htmlFile.write('        <td bgcolor = "orange" >' + str(status)  + '</td>\n')
+			i = 0
+			while (i < self.htmlUEConnected):
+				if (i < ue_status):
+					if (not ue_queue.empty()):
+						if (addOrangeBK):
+							self.htmlFile.write('        <td bgcolor = "orange" >' + str(ue_queue.get()).replace('white', 'orange') + '</td>\n')
+						else:
+							self.htmlFile.write('        <td>' + str(ue_queue.get()) + '</td>\n')
+					else:
+						self.htmlFile.write('        <td>-</td>\n')
+				else:
+					self.htmlFile.write('        <td>-</td>\n')
+				i += 1
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()

@@ -483,80 +546,80 @@ class HTMLManagement():
 		vId = 0
 		for version in CCR.versions:
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> Results for cppcheck v ' + version + ' </b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> Results for cppcheck v ' + version + ' </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
 			if CCR.nbErrors[vId] == 0:
 				myColor = 'lightgreen'
 			elif CCR.nbErrors[vId] < 20:
 				myColor = 'orange'
 			else:
 				myColor = 'lightcoral'
-			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + ' bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
 			if CCR.nbWarnings[vId] == 0:
 				myColor = 'lightgreen'
 			elif CCR.nbWarnings[vId] < 20:
 				myColor = 'orange'
 			else:
 				myColor = 'lightcoral'
-			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + ' bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"> ----------------- </td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '> ----------------- </td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbUninitVars[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbUninitVars[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"> </td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '> </td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
-			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			vId += 1

@@ -566,12 +629,12 @@ class HTMLManagement():
 		self.htmlFile = open('test_results.html', 'a')
 		if bool(testResult) == False and bool(testSummary) == False:
 			self.htmlFile.write('      <tr bgcolor = "red" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> ----PHYSIM TESTING FAILED - Unable to recover the test logs ---- </b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ----PHYSIM TESTING FAILED - Unable to recover the test logs ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 		else:
 		# Tab header
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> ---- PHYSIM TEST SUMMARY---- </b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- PHYSIM TEST SUMMARY---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th colspan="2">LogFile Name</th>\n')
@@ -589,27 +652,27 @@ class HTMLManagement():
 			self.htmlFile.write('        <td gcolor = "lightcyan" >' + str(testSummary['Nbpass']) + ' </td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan="6"><b> ---- PHYSIM TEST DETAIL INFO---- </b></td>\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- PHYSIM TEST DETAIL INFO---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th colspan="2">Test Name</th>\n')
 			self.htmlFile.write('        <th colspan="2">Test Description</th>\n')
-			self.htmlFile.write('        <th colspan="2">Result</th>\n')
+			self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>Result</th>\n')
 			self.htmlFile.write('      </tr>\n')
 			y = ''
 			for key, value in testResult.items():
 				x = key.split(".")
 				if x[0] != y:
 					self.htmlFile.write('      <tr bgcolor = "lightgreen" >\n')
-					self.htmlFile.write('        <td style="text-align: center;" colspan="6"><b>"' + x[0] + '" series </b></td>\n')
+					self.htmlFile.write('        <td style="text-align: center;" colspan=' + str(5+self.htmlUEConnected) + '><b>"' + x[0] + '" series </b></td>\n')
 					self.htmlFile.write('      </tr>\n')
 					y = x[0]
 				self.htmlFile.write('      <tr>\n')
 				self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + key  + ' </td>\n')
 				self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + value[0]  + '</td>\n')
 				if 'PASS' in value:
-					self.htmlFile.write('        <td colspan="2" bgcolor = "green" >' + value[1]  + '</td>\n')
+					self.htmlFile.write('        <td colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" >' + value[1]  + '</td>\n')
 				else:
-					self.htmlFile.write('        <td colspan="2" bgcolor = "red" >' + value[1]  + '</td>\n')
+					self.htmlFile.write('        <td colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" >' + value[1]  + '</td>\n')

 		self.htmlFile.close()
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -81,39 +81,15 @@ class PhySim:
 		#once parsed move the local logfile to its folder for tidiness
 		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')

-		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		return HTML
-
-	def __CheckResults_LDPCt1Test(self,HTML,CONST,testcase_id):
-		thrs_NOK = 500
-		thrs_KO = 1000
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		#retrieve run log file and store it locally$
-		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
-		mySSH.close()
-		#parse results looking for Decoding values
-		runResultsT1=[]
-		with open(self.__runLogFile) as g:
-			for line in g:
-				if 'decoding time' in line:
-					runResultsT1.append(line)
-		info = runResultsT1[0][15:-13]
-		result = int(''.join(filter(str.isdigit, info)))/100
-		#once parsed move the local logfile to its folder for tidiness
-		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
-		if result < thrs_NOK:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		elif result > thrs_KO:
-			error_msg = f'Decoding time exceeds a limit of {thrs_KO} us'
-			logging.error(error_msg)
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
-			self.exitStatus = 1
-		else:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', [info])
+		#updating the HTML with results
+		html_cell = '<pre style="background-color:white">' + info  + '</pre>'
+		html_queue=SimpleQueue()
+		html_queue.put(html_cell)
+		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
 		return HTML

 	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
+		html_queue = SimpleQueue()
 		#retrieve run log file and store it locally
 		mySSH = sshconnection.SSHConnection()
 		filename = self.__workSpacePath + self.__runLogFile
@@ -121,7 +97,8 @@ class PhySim:
 		if ret != 0:
 			error_msg = f'could not recover test result file {filename}'
 			logging.error(error_msg)
-			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
+			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', 1, html_queue)
 			self.exitStatus = 1
 			return HTML

@@ -134,11 +111,13 @@ class PhySim:

 		#updating the HTML with results
 		if PUSCH_OK:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"])
+			html_queue.put('<pre style="background-color:white">succeeded</pre>')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
 		else:
 			error_msg = 'error: no "PUSCH test OK"'
 			logging.error(error_msg)
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
+			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, html_queue)
 			self.exitStatus = 1
 		return HTML

@@ -237,24 +216,6 @@ class PhySim:
 		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
 		return lHTML

-	def Run_LDPCt1Test(self,htmlObj,constObj,testcase_id):
-		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
-		#create run logs folder locally
-		os.system('mkdir -p ./'+self.__runLogPath)
-		#log file is tc_<testcase_id>.log remotely
-		self.__runLogFile='physim_'+str(testcase_id)+'.log'
-		#open a session for test run
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		mySSH.command('cd '+self.__workSpacePath,'\$',5)
-		#run and redirect the results to a log file
-		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
-		mySSH.close()
-		#return updated HTML to main
-		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_LDPCt1Test(htmlObj,constObj,testcase_id)
-		return lHTML
-
 	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
 		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
 		os.system(f'mkdir -p ./{self.__runLogPath}')
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -114,7 +114,7 @@ class PhySim:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
 				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 		else:
-			imageTag = f'develop-{self.ranCommitID[0:8]}'
+			imageTag = "develop"

 		# logging to OC Cluster and then switch to corresponding project
 		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server https://api.oai.cs.eurecom.fr:6443', '\$', 30)
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -357,43 +357,63 @@ class StaticCodeAnalysis():
 				if nbFilesNotFormatted == 0:
 					HTML.CreateHtmlTestRow('File(s) Format', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_cell = f'Number of files not following OAI Rules: {nbFilesNotFormatted}\n'
+					html_queue = SimpleQueue()
+					html_cell = '<pre style="background-color:white">\n'
+					html_cell += 'Number of files not following OAI Rules: ' + str(nbFilesNotFormatted) + '\n'
 					for nFile in listFilesNotFormatted:
 						html_cell += str(nFile).strip() + '\n'
-					HTML.CreateHtmlTestRowQueue('File(s) Format', 'KO', [html_cell])
+					html_cell += '</pre>'
+					html_queue.put(html_cell)
+					HTML.CreateHtmlTestRowQueue('File(s) Format', 'KO', 1, html_queue)
 					del(html_cell)
+					del(html_queue)

 				logging.debug('header files not respecting the circular dependency protection: ' + str(len(circularHeaderDependencyFiles)))
 				if len(circularHeaderDependencyFiles) == 0:
 					HTML.CreateHtmlTestRow('Header Circular Dependency', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_cell = f'Number of files not respecting: {len(circularHeaderDependencyFiles)}\n'
+					html_queue = SimpleQueue()
+					html_cell = '<pre style="background-color:white">\n'
+					html_cell += 'Number of files not respecting: ' + str(len(circularHeaderDependencyFiles)) + '\n'
 					for nFile in circularHeaderDependencyFiles:
 						html_cell += str(nFile).strip() + '\n'
-					HTML.CreateHtmlTestRowQueue('Header Circular Dependency', 'KO', [html_cell])
+					html_cell += '</pre>'
+					html_queue.put(html_cell)
+					HTML.CreateHtmlTestRowQueue('Header Circular Dependency', 'KO', 1, html_queue)
 					del(html_cell)
+					del(html_queue)
 					finalStatus = -1

 				logging.debug('files with a GNU GPL license: ' + str(len(gnuGplLicenceFiles)))
 				if len(gnuGplLicenceFiles) == 0:
 					HTML.CreateHtmlTestRow('Files w/ GNU GPL License', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_cell = f'Number of files not respecting: {len(gnuGplLicenceFiles)}\n'
+					html_queue = SimpleQueue()
+					html_cell = '<pre style="background-color:white">\n'
+					html_cell += 'Number of files not respecting: ' + str(len(gnuGplLicenceFiles)) + '\n'
 					for nFile in gnuGplLicenceFiles:
 						html_cell += str(nFile).strip() + '\n'
-					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', html_queue)
+					html_cell += '</pre>'
+					html_queue.put(html_cell)
+					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', 1, html_queue)
 					del(html_cell)
+					del(html_queue)
 					finalStatus = -1

 				logging.debug('files with a suspect license: ' + str(len(suspectLicenceFiles)))
 				if len(suspectLicenceFiles) == 0:
 					HTML.CreateHtmlTestRow('Files with suspect license', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_cell = f'Number of files not respecting: {len(suspectLicenceFiles)}\n'
+					html_queue = SimpleQueue()
+					html_cell = '<pre style="background-color:white">\n'
+					html_cell += 'Number of files not respecting: ' + str(len(suspectLicenceFiles)) + '\n'
 					for nFile in suspectLicenceFiles:
 						html_cell += str(nFile).strip() + '\n'
-					HTML.CreateHtmlTestRowQueue('Files with suspect license', 'KO', [html_cell])
+					html_cell += '</pre>'
+					html_queue.put(html_cell)
+					HTML.CreateHtmlTestRowQueue('Files with suspect license', 'KO', 1, html_queue)
 					del(html_cell)
+					del(html_queue)
 					finalStatus = -1

 			else:
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
@@ -172,7 +172,7 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -191,11 +191,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.20.2,second_addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
@@ -172,7 +172,7 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -191,11 +191,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.20.2,second_addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.20.2,second_addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/gNB_SA_CU.conf
+++ b/ci-scripts/conf_files/gNB_SA_CU.conf
@@ -169,7 +169,7 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+        amf_ip_address      = ( { ipv4       = "192.168.5.233";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -178,10 +178,11 @@ gNBs =

    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_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
@@ -212,7 +213,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gNB_SA_DU.conf
+++ b/ci-scripts/conf_files/gNB_SA_DU.conf
@@ -177,7 +177,6 @@ MACRLCs = (
    remote_n_portd  = 2152;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
  }
 );

@@ -233,7 +232,7 @@ serveraddr = "server";
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -274,5 +274,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                        ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -270,5 +270,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -222,7 +222,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -81,7 +81,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
@@ -233,6 +233,6 @@ log_config :
  rlc_log_level    = "info";
  pdcp_log_level   = "info";
  rrc_log_level    = "info";
-  f1ap_log_level   = "info";
+  f1ap_log_level   = "debug";
  ngap_log_level   = "debug";
 };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
@@ -278,5 +278,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                        ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -276,5 +276,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
@@ -277,5 +277,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -280,5 +280,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
@@ -279,5 +279,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                        ="info";
+       f1ap_log_level                         ="debug";
    };
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -280,5 +280,5 @@ log_config :
  pdcp_log_level                        ="info";
  rrc_log_level                         ="info";
  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="info";
+  f1ap_log_level                        ="debug";
 };
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -158,6 +158,65 @@ gNBs =

  );

+# 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 :
    {
@@ -272,5 +331,5 @@ log_config :
  pdcp_log_level                        ="info";
  rrc_log_level                         ="info";
  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="info";
+  f1ap_log_level                        ="debug";
 };
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -1,281 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-n78_20");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-#device :{
-# name = "aw2sori_transpro";
-#}
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
-
-    gNB_name  =  "gNB-Eurecom-n78_20";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  0x1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
-
-    nr_cellid = 12345678L
-
-    ////////// Physical parameters:
-    pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 2;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
-      absoluteFrequencySSB                                             = 627360;
-      dl_frequencyBand                                                 = 78;
-      # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
-      dl_absoluteFrequencyPointA                                       = 626748;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 51;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 11; # this means shift of 14, so Coreset is in PRBs 1..48, SSB starts at PRB 15
-        initialDLBWPsearchSpaceZero                                             = 0;
-      #pdsch-ConfigCommon
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 51;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13750;
-# 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                                 = 15;
-          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;
-#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                                         =-96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -96;
-# 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                                 = 5;
-      nrofDownlinkSlots                                             = 2;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                             = -10;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.6.100";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/20";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/20";
-        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;
-    ulsch_max_frame_inactivity = 10;
-    ul_max_mcs         = 15;
-  }
-);
-
-L1s = (
-        {
-        num_cc = 1;
-        tr_n_preference = "local_mac";
-        prach_dtx_threshold = 120;
-        pucch0_dtx_threshold = 50;
-        pusch_dtx_threshold = 10;
-        }
-);
-
-RUs = (
-    {
-        local_if_name  = "ens7f3";
-        remote_address = "192.168.80.239";
-        local_address  = "192.168.80.24";
-        local_portc    = 50000;
-        remote_portc   = 55444;
-        local_portd    = 52001;
-        remote_portd   = 52183;
-        local_rf       = "no"
-        tr_preference  = "udp_ecpri_if5"
-        nb_tx          = 2
-        nb_rx          = 2
-        att_tx         = 16
-        att_rx         = 0;
-        num_tp_cores   = 4;
-        rxfh_core_id   = 9;
-        txfh_core_id   = 10;
-        tp_cores       = [11,12,13,14];
-        nr_flag        = 1;
-        eNB_instances  = [0];
-        bands          = [78];
-        sl_ahead       = 5;
-        ##beamforming 1x2 matrix: 1 layer x 2 antennas
-        bf_weights = [0x00007fff, 0x0000];
-        ##beamforming 1x4 matrix: 1 layer x 4 antennas
-        #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
-        ## beamforming 2x2 matrix:
-        # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
-        ## beamforming 4x4 matrix:
-        #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
-    }
-);
-
-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";
-  }
-);
-
-     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";
-       f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
-       ngap_log_level                         ="debug";
-       ngap_log_verbosity                     ="medium";
-    };
-
--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -262,6 +262,6 @@ log_config :
  pdcp_log_level                        ="info";
  rrc_log_level                         ="info";
  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="info";
+  f1ap_log_level                        ="debug";
 };

--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -8,14 +8,14 @@ ColNames :
  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref :
  feprx : 46.0
-  feptx_prec : 15.0
+  feptx_prec : 11.0
  feptx_ofdm : 35.0
  feptx_total : 57.0
  L1 Tx processing : 210.0
  DLSCH encoding : 137.0
  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 210.0
+  PUSCH inner-receiver : 184.0
+  PUSCH decoding : 276.0
  Schedule Response : 48.0
  DL & UL scheduling timing : 13.0
  UL Indication : 60.0
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -14,10 +14,10 @@ Ref :
  L1 Tx processing : 400.0
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 210.0
+  PUSCH inner-receiver : 184.0
+  PUSCH decoding : 276.0 
  Schedule Response : 111.0
-  DL & UL scheduling timing : 20.0
+  DL & UL scheduling timing : 37.0
  UL Indication : 127.0
 Threshold :
  feprx : 1.25
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -14,11 +14,11 @@ Ref :
  L1 Tx processing : 170.0
  DLSCH encoding : 118.0
  L1 Rx processing : 305.0
-  PUSCH inner-receiver : 150.0
-  PUSCH decoding : 210.0
-  Schedule Response : 20.0
+  PUSCH inner-receiver : 117.0
+  PUSCH decoding : 303.0
+  Schedule Response : 25.0
  DL & UL scheduling timing : 10.0
-  UL Indication : 30.0
+  UL Indication : 34.0
 Threshold :
  feprx : 1.25
  feptx_prec : 1.25
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -31,8 +31,8 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
-import sys	      # arg
-import re	       # reg
+import sys              # arg
+import re               # reg
 import logging
 import os
 import time
@@ -46,13 +46,10 @@ from multiprocessing import Process, Lock, SimpleQueue
 import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-import cls_cluster as OC
-import cls_cmd
+
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
-
-
 class EPCManagement():

 	def __init__(self):
@@ -71,13 +68,7 @@ class EPCManagement():
 		self.isMagmaUsed = False
 		self.cfgDeploy = '--type start-mini --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap' #from xml, 'mini' is default normal for docker-network.py
 		self.cfgUnDeploy = '--type stop-mini --scenario 1' #from xml, 'mini' is default normal for docker-network.py
-		self.OCUrl = "https://api.oai.cs.eurecom.fr:6443"
-		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
-		self.OCUserName = ''
-		self.OCPassword = ''
-		self.OCProjectName = ''
-		self.imageToPull = ''
-		self.eNBSourceCodePath = ''
+

 #-----------------------------------------------------------
 # EPC management functions
@@ -244,8 +235,9 @@ class EPCManagement():
 			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
 			sys.exit('Insufficient EPC Parameters')
-		mySSH = cls_cmd.getConnection(self.IPAddress)
-		html_cell = ''
+		mySSH = SSH.SSHConnection()
+		mySSH.open(self.IPAddress, self.UserName, self.Password)
+		html_cell = '<pre style="background-color:white">\n'
 		if re.match('ltebox', self.Type, re.IGNORECASE):
 			logging.debug('Using the SABOX simulated HSS')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
@@ -294,44 +286,13 @@ class EPCManagement():
 					if res4 is not None:
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
-		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			self.testCase_id = HTML.testCase_id
-			imageNames = ["oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "mysql","oai-traffic-server"]
-			logging.debug('Deploying OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = self.SourceCodePath
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, self.OCProjectName)
-			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			for ii in imageNames:
-					mySSH.run(f'helm uninstall {ii}', reportNonZero=False)
-			mySSH.run(f'helm spray {lSourcePath}/ci-scripts/charts/oai-5g-basic/.')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			if ret.stdout.count('Running') != 9:
-				logging.error('\u001B[1m Deploying 5GCN Failed using helm chart on OC Cluster\u001B[0m')
-				for ii in imageNames:
-					mySSH.run('helm uninstall '+ ii)
-				ret = mySSH.run(f'oc get pods')
-				if re.search('No resources found', ret.stdout):
-					logging.debug('All pods uninstalled')
-					OC.OC_logout(mySSH)
-					mySSH.close()
-					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
-					return False
-			ret = mySSH.run(f'oc get pods', silent=True)
-			for line in ret.stdout.split('\n')[1:]:
-				columns = line.strip().split()
-				name = columns[0]
-				status = columns[2]
-				html_cell += status + '    ' + name
-				html_cell += '\n'
-			OC.OC_logout(mySSH)
 		else:
 			logging.error('This option should not occur!')
+		html_cell += '</pre>'
 		mySSH.close()
-		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [html_cell])
+		html_queue = SimpleQueue()
+		html_queue.put(html_cell)
+		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)

 	def SetAmfIPAddress(self):
 		# Not an error if we don't need an 5GCN
@@ -353,10 +314,6 @@ class EPCManagement():
 			else:
 				logging.error('no container with name oai-amf found, could not retrieve AMF IP address')
 			mySSH.close()
-		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			mySSH = SSH.SSHConnection()
-			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			response=mySSH.command3('oc pods ls -f name=oai-amf', 10)

 	def CheckHSSProcess(self, status_queue):
 		try:
@@ -559,9 +516,8 @@ class EPCManagement():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)

 	def Terminate5GCN(self, HTML):
-		imageNames = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-		containerInPods = ["", "-c nrf", "-c amf", "-c smf", "-c spgwu", "-c ausf", "-c udm", "-c udr", ""]
-		mySSH = cls_cmd.getConnection(self.IPAddress)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		message = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
 			logging.debug('Terminating SA BOX')
@@ -592,41 +548,13 @@ class EPCManagement():
 			else:
 				message = 'No Tracking area update request'
 			logging.debug(message)
-		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			logging.debug('Terminating OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = self.SourceCodePath
-			mySSH.run(f'rm -Rf {lSourcePath}/logs')
-			mySSH.run(f'mkdir -p {lSourcePath}/logs')
-			logging.debug('OC OAI CN5G - Collecting Log files to workspace')
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, self.OCProjectName)
-			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			mySSH.run(f'oc describe pod &> {lSourcePath}/logs/describe-pods-post-test.log')
-			mySSH.run(f'oc get pods.metrics.k8s &> {lSourcePath}/logs/nf-resource-consumption.log')
-			for ii, ci in zip(imageNames, containerInPods):
-			       podName = mySSH.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-			       if not podName:
-				       logging.debug(f'{ii} pod not found!')
-				       HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-				       HTML.CreateHtmlTabFooter(False)
-			       mySSH.run(f'oc logs -f {podName} {ci} &> {lSourcePath}/logs/{ii}.log &')
-			       mySSH.run(f'helm uninstall {ii}')
-			       podName = ''
-			mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq test_logs_CN.zip *.log')
-			mySSH.copyin(f'{lSourcePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			res = re.search('No resources found in oaicicd-ran namespace.', ret.stdout)
-			if res is not None:
-			       logging.debug('OC OAI CN5G components uninstalled')
-			       message = 'OC OAI CN5G components uninstalled'
-			OC.OC_logout(mySSH)
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [message])
+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">' + message + '</pre>'
+		html_queue.put(html_cell)
+		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)

 	def DeployEpc(self, HTML):
 		logging.debug('Trying to deploy')
@@ -716,7 +644,7 @@ class EPCManagement():
 			expectedHealthyContainers += 1

 		mySSH.command('docker-compose config | grep --colour=never image', '\$', 10)
-		html_cell = ''
+		html_cell = '<pre style="background-color:white">\n'
 		listOfImages = mySSH.getBefore()
 		for imageLine in listOfImages.split('\\r\\n'):
 			res1 = re.search('image: (?P<name>[a-zA-Z0-9\-]+):(?P<tag>[a-zA-Z0-9\-]+)', str(imageLine))
@@ -738,6 +666,7 @@ class EPCManagement():
 				if res4 is not None:
 					html_cell += '(' + res4.group('date') + ')'
 				html_cell += '\n'
+		html_cell += '</pre>'
 		# Checking if all are healthy
 		cnt = 0
 		while (cnt < 3):
@@ -753,6 +682,8 @@ class EPCManagement():
 		logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)')
 		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
 		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
+		html_queue = SimpleQueue()
+		html_queue.put(html_cell)
 		if healthyNb == expectedHealthyContainers:
 			mySSH.command('docker exec -d prod-oai-hss /bin/bash -c "nohup tshark -i any -f \'port 9042 or port 3868\' -w /tmp/hss_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
 			if self.isMagmaUsed:
@@ -764,11 +695,11 @@ class EPCManagement():
 			mySSH.command('docker exec -d prod-oai-spgwu-tiny /bin/bash -c "nohup tshark -i any -f \'port 8805\'  -w /tmp/spgwu_check_run.pcap 2>&1 > /dev/null"', '\$', 10)
 			mySSH.close()
 			logging.debug('Deployment OK')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [html_cell])
+			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)
 		else:
 			mySSH.close()
 			logging.debug('Deployment went wrong')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', [html_cell])
+			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', 1, html_queue)

 	def UndeployEpc(self, HTML):
 		logging.debug('Trying to undeploy')
@@ -836,12 +767,15 @@ class EPCManagement():
 		mySSH.command('docker inspect --format=\'{{.Name}}\' prod-oai-public-net prod-oai-private-net', '\$', 10)
 		noMoreNetworkNb = mySSH.getBefore().count('No such object')
 		mySSH.close()
+		html_queue = SimpleQueue()
+		html_cell = '<pre style="background-color:white">' + message + '</pre>'
+		html_queue.put(html_cell)
 		if noMoreContainerNb == nbContainers and noMoreNetworkNb == 2:
 			logging.debug('Undeployment OK')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [message])
+			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)
 		else:
 			logging.debug('Undeployment went wrong')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', [message])
+			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', 1, html_queue)

 	def LogCollectHSS(self):
 		mySSH = SSH.SSHConnection()
@@ -862,8 +796,6 @@ class EPCManagement():
 				mySSH.command('zip hss.log.zip hss_check_run.*', '\$', 60)
 		elif re.match('OAICN5G', self.Type, re.IGNORECASE):
 			logging.debug('LogCollect is bypassed for that variant')
-		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			logging.debug('LogCollect is bypassed for that variant')
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip hss.log.zip hss*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm hss*.log', '\$', 5)
@@ -878,13 +810,10 @@ class EPCManagement():
 		mySSH.close()

 	def LogCollectMME(self):
-		if self.Type != 'OC-OAI-CN5G':
-			mySSH = SSH.SSHConnection()
-			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('rm -f mme.log.zip', '\$', 5)
-		else:
-			mySSH = cls_cmd.getConnection(self.IPAddress)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(self.IPAddress, self.UserName, self.Password)
+		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+		mySSH.command('rm -f mme.log.zip', '\$', 5)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
 			mySSH.command('docker inspect prod-oai-mme', '\$', 10)
 			result = re.search('No such object', mySSH.getBefore())
@@ -902,10 +831,6 @@ class EPCManagement():
 			mySSH.command('cp -f /tmp/oai-cn5g-v1.5.pcap .','\$', 30)
 			mySSH.command('zip mme.log.zip oai-amf.log oai-nrf.log oai-cn5g*.pcap','\$', 30)
 			mySSH.command('mv mme.log.zip ' + self.SourceCodePath + '/scripts','\$', 30)
-		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			mySSH.run('cd ' + self.SourceCodePath + '/logs')
-			mySSH.run('zip mme.log.zip oai-amf.log oai-nrf.log oai-cn5g*.pcap')
-			mySSH.run('mv mme.log.zip ' + self.SourceCodePath + '/scripts')
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip mme.log.zip mme*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm mme*.log', '\$', 5)
@@ -939,10 +864,6 @@ class EPCManagement():
 			mySSH.command('cd ' + self.SourceCodePath + '/logs','\$', 5)
 			mySSH.command('zip spgw.log.zip oai-smf.log oai-spgwu.log','\$', 30)
 			mySSH.command('mv spgw.log.zip ' + self.SourceCodePath + '/scripts','\$', 30)
-		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			mySSH.command('cd ' + self.SourceCodePath + '/logs','\$', 5)
-			mySSH.command('zip spgw.log.zip oai-smf.log oai-spgwu.log','\$', 30)
-			mySSH.command('mv spgw.log.zip ' + self.SourceCodePath + '/scripts','\$', 30)
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip spgw.log.zip spgw*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm spgw*.log', '\$', 5)
--- a/ci-scripts/helpreadme.py
+++ b/ci-scripts/helpreadme.py
@@ -41,7 +41,7 @@ def GenericHelp(vers):
 	print('  --mode=[Mode]')
 	print('      TesteNB')
 	print('      InitiateHtml, FinalizeHtml')
-	print('      TerminateeNB, TerminateHSS, TerminateMME, TerminateSPGW')
+	print('      TerminateeNB, TerminateUE, TerminateHSS, TerminateMME, TerminateSPGW')
 	print('      LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')

 def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
@@ -70,6 +70,11 @@ def EPCSrvHelp(ipaddr, username, password, sourcepath, epctype):
 	print('  --EPCSourceCodePath=[EPC\'s Source Code Path]            -- ' + sourcepath)
 	print('  --EPCType=[EPC\'s Type: OAI or ltebox or OAI-Rel14-CUPS] -- ' + epctype)

+def ADBSrvHelp(ipaddr, username, password):
+	print('  --ADBIPAddress=[ADB\'s IP Address]                       -- ' + ipaddr)
+	print('  --ADBUserName=[ADB\'s Login User Name]                   -- ' + username)
+	print('  --ADBPassword=[ADB\'s Login Password]                    -- ' + password)
+
 def XmlHelp(filename):
 	print('  --XMLTestFile=[XML Test File to be run]                  -- ' + filename)
 	print('	Note: multiple xml files can be specified (--XMLFile=File1 ... --XMLTestFile=FileN) when HTML headers are created ("InitiateHtml" mode)')
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -38,12 +38,14 @@ import helpreadme as HELP
 import constants as CONST


-import cls_oaicitest		 #main class for OAI CI test framework
-import cls_physim		 #class PhySim for physical simulators build and test
-import cls_containerize	 #class Containerize for all container-based operations on RAN/UE objects
-import cls_static_code_analysis  #class for static code analysis
-import cls_physim1		 #class PhySim for physical simulators deploy and run
-import cls_cluster		 # class for building/deploying on cluster
+import cls_oaicitest            #main class for OAI CI test framework
+import cls_physim               #class PhySim for physical simulators build and test
+import cls_cots_ue              #class CotsUe for Airplane mode control
+import cls_containerize         #class Containerize for all container-based operations on RAN/UE objects
+import cls_static_code_analysis #class for static code analysis
+import cls_ci_ueinfra			#class defining the multi Ue infrastrucure
+import cls_physim1          #class PhySim for physical simulators deploy and run
+import cls_cluster              # class for building/deploying on cluster

 import sshconnection 
 import epc
@@ -179,10 +181,12 @@ def GetParametersFromXML(action):
 			
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
 			RAN.air_interface[RAN.eNB_instance] = 'lte-softmodem'
-		else:
+		elif (air_interface.lower() in ['nr','lte']):
 			RAN.air_interface[RAN.eNB_instance] = air_interface.lower() +'-softmodem'
+		else :
+			RAN.air_interface[RAN.eNB_instance] = 'ocp-enb'

 		cmd_prefix = test.findtext('cmd_prefix')
 		if cmd_prefix is not None: RAN.cmd_prefix = cmd_prefix
@@ -209,13 +213,54 @@ def GetParametersFromXML(action):

 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
 			RAN.air_interface[RAN.eNB_instance] = 'lte-softmodem'
-		else:
+		elif (air_interface.lower() in ['nr','lte']):
 			RAN.air_interface[RAN.eNB_instance] = air_interface.lower() +'-softmodem'
+		else :
+			RAN.air_interface[RAN.eNB_instance] = 'ocp-enb'

-	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
-		CiTestObj.ue_ids = test.findtext('id').split(' ')
+	elif action == 'Initialize_UE':
+		ue_id = test.findtext('id')
+		CiTestObj.ue_trace=test.findtext('UE_Trace')#temporary variable, to be passed to Module_UE in Initialize_UE call
+		if (ue_id is None):
+			CiTestObj.ue_id = ""
+		else:
+			CiTestObj.ue_id = ue_id
+
+	elif action == 'Detach_UE':
+		ue_id = test.findtext('id')
+		if (ue_id is None):
+			CiTestObj.ue_id = ""
+		else:
+			CiTestObj.ue_id = ue_id
+
+	elif action == 'Attach_UE':
+		ue_id = test.findtext('id')
+		if (ue_id is None):
+			CiTestObj.ue_id = ""
+		else:
+			CiTestObj.ue_id = ue_id
+		nbMaxUEtoAttach = test.findtext('nbMaxUEtoAttach')
+		if (nbMaxUEtoAttach is None):
+			CiTestObj.nbMaxUEtoAttach = -1
+		else:
+			CiTestObj.nbMaxUEtoAttach = int(nbMaxUEtoAttach)
+
+	elif action == 'Terminate_UE':
+		ue_id = test.findtext('id')
+		if (ue_id is None):
+			CiTestObj.ue_id = ""
+		else:
+			CiTestObj.ue_id = ue_id
+
+
+	elif action == 'CheckStatusUE':
+		expectedNBUE = test.findtext('expectedNbOfConnectedUEs')
+		if (expectedNBUE is None):
+			CiTestObj.expectedNbOfConnectedUEs = -1
+		else:
+			CiTestObj.expectedNbOfConnectedUEs = int(expectedNBUE)

 	elif action == 'Build_OAI_UE':
 		CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
@@ -235,11 +280,12 @@ def GetParametersFromXML(action):
 			
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
 			CiTestObj.air_interface = 'lte-uesoftmodem'
 		elif (air_interface.lower() in ['nr','lte']):
 			CiTestObj.air_interface = air_interface.lower() +'-uesoftmodem'
 		else :
+			#CiTestObj.air_interface = 'ocp-enb'
 			logging.error('OCP UE -- NOT SUPPORTED')

 		CiTestObj.cmd_prefix = test.findtext('cmd_prefix') or ""
@@ -253,31 +299,58 @@ def GetParametersFromXML(action):
 		
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
 			CiTestObj.air_interface = 'lte-uesoftmodem'
-		else:
+		elif (air_interface.lower() in ['nr','lte']):
 			CiTestObj.air_interface = air_interface.lower() +'-uesoftmodem'
+		else :
+			#CiTestObj.air_interface = 'ocp-enb'
+			logging.error('OCP UE -- NOT SUPPORTED')

-	elif action == 'Ping':
+	elif (action == 'Ping') or (action == 'Ping_CatM_module'):
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
-		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
+		ue_id = test.findtext('id')
+		if (ue_id is None):
+			CiTestObj.ue_id = ""
+		else:
+			CiTestObj.ue_id = ue_id
+		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold')
+		if (ping_rttavg_threshold is None):
+			CiTestObj.ping_rttavg_threshold = ""
+		else:
+			CiTestObj.ping_rttavg_threshold = ping_rttavg_threshold

 	elif action == 'Iperf':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
-		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.iperf_direction = test.findtext('direction')
+		ue_id = test.findtext('id')
+		if (ue_id is None):
+			CiTestObj.ue_id = ""
+		else:
+			CiTestObj.ue_id = ue_id
+		CiTestObj.iperf_direction = test.findtext('direction')#used for modules only
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
-		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
-		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
-		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
-			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
+		iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold')
+		if (iperf_bitrate_threshold is None):
+			CiTestObj.iperf_bitrate_threshold = "90" #if no threshold is specified, default will be 90%
+		else:
+			CiTestObj.iperf_bitrate_threshold = iperf_bitrate_threshold
+
+
+		CiTestObj.iperf_profile = test.findtext('iperf_profile')
+		if (CiTestObj.iperf_profile is None):
 			CiTestObj.iperf_profile = 'balanced'
-		CiTestObj.iperf_options = test.findtext('iperf_options') or 'check'
-		if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
-			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
+		else:
+			if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
+				logging.error('test-case has wrong profile ' + CiTestObj.iperf_profile)
+				CiTestObj.iperf_profile = 'balanced'
+		CiTestObj.iperf_options = test.findtext('iperf_options')
+		if (CiTestObj.iperf_options is None):
 			CiTestObj.iperf_options = 'check'
+		else:
+			if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
+				logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
+				CiTestObj.iperf_options = 'check'

 	elif action == 'IdleSleep':
 		string_field = test.findtext('idle_sleep_time_in_sec')
@@ -399,7 +472,7 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.cliOptions = string_field

-	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest' or action == 'Run_LDPCt1Test':
+	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest':
 		ldpc.runargs = test.findtext('physim_run_args')

 	elif action == 'LicenceAndFormattingCheck':
@@ -429,12 +502,7 @@ def GetParametersFromXML(action):
 	elif action == 'Custom_Command':
 		RAN.node = test.findtext('node')
 		RAN.command = test.findtext('command')
-		RAN.command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
-	elif action == 'Pull_Cluster_Image':
-		# CLUSTER.imageToPull.clear()
-		string_field = test.findtext('images_to_pull')
-		if (string_field is not None):
-			CLUSTER.imageToPull = string_field.split()
+
 	else:
 		logging.warning(f"unknown action {action} from option-parsing point-of-view")

@@ -476,6 +544,22 @@ with open(yaml_file,'r') as f:
    #from YAML scalar values to Python dictionary format$
    xml_class_list = yaml.load(f,Loader=yaml.FullLoader)

+
+
+#loading UE infrastructure from yaml
+ue_infra_file='ci_ueinfra.yaml'
+if (os.path.isfile(ue_infra_file)):
+	yaml_file=ue_infra_file
+elif (os.path.isfile('ci-scripts/'+ue_infra_file)):
+	yaml_file='ci-scripts/'+ue_infra_file
+else:
+	logging.error("UE infrastructure yaml file cannot be found")
+	sys.exit("UE infrastructure file cannot be found")
+InfraUE=cls_ci_ueinfra.InfraUE() #initialize UE infrastructure class
+InfraUE.Get_UE_Infra(yaml_file) #read the UE infra, filename is hardcoded and unique for the moment but should be passed as parameter from the test suite
+
+
+
 mode = ''

 CiTestObj = cls_oaicitest.OaiCiTest()
@@ -508,6 +592,15 @@ py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj
 if py_param_file_present == True:
 	AssignParams(py_params)

+
+#-----------------------------------------------------------
+# COTS UE instanciation
+#-----------------------------------------------------------
+#COTS_UE instanciation and ADB server init
+#ue id and ue mode are retrieved from xml
+COTS_UE=cls_cots_ue.CotsUe(CiTestObj.ADBIPAddress, CiTestObj.ADBUserName,CiTestObj.ADBPassword)
+
+
 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
 #-----------------------------------------------------------
@@ -523,12 +616,18 @@ if re.match('^TerminateeNB$', mode, re.IGNORECASE):
 	RAN.eNB_serverId[0]='0'
 	RAN.eNBSourceCodePath='/tmp/'
 	RAN.TerminateeNB(HTML, EPC)
+elif re.match('^TerminateUE$', mode, re.IGNORECASE):
+	if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
+		HELP.GenericHelp(CONST.Version)
+		sys.exit('Insufficient Parameter')
+	signal.signal(signal.SIGUSR1, receive_signal)
+	CiTestObj.TerminateUE(HTML,COTS_UE,InfraUE,CiTestObj.ue_trace)
 elif re.match('^TerminateOAIUE$', mode, re.IGNORECASE):
 	if CiTestObj.UEIPAddress == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
 	signal.signal(signal.SIGUSR1, receive_signal)
-	CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
+	CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
 elif re.match('^TerminateHSS$', mode, re.IGNORECASE):
 	if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '':
 		HELP.GenericHelp(CONST.Version)
@@ -592,6 +691,9 @@ elif re.match('^LogCollectOAIUE$', mode, re.IGNORECASE):
 		sys.exit('Insufficient Parameter')
 	CiTestObj.LogCollectOAIUE()
 elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
+	if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
+		HELP.GenericHelp(CONST.Version)
+		sys.exit('Insufficient Parameter')
 	count = 0
 	foundCount = 0
 	while (count < HTML.nbTestXMLfiles):
@@ -611,19 +713,28 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
 	if foundCount != HTML.nbTestXMLfiles:
 		HTML.nbTestXMLfiles=foundCount
 	
-	HTML.CreateHtmlHeader()
+	if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
+		terminate_ue_flag = False
+		CiTestObj.GetAllUEDevices(terminate_ue_flag)
+		CiTestObj.GetAllCatMDevices(terminate_ue_flag)
+		HTML.SethtmlUEConnected(len(CiTestObj.UEDevices) + len(CiTestObj.CatMDevices))
+		HTML.htmlNb_Smartphones=len(CiTestObj.UEDevices)
+		HTML.htmlNb_CATM_Modules=len(CiTestObj.CatMDevices)
+	HTML.CreateHtmlHeader(CiTestObj.ADBIPAddress)
 elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	logging.info('\u001B[1m  Creating HTML footer \u001B[0m')
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')

+	CiTestObj.RetrieveSystemVersion('eNB',HTML,RAN)
+	CiTestObj.RetrieveSystemVersion('UE',HTML,RAN)
 	HTML.CreateHtmlFooter(CiTestObj.finalStatus)
 elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re.IGNORECASE):
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	logging.info('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	if re.match('^TesteNB$', mode, re.IGNORECASE):
-		if RAN.eNBIPAddress == '' or RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '' or EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '':
+		if RAN.eNBIPAddress == '' or RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '' or EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '' or CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == '':
 			HELP.GenericHelp(CONST.Version)
 			if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '' or EPC.Type == '':
 				HELP.EPCSrvHelp(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath, EPC.Type)
@@ -705,13 +816,20 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re

 	signal.signal(signal.SIGUSR1, receive_signal)

+	if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
+		terminate_ue_flag = False
+		CiTestObj.GetAllUEDevices(terminate_ue_flag)
+		CiTestObj.GetAllCatMDevices(terminate_ue_flag)
+	elif (CiTestObj.ADBIPAddress == 'modules'):
+		CiTestObj.UEDevices.append('COTS-Module')
+	else:
+		CiTestObj.UEDevices.append('OAI-UE')
+	HTML.SethtmlUEConnected(len(CiTestObj.UEDevices) + len(CiTestObj.CatMDevices))
 	HTML.CreateHtmlTabHeader()

 	# On CI bench w/ containers, we need to validate if IP routes are set
 	if EPC.IPAddress == '172.21.16.136':
 		CONTAINERS.CheckAndAddRoute('porcepix', EPC.IPAddress, EPC.UserName, EPC.Password)
-	if EPC.IPAddress == '172.21.16.137':
-		CONTAINERS.CheckAndAddRoute('nepes', EPC.IPAddress, EPC.UserName, EPC.Password)
 	if CONTAINERS.eNBIPAddress == '172.21.16.127':
 		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.127':
@@ -720,8 +838,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.128':
 		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
-	if CONTAINERS.eNBIPAddress == '172.21.16.109' or CONTAINERS.eNBIPAddress == 'ofqot':
-		CONTAINERS.CheckAndAddRoute('ofqot', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNBIPAddress == '172.21.16.137':
 		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.137':
@@ -754,6 +870,15 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					continue
 				CiTestObj.ShowTestID()
 				GetParametersFromXML(action)
+				if action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Ping' or action == 'Iperf' or action == 'Reboot_UE' or action == 'DataDisable_UE' or action == 'DataEnable_UE' or action == 'CheckStatusUE':
+					if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
+						#in these cases, having no devices is critical, GetAllUEDevices function has to manage it as a critical error, reason why terminate_ue_flag is set to True
+						terminate_ue_flag = True 
+						# Now we stop properly the test-suite --> clean reporting
+						status = CiTestObj.GetAllUEDevices(terminate_ue_flag)
+						if not status:
+							RAN.prematureExit = True
+							break
 				if action == 'Build_eNB':
 					RAN.BuildeNB(HTML)
 				elif action == 'WaitEndBuild_eNB':
@@ -761,38 +886,51 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				elif action == 'Custom_Command':
 					logging.info(f"Executing custom command")
 					RAN.CustomCommand(HTML)
-					if RAN.prematureExit:
-						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Initialize_eNB':
+					check_eNB = False
+					check_OAI_UE = False
+					RAN.pStatus=CiTestObj.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 					RAN.InitializeeNB(HTML, EPC)
 					if RAN.prematureExit:
 						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Terminate_eNB':
 					RAN.TerminateeNB(HTML, EPC)
 				elif action == 'Initialize_UE':
-					CiTestObj.InitializeUE(HTML)
+					CiTestObj.InitializeUE(HTML,RAN, EPC, COTS_UE, InfraUE, CiTestObj.ue_trace, CONTAINERS)
 				elif action == 'Terminate_UE':
-					CiTestObj.TerminateUE(HTML)
+					CiTestObj.TerminateUE(HTML,COTS_UE, InfraUE, CiTestObj.ue_trace)
 				elif action == 'Attach_UE':
-					CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
+					CiTestObj.AttachUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
 				elif action == 'Detach_UE':
-					CiTestObj.DetachUE(HTML)
+					CiTestObj.DetachUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
 				elif action == 'DataDisable_UE':
 					CiTestObj.DataDisableUE(HTML)
 				elif action == 'DataEnable_UE':
 					CiTestObj.DataEnableUE(HTML)
 				elif action == 'CheckStatusUE':
-					CiTestObj.CheckStatusUE(HTML)
+					CiTestObj.CheckStatusUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
 				elif action == 'Build_OAI_UE':
 					CiTestObj.BuildOAIUE(HTML)
 				elif action == 'Initialize_OAI_UE':
-					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
+					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
 				elif action == 'Terminate_OAI_UE':
-					CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
+					CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+				elif action == 'Initialize_CatM_module':
+					CiTestObj.InitializeCatM(HTML)
+				elif action == 'Terminate_CatM_module':
+					CiTestObj.TerminateCatM(HTML)
+				elif action == 'Attach_CatM_module':
+					CiTestObj.AttachCatM(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+				elif action == 'Detach_CatM_module':
+					CiTestObj.TerminateCatM(HTML)
+				elif action == 'Ping_CatM_module':
+					CiTestObj.PingCatM(HTML,RAN,EPC,COTS_UE,EPC,InfraUE,CONTAINERS)
 				elif action == 'Ping':
-					CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
+					CiTestObj.Ping(HTML,RAN,EPC,COTS_UE, InfraUE, CONTAINERS)
 				elif action == 'Iperf':
-					CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
+					CiTestObj.Iperf(HTML,RAN,EPC,COTS_UE, InfraUE, CONTAINERS)
+				elif action == 'Reboot_UE':
+					CiTestObj.RebootUE(HTML,RAN,EPC)
 				elif action == 'Initialize_HSS':
 					EPC.InitializeHSS(HTML)
 				elif action == 'Terminate_HSS':
@@ -825,17 +963,10 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
 					if ldpc.exitStatus==1:
 						RAN.prematureExit = True
-				elif action == 'Run_LDPCt1Test':
-					HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
-					if ldpc.exitStatus==1:
-						RAN.prematureExit = True
 				elif action == 'Run_NRulsimTest':
 					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
 					if ldpc.exitStatus==1:
 						RAN.prematureExit = True
-				elif action == 'Pull_Cluster_Image':
-					if not CLUSTER.PullClusterImage(HTML,RAN):
-						RAN.prematureExit = True
 				elif action == 'Build_Cluster_Image':
 					if not CLUSTER.BuildClusterImage(HTML):
 						RAN.prematureExit = True
--- a/ci-scripts/py_params.yaml
+++ b/ci-scripts/py_params.yaml
@@ -38,6 +38,11 @@ EPCSourceCodePath : s
 EPCType : t
 EPCContainerPrefix : u

+ADBIPAddress : v
+ADBUserName : w
+ADBType : x
+ADBPassword : y
+
 XMLTestFile : z

 UEIPAddress : qqq
--- a/ci-scripts/py_params_template.yaml
+++ b/ci-scripts/py_params_template.yaml
@@ -69,6 +69,13 @@ EPC:
    EPCType : t
    EPCContainerPrefix : u

+ADB:
+  ADBIPAddress : v
+  ADBUserName : w
+  ADBType : x
+  ADBPassword : y
+
+
 UE:
  UE_inst_0:
    name : UE_1 
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -99,7 +99,6 @@ class RANManagement():
 		self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
 		self.node = ''
 		self.command = ''
-		self.command_fail = False


 #-----------------------------------------------------------
@@ -132,16 +131,20 @@ class RANManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		
-		# Check if we build an 5G-NR gNB or an LTE eNB
-		result = re.search('--RU', self.Build_eNB_args)
+		# Check if we build an 5G-NR gNB or an LTE eNB or an OCP eNB
+		result = re.search('--eNBocp', self.Build_eNB_args)
 		if result is not None:
-			self.air_interface[self.eNB_instance] = 'oairu'
+			self.air_interface[self.eNB_instance] = 'ocp-enb'
 		else:
-			result = re.search('--gNB', self.Build_eNB_args)
+			result = re.search('--RU', self.Build_eNB_args)
 			if result is not None:
-				self.air_interface[self.eNB_instance] = 'nr-softmodem'
+				self.air_interface[self.eNB_instance] = 'oairu'
 			else:
-				self.air_interface[self.eNB_instance] = 'lte-softmodem'
+				result = re.search('--gNB', self.Build_eNB_args)
+				if result is not None:
+					self.air_interface[self.eNB_instance] = 'nr-softmodem'
+				else:
+					self.air_interface[self.eNB_instance] = 'lte-softmodem'
 		
 		# Worakround for some servers, we need to erase completely the workspace
 		if self.Build_eNB_forced_workspace_cleanup:
@@ -220,7 +223,7 @@ class RANManagement():
 			HTML.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
 			self.backgroundBuildTestId[int(self.eNB_instance)] = self.testCase_id
 			return
-		mySSH.command('stdbuf -o0 ./build_oai ' + self.Build_eNB_args + ' 2>&1 | stdbuf -o0 tee compile_oai_enb.log', 'BUILD SHOULD BE SUCCESSFUL|build have failed', 900)
+		mySSH.command('stdbuf -o0 ./build_oai ' + self.Build_eNB_args + ' 2>&1 | stdbuf -o0 tee compile_oai_enb.log', 'Bypassing the Tests|build have failed', 1500)
 		mySSH.close()
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id, HTML)

@@ -260,24 +263,19 @@ class RANManagement():
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML)

 	def CustomCommand(self, HTML):
-		cmd = cls_cmd.getConnection(self.node)
+		if self.node == '' or self.node == "localhost":
+			cmd = cls_cmd.LocalCmd()
+		else:
+			cmd = cls_cmd.RemoteCmd(self.node)
 		ret = cmd.run(self.command)
 		cmd.close()
-		logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode}')
+		logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode} output: {ret.stdout}')
+		html_queue = SimpleQueue()
 		status = 'OK'
-		message = []
-		if ret.returncode != 0 and not self.command_fail:
-			message = [ret.stdout]
-			logging.warning(f'CustomCommand output: {message}')
+		if ret.returncode != 0:
+			html_queue.put(ret.stdout)
 			status = 'Warning'
-		if self.command_fail: # important command since it would make the pipeline fail, so show output in HTML
-			message = [ret.stdout]
-		if ret.returncode != 0 and self.command_fail:
-			message = [ret.stdout]
-			logging.error(f'CustomCommand failed: output: {message}')
-			status = 'KO'
-			self.prematureExit = True
-		HTML.CreateHtmlTestRowQueue(self.command, status, message)
+		HTML.CreateHtmlTestRow(self.command, status, 1, html_queue)

 	def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId, HTML):
 		HTML.testCase_id=testcaseId
@@ -288,7 +286,7 @@ class RANManagement():
 		mySSH.command('ls ran_build/build', '\$', 3)
 		mySSH.command('ls ran_build/build', '\$', 3)

-		#check if we have the build corresponding to the air interface keywords (nr-softmode, lte-softmodem)
+		#check if we have the build corresponding to the air interface keywords (nr-softmode, lte-softmodem, ocp-enb)
 		logging.info('CHECK Build with IP='+lIpAddr+' SourcePath='+lSourcePath)
 		result = re.search(self.air_interface[self.eNB_instance], mySSH.getBefore())
 		if result is None:
@@ -367,9 +365,14 @@ class RANManagement():
 		cwd = os.getcwd()
 		mySSH.copyout(lIpAddr,lUserName,lPassWord, cwd + "/active_net_interfaces.awk", "/tmp")
 		
+		if (self.pStatus < 0):
+			HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus)
+			HTML.CreateHtmlTabFooter(False)
+			sys.exit(1)
+
 		#Get pcap on enb and/or gnb if enabled in the xml 
 		if self.eNB_Trace=='yes':
-			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+			if ((self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb')):
 				pcapfile_prefix="enb_"
 			else:
 				pcapfile_prefix="gnb_"
@@ -454,7 +457,7 @@ class RANManagement():

 		#hack UHD_RFNOC_DIR variable for gNB / N310 on RHEL8 server:
 		#if the USRP address is in the xml then we are using an eth USRP (N3xx)
-		if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+		if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
 			gNB = False
 		else:
 			gNB = True
@@ -470,7 +473,7 @@ class RANManagement():
 		monitor_file='../ci-scripts/stats_monitor.py'
 		conf_file='../ci-scripts/stats_monitor_conf.yaml'
 		if self.eNB_Stats=='yes':
-			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+			if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
 				mySSH.command('echo $USER; nohup python3 ' + monitor_file + ' ' + conf_file + ' ' + self.testCase_id + ' enb 2>&1 > enb_stats_monitor_execution.log &', '\$', 5)
 			else:
 				mySSH.command('echo $USER; nohup python3 ' + monitor_file + ' ' + conf_file + ' ' + self.testCase_id + ' gnb 2>&1 > gnb_stats_monitor_execution.log &', '\$', 5)
@@ -493,7 +496,7 @@ class RANManagement():
 					mySSH.command('killall --signal SIGKILL record', '\$', 5)
 				mySSH.close()
 				doLoop = False
-				logging.error('\u001B[1;37;41m eNB/gNB logging system did not show got sync! \u001B[0m')
+				logging.error('\u001B[1;37;41m eNB/gNB/ocp-eNB logging system did not show got sync! \u001B[0m')
 				HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
 				# In case of T tracer recording, we need to kill tshark on EPC side
 				localEpcIpAddr = EPC.IPAddress
@@ -550,7 +553,7 @@ class RANManagement():


 		HTML.CreateHtmlTestRow(f'{self.cmd_prefix} {self.air_interface[self.eNB_instance]} -O {config_file} {extra_options}', 'OK', CONST.ALL_PROCESSES_OK)
-		logging.debug('\u001B[1m Initialize eNB/gNB Completed\u001B[0m')
+		logging.debug('\u001B[1m Initialize eNB/gNB/ocp-eNB Completed\u001B[0m')

 	def CheckeNBProcess(self, status_queue):
 		try:
@@ -611,19 +614,19 @@ class RANManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-		if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+		if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
 			nodeB_prefix = 'e'
 		else:
 			nodeB_prefix = 'g'
-		mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem | grep -v grep', '\$', 5)
-		result = re.search('-softmodem', mySSH.getBefore())
+		mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem -e ocp-enb | grep -v grep', '\$', 5)
+		result = re.search('(-softmodem|ocp)', mySSH.getBefore())
 		if result is not None:
-			mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGINT -r .*-softmodem || true', '\$', 5)
+			mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGINT -r .*-softmodem ocp-enb || true', '\$', 5)
 			time.sleep(10)
-			mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem | grep -v grep', '\$', 5)
-			result = re.search('-softmodem', mySSH.getBefore())
+			mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem -e ocp-enb | grep -v grep', '\$', 5)
+			result = re.search('(-softmodem|ocp)', mySSH.getBefore())
 			if result is not None:
-				mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL -r .*-softmodem || true', '\$', 5)
+				mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL -r .*-softmodem ocp-enb || true', '\$', 5)
 				time.sleep(5)
 		mySSH.command('rm -f my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		#stopping tshark (valid if eNB and enabled in xml, will not harm otherwise)
@@ -1085,7 +1088,7 @@ class RANManagement():

 		#post processing depending on the node type
 		if not nodeB_prefix_found:
-			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+			if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
 				nodeB_prefix = 'e'
 			else:
 				nodeB_prefix = 'g'
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -1,9 +1,7 @@
  - Build_Proxy
  - Build_Cluster_Image
-  - Pull_Cluster_Image
  - Build_PhySim
  - Run_LDPCTest
-  - Run_LDPCt1Test
  - Run_NRulsimTest
  - Build_eNB
  - WaitEndBuild_eNB
@@ -21,6 +19,7 @@
  - CheckStatusUE
  - Ping
  - Iperf
+  - Reboot_UE
  - Deploy_EPC
  - Undeploy_EPC
  - Initialize_HSS
@@ -31,6 +30,11 @@
  - Terminate_SPGW
  - Initialize_5GCN
  - Terminate_5GCN
+  - Initialize_CatM_module
+  - Terminate_CatM_module
+  - Attach_CatM_module
+  - Detach_CatM_module
+  - Ping_CatM_module
  - IdleSleep
  - Perform_X2_Handover
  - Build_Image
--- a/ci-scripts/xml_files/benetel_multi_node_build.xml
+++ b/ci-scripts/xml_files/benetel_multi_node_build.xml
@@ -0,0 +1,54 @@
+<!--
+
+ 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>build-tab</htmlTabRef>
+	<htmlTabName>Build</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 000001 000002
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>Build_eNB</class>
+		<desc>Build eNB</desc>
+		<Build_eNB_args>--eNB -t benetel4g -w None</Build_eNB_args>
+		<forced_workspace_cleanup>True</forced_workspace_cleanup>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+
+	<testCase id="000002">
+		<class>Build_eNB</class>
+		<desc>Build gNB</desc>
+		<Build_eNB_args>--gNB -t benetel5g -w None</Build_eNB_args>
+		<forced_workspace_cleanup>True</forced_workspace_cleanup>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+	</testCase>
+
+
+
+
+</testCaseList>
--- a/ci-scripts/xml_files/benetel_nsa_quectel.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel.xml
@@ -0,0 +1,147 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
+	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030000
+ 040000
+ 000002
+ 010000
+ 050000
+ 050001
+ 000001
+ 070000
+ 000001
+ 070001
+ 000001
+ 010002
+ 000001
+ 080001
+ 080000
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="010000">
+		<class>Initialize_UE</class>
+		<desc>Initialize Quectel</desc>
+		<id>idefix</id>
+	</testCase>
+
+
+	<testCase id="010002">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>idefix</id>
+	</testCase>
+
+
+	<testCase id="030000">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-4g.conf --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+		<air_interface>lte</air_interface>
+	</testCase>
+
+
+	<testCase id="040000">
+		<class>Initialize_eNB</class>
+		<desc>Initialize gNB</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf -q --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+		<air_interface>nr</air_interface>
+	</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>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="050001">
+		<class>Ping</class>
+		<desc>Ping: 100pings in 20sec</desc>
+		<id>idefix</id>
+		<ping_args>-c 100 -i 0.2</ping_args>
+		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="070000">
+		<class>Iperf</class>
+		<desc>iperf (DL/20Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 60 -i 1</iperf_args>
+		<direction>DL</direction>
+		<id>idefix</id>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="070001">
+		<class>Iperf</class>
+		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 3M -t 60 -i 1</iperf_args>
+		<direction>UL</direction>
+		<id>idefix</id>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+
+	<testCase id="080000">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+		<air_interface>lte</air_interface>
+	</testCase>
+
+	<testCase id="080001">
+		<class>Terminate_eNB</class>
+		<desc>Terminate gNB</desc>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+		<air_interface>nr</air_interface>
+	</testCase>
+
+</testCaseList>
+
--- a/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
@@ -0,0 +1,149 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
+	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030000
+ 040000
+ 000002
+ 010000
+ 000001
+ 050000
+ 050001
+ 000001
+ 070000
+ 000001
+ 070001
+ 000001
+ 010002
+ 000001
+ 080001
+ 080000
+  
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="010000">
+		<class>Initialize_UE</class>
+		<desc>Initialize Quectel</desc>
+		<id>idefix</id>
+	</testCase>
+
+
+	<testCase id="010002">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>idefix</id>
+	</testCase>
+
+
+	<testCase id="030000">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-4g.conf --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+		<air_interface>lte</air_interface>
+	</testCase>
+
+
+	<testCase id="040000">
+		<class>Initialize_eNB</class>
+		<desc>Initialize gNB</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf -q --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+		<air_interface>nr</air_interface>
+	</testCase>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+	</testCase>
+
+
+	<testCase id="050000">
+		<class>Ping</class>
+		<desc>Ping: 20pings in 20sec</desc>
+		<id>idefix</id>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="050001">
+		<class>Ping</class>
+		<desc>Ping: 100pings in 20sec</desc>
+		<id>idefix</id>
+		<ping_args>-c 100 -i 0.2</ping_args>
+		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="070000">
+		<class>Iperf</class>
+		<desc>iperf (DL/20Mbps/UDP)(20 min)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 1200 -i 1</iperf_args>
+		<direction>DL</direction>
+		<id>idefix</id>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="070001">
+		<class>Iperf</class>
+		<desc>iperf (UL/3Mbps/UDP)(20 min)(single-ue profile)</desc>
+		<iperf_args>-u -b 2M -t 1200 -i 1</iperf_args>
+		<direction>UL</direction>
+		<id>idefix</id>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+
+	<testCase id="080000">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+		<air_interface>lte</air_interface>
+	</testCase>
+
+	<testCase id="080001">
+		<class>Terminate_eNB</class>
+		<desc>Terminate gNB</desc>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+		<air_interface>nr</air_interface>
+	</testCase>
+
+</testCaseList>
+
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>a2fa216</proxy_commit>
+                <proxy_commit>a6169d8</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>a2fa216</proxy_commit>
+                <proxy_commit>a6169d8</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -30,9 +30,10 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 100000
 111110
 300000
-040101 
+040101
 030101
-040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
+000001
+040301 000001 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
 030201
 200000
    </TestCaseRequestedList>
@@ -44,26 +45,24 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <test_svr_id>0</test_svr_id>
        <images_to_pull>oai-enb</images_to_pull>
    </testCase>
-
    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
+	    <class>Custom_Command</class>
+	    <desc>To reset cpupower</desc>
+	    <node>hutch</node>
+	    <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
+	    <class>Custom_Command</class>
+	    <desc>To reset cpupower</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="300000">
+	    <class>Custom_Command</class>
+	    <desc>To reset USRP</desc>
+	    <node>hutch</node>
+	    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+   </testCase>
    <testCase id="030101">
        <class>Deploy_Object</class>
        <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
@@ -89,22 +88,21 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
    <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>
        <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>
+        <desc>Attach UE</desc>
    </testCase>
+
    <testCase id="040401">
        <class>Detach_UE</class>
-        <desc>Detach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
+        <desc>Detach UE</desc>
    </testCase>

    <testCase id="040501">
@@ -112,7 +110,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040603">
@@ -120,8 +117,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
+        <iperf_profile>balanced</iperf_profile>
    </testCase>

    <testCase id="040604">
@@ -129,8 +125,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
+        <iperf_profile>single-ue</iperf_profile>
    </testCase>

    <testCase id="040605">
@@ -139,8 +134,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040606">
@@ -149,8 +142,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_2</id>
    </testCase>

    <testCase id="040607">
@@ -159,48 +150,38 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040643">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040644">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -44,16 +44,16 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
        <images_to_pull>oai-enb</images_to_pull>
    </testCase>
    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
+	    <class>Custom_Command</class>
+	    <desc>To reset cpupower</desc>
+	    <node>hutch</node>
+	    <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
+	    <class>Custom_Command</class>
+	    <desc>To reset cpupower</desc>
+	    <node>hutch</node>
+	    <command>sudo cpupower idle-set -E</command>
    </testCase>

    <testCase id="030102">
@@ -75,22 +75,21 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="000001">
@@ -109,40 +108,34 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
        <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 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 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 id="040302">
        <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 id="040502">
@@ -150,7 +143,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
        <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>
    </testCase>

    <testCase id="040503">
@@ -158,7 +150,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
        <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>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -46,16 +46,16 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <images_to_pull>oai-enb</images_to_pull>
    </testCase>
    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>hutch</node>
+            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>hutch</node>
+            <command>sudo cpupower idle-set -E</command>
    </testCase>

    <testCase id="030111">
@@ -83,22 +83,21 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040511">
@@ -106,7 +105,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040613">
@@ -115,8 +113,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040614">
@@ -125,8 +121,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040615">
@@ -135,8 +129,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040616">
@@ -145,8 +137,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040617">
@@ -155,48 +145,38 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040653">
        <class>Iperf</class>
        <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040654">
        <class>Iperf</class>
        <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -31,8 +31,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 111110
 040101
 030112
-040301 040302 040512 040612 040650 040401
-040201
+040301 040512 040612 040650 040401 040201
 030201
 200000
    </TestCaseRequestedList>
@@ -46,13 +45,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>hutch</node>
            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
            <class>Custom_Command</class>
-            <desc>Enable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>hutch</node>
            <command>sudo cpupower idle-set -E</command>
    </testCase>
@@ -76,22 +75,21 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040512">
@@ -99,7 +97,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040612">
@@ -108,18 +105,14 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040650">
        <class>Iperf</class>
        <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 20M -t 30 -i 1</iperf_args>
+        <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -46,13 +46,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>hutch</node>
            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
            <class>Custom_Command</class>
-            <desc>Enable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>hutch</node>
            <command>sudo cpupower idle-set -E</command>
    </testCase>
@@ -82,22 +82,21 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040521">
@@ -105,7 +104,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040623">
@@ -114,8 +112,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040624">
@@ -124,8 +120,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040625">
@@ -134,8 +128,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040626">
@@ -144,8 +136,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040627">
@@ -154,48 +144,38 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040663">
        <class>Iperf</class>
        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040664">
        <class>Iperf</class>
        <desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -27,7 +27,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
    <htmlTabName>Test-TDD-05MHz-TM1</htmlTabName>
    <htmlTabIcon>tasks</htmlTabIcon>
    <TestCaseRequestedList>
-300000
 100000
 111110
 040101
@@ -44,25 +43,17 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <test_svr_id>0</test_svr_id>
        <images_to_pull>oai-enb</images_to_pull>
    </testCase>
-
    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>starsky</node>
+            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</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>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>starsky</node>
+            <command>sudo cpupower idle-set -E</command>
    </testCase>

    <testCase id="030104">
@@ -90,22 +81,21 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040501">
@@ -113,7 +103,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040601">
@@ -122,8 +111,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040602">
@@ -132,8 +119,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040603">
@@ -142,8 +127,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040604">
@@ -152,8 +135,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040605">
@@ -161,57 +142,45 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040644">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040645">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -45,13 +45,13 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>starsky</node>
            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
            <class>Custom_Command</class>
-            <desc>Enable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>starsky</node>
            <command>sudo cpupower idle-set -E</command>
    </testCase>
@@ -80,22 +80,21 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040502">
@@ -103,7 +102,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <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>
    </testCase>

    <testCase id="040601">
@@ -112,8 +110,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040606">
@@ -122,8 +118,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040603">
@@ -132,8 +126,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040608">
@@ -142,8 +134,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040605">
@@ -151,57 +141,45 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040646">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040648">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040645">
        <class>Iperf</class>
        <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -44,16 +44,16 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <images_to_pull>oai-enb</images_to_pull>
    </testCase>
    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>starsky</node>
+            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>starsky</node>
+            <command>sudo cpupower idle-set -E</command>
    </testCase>
    <testCase id="030114">
        <class>Deploy_Object</class>
@@ -80,22 +80,21 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040511">
@@ -103,7 +102,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040611">
@@ -112,8 +110,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040612">
@@ -122,8 +118,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040613">
@@ -132,8 +126,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040614">
@@ -142,8 +134,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040615">
@@ -151,57 +141,45 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040654">
        <class>Iperf</class>
        <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040655">
        <class>Iperf</class>
        <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -45,13 +45,13 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
-            <desc>Disable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>starsky</node>
            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
            <class>Custom_Command</class>
-            <desc>Enable Sleep States</desc>
+            <desc>To reset cpupower</desc>
            <node>starsky</node>
            <command>sudo cpupower idle-set -E</command>
    </testCase>
@@ -80,22 +80,21 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040521">
@@ -103,7 +102,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <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>
    </testCase>

    <testCase id="040621">
@@ -112,8 +110,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040622">
@@ -122,8 +118,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040623">
@@ -132,8 +126,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040624">
@@ -142,8 +134,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040625">
@@ -151,57 +141,45 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</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 -i 1</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>UL</direction>
-        <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 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040665">
        <class>Iperf</class>
        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -43,20 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <test_svr_id>0</test_svr_id>
        <images_to_pull>oai-enb</images_to_pull>
    </testCase>
-
    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>starsky</node>
+            <command>sudo cpupower idle-set -D 0</command>
    </testCase>
    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
+            <class>Custom_Command</class>
+            <desc>To reset cpupower</desc>
+            <node>starsky</node>
+            <command>sudo cpupower idle-set -E</command>
    </testCase>
-
    <testCase id="030125">
        <class>Deploy_Object</class>
        <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
@@ -82,22 +80,21 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
    <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>
        <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>
        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040522">
@@ -105,7 +102,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <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>
    </testCase>

    <testCase id="040626">
@@ -114,8 +110,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040627">
@@ -124,8 +118,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040628">
@@ -134,8 +126,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040629">
@@ -144,8 +134,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040630">
@@ -153,57 +141,45 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
        <iperf_args>-t 30 -i 1 -fm</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</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 -i 1</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</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 -i 1</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>unbalanced</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

    <testCase id="040669">
        <class>Iperf</class>
        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
    </testCase>

    <testCase id="040670">
        <class>Iperf</class>
        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <direction>UL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -1,160 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-
-<testCaseList>
-  <htmlTabRef>TEST-LTE-2x2-N3XX-TM1</htmlTabRef>
-  <htmlTabName>2.6 Ghz TDD LTE 2x2 TM1</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-
-111111
-100000
-010000
-030101
-010001
-000001
-050000
-050001
-070000
-070001
-010010
-010002
-030201
-
-</TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <test_svr_id>0</test_svr_id>
-    <images_to_pull>oai-enb</images_to_pull>
-  </testCase>
-
-  <testCase id="100000">
-    <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>
-
-  <testCase id="030101">
-    <class>Deploy_Object</class>
-    <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="010000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="050000">
-    <class>Ping</class>
-    <desc>Ping: 20 pings</desc>
-    <id>nrmodule2_quectel</id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>60</ping_rttavg_threshold>
-  </testCase>
-
- <testCase id="050001">
-    <class>Ping</class>
-    <desc>Ping: 100 pings, size 1024</desc>
-    <id>nrmodule2_quectel</id>
-    <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 id="070000">
-    <class>Iperf</class>
-    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 26M -t 60</iperf_args>
-    <direction>DL</direction>
-    <id>nrmodule2_quectel</id>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <iperf_profile>single-ue</iperf_profile>
-   </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>
-     <direction>UL</direction>
-     <id>nrmodule2_quectel</id>
-     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-     <iperf_profile>single-ue</iperf_profile>
-   </testCase>
-
-  <testCase id="010010">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="030201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <!-- <d_retx_th>1,100,100,100</d_retx_th>
-	    <u_retx_th>1,100,100,100</u_retx_th>
-		    ?
-    -->
-  </testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -1,160 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-
-<testCaseList>
-  <htmlTabRef>TEST-LTE-2x2-N3XXi-TM2</htmlTabRef>
-  <htmlTabName>2.6 Ghz TDD LTE 2x2 TM2</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-
-111111
-100000
-010000
-030101
-010001
-000001
-050000
-050001
-070000
-070001
-010010
-010002
-030201
-
-</TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <test_svr_id>0</test_svr_id>
-    <images_to_pull>oai-enb</images_to_pull>
-  </testCase>
-
-  <testCase id="100000">
-    <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>
-
-  <testCase id="030101">
-    <class>Deploy_Object</class>
-    <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="010000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="050000">
-    <class>Ping</class>
-    <desc>Ping: 20 pings</desc>
-    <id>nrmodule2_quectel</id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>60</ping_rttavg_threshold>
-  </testCase>
-
- <testCase id="050001">
-    <class>Ping</class>
-    <desc>Ping: 100 pings, size 1024</desc>
-    <id>nrmodule2_quectel</id>
-    <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 id="070000">
-    <class>Iperf</class>
-    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 1M -t 60</iperf_args>
-    <direction>DL</direction>
-    <id>nrmodule2_quectel</id>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <iperf_profile>single-ue</iperf_profile>
-   </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>
-     <direction>UL</direction>
-     <id>nrmodule2_quectel</id>
-     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-     <iperf_profile>single-ue</iperf_profile>
-   </testCase>
-
-  <testCase id="010010">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="030201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <!-- <d_retx_th>1,100,100,100</d_retx_th>
-	    <u_retx_th>1,100,100,100</u_retx_th>
-		    ?
-    -->
-  </testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -31,10 +31,14 @@
 500000
 111110
 111111
- 010000
+ 000001
+ 010002
 030101
+ 000001
 030102
- 010001
+ 000001
+ 010000
+ 000001
 050000
 050001
 070001
@@ -42,8 +46,8 @@
 070002
 050002
 050003
- 010010
 010002
+ 000001
 030202
 030201
 300000
@@ -65,58 +69,47 @@
 		<images_to_pull>oai-gnb</images_to_pull>
 	</testCase>

-	<testCase id = "100000">
-		<class>Custom_Command</class>
-		<desc>Reset USRP</desc>
-		<node>nepes</node>
-		<command>sudo -S b2xx_fx3_utils --reset-device</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>
-		<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>Enable Sleep States (ofqot)</desc>
-		<node>ofqot</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
-
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>idefix</id>
 	</testCase>
+        <testCase id = "100000">
+		<class>Custom_Command</class>
+		<desc>To reset USRP</desc>
+		<node>nepes</node>
+		<command>sudo -S b2xx_fx3_utils --reset-device</command>
+        </testCase>
+       <testCase id="200000">
+            <class>Custom_Command</class>
+            <desc>To reset cpupower - nepes</desc>
+            <node>nepes</node>
+            <command>sudo cpupower idle-set -D 0</command>
+       </testCase>
+       <testCase id="300000">
+            <class>Custom_Command</class>
+            <desc>To reset cpupower - nepes</desc>
+            <node>nepes</node>
+            <command>sudo cpupower idle-set -E</command>
+       </testCase>
+       <testCase id="500000">
+            <class>Custom_Command</class>
+            <desc>To reset cpupower - obelix</desc>
+            <node>obelix</node>
+            <command>sudo cpupower idle-set -D 0</command>
+       </testCase>
+       <testCase id="600000">
+            <class>Custom_Command</class>
+            <desc>To reset cpupower - obelix</desc>
+            <node>obelix</node>
+            <command>sudo cpupower idle-set -E</command>
+       </testCase>
+
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<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>Detach UE</desc>
-		<id>idefix</id>
-	</testCase>

 	<testCase id="030101">
 		<class>Deploy_Object</class>
@@ -185,8 +178,8 @@

 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/125Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 125M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -1,122 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>TEST-5G-AW2S</htmlTabRef>
-  <htmlTabName>20 MHz TDD SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-    010000
-    001000
-    020000
-    002000
-    002002
-    000100
-    000200
-    003000
-    004000
-    000002
-    030000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="010000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images_to_pull>oai-gnb-aw2s</images_to_pull>
-  </testCase>
-
-  <testCase id="020000">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="001000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_ue</id>
-  </testCase>
-
-  <testCase id="002000">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase id="002002">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_2</id>
-  </testCase>
-
-  <testCase id="000100">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2</id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="000200">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2</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="003000">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2</id>
-  </testCase>
-
-  <testCase id="004000">
-    <class>Terminate_UE</class>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_ue</id>
-  </testCase>
-
-  <testCase id="000002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="030000">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <d_retx_th>20,100,100,100</d_retx_th>
-    <u_retx_th>20,100,100,100</u_retx_th>
-  </testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -22,29 +22,31 @@
 -->
 <testCaseList>
  <htmlTabRef>TEST-SA-FR1-B200</htmlTabRef>
-  <htmlTabName>20 MHz TDD SA</htmlTabName>
+  <htmlTabName>40 MHz TDD SA</htmlTabName>
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
    100000
    111111
-    010000
+    010002
    030101
-    010001
+    000001
+    010000
+    000001
    050000
    050001
-    070000
    070001
-    070002
-    060001
-    000002
-    060002
-    050000
-    010010
+    070000
    010002
+    000001
    030201
    200000
  </TestCaseRequestedList>
+    <!--
+ 070002
+ 050002
+ 050003
+    -->
  <TestCaseExclusionList></TestCaseExclusionList>

  <testCase id="111111">
@@ -54,40 +56,30 @@
    <images_to_pull>oai-gnb</images_to_pull>
  </testCase>

-  <testCase id="100000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
  <testCase id="010000">
    <class>Initialize_UE</class>
    <desc>Initialize Quectel</desc>
    <id>idefix</id>
  </testCase>
+
+
  <testCase id="010002">
    <class>Terminate_UE</class>
    <desc>Terminate Quectel</desc>
    <id>idefix</id>
  </testCase>
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>idefix</id>
+  <testCase id="100000">
+            <class>Custom_Command</class>
+            <desc>To reset cpupower - nepes</desc>
+            <node>nepes</node>
+            <command>sudo cpupower idle-set -D 0</command>
+   </testCase>
+   <testCase id="200000">
+            <class>Custom_Command</class>
+            <desc>To reset cpupower - nepes</desc>
+            <node>nepes</node>
+            <command>sudo cpupower idle-set -E</command>
  </testCase>
-  <testCase id="010010">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-
  <testCase id="030101">
    <class>Deploy_Object</class>
    <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
@@ -127,10 +119,28 @@
    <ping_rttavg_threshold>15</ping_rttavg_threshold>
  </testCase>

+  <testCase id="050002">
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</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>
+    <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/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 30M -t 30 -i 1 -fm</iperf_args>
+    <iperf_args>-u -b 30M -t 30 -i 1 -fm -l1400</iperf_args>
    <direction>DL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -140,8 +150,8 @@

  <testCase id="070001">
    <class>Iperf</class>
-    <desc>iperf (UL/3.5Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 3.5M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (UL/8Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 8M -t 30 -i 1 -fm -l1400</iperf_args>
    <direction>UL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
@@ -158,21 +168,6 @@
    <iperf_profile>single-ue</iperf_profile>
  </testCase>

-  <testCase id="060001">
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment</desc>
-    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'force-remove UE RNTI [0-9a-f]{4} from RLC to trigger reestablishment'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-  <testCase id="060002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1 reconf_after_reestab 1'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
  <testCase id="030201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -32,11 +32,9 @@
    130102
    100001
    110000
-    110001
    100001
    150000
    150001
-    110011
    110002
    100001
    130201
@@ -56,21 +54,13 @@
    <desc>Initialize Quectel</desc>
    <id>idefix</id>
  </testCase>
+
+
  <testCase id="110002">
    <class>Terminate_UE</class>
    <desc>Terminate Quectel</desc>
    <id>idefix</id>
  </testCase>
-  <testCase id="110001">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="110011">
-    <class>Detach_UE</class>
-    <desc>Detach Quectel</desc>
-    <id>idefix</id>
-  </testCase>

  <testCase id="130101">
    <class>Deploy_Object</class>
@@ -89,20 +79,18 @@
    <eNB_serverId>0</eNB_serverId>
    <services>gnb_du_tdd</services>
  </testCase>
-
  <testCase id="100000">
    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
+    <desc>To reset cpupower</desc>
+    <node>nepes</node>
    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
+    </testCase>
+    <testCase id="200000">
+      <class>Custom_Command</class>
+      <desc>To reset cpupower</desc>
+      <node>nepes</node>
+      <command>sudo cpupower idle-set -E</command>
+    </testCase>
  <testCase id="100001">
    <class>IdleSleep</class>
    <desc>Sleep</desc>
@@ -115,6 +103,7 @@
    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
  </testCase>

+
  <testCase id="150000">
    <class>Ping</class>
    <desc>Ping: 20pings in 20sec</desc>
--- a/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
@@ -0,0 +1,147 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="030101">
+		<class>Initialize_eNB</class>
+		<desc>Initialize OCP-eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<air_interface>ocp</air_interface>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate OCP-eNB</desc>
+		<air_interface>ocp</air_interface>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040603">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040604">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040605">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040606">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040607">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040643">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040644">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
+++ b/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
@@ -0,0 +1,38 @@
+<!--
+
+ 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>build-tab</htmlTabRef>
+	<htmlTabName>Build</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 010101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB OCP (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNBocp --ninja</Build_eNB_args>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml
@@ -0,0 +1,38 @@
+<!--
+
+ 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>build-tab</htmlTabRef>
+	<htmlTabName>Build</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 010101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_closure.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_closure.xml
@@ -0,0 +1,48 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-closure</htmlTabRef>
+	<htmlTabName>EPC-Closure</htmlTabName>
+	<htmlTabIcon>log-out</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050201 060201 070201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
+
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
+
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml
@@ -0,0 +1,47 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-start</htmlTabRef>
+	<htmlTabName>EPC-Start</htmlTabName>
+	<htmlTabIcon>log-in</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050101 060101 070101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+	</testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
@@ -0,0 +1,118 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030201 090109
+ 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000003">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030101">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090101">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
+		<ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040502">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
+		<ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040601">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040602">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.2 -u -b 14M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 4M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml
@@ -0,0 +1,82 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-fembms-nos1-tunnel</htmlTabRef>
+	<htmlTabName>Test-05MHz-FEMBMS-TM1-noS1-tunnel</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030201 090109
+ 030104 000001 090104 000002 040605 000001 090109 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000003">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030104">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz/MBMS)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --nokrnmod 1 --eNBs.[0].component_carriers.[0].eutra_band 7 --eNBs.[0].component_carriers.[0].downlink_frequency 2680000000 --eNBs.[0].component_carriers.[0].uplink_frequency_offset -120000000 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --MCEs.[0].mbms_sched_info.mbms_area_config_list.[0].pmch_config_list.[0].allocated_sf_end 512 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090104">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz/MBMS)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040605">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1.5Mbps/UDP/MBMS-sink)(20 sec)</desc>
+		<iperf_args>-c 10.0.2.2 -u -b 1.5M -t 20 -i 1 -fm -B 10.0.2.1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_options>sink</iperf_options>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml
@@ -0,0 +1,82 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-mbms-nos1-tunnel</htmlTabRef>
+	<htmlTabName>Test-05MHz-MBMS-TM1-noS1-tunnel</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030201 090109
+ 030103 000001 090103 000002 040605 000001 090109 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000003">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030103">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz/MBMS)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --nokrnmod 1 --eNBs.[0].component_carriers.[0].eutra_band 7 --eNBs.[0].component_carriers.[0].downlink_frequency 2680000000 --eNBs.[0].component_carriers.[0].uplink_frequency_offset -120000000 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090103">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz/MBMS)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040605">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1.5Mbps/UDP/MBMS-sink)(20 sec)</desc>
+		<iperf_args>-c 10.0.2.2 -u -b 1.5M -t 20 -i 1 -fm -B 10.0.2.1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_options>sink</iperf_options>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
@@ -0,0 +1,105 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-tunnel</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1-tunnel</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030201 090109
+ 030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030102">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090102">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040503">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040603">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040604">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 14M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040643">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040644">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 4M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml
@@ -0,0 +1,38 @@
+<!--
+
+ 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>oai-ue-build-tab</htmlTabRef>
+	<htmlTabName>OAI-UE-Build</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+090101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="090101">
+		<class>Build_OAI_UE</class>
+		<desc>Build OAI UE</desc>
+		<Build_OAI_UE_args>-w USRP --UE --ninja</Build_OAI_UE_args>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_usrp210_band13_build.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band13_build.xml
@@ -0,0 +1,39 @@
+<!--
+
+ 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>build-tab</htmlTabRef>
+	<htmlTabName>Build</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 010101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_usrp210_band13_epc_closure.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band13_epc_closure.xml
@@ -0,0 +1,53 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-closure</htmlTabRef>
+	<htmlTabName>EPC-Closure</htmlTabName>
+	<htmlTabIcon>log-out</htmlTabIcon>
+	<TestCaseRequestedList>
+ 040202
+ 050201 060201 070201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="040202">
+		<class>Terminate_CatM_module</class>
+		<desc>Terminate CAT-M Module</desc>
+	</testCase>
+
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
+
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
+
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml
@@ -0,0 +1,48 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-start-tab</htmlTabRef>
+	<htmlTabName>EPC-Start</htmlTabName>
+	<htmlTabIcon>log-in</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050101 060101 070101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+	</testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
@@ -0,0 +1,81 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-lte-m-10-tm1</htmlTabRef>
+	<htmlTabName>Test-LTE-M-10MHz-TM1</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestUnstable>True</TestUnstable>
+	<TestCaseRequestedList>
+ 030201
+ 040102
+ 030121 000001 040302 000001 040502 000001 040402 040202 000001 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Waiting for a moment...</desc>
+		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030121">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band13/10MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="040102">
+		<class>Initialize_CatM_module</class>
+		<desc>Initialize CAT-M Module</desc>
+	</testCase>
+
+	<testCase id="040202">
+		<class>Terminate_CatM_module</class>
+		<desc>Terminate CAT-M Module</desc>
+	</testCase>
+
+	<testCase id="040302">
+		<class>Attach_CatM_module</class>
+		<desc>Attach CAT-M Module</desc>
+	</testCase>
+
+	<testCase id="040402">
+		<class>Detach_CatM_module</class>
+		<desc>Detach CAT-M Module</desc>
+	</testCase>
+
+	<testCase id="040502">
+		<class>Ping_CatM_module</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+</testCaseList>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hongzhi Wang	ffee14b30c	update tutorial	2023-03-21 10:50:40 +01:00
Hongzhi Wang	60cc913956	change config to 2 Tx [Dantenna ports	2023-03-09 16:01:45 +01:00
Hongzhi Wang	2aba646ea7	Update tutorial and config file	2023-03-09 15:54:10 +01:00
Raymond	c3d8907a86	Merge remote-tracking branch 'origin/NR_SA_release_reestablishment_paging' into use_msgq	2023-02-24 09:08:57 +01:00
Raymond	ac5b73fa38	prevent DLSCH precoding until implementation is optimized. suppress UL_INFO_mutex	2023-02-24 09:08:01 +01:00
Raymond Knopp	84b34ffb38	prach repetition combining. threadCreate for PDCP/RLC Queue with max priority	2023-02-23 13:14:42 +01:00
Raymond Knopp	006c47df25	Merge remote-tracking branch 'origin/bugfix-ldpc-processing' into use_msgq	2023-02-20 23:04:57 +01:00
Raymond Knopp	a8e6cae796	Merge remote-tracking branch 'origin/t-reordering-gt-0' into use_msgq	2023-02-20 22:34:07 +01:00
Raymond Knopp	6b3f25afc7	Merge remote-tracking branch 'origin/develop' into use_msgq	2023-02-20 22:24:37 +01:00
Raymond Knopp	133aa928f7	temporary version, use of threadPool for two main RX/TX gNB threads switched to simpler MsgQ and handler thread. TX is called directly from RX thread instead of spawned. with sl_ahead set to TDD period, only TX or RX will execute in a given slot (except in mixed-slot). MIMO not working well when throughput is pushed.	2023-02-20 22:21:43 +01:00
Raymond Knopp	5067a2de00	initial changes for MsgQ use without threadPool for L1_rx_thread and L1_tx_thread	2023-02-20 11:06:35 +01:00
luis_pereira87	39fd90f4bf	Implementation of NR_RRCReestablishment procedures at gNB	2023-02-20 08:46:19 +00:00
Raymond Knopp	87e7bfce79	extra performance measurements	2023-02-19 10:48:58 +01:00
Raymond Knopp	451fd2a3ec	Merge branch 'VVDN_ORAN_fhi_integration' of https://gitlab.eurecom.fr/oai/openairinterface5g into VVDN_ORAN_fhi_integration	2023-02-17 10:05:31 +01:00
Raymond Knopp	6e63a48acd	changes to support multiple TX and RX antennas with O-RAN 7.2 split. zero-copy in 7.2 interface ru_procedures with ru->do_precoding=0.	2023-02-17 09:25:30 +01:00
Hongzhi Wang	ecd35a3cfb	change reorder-thread-disable to boolean	2023-02-15 19:08:53 +01:00
Hongzhi Wang	b51823936d	remove ORAH FHI lib folder	2023-02-15 17:29:33 +01:00
Hongzhi Wang	fa7fa99bc5	add ORAN FHI Tutorial	2023-02-15 09:24:56 +01:00
Manish	ea57aa58d7	Changes Reverted - Not Required for FH	2023-02-14 05:24:09 -08:00
Manish	ef9e8fd788	Following parameter made configurable: Compression Method IQ Width Number of slot based on Numerology Unused Structure Variable Removed, Debug Logs Updated	2023-02-14 04:47:32 -08:00
Raymond	71d25e7886	revert change for pkt_proc_core	2023-02-13 16:14:53 +01:00
Raymond Knopp	f0f441e7b9	Merge branch 'VVDN_ORAN_fhi_integration' of https://gitlab.eurecom.fr/oai/openairinterface5g into VVDN_ORAN_fhi_integration	2023-02-13 09:12:51 +01:00
Raymond	6ddd3b848f	fix for commandline parameters after merge	2023-02-13 09:12:40 +01:00
Raymond Knopp	515191c593	Merge branch 'VVDN_ORAN_fhi_integration' of https://gitlab.eurecom.fr/oai/openairinterface5g into VVDN_ORAN_fhi_integration	2023-02-13 09:08:18 +01:00
Raymond	9d5d23008f	Merge remote-tracking branch 'origin/develop' into VVDN_ORAN_fhi_integration	2023-02-12 22:14:16 +01:00
Raymond	97a54e5496	n_TimingAdvanceOffset in config	2023-02-12 22:11:32 +01:00
Eurecom	e626bbd8b0	moved ORAN files/drivers to radio/ETHERNET	2023-02-12 20:26:21 +01:00
Eurecom	60a9f8a8a2	testing with VVDN RU. mixed-slot DDDSU ok single antenna 100 MHz	2023-02-12 19:41:32 +01:00
thamizhselvan.k	3478e8da5d	updated the oran fhi patches for xran/oai	2023-01-27 16:26:55 +05:30
thamizhselvan.k	9d04f2e8bb	changed from include_directories to target_include_directories for oran_fhlib_5g	2023-01-23 13:22:25 +05:30
Raymond Knopp	fe09318b13	testing	2023-01-19 23:21:24 +01:00
thamizhselvan.k	786cdd839c	changed the scope of variables in reading mixed slot from conf.json	2023-01-19 18:04:03 +05:30
Hongzhi Wang	47ef743950	apply tx amp backoff to PBCH,PDCCH and CSI	2023-01-19 10:54:39 +01:00
Raymond Knopp	75cec63fa1	fix for tx_amp_backoff_dB = 0	2023-01-19 10:28:22 +01:00
Raymond Knopp	1ddf300b06	added new parameter to L1 section of configuration file, tx_amp_backoff_dB, which provides the backoff from full-scale output at the L1 entity (frequency-domain samples). Default is, 36 dBFS, which is the correct value when using the OAI RU entity. For O-RAN RU, this value should be set according to the O-RU manufacturer requirements. For example 12 would corresponding to 14-bit input level (6 dB/bit).	2023-01-19 10:27:29 +01:00
Manish	72da42de21	Redundant html files Removed	2023-01-17 02:40:01 -08:00
Manish	7b65478ec3	ORAN 4G Removed	2023-01-17 01:48:59 -08:00
Manish Kumar Singh	52046caa51	Rebase with develop # Conflicts: # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c	2023-01-17 09:05:09 +00:00
Manish	fe20b0cb5d	ORAN FHI Integration patches moved to cmake_targets	2023-01-17 00:00:59 -08:00
Manish	119a5edfb5	Redundant Code Removed	2023-01-16 03:23:53 -08:00
thamizhselvan.k	099904b320	reduced the size of variable based on the comments	2023-01-16 10:12:50 +05:30
thamizhselvan.k	0ddc772c53	removed hardcoded core id for itti_task and L1_stats	2023-01-16 09:36:24 +05:30
thamizhselvan.k	d3ed5b7d66	read pkt_proc_core as core id	2023-01-16 09:36:18 +05:30
thamizhselvan.k	c92e45296c	mixed slot symbol update in c-plane from conf.json file	2023-01-16 09:36:10 +05:30
Hongzhi Wang	fd5f31f780	add missing header	2023-01-13 16:52:02 +01:00
Hongzhi Wang	39690e6d10	adding reorder thread disable option	2023-01-13 16:50:37 +01:00
Hongzhi Wang	65d900e8b0	dedicated core pinning to ru thread	2023-01-13 16:48:15 +01:00
Manish	6c6266e725	Merge conflict	2023-01-04 09:00:03 +00:00
Manish	0f55476b62	Generic Code Compilation Issue Fix	2023-01-04 08:57:01 +00:00
thamizhselvan.k	d95ac0a913	Changes to sync oai tti with xran tti	2023-01-04 08:54:17 +00:00
rajeshwari.p	8f1db2ea0b	Removed Phase compensation/nr_rotation in DL/UL if IF4P5 mode is used with single antenna	2023-01-04 08:54:16 +00:00
rajeshwari.p	2d82cf51b7	Corrected oran_fhlib_4g library name in CMakeLists.txt Added Precoding function for IF4P5	2023-01-04 08:54:16 +00:00
rajeshwari.p	40e8376eb3	oran_fhlib_5g compilation issue resolved Support added to read XRAN_LIB_DIR from env variable Changes to check RTE_SDK and RTE_TARGET env variable if tp is oran_fhlib_5g	2023-01-04 08:54:16 +00:00
rajeshwari.p	28d782a600	Fix for crash occured if tr_preference is set as if4p5	2023-01-04 08:54:16 +00:00
rajeshwari.p	c53150145c	Compilation steps updated for oran_fhlib_5g and oran_fhlib_4g	2023-01-04 08:54:16 +00:00
thamizhselvan.k	989cc7adea	OAI and XRAN Patches	2023-01-04 08:54:16 +00:00
thamizhselvan.k	2fc9020459	vrb_to_prb_mapping value updated in dci_pdu based on CceRegMappingType	2023-01-04 08:54:16 +00:00
thamizhselvan.k	987f88ff5b	Changes for copying PRACH data from xran buffer to oai buffer	2023-01-04 08:54:16 +00:00
thamizhselvan.k	7466a3caad	Address offset updated for 100MHz bandwidth in both tx/rx memcpy between xran and oai buffers Byte order in tx/rx emcpy between xran and oai buffers updated	2023-01-04 08:54:16 +00:00
Manish	60a025b553	updated interleave & non-interleave macro based on 3GPP standard Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2023-01-04 08:54:16 +00:00
thamizhselvan.k	5c77df1e4f	Static core id pinning for each thread Declared sl_ahead to avoid runtime time error	2023-01-04 08:54:16 +00:00
rajeshwari.p	6fdd65b3aa	Incorrect ssb start symbol number issue resolved, When more than one ssb enabled (ssb_PositionsInBurst_Bitmap > 1)	2023-01-04 08:54:16 +00:00
Manish	817e5cbc62	Read C/U plane dpdk device from config file	2023-01-04 08:53:26 +00:00
Manish	d4afd251d5	Resolved the compilation error caused due to xran library linking	2023-01-04 08:52:51 +00:00
Cedric Roux	6c9a0dea27	LDPC processing: bugfix: clear d[] if first transmission is DTX If first transmission (round == 0) is DTX then d[] will not be cleared for following transmissions (those that are not DTX) in nr_rate_matching_ldpc_rx() because new_rx will not be 1, leading to potential wrong decoding.	2022-12-27 23:24:59 +01:00
Cedric Roux	b038ee0af8	NR LDPC processing: do not redo LDPC decoding on retransmission if not needed Adding crc_ok[] so that we don't redo LDPC decoding of a segment on retransmissions if the CRC was correct for the segment in a previous transmission. We have to be careful with DTX of round 0, because in this case nr_ulsch_decoding() will never be called with new_rx == 1, so we would not reset crc_ok[]. (Hopefully I understand things correctly here...)	2022-12-27 23:24:59 +01:00
Cedric Roux	7fc31d9ca9	NR LDPC processing: check CRC of the full transport block And reject data in case of failure.	2022-12-27 23:24:55 +01:00
Cedric Roux	6d66049e1f	NR LDPC processing: do not stop processing too early It's important to feed data to the d[] array (and clear it first in case of new_rx) so the logic to cancel the other LDPC processing threads when a decoding failure happens has to be changed. This commit introduces a new cancellation point possible only after calling nr_rate_matching_ldpc_rx(), thus the d[] array receives data for all the LDPC segments.	2022-12-27 23:19:56 +01:00
thamizhselvan.k	c623400f54	Changes to sync oai tti with xran tti Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-16 15:42:42 +05:30
rajeshwari.p	eef3688919	Removed Phase compensation/nr_rotation in DL/UL if IF4P5 mode is used with single antenna Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.com>	2022-12-16 14:19:30 +05:30
rajeshwari.p	17c1c58033	1.Corrected oran_fhlib_4g library name in CMakeLists.txt 2.Added Precoding function for IF4P5 Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.com>	2022-12-16 13:22:40 +05:30
rajeshwari.p	1de435d273	1. Resolved oran_fhlib_5g compilation issue 2. Added support to read XRAN_LIB_DIR from env variable 3. Changes to check RTE_SDK and RTE_TARGET env variable if tp is oran_fhlib_5g Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.com>	2022-12-16 13:09:47 +05:30
Sofia Pison	173e57d68f	Modiefied CMakeLists, Compilation Warning solved, No more modification of CMakeCache required. New Instructions to build	2022-12-15 14:01:01 +05:30
rajeshwari.p	04062e8e8b	Fix for crash occured if tr_preference is set as if4p5 Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	870dbe2927	xran_lib_wrap.hpp moved and split to have separation between headers and code	2022-12-15 14:01:01 +05:30
rajeshwari.p	48ef608a8d	updated oran_fhlib_5g and oran_fhlib_4g compilation steps in build_oai Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	64b683d496	fix offset in RX compressed	2022-12-15 14:01:01 +05:30
thamizhselvan.k	62e488d4a1	committed necessary oai and xran patches Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	a93e3e6328	ORAN Tx and Rx implemented and validated with RUsample app. No timing yet. Code to be cleaned	2022-12-15 14:01:01 +05:30
thamizhselvan.k	9b2146817c	updating vrb_to_prb_mapping value in dci_pdu based on CceRegMappingType Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	3ec89b671e	Correct number of samples per symbols (only 106 PRBs per symbol for now)	2022-12-15 14:01:01 +05:30
thamizhselvan.k	fb715f022e	Added code changes to copy prach data from xran buffer to oai buffer Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	c25ab52c92	Fix iq size error from previous commit	2022-12-15 14:01:01 +05:30
thamizhselvan.k	fd8d646ffa	- Updated the pointer address offset for 100MHz bandwidth in both tx/rx memcpy between xran and oai buffers - Updated the byte order in tx/rx emcpy between xran and oai buffers Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	9151e06fe1	Progress in DL integration, not yet overwritting the TX shared buffer	2022-12-15 14:01:01 +05:30
thamizhselvan.k	7fced9d640	updated interleave & non-interleave macro based on 3GPP standard Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	20be2dd36d	sending according to the NIC light	2022-12-15 14:01:01 +05:30
thamizhselvan.k	d6fcc5f2d4	- static core id pinning for each thread - declared sl_ahead to avoid runtime time error Signed-off-by: thamizhselvan.k <thamizhselvan.k@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	4dad60fe20	fixed few previously existing issues, now nr_softmodem runs.	2022-12-15 14:01:01 +05:30
rajeshwari.p	6addbdefff	Resolved incorrect ssb start symbol number issue, when more than one ssb enabled (ssb_PositionsInBurst_Bitmap > 1) Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	25d0b4317e	update on NR oran_isolate.c	2022-12-15 14:01:01 +05:30
rajeshwari.p	ed9d9001a2	support to read C/U plane dpdk device from config file Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	ad40d0d49b	Delete NR oran.cc	2022-12-15 14:01:01 +05:30
rajeshwari.p	c0c598262d	Resolved the compilation error caused due to xran library linking Signed-off-by: rajeshwari.p <rajeshwari.p@vvdntech.in>	2022-12-15 14:01:01 +05:30
Sofia Pison	068c239b37	Add first template for NR integration of O-RAN FHI Library.	2022-12-15 14:01:01 +05:30
Sofia Pison	62c73ee3c5	add few notes in oran_isolate.c south_out	2022-12-15 14:01:01 +05:30
oba	eacd88ea96	Standalone DU simulator integrated to demonstrate the xRAN lib working with OAI. Same IQ samples of sample app are loaded from file and copied in xRAN buffer. Tested with sample app RU	2022-12-15 14:01:01 +05:30
Ting-An Lin	1dbffbdea6	Init done: load FHI lib and DPDK lib in OAI	2022-12-15 14:01:01 +05:30
Ting-An-Lin	d2ae2a0928	Create oran_isolate.c & link to libxran.so	2022-12-15 14:01:01 +05:30
Ting-An-Lin	7d93bc3328	casting in C++ file, rename debug.h in nFAPI	2022-12-15 14:01:01 +05:30
Ting-An-Lin	ee60fbc290	add targets/ARCH/ETHERNET/oran besides benetel	2022-12-15 14:01:01 +05:30
Ting-An-Lin	e13e01c097	add targets/ARCH/ORAN_FHI/lib in OAI	2022-12-15 14:01:01 +05:30