hack: install asn1c locally and use local version

The goal of this commit is to force the use of the new asn1c, no matter what is installed on the host. This is to ease the transition between the previous asn1c version that was used by the project and the new version. This is mostly a hack. There are certainly other ways to do this (I know 'make' so I went with 'make') (I couldn't change PATH easily so I hardcoded asn1c in the various CMakeLists.txt). It is not meant to stay for too long in the code, so I don't think there is the need to do things in a better way.
asn1c: use better version of asn1c
2026-07-19 23:50:30 +00:00 · 2023-03-13 11:28:42 +01:00 · 2023-03-13 11:28:38 +01:00
1168 changed files with 52752 additions and 131674 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "openair2/E2AP/flexric"]
-	path = openair2/E2AP/flexric
-	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
-	branch = remotes/origin/mir_dev
--- 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
@@ -36,6 +36,7 @@ pipeline {
    label nodeExecutor
  }
  options {
+    disableConcurrentBuilds()
    timestamps()
    gitLabConnection('OAI GitLab')
    ansiColor('xterm')
@@ -384,106 +385,27 @@ 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'
-              }
-            }
-          }
-        }
-        stage ("Interop-F1") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
-            }
-          }
-          post {
-            always {
-              script {
-                finalizeSlaveJob('RAN-Interop-F1')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-              }
-            }
-          }
-        }
-        stage ("Sanity-Check OAI-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerCN5GSlaveJob ('OAI-CN5G-COTS-UE-Test', 'OAI-CN5G-COTS-UE-Test')
-            }
-          }
-          post {
-            always {
-              script {
-                finalizeSlaveJob('OAI-CN5G-COTS-UE-Test')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-              }
-            }
-          }
-        }
-        stage ("SA-OAIUE-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'RAN-SA-OAIUE-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-              }
-            }
-          }
-        }
+        //avra is offline, re-enable once it is available
+        //stage ("T1-Offload-Test") {
+        //  when { expression {do5Gtest} }
+        //  steps {
+        //    script {
+        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'T1-Offload-Test')
+        //    }
+        //  }
+        //  post {
+        //    always {
+        //      script {
+        //        finalizeSlaveJob('RAN-T1-Offload-Test')
+        //      }
+        //    }
+        //    failure {
+        //      script {
+        //        currentBuild.result = 'FAILURE'
+        //      }
+        //    }
+        //  }
+        //}
      }
    }
    stage ("DockerHub-Push") {
@@ -578,36 +500,8 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
       echo "${jobName} Slave Job is OK"
    } else {
-       error "${jobName} Slave Job is KO"
-    }
-  }
-}
-
-def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
-  if ("MERGE".equals(env.gitlabActionType)) {
-    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
-    shortenShaOne = shortenShaOne.trim()
-    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
-  } else {
-    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
-    shortenShaOne = shortenShaOne.trim()
-    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:develop-' + shortenShaOne
-  }
-  // Workaround for the "cancelled" GitLab pipeline notification
-  // The slave job is triggered with the propagate false so the following commands are executed
-  // Its status is now PASS/SUCCESS from a stage pipeline point of view
-  // localStatus variable MUST be analyzed to properly assess the status
-  localStatus = build job: jobName,
-    parameters: [
-      string(name: 'FULL_RAN_TAG', value: String.valueOf(fullRanTag))
-    ], propagate: false
-  localResult = localStatus.getResult()
-  echo "${jobName} Slave Job status is ${localResult}"
-  gitlabCommitStatus(name: gitlabStatusName) {
-    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-       echo "${jobName} Slave Job is OK"
-    } else {
-       error "${jobName} Slave Job is KO"
+       echo "${jobName} Slave Job is KO"
+       sh "ci-scripts/fail.sh"
    }
  }
 }
@@ -636,18 +530,15 @@ def triggerSlaveJobNoGitLab (jobName) {
  if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
     echo "${jobName} Slave Job is OK"
  } else {
-     error "${jobName} Slave Job is KO"
+     echo "${jobName} Slave Job is KO"
+     sh "ci-scripts/fail.sh"
  }
 }

 def finalizeSlaveJob(jobName) {
  // In case of any non-success, we are retrieving the HTML report of the last completed
  // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
-  if (jobName == 'OAI-CN5G-COTS-UE-Test') {
-    fileName = "test_results_oai_cn5g_cots_ue.html"
-  } else {
-    fileName = "test_results-${jobName}.html"
-  }
+  fileName = "test_results-${jobName}.html"
  if (!fileExists(fileName)) {
    copyArtifacts(projectName: jobName,
      filter: 'test_results*.html',
--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -61,6 +61,7 @@ pipeline {
    label pythonExecutor
  }
  options {
+    disableConcurrentBuilds()
    timestamps()
    ansiColor('xterm')
    lock(extra: lockResources)
@@ -204,9 +205,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    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}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-nrue
+++ b/ci-scripts/Jenkinsfile-nrue
@@ -1,244 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// Location of the executor node
-def pythonExecutor = params.pythonExecutor
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the test stage
-def testStageName = params.pipelineTestStageName
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch
-
-// Flags
-def scmEvent = false
-def upstreamEvent = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-
-          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-          def allParametersPresent = true
-
-          // It is already to late to check it
-          if (params.pythonExecutor != null) {
-            echo "eNB CI executor node  :   ${pythonExecutor}"
-          }
-          // If not present picking a default Stage Name
-          if (params.pipelineTestStageName == null) {
-            // picking default
-            testStageName = 'Template Test Stage'
-          }
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB1_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB1_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          if (params.eNB1_Credentials == null) {
-            allParametersPresent = false
-          }
-          // the following 4 parameters should be pushed by the master trigger
-          // if not present, take the job GIT variables (used for developing)
-          if (params.eNB_Repository == null) {
-            eNB_Repository = env.GIT_URL
-          } else {
-            eNB_Repository = params.eNB_Repository
-          }
-          echo "eNB_Repository        :   ${eNB_Repository}"
-          if (params.eNB_Branch == null) {
-            eNB_Branch = env.GIT_BRANCH
-          } else {
-            eNB_Branch = params.eNB_Branch
-          }
-          echo "eNB_Branch            :   ${eNB_Branch}"
-          if (params.eNB_CommitID == null) {
-            eNB_CommitID = env.GIT_COMMIT
-          } else {
-            eNB_CommitID = params.eNB_CommitID
-          }
-          echo "eNB_CommitID          :   ${eNB_CommitID}"
-          if (params.eNB_mergeRequest != null) {
-            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
-            if (eNB_AllowMergeRequestProcess) {
-              if (params.eNB_TargetBranch != null) {
-                eNB_TargetBranch = params.eNB_TargetBranch
-              } else {
-                eNB_TargetBranch = 'develop'
-              }
-              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
-            }
-          }
-
-          if (params.EPC_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.EPC_Type == null) {
-            allParametersPresent = false
-          }
-          if (params.EPC_SourceCodePath == null) {
-            allParametersPresent = false
-          }
-          if (params.EPC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_Credentials == null) {
-            allParametersPresent = false
-          }
-          if (params.OC_ProjectName == null) {
-            allParametersPresent = false
-          }
-          if (allParametersPresent) {
-            echo "All parameters are present"
-            if (eNB_AllowMergeRequestProcess) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${eNB_CommitID}"
-            }
-          } else {
-            echo "Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
-            // If not present picking a default XML file
-            if (params.pythonTestXmlFile == null) {
-              // picking default
-              testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-              echo "Test XML file(default):   ${testXMLFile}"
-              mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-            } else {
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                  echo "Test XML file         :   ${xmlFile}"
-                }
-              }
-            }
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_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}"
-              String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
-                    sh "python3 main.py --mode=TesteNB --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} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath}"
-                   }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
-            }
-          }
-        } 
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        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"
-            }
-            if (fileExists("test_results.html")) {
-              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
-              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
-            }
-          }
-        }
-      }
-    }
-  }  
-}
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -55,6 +55,7 @@ pipeline {
    label pythonExecutor
  }
  options {
+    disableConcurrentBuilds()
    timestamps()
    ansiColor('xterm')
    lock(extra: lockResources)
@@ -192,9 +193,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    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}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
@@ -212,16 +211,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-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -36,6 +36,7 @@ pipeline {
    label nodeExecutor
  }
  options {
+    disableConcurrentBuilds()
    ansiColor('xterm')
    lock(extra: lockResources)
  }
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -61,6 +61,7 @@ pipeline {
        label pythonExecutor
    }
    options {
+        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }
@@ -200,9 +201,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --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}"
-                                  }
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -50,6 +50,7 @@ pipeline {
        label pythonExecutor
    }
    options {
+        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }
@@ -196,9 +197,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                                if (fileExists(xmlFile)) {
                                    try {
-                                      timeout (time: 60, unit: 'MINUTES') {
                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --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}"
-                                      }
                                    } catch (Exception e) {
                                        currentBuild.result = 'FAILURE'
                                        buildStageStatus = false
--- 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
@@ -52,6 +53,7 @@ def StatusForDb = ""
 pipeline {
  agent {label pythonExecutor}
  options {
+    disableConcurrentBuilds()
    ansiColor('xterm')
    lock(extra: lockResources)
  }
@@ -167,6 +169,10 @@ pipeline {
            allParametersPresent = false
          }

+          if (params.DataBaseHost == "none") {
+            DataBaseHost = pythonExecutor
+          }
+
          if (allParametersPresent) {
            echo "All parameters are present"
            if (eNB_AllowMergeRequestProcess) {
@@ -215,9 +221,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --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}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
@@ -353,6 +357,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
@@ -63,6 +63,7 @@ pipeline {
        label pythonExecutor
    }
    options {
+        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }
@@ -211,9 +212,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    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}"
-                                  }
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
                                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-tmp-ue
+++ b/ci-scripts/Jenkinsfile-tmp-ue
@@ -63,6 +63,7 @@ pipeline {
        label pythonExecutor
    }
    options {
+        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }
@@ -185,9 +186,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    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}"
-                                  }
                                } 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,13 +219,21 @@ 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-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-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")
+        elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBUserName parameter")
+        elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBType parameter")
+        elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
+            print("ignoring --ADBPassword parameter")
        elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
            CiTestObj.testXMLfiles.append(matchReg.group(1))
@@ -253,17 +260,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/aw2s-multi-20897.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-20897.cfg
@@ -1,280 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 2
-#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/ue.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,
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */     
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "208970000000111",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "208970000000112",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "208970000000113",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "208970000000114",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "208970000000115",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "208970000000116",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "208970000000117",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "208970000000118",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "208970000000119",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "208970000000120",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "208970000000121",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "208970000000122",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "208970000000123",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "208970000000124",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "208970000000125",
-      "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, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "208970000000126",
-      "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, },
-      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/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -4,7 +4,7 @@ idefix:
  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
-  NetworkScript: ip a show dev wwan0
+  UENetworkScript: ip a show dev wwan0
  IF: wwan0
  MTU: 1500
  Trace: True
@@ -15,7 +15,7 @@ nrmodule2_quectel:
  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
-  NetworkScript: ip a show dev wwan0
+  UENetworkScript: ip a show dev wwan0
  IF: wwan0
  MTU: 1500
  LogStore: /media/ci_qlogs
@@ -29,7 +29,7 @@ adb_ue_1:
  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"
-  NetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
+  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
@@ -42,158 +42,87 @@ adb_ue_2:
  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"
-  NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
+  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-multi-20897-2x2.cfg &
-  TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  InitScript: nohup /root/NV18-06-2022/ue/lteue /root/NV18-06-2022/ue/config/oaicicd-ue-ci-test.cfg &
+  TermScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
 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}'
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue2 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue3 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue4 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue5 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue6 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue7 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue8 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue9 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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}'
-  NetworkScript: ip netns exec ue10 ip a show dev pdn0
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/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

-oai_ue_caracal:
-  Host: caracal
-  AttachScript: 'docker start oai-nr-ue'
-  DetachScript: 'docker stop oai-nr-ue'
-  NetworkScript: ip a show dev oaitun_ue1
+oai_ue_obelix:
+  Host: obelix
+  UENetworkScript: ip a show dev oaitun_ue1
  IF: oaitun_ue1
-  MTU: 1500
-
-rfsim5g_gnb_nos1:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
-  CmdPrefix: docker exec rfsim5g-oai-gnb
-  IF: oaitun_enb1
-
-rfsim5g_ue:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
-
-rfsim5g_ue2:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue2
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue2
-  DetachScript: docker stop rfsim5g-oai-nr-ue2
-  MTU: 1500
-
-rfsim5g_ext_dn:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec rfsim5g-oai-ext-dn
-
-rfsim4g_ue:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_ue1
-
-rfsim4g_ext_dn:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec rfsim4g-trf-gen
-
-rfsim4g_enb_nos1:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enb1
-
-l2sim5g_ue:
-  Host: localhost
-  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec l2sim-oai-nr-ue0
-  IF: oaitun_ue1
-
-l2sim5g_ext_dn:
-  Host: localhost
-  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec l2sim-oai-ext-dn
-
-l2sim4g_ue:
-  Host: localhost
-  NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec l2sim4g-oai-lte-ue1
-  IF: oaitun_ue1
-
-l2sim4g_ext_dn:
-  Host: localhost
-  NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec l2sim4g-trf-gen
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -40,30 +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/"
-CI_OC_RAN_NAMESPACE = "oaicicd-ran"
-CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
-
-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):
@@ -81,8 +57,7 @@ class Cluster:
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
-		self.imageToPull = ''
-		self.testSvrId = None
+

 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
@@ -195,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.testSvrId == None: self.testSvrId = self.eNBIPAddress
-		if self.imageToPull == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
-		self.testCase_id = HTML.testCase_id
-		cmd = cls_cmd.getConnection(self.testSvrId)
-		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
-		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 {CI_OC_RAN_NAMESPACE}\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}{CI_OC_RAN_NAMESPACE}'
-			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 == '':
@@ -265,16 +204,16 @@ 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':
-				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel9 | grep --colour=never -i INDEX')
+				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX')
 				result = re.search('index', ret.stdout)
 				if result is not None:
 					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
@@ -308,7 +247,7 @@ class Cluster:
 			self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml')
 			ranbase_job = self._start_build('ran-base')
 			attemptedImages += ['ran-base']
-			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 800)
+			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 600)
 			if not status: logging.error('failure during build of ran-base')
 			self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect
 			# recover logs by mounting image
@@ -324,49 +263,42 @@ class Cluster:
 		if status:
 			self._recreate_is_tag('oai-physim', imageTag, 'openshift/oai-physim-is.yaml')
 			self._recreate_bc('oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel8.2')
 			physim_job = self._start_build('oai-physim')
 			attemptedImages += ['oai-physim']

 			self._recreate_is_tag('ran-build', imageTag, 'openshift/ran-build-is.yaml')
 			self._recreate_bc('ran-build', imageTag, 'openshift/ran-build-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel8.2')
 			ranbuild_job = self._start_build('ran-build')
 			attemptedImages += ['ran-build']

-			self._recreate_is_tag('oai-clang', imageTag, 'openshift/oai-clang-is.yaml')
-			self._recreate_bc('oai-clang', imageTag, 'openshift/oai-clang-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.clang.rhel9')
-			clang_job = self._start_build('oai-clang')
-			attemptedImages += ['oai-clang']
-
-			wait = ranbuild_job is not None and physim_job is not None and clang_job is not None and self._wait_build_end([ranbuild_job, physim_job, clang_job], 1200)
-			if not wait: logging.error('error during build of ranbuild_job or physim_job or clang_job')
+			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:
 			self._recreate_is_tag('oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
 			self._recreate_bc('oai-enb', imageTag, 'openshift/oai-enb-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel8.2')
 			enb_job = self._start_build('oai-enb')
 			attemptedImages += ['oai-enb']

 			self._recreate_is_tag('oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
 			self._recreate_bc('oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel8.2')
 			gnb_job = self._start_build('oai-gnb')
 			attemptedImages += ['oai-gnb']

 			self._recreate_is_tag('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-is.yaml')
 			self._recreate_bc('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
 			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
 			attemptedImages += ['oai-gnb-aw2s']

@@ -378,32 +310,24 @@ class Cluster:
 			self.cmd.run(f'oc logs {gnb_job} &> cmake_targets/log/oai-gnb.log')
 			self.cmd.run(f'oc logs {gnb_aw2s_job} &> cmake_targets/log/oai-gnb-aw2s.log')

-			self._recreate_is_tag('oai-nr-cuup', imageTag, 'openshift/oai-nr-cuup-is.yaml')
-			self._recreate_bc('oai-nr-cuup', imageTag, 'openshift/oai-nr-cuup-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nr-cuup.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nr-cuup.rhel9')
-			nr_cuup_job = self._start_build('oai-nr-cuup')
-			attemptedImages += ['oai-nr-cuup']
-
 			self._recreate_is_tag('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
 			self._recreate_bc('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel8.2')
 			lteue_job = self._start_build('oai-lte-ue')
 			attemptedImages += ['oai-lte-ue']

 			self._recreate_is_tag('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
 			self._recreate_bc('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel9')
-			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel9')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel8.2')
 			nrue_job = self._start_build('oai-nr-ue')
 			attemptedImages += ['oai-nr-ue']

-			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 600)
-			if not wait: logging.error('error during build of nr-cuup/lteUE/nrUE')
+			wait = lteue_job is not None and nrue_job is not None and self._wait_build_end([lteue_job, nrue_job], 600)
+			if not wait: logging.error('error during build of lteUE/nrUE')
 			status = status and wait
 			# recover logs
-			self.cmd.run(f'oc logs {nr_cuup_job} &> cmake_targets/log/oai-nr-cuup.log')
 			self.cmd.run(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log')
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -31,9 +31,6 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import sys 
-
-SSHTIMEOUT=7

 # helper that returns either LocalCmd or RemoteCmd based on passed host name
 def getConnection(host, d=None):
@@ -118,32 +115,21 @@ class LocalCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout

-	def copyin(self, src, tgt, recursive=False):
-		if src[0] != '/' or tgt[0] != '/':
-			raise Exception('support only absolute file paths!')
-		opt = '-r' if recursive else ''
-		self.run(f'cp {opt} {src} {tgt}')
+	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
+		self.run(f'cp -r {src} {tgt}')

-	def copyout(self, src, tgt, recursive=False):
-		self.copyin(src, tgt, recursive)
+	def copyout(self, scpIp, scpUser, scpPw, src, tgt):
+		self.run(f'cp -r {src} {tgt}')

 class RemoteCmd(Cmd):
 	def __init__(self, hostname, d=None):
-		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
 		self.client = paramiko.SSHClient()
 		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
+		self.client.connect(**cfg)
 		self.cwd = d
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
-		while cIdx < 3:
-			try:
-				self.client.connect(**cfg)
-				return
-			except:
-				logging.error(f'Could not connect to {hostname}, tried for {cIdx} time')
-				cIdx +=1
-		raise Exception ("Error: max retries, did not connect to host")

 	def _lookup_ssh_config(hostname):
 		ssh_config = paramiko.SSHConfig()
@@ -156,7 +142,7 @@ class RemoteCmd(Cmd):
 		ucfg = ssh_config.lookup(hostname)
 		if 'identityfile' not in ucfg or 'user' not in ucfg:
 			raise KeyError(f'no identityfile or user in SSH config for host {hostname}')
-		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile'], 'timeout':SSHTIMEOUT}
+		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile']}
 		if 'hostname' in ucfg:
 			cfg['hostname'] = ucfg['hostname'] # override user-given hostname with what is in config
 		if 'port' in ucfg:
--- 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,19 +47,15 @@ from zipfile import ZipFile
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
-import cls_cluster as OC
 import cls_cmd
 import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-import cls_oaicitest

 #-----------------------------------------------------------
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']
-
 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
 		logging.error('need ranCommitID in CreateWorkspace()')
@@ -94,15 +90,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')
@@ -319,6 +306,7 @@ class Containerize():
 		self.registrySvrId = ''
 		self.testSvrId = ''
 		self.imageToPull = []
+
 		#checkers from xml
 		self.ran_checkers={}

@@ -361,7 +349,7 @@ class Containerize():
 			self.cliBuildOptions = '--no-cache'
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
-			self.dockerfileprefix = '.rhel9'
+			self.dockerfileprefix = '.rhel8.2'
 			self.cliBuildOptions = '--no-cache --disable-compression'

 		# we always build the ran-build image with all targets
@@ -395,7 +383,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/')
@@ -661,6 +649,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
@@ -683,8 +680,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)
@@ -697,9 +694,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}'
@@ -707,9 +704,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)
@@ -742,18 +739,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)
@@ -762,15 +766,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
@@ -803,9 +808,9 @@ class Containerize():
 			logging.debug('Removing test images locally')
 			myCmd = cls_cmd.LocalCmd()

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

 		myCmd.close()
@@ -839,10 +844,13 @@ 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)
-		for image in IMAGES:
-			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)
+		mySSH.command('cp docker-compose.yml ci-docker-compose.yml', '\$', 5)
+		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup']
+		for image in imagesList:
+			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)

 		# Currently support only one
 		svcName = self.services[self.eNB_instance]
@@ -876,11 +884,10 @@ class Containerize():
 				else:
 					time.sleep(10)
 					cnt += 1
-
 			mySSH.command('docker inspect --format="ImageUsed: {{.Config.Image}}" ' + containerName, '\$', 5)
 			for stdoutLine in mySSH.getBefore().split('\n'):
-				if stdoutLine.count('ImageUsed: oai-ci'):
-					usedImage = stdoutLine.replace('ImageUsed: oai-ci', 'oai-ci').strip()
+				if stdoutLine.count('ImageUsed: porcepix'):
+					usedImage = stdoutLine.replace('ImageUsed: porcepix', 'porcepix').strip()
 					logging.debug('Used image is ' + usedImage)
 			if usedImage != '':
 				mySSH.command('docker image inspect --format "* Size     = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id       = {{.Id}}" ' + usedImage, '\$', 5, silent=True)
@@ -903,7 +910,7 @@ class Containerize():
 			cnt = 0
 			while (cnt < 20):
 				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
-				result = re.search('got sync|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
+				result = re.search('got sync|Starting F1AP at CU', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -959,7 +966,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 +980,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}')
@@ -993,6 +999,7 @@ class Containerize():
 		mySSH.command('docker volume prune --force', '\$', 20)

 		mySSH.close()
+
 		# Analyzing log file!
 		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
 		if len(services) > 1:
@@ -1004,16 +1011,6 @@ class Containerize():
 			HTML.htmleNBFailureMsg='Could not copy logfile to analyze it!'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
-		# use function for UE log analysis, when oai-nr-ue container is used
-		elif 'oai-nr-ue' in services:
-			self.exitStatus == 0
-			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
-			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
-			if (logStatus < 0):
-				fullStatus = False
-				HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
-			else:
-				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
 			for svcName in services:
 				filename = f'{svcName}-{HTML.testCase_id}.log'
@@ -1053,12 +1050,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

@@ -1195,11 +1193,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)
-		for image in IMAGES:
-			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'
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		for image in imageNames:
+			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

@@ -1349,6 +1349,62 @@ class Containerize():

 		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])

+	def PingFromContainer(self, HTML, RAN, UE):
+		myCmd = cls_cmd.LocalCmd()
+		self.exitStatus = 0
+		ymlPath = self.yamlPath[0].split('/')
+		logPath = '../cmake_targets/log/' + ymlPath[1]
+		cmd = f'mkdir -p {logPath}'
+		myCmd.run(cmd, silent=True)
+
+		cmd = f'docker exec {self.pingContName} /bin/bash -c "ping {self.pingOptions}" 2>&1 | tee {logPath}/ping_{HTML.testCase_id}.log'
+		pingStatus = myCmd.run(cmd, timeout=100, reportNonZero=False)
+		myCmd.close()
+
+		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', pingStatus.stdout)
+		if result is None:
+			self.PingExit(HTML, RAN, UE, False, 'Packet Loss Not Found')
+			return
+
+		packetloss = result.group('packetloss')
+		if float(packetloss) == 100:
+			self.PingExit(HTML, RAN, UE, False, 'Packet Loss is 100%')
+			return
+
+		result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', pingStatus.stdout)
+		if result is None:
+			self.PingExit(HTML, RAN, UE, False, 'Ping RTT_Min RTT_Avg RTT_Max Not Found!')
+			return
+
+		rtt_min = result.group('rtt_min')
+		rtt_avg = result.group('rtt_avg')
+		rtt_max = result.group('rtt_max')
+		pal_msg = 'Packet Loss : ' + packetloss + '%'
+		min_msg = 'RTT(Min)    : ' + rtt_min + ' ms'
+		avg_msg = 'RTT(Avg)    : ' + rtt_avg + ' ms'
+		max_msg = 'RTT(Max)    : ' + rtt_max + ' ms'
+
+		message = 'ping result\n'
+		message += '    ' + pal_msg + '\n'
+		message += '    ' + min_msg + '\n'
+		message += '    ' + avg_msg + '\n'
+		message += '    ' + max_msg + '\n'
+		packetLossOK = True
+		if float(packetloss) > float(self.pingLossThreshold):
+			message += '\nPacket Loss too high'
+			packetLossOK = False
+		elif float(packetloss) > 0:
+			message += '\nPacket Loss is not 0%'
+		self.PingExit(HTML, RAN, UE, packetLossOK, message)
+
+		if packetLossOK:
+			logging.debug('\u001B[1;37;44m ping result \u001B[0m')
+			logging.debug('\u001B[1;34m    ' + pal_msg + '\u001B[0m')
+			logging.debug('\u001B[1;34m    ' + min_msg + '\u001B[0m')
+			logging.debug('\u001B[1;34m    ' + avg_msg + '\u001B[0m')
+			logging.debug('\u001B[1;34m    ' + max_msg + '\u001B[0m')
+			logging.info('\u001B[1m Ping Test PASS\u001B[0m')
+
 	def PingExit(self, HTML, RAN, UE, status, message):
 		if status:
 			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
@@ -1434,6 +1490,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())
@@ -1503,28 +1564,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_module_ue.py
+++ b/ci-scripts/cls_module_ue.py
@@ -54,7 +54,7 @@ class Module_UE:
 				"detach": m.get('DetachScript'),
 				"initialize": m.get('InitScript'),
 				"terminate": m.get('TermScript'),
-				"getNetwork": m.get('NetworkScript'),
+				"getNetwork": m.get('UENetworkScript'),
 				"check": m.get('CheckStatusScript'),
 				"dataEnable": m.get('DataEnableScript'),
 				"dataDisable": m.get('DataDisableScript'),
@@ -81,7 +81,7 @@ class Module_UE:
 			c = cls_cmd.RemoteCmd(self.host)
 		response = c.run(cmd, silent=silent)
 		c.close()
-		return response
+		return response.stdout

 #-----------------$
 #PUBLIC Methods$
@@ -95,11 +95,7 @@ class Module_UE:
 		if self.cmd_dict["detach"]:
 			self._command(self.cmd_dict["detach"], silent=True)
 		self._command(self.cmd_dict["terminate"], silent=True)
-		ret = self._command(self.cmd_dict["initialize"])
-		logging.info(f'For command: {ret.args} | return output: {ret.stdout} | Code: {ret.returncode}')
-		# Here each UE returns differently for the successful initialization, requires check based on UE
-		return ret.returncode == 0
-
+		self._command(self.cmd_dict["initialize"])

 	def terminate(self):
 		self._command(self.cmd_dict["terminate"])
@@ -126,9 +122,9 @@ class Module_UE:
 			self._command(self.cmd_dict["detach"])
 			time.sleep(5)
 		if ip:
-			logging.debug(f'\u001B[1mUE IP Address for UE {self.module_name} is {ip}\u001B[0m')
+			logging.debug(f'\u001B[1mUE IP Address is {ip}\u001B[0m')
 		else:
-			logging.debug(f'\u001B[1;37;41mUE IP Address for UE {self.module_name} Not Found!\u001B[0m')
+			logging.debug('\u001B[1;37;41mUE IP Address Not Found!\u001B[0m')
 		return ip

 	def detach(self):
@@ -137,7 +133,7 @@ class Module_UE:
 	def check(self):
 		cmd = self.cmd_dict["check"]
 		if cmd:
-			return self._command(cmd).stdout
+			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"
@@ -164,7 +160,7 @@ class Module_UE:

 	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.stdout)
+		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
@@ -172,12 +168,12 @@ class Module_UE:

 	def checkMTU(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('mtu (?P<mtu>[0-9]+)', output.stdout)
+		result = re.search('mtu (?P<mtu>[0-9]+)', output)
 		if result and result.group('mtu') and int(result.group('mtu')) == self.MTU:
-			logging.debug(f'\u001B[1mUE Module {self.module_name} NIC MTU is {self.MTU} as expected\u001B[0m')
+			logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
 			return True
 		else:
-			logging.debug(f'\u001B[1;37;41m UE module {self.module_name} has incorrect Module NIC MTU or MTU not found! Expected: {self.MTU} \u001B[0m')
+			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):
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
--- 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
@@ -42,10 +42,9 @@ from multiprocessing import Process, Lock, SimpleQueue
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-import cls_cmd
-from cls_containerize import CreateWorkspace

 #-----------------------------------------------------------
 # Class Declaration
@@ -96,31 +95,53 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)

-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		if (self.ranAllowMerge):
+			if self.ranTargetBranch == '':
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+			else:
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)

-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
-		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
-		cmd.run(f'docker build --tag oai-cppcheck:bionic --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic . > {logDir}/cppcheck-bionic.txt 2>&1')
-		cmd.run(f'sed -e "s@xenial@focal@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal')
-		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 60)
+		mySSH.command('sed -e "s@xenial@bionic@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.bionic', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:bionic --file ci-scripts/docker/Dockerfile.cppcheck.bionic . > cmake_targets/log/cppcheck-bionic.txt 2>&1', '\$', 600)
+		mySSH.command('sed -e "s@xenial@focal@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.focal', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:focal --file ci-scripts/docker/Dockerfile.cppcheck.focal . > cmake_targets/log/cppcheck-focal.txt 2>&1', '\$', 600)
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 30)

 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/cppcheck-bionic.txt', 'cppcheck-bionic.txt')
-		cmd.copyin(f'{logDir}/cppcheck-focal.txt', 'cppcheck-focal.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()

+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')
 		CCR = CppCheckResults()
 		CCR_ref = CppCheckResults()
 		vId = 0
@@ -142,7 +163,7 @@ class StaticCodeAnalysis():
 				xmlStart = False
 				with open('./cppcheck-'+ variant + '.txt', 'r') as logfile:
 					for line in logfile:
-						ret = re.search('cppcheck version="(?P<version>[0-9\.]+)"', str(line))
+						ret = re.search('Unpacking cppcheck \((?P<version>[0-9\.]+)', str(line))
 						if ret is not None:
 						   CCR.versions[vId] = ret.group('version')
 						if re.search('RUN cat cmake_targets/log/cppcheck.xml', str(line)) is not None:
@@ -230,37 +251,57 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)

-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-		check_options = ''
-		if self.ranAllowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		argToPass = ''
+		if (self.ranAllowMerge):
+			argToPass = '--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH=' + self.ranBranch
 			if self.ranTargetBranch == '':
-				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
-					check_options += ' --build-arg TARGET_BRANCH=develop'
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+					argToPass += ' --build-arg TARGET_BRANCH=develop '
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+				argToPass += ' --build-arg TARGET_BRANCH=' + self.ranTargetBranch + ' '

-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic . > {logDir}/oai-formatting-check.txt 2>&1')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker build --target oai-formatting-check --tag oai-formatting-check:latest ' + argToPass + '--file ci-scripts/docker/Dockerfile.formatting.bionic . > cmake_targets/log/oai-formatting-check.txt 2>&1', '\$', 600)

-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run('docker image prune --force')
-		cmd.run('docker volume prune --force')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker image prune --force', '\$', 60)
+		mySSH.command('docker volume prune --force', '\$', 60)

 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()
+
+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')

 		finalStatus = 0
 		if (os.path.isfile('./oai-formatting-check.txt')):
--- a/ci-scripts/conf_files/README.md
+++ b/ci-scripts/conf_files/README.md
@@ -29,8 +29,7 @@ Examples:
 - standard monolithic gNB, 2x2 configuration, with SDAP: `gnb.sa.band78.162prb.usrpn310.2x2-sdap.conf`
 - gNB-CU: `gnb-cu.sa.f1.conf`
 - monolithic gNB, L2sim: `gnb.sa.band77.106prb.l2sim.conf`
- monolithic eNB: `enb.band7.25prb.usrpb200.conf`
- RCC (4G eNB with IF4.5 split): `enb-rcc.band7.25prb.tm1.if4p5.conf`
+- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`

 Notes:
 - there is no need for TDD/FDD, this is encoded in the band number
--- a/ci-scripts/conf_files/untested/benetel-4g.conf
+++ b/ci-scripts/conf_files/untested/benetel-4g.conf
--- a/ci-scripts/conf_files/untested/benetel-5g.conf
+++ b/ci-scripts/conf_files/untested/benetel-5g.conf
--- a/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.100PRB.conf
@@ -0,0 +1,207 @@
+Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs = (
+  {
+    ////////// Identification parameters:
+    eNB_ID    = 0xe00;
+
+    cell_type = "CELL_MACRO_ENB";
+
+    eNB_name  = "eNB-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 100;
+        pbch_repetition                         = "FALSE";
+        prach_root                              = 0;
+        prach_config_index                      = 0;
+        prach_high_speed                        = "DISABLE";
+        prach_zero_correlation                  = 1;
+        prach_freq_offset                       = 2;
+        pucch_delta_shift                       = 1;
+        pucch_nRB_CQI                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -29;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "ENABLE";
+        pusch_groupAssignment                   = 0;
+        pusch_sequenceHoppingEnabled            = "DISABLE";
+        pusch_nDMRS1                            = 1;
+        phich_duration                          = "NORMAL";
+        phich_resource                          = "ONESIXTH";
+        srs_enable                              = "DISABLE";
+        /*
+        srs_BandwidthConfig                     =;
+        srs_SubframeConfig                      =;
+        srs_ackNackST                           =;
+        srs_MaxUpPts                            =;
+        */
+
+        pusch_p0_Nominal                        = -96;
+        pusch_alpha                             = "AL1";
+        pucch_p0_Nominal                        = -104;
+        msg3_delta_Preamble                     = 6;
+        pucch_deltaF_Format1                    = "deltaF2";
+        pucch_deltaF_Format1b                   = "deltaF3";
+        pucch_deltaF_Format2                    = "deltaF0";
+        pucch_deltaF_Format2a                   = "deltaF0";
+        pucch_deltaF_Format2b                   = "deltaF0";
+
+        rach_numberOfRA_Preambles               = 64;
+        rach_preamblesGroupAConfig              = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA           = ;
+        rach_messageSizeGroupA                  = ;
+        rach_messagePowerOffsetGroupB           = ;
+        */
+        rach_powerRampingStep                   = 4;
+        rach_preambleInitialReceivedTargetPower = -108;
+        rach_preambleTransMax                   = 10;
+        rach_raResponseWindowSize               = 10;
+        rach_macContentionResolutionTimer       = 48;
+        rach_maxHARQ_Msg3Tx                     = 4;
+
+        pcch_default_PagingCycle                = 128;
+        pcch_nB                                 = "oneT";
+        bcch_modificationPeriodCoeff= 2;
+        ue_TimersAndConstants_t300              = 1000;
+        ue_TimersAndConstants_t301              = 1000;
+        ue_TimersAndConstants_t310              = 1000;
+        ue_TimersAndConstants_t311              = 10000;
+        ue_TimersAndConstants_n310              = 20;
+        ue_TimersAndConstants_n311              = 1;
+        ue_TransmissionMode                     = 1;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+      # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+      timer_poll_retransmit    = 80;
+
+      # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+      timer_reordering         = 35;
+
+      # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+      timer_status_prohibit    = 0;
+
+      # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+      poll_pdu                 =  4;
+
+      # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+      poll_byte                =  99999;
+
+      # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+      max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address  = (
+      {
+        ipv4       = "CI_MME_IP_ADDR";
+        ipv6       = "192:168:30::17";
+        port       = 36412 ;
+        active     = "yes";
+        preference = "ipv4";
+      }
+    );
+
+    NETWORK_INTERFACES : {
+      ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
+      ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_S1U              = 2152; # Spec 2152
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_X2C              = 36422; # Spec 36422
+    };
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  pdcp_log_level              = "info";
+  rrc_log_level               = "info";
+  gtp_log_level               = "info";
+};
--- a/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.25PRB.conf
@@ -0,0 +1,207 @@
+Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs = (
+  {
+    ////////// Identification parameters:
+    eNB_ID    = 0xe00;
+
+    cell_type = "CELL_MACRO_ENB";
+
+    eNB_name  = "eNB-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 25;
+        pbch_repetition                         = "FALSE";
+        prach_root                              = 0;
+        prach_config_index                      = 0;
+        prach_high_speed                        = "DISABLE";
+        prach_zero_correlation                  = 1;
+        prach_freq_offset                       = 2;
+        pucch_delta_shift                       = 1;
+        pucch_nRB_CQI                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -25;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "ENABLE";
+        pusch_groupAssignment                   = 0;
+        pusch_sequenceHoppingEnabled            = "DISABLE";
+        pusch_nDMRS1                            = 1;
+        phich_duration                          = "NORMAL";
+        phich_resource                          = "ONESIXTH";
+        srs_enable                              = "DISABLE";
+        /*
+        srs_BandwidthConfig                     =;
+        srs_SubframeConfig                      =;
+        srs_ackNackST                           =;
+        srs_MaxUpPts                            =;
+        */
+
+        pusch_p0_Nominal                        = -96;
+        pusch_alpha                             = "AL1";
+        pucch_p0_Nominal                        = -104;
+        msg3_delta_Preamble                     = 6;
+        pucch_deltaF_Format1                    = "deltaF2";
+        pucch_deltaF_Format1b                   = "deltaF3";
+        pucch_deltaF_Format2                    = "deltaF0";
+        pucch_deltaF_Format2a                   = "deltaF0";
+        pucch_deltaF_Format2b                   = "deltaF0";
+
+        rach_numberOfRA_Preambles               = 64;
+        rach_preamblesGroupAConfig              = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA           = ;
+        rach_messageSizeGroupA                  = ;
+        rach_messagePowerOffsetGroupB           = ;
+        */
+        rach_powerRampingStep                   = 4;
+        rach_preambleInitialReceivedTargetPower = -108;
+        rach_preambleTransMax                   = 10;
+        rach_raResponseWindowSize               = 10;
+        rach_macContentionResolutionTimer       = 48;
+        rach_maxHARQ_Msg3Tx                     = 4;
+
+        pcch_default_PagingCycle                = 128;
+        pcch_nB                                 = "oneT";
+        bcch_modificationPeriodCoeff= 2;
+        ue_TimersAndConstants_t300              = 1000;
+        ue_TimersAndConstants_t301              = 1000;
+        ue_TimersAndConstants_t310              = 1000;
+        ue_TimersAndConstants_t311              = 10000;
+        ue_TimersAndConstants_n310              = 20;
+        ue_TimersAndConstants_n311              = 1;
+        ue_TransmissionMode                     = 1;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+      # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+      timer_poll_retransmit    = 80;
+
+      # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+      timer_reordering         = 35;
+
+      # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+      timer_status_prohibit    = 0;
+
+      # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+      poll_pdu                 =  4;
+
+      # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+      poll_byte                =  99999;
+
+      # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+      max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address  = (
+      {
+        ipv4       = "CI_MME_IP_ADDR";
+        ipv6       = "192:168:30::17";
+        port       = 36412 ;
+        active     = "yes";
+        preference = "ipv4";
+      }
+    );
+
+    NETWORK_INTERFACES : {
+      ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
+      ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_S1U              = 2152; # Spec 2152
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_X2C              = 36422; # Spec 36422
+    };
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  pdcp_log_level              = "info";
+  rrc_log_level               = "info";
+  gtp_log_level               = "info";
+};
--- a/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
+++ b/ci-scripts/conf_files/cu.band7.tm1.50PRB.conf
@@ -0,0 +1,207 @@
+Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs = (
+  {
+    ////////// Identification parameters:
+    eNB_ID    = 0xe00;
+
+    cell_type = "CELL_MACRO_ENB";
+
+    eNB_name  = "eNB-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 50;
+        pbch_repetition                         = "FALSE";
+        prach_root                              = 0;
+        prach_config_index                      = 0;
+        prach_high_speed                        = "DISABLE";
+        prach_zero_correlation                  = 1;
+        prach_freq_offset                       = 2;
+        pucch_delta_shift                       = 1;
+        pucch_nRB_CQI                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -27;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "ENABLE";
+        pusch_groupAssignment                   = 0;
+        pusch_sequenceHoppingEnabled            = "DISABLE";
+        pusch_nDMRS1                            = 1;
+        phich_duration                          = "NORMAL";
+        phich_resource                          = "ONESIXTH";
+        srs_enable                              = "DISABLE";
+        /*
+        srs_BandwidthConfig                     =;
+        srs_SubframeConfig                      =;
+        srs_ackNackST                           =;
+        srs_MaxUpPts                            =;
+        */
+
+        pusch_p0_Nominal                        = -96;
+        pusch_alpha                             = "AL1";
+        pucch_p0_Nominal                        = -104;
+        msg3_delta_Preamble                     = 6;
+        pucch_deltaF_Format1                    = "deltaF2";
+        pucch_deltaF_Format1b                   = "deltaF3";
+        pucch_deltaF_Format2                    = "deltaF0";
+        pucch_deltaF_Format2a                   = "deltaF0";
+        pucch_deltaF_Format2b                   = "deltaF0";
+
+        rach_numberOfRA_Preambles               = 64;
+        rach_preamblesGroupAConfig              = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA           = ;
+        rach_messageSizeGroupA                  = ;
+        rach_messagePowerOffsetGroupB           = ;
+        */
+        rach_powerRampingStep                   = 4;
+        rach_preambleInitialReceivedTargetPower = -108;
+        rach_preambleTransMax                   = 10;
+        rach_raResponseWindowSize               = 10;
+        rach_macContentionResolutionTimer       = 48;
+        rach_maxHARQ_Msg3Tx                     = 4;
+
+        pcch_default_PagingCycle                = 128;
+        pcch_nB                                 = "oneT";
+        bcch_modificationPeriodCoeff= 2;
+        ue_TimersAndConstants_t300              = 1000;
+        ue_TimersAndConstants_t301              = 1000;
+        ue_TimersAndConstants_t310              = 1000;
+        ue_TimersAndConstants_t311              = 10000;
+        ue_TimersAndConstants_n310              = 20;
+        ue_TimersAndConstants_n311              = 1;
+        ue_TransmissionMode                     = 1;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+      # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+      timer_poll_retransmit    = 80;
+
+      # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+      timer_reordering         = 35;
+
+      # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+      timer_status_prohibit    = 0;
+
+      # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+      poll_pdu                 =  4;
+
+      # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+      poll_byte                =  99999;
+
+      # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+      max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address  = (
+      {
+        ipv4       = "CI_MME_IP_ADDR";
+        ipv6       = "192:168:30::17";
+        port       = 36412 ;
+        active     = "yes";
+        preference = "ipv4";
+      }
+    );
+
+    NETWORK_INTERFACES : {
+      ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
+      ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_S1U              = 2152; # Spec 2152
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
+      ENB_PORT_FOR_X2C              = 36422; # Spec 36422
+    };
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  pdcp_log_level              = "info";
+  rrc_log_level               = "info";
+  gtp_log_level               = "info";
+};
--- a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
@@ -0,0 +1,112 @@
+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 100;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 115;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -29;
+    max_rxgain                    = 115;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  hw_log_level                = "info";
+  phy_log_level               = "info";
+  mac_log_level               = "info";
+  rlc_log_level               = "info";
+};
+
+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";
+  }
+);
--- a/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf
@@ -0,0 +1,112 @@
+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 25;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 125;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -25;
+    max_rxgain                    = 125;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  hw_log_level                = "info";
+  phy_log_level               = "info";
+  mac_log_level               = "info";
+  rlc_log_level               = "info";
+};
+
+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";
+  }
+);
--- a/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf
@@ -0,0 +1,112 @@
+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 50;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 120;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -27;
+    max_rxgain                    = 120;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  hw_log_level                = "info";
+  phy_log_level               = "info";
+  mac_log_level               = "info";
+  rlc_log_level               = "info";
+};
+
+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";
+  }
+);
--- a/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf
+++ b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf
--- a/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf
@@ -1,222 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB_Eurecom_LTEBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-
-       ////////// Physical parameters:
-
-    component_carriers = (
-      {
-        node_function                                         = "eNodeB_3GPP";
-        node_timing                                           = "synch_to_ext_device";
-        node_synch_ref                                        = 0;
-        frame_type					      = "TDD";
-        tdd_config 					      = 1;
-        tdd_config_s            			      = 0;
-        prefix_type             			      = "NORMAL";
-        eutra_band              			      = 38;
-        downlink_frequency      			      = 2605000000L;
-        uplink_frequency_offset 			      = 0000000;
-        Nid_cell					      = 10;
-        N_RB_DL                 			      = 25;
-        Nid_cell_mbsfn          			      = 0;
-        nb_antenna_ports          			      = 1;
-        nb_antennas_tx          			      = 1;
-        nb_antennas_rx          			      = 1;
-        tx_gain                                            = 90;
-        rx_gain                                            = 125;
-        prach_root              			      = 0;
-        prach_config_index      			      = 0;
-        prach_high_speed        			      = "DISABLE";
-        prach_zero_correlation  			      = 1;
-        prach_freq_offset       			      = 2;
-        pucch_delta_shift       			      = 1;
-        pucch_nRB_CQI           			      = 1;
-        pucch_nCS_AN            			      = 0;
-        pucch_n1_AN             			      = 0;
-        pdsch_referenceSignalPower 			      =-27;
-        pdsch_p_b                  			      = 0;
-        pusch_n_SB                 			      = 1;
-        pusch_enable64QAM          			      = "DISABLE";
-        pusch_hoppingMode                                  = "interSubFrame";
-        pusch_hoppingOffset                                = 0;
-        pusch_groupHoppingEnabled  			      = "ENABLE";
-        pusch_groupAssignment      			      = 0;
-        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-        pusch_nDMRS1                                       = 1;
-        phich_duration                                     = "NORMAL";
-        phich_resource                                     = "ONESIXTH";
-        srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-        srs_SubframeConfig                                 =;
-        srs_ackNackST                                      =;
-        srs_MaxUpPts                                       =;*/
-
-        pusch_p0_Nominal                                   = -96;
-        pusch_alpha                                        = "AL1";
-        pucch_p0_Nominal                                   = -106;
-        msg3_delta_Preamble                                = 6;
-        pucch_deltaF_Format1                               = "deltaF2";
-        pucch_deltaF_Format1b                              = "deltaF3";
-        pucch_deltaF_Format2                               = "deltaF0";
-        pucch_deltaF_Format2a                              = "deltaF0";
-        pucch_deltaF_Format2b		    	      = "deltaF0";
-
-        rach_numberOfRA_Preambles                          = 64;
-        rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-        rach_sizeOfRA_PreamblesGroupA                      = ;
-        rach_messageSizeGroupA                             = ;
-        rach_messagePowerOffsetGroupB                      = ;
-      */
-        rach_powerRampingStep                              = 4;
-        rach_preambleInitialReceivedTargetPower            = -108;
-        rach_preambleTransMax                              = 10;
-        rach_raResponseWindowSize                          = 10;
-        rach_macContentionResolutionTimer                  = 48;
-        rach_maxHARQ_Msg3Tx                                = 4;
-
-        pcch_default_PagingCycle                           = 128;
-        pcch_nB                                            = "oneT";
-        bcch_modificationPeriodCoeff			      = 2;
-        ue_TimersAndConstants_t300			      = 1000;
-        ue_TimersAndConstants_t301			      = 1000;
-        ue_TimersAndConstants_t310			      = 1000;
-        ue_TimersAndConstants_t311			      = 10000;
-        ue_TimersAndConstants_n310			      = 20;
-        ue_TimersAndConstants_n311			      = 1;
-
-	ue_TransmissionMode				      = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-
-    log_config :
-    {
-      global_log_level                      ="debug";
-      hw_log_level                          ="info";
-      phy_log_level                         ="info";
-      mac_log_level                         ="info";
-      rlc_log_level                         ="info";
-      pdcp_log_level                        ="info";
-      rrc_log_level                         ="info";
-   };
-
-  }
-);
-MACRLCs = (
-	{
-        num_cc = 1;
-        tr_s_preference = "local_L1";
-        tr_n_preference = "local_RRC";
-        scheduler_mode = "fairRR";
-        puSch10xSnr     =  150;
-        puCch10xSnr     =  150;
-        }  
-);
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
-);
-
-RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 6
-         att_rx         = 6;
-         bands          = [38];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 125;
-         eNB_instances  = [0];
-
-    }
-);  
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-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";
-  }
-);
--- 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
    };
  }
--- 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
    };
  }
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
--- a/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
--- a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
@@ -1,267 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 100;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
@@ -1,263 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 100;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
@@ -1,267 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
@@ -1,267 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf
@@ -1,263 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 222; mnc = 01; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.30";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.30";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.30";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
@@ -1,263 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 30;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
@@ -1,263 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
@@ -1,267 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 10;
-      N_RB_DL                   = 50;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
@@ -1,263 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 50;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "no";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf
--- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf
@@ -374,10 +374,6 @@ RUs = (
    }
 );

-rfsimulator: {
-    serveraddr = "server";
-};
-
 THREAD_STRUCT = (
  {
    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf
@@ -1,263 +0,0 @@
-Active_eNBs = ( "eNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-    cell_type =  "CELL_MACRO_ENB";
-    eNB_name  =  "eNB-in-docker";
-    
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 222; mnc = 01; mnc_length = 2; } );
-    
-    tr_s_preference     = "local_mac"
-
-    // In seconds
-    rrc_inactivity_threshold = 0;
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type                = "FDD";
-      tdd_config                = 3;
-      tdd_config_s              = 0;
-      prefix_type               = "NORMAL";
-      eutra_band                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      Nid_cell                  = 0;
-      N_RB_DL                   = 25;
-      Nid_cell_mbsfn            = 0;
-      nb_antenna_ports          = 1;
-      nb_antennas_tx            = 1;
-      nb_antennas_rx            = 1;
-      tx_gain                   = 90;
-      rx_gain                   = 115;
-      pbch_repetition           = "FALSE";
-      prach_root                = 0;
-      prach_config_index        = 0;
-      prach_high_speed          = "DISABLE";
-      prach_zero_correlation    = 1;
-      prach_freq_offset         = 2;
-      pucch_delta_shift         = 1;
-      pucch_nRB_CQI             = 0;
-      pucch_nCS_AN              = 0;
-      pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower= -29;
-      pdsch_p_b                 = 0;
-      pusch_n_SB                = 1;
-      pusch_enable64QAM         = "DISABLE";
-      pusch_hoppingMode         = "interSubFrame";
-      pusch_hoppingOffset       = 0;
-      pusch_groupHoppingEnabled = "ENABLE";
-      pusch_groupAssignment     = 0;
-      pusch_sequenceHoppingEnabled = "DISABLE";
-      pusch_nDMRS1              = 1;
-      phich_duration            = "NORMAL";
-      phich_resource            = "ONESIXTH";
-      srs_enable                = "DISABLE";
-/*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
-*/
-
-      pusch_p0_Nominal          = -96;
-      pusch_alpha               = "AL1";
-      pucch_p0_Nominal          = -96;
-      msg3_delta_Preamble       = 6;
-      pucch_deltaF_Format1      = "deltaF2";
-      pucch_deltaF_Format1b     = "deltaF3";
-      pucch_deltaF_Format2      = "deltaF0";
-      pucch_deltaF_Format2a     = "deltaF0";
-      pucch_deltaF_Format2b     = "deltaF0";
- 
-      rach_numberOfRA_Preambles                = 64;
-      rach_preamblesGroupAConfig               = "DISABLE";
-/*
-      rach_sizeOfRA_PreamblesGroupA            = ;
-      rach_messageSizeGroupA                   = ;
-      rach_messagePowerOffsetGroupB            = ;
-*/
-      rach_powerRampingStep                    = 4;
-      rach_preambleInitialReceivedTargetPower  = -108;
-      rach_preambleTransMax                    = 10;
-      rach_raResponseWindowSize                = 10;
-      rach_macContentionResolutionTimer        = 48;
-      rach_maxHARQ_Msg3Tx                      = 4;
-
-      pcch_default_PagingCycle                 = 128;
-      pcch_nB                                  = "oneT";
-      bcch_modificationPeriodCoeff             = 2;
-      ue_TimersAndConstants_t300               = 1000;
-      ue_TimersAndConstants_t301               = 1000;
-      ue_TimersAndConstants_t310               = 1000;
-      ue_TimersAndConstants_t311               = 10000;
-      ue_TimersAndConstants_n310               = 20;
-      ue_TimersAndConstants_n311               = 1;
-      ue_TransmissionMode                      = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal"; 
-      rxPool_sc_Period                                       = "sf40";  
-      rxPool_data_CP_Len                                     = "normal";  
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;      
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*
-      rxPool_dataHoppingConfig_hoppingParameter              = 0;
-      rxPool_dataHoppingConfig_numSubbands                   = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                      = 0;
-      rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
-*/    
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    enable_measurement_reports = "yes";
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2         = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.68.130";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.68.130";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.68.130";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }
-);
-
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }
-);
-
-RUs =
-(
-  {
-    local_rf                      = "yes"
-    nb_tx                         = 1
-    nb_rx                         = 1
-    att_tx                        = 3
-    att_rx                        = 0;
-    bands                         = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    eNB_instances                 = [0];
-#    clock_src                     = "external";
-  }
-);
-
-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"; 
-     hw_log_level                          ="info"; 
-     phy_log_level                         ="info"; 
-     mac_log_level                         ="info"; 
-     rlc_log_level                         ="info"; 
-     pdcp_log_level                        ="info"; 
-     rrc_log_level                         ="info"; 
-};
--- a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf
--- a/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/episci_ue_test_sfr.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_ue_test_sfr.conf
--- a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
+++ b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
--- a/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
--- a/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
--- a/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -1,4 +1,4 @@
-Active_gNBs = ( "cu-rfsim");
+Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 Num_Threads_PUSCH = 8;
@@ -11,7 +11,7 @@ gNBs =

 #     cell_type =  "CELL_MACRO_GNB";

-    gNB_name  =  "cu-rfsim";
+    gNB_name  =  "gNB-Eurecom-CU";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
@@ -23,16 +23,15 @@ gNBs =

    tr_s_preference = "f1";

-    local_s_if_name = "eth0";
-    local_s_address = "192.168.71.140";
-    remote_s_address = "192.168.71.142";
+    local_s_if_name = "lo";
+    local_s_address = "127.0.0.4";
+    remote_s_address = "127.0.0.3";
    local_s_portc   = 501;
-    local_s_portd   = 2153;
+    local_s_portd   = 2152;
    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
+    remote_s_portd  = 2152;
    min_rxtxtime                                              = 6;

-
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -170,7 +169,7 @@ gNBs =


    ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "192.168.71.132";
+        amf_ip_address      = ( { ipv4       = "192.168.5.233";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -181,9 +180,9 @@ gNBs =
    {

        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
@@ -214,6 +213,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
       ngap_log_level                         ="debug";
    };
+
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -1,4 +1,4 @@
-Active_gNBs = ( "du-rfsim");
+Active_gNBs = ( "gNB-Eurecom-DU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -10,7 +10,7 @@ gNBs =

 #     cell_type =  "CELL_MACRO_GNB";

-    gNB_name  =  "du-rfsim";
+    gNB_name  =  "gNB-Eurecom-DU";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
@@ -168,15 +168,16 @@ MACRLCs = (
    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
-    local_n_address = "192.168.71.142";
-    remote_n_address = "192.168.71.140";
+    local_n_if_name = "lo";
+    local_n_address = "127.0.0.3";
+    remote_n_address = "127.0.0.4";
    local_n_portc   = 500;
-    local_n_portd   = 2153;
+    local_n_portd   = 2152;
    remote_n_portc  = 501;
-    remote_n_portd  = 2153;
+    remote_n_portd  = 2152;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
+    ulsch_max_frame_inactivity = 1;
  }
 );

@@ -232,6 +233,7 @@ serveraddr = "server";
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
       ngap_log_level                         ="debug";
    };
+
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf
@@ -1,218 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-CU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-CU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-    force_256qam_off = 1;
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "eth0";
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-    min_rxtxtime                                              = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 11;
-        initialDLBWPsearchSpaceZero                                     = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-     log_config :
-     {
-       global_log_level                      ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       rlc_log_level                         ="debug";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
-       ngap_log_level                         ="debug";
-    };
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -1,232 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-DU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    min_rxtxtime                                              = 6;
-    force_256qam_off = 1;
-
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon 
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #  
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1 
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-     }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-  }
-);
-
-MACRLCs = (
-  {
-    num_cc           = 1;
-    tr_s_preference  = "local_L1";
-    tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
-    local_n_address = "192.168.68.195";
-    remote_n_address = "192.168.68.194";
-    local_n_portc   = 500;
-    local_n_portd   = 2153;
-    remote_n_portc  = 501;
-    remote_n_portd  = 2153;
-    pusch_TargetSNRx10          = 200;
-    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
-  }
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 150;
-  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 114;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         clock_src = "internal";
-    }
-);  
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       rlc_log_level                         ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
-       ngap_log_level                         ="debug";
-    };
--- a/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
@@ -15,7 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
+    plmn_list = ({mcc = 311; mnc = 480; mnc_length = 3;});	 

    tr_s_preference     = "local_mac"

@@ -234,10 +234,6 @@ RUs = (
    }
 );  

-rfsimulator: {
-    serveraddr = "server";
-};
-
 THREAD_STRUCT = (
  {
    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -212,10 +212,6 @@ RUs = (
    }
 );

-rfsimulator: {
-    serveraddr = "server";
-};
-
 THREAD_STRUCT = (
  {
    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -1,264 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641032;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640000;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon 
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #  
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1 
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "local_RRC";
-	}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-}
-);
-
-RUs = (
-    {		  
-         local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 50;
-         eNB_instances  = [0];
-         ## 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];
-
-         sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
-    }
-);  
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       rlc_log_level                         ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-    };
-
--- a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
--- 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
@@ -1,4 +1,4 @@
-Active_gNBs = ( "gnb-rfsim");
+Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -10,12 +10,12 @@ gNBs =

 #     cell_type =  "CELL_MACRO_GNB";

-    gNB_name  =  "gnb-rfsim";
+    gNB_name  =  "gNB-OAI";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });

    nr_cellid = 12345678L

@@ -23,7 +23,11 @@ gNBs =

    ////////// Physical parameters:

-    min_rxtxtime = 6;
+    pusch_AntennaPorts                                        = 2;
+    pdsch_AntennaPorts_XP                                     = 2;
+    ul_prbblacklist                                           = "51,52,53,54"
+    do_SRS                                                    = 0;
+    do_CSIRS                                                  = 1;

    servingCellConfigCommon = (
    {
@@ -33,10 +37,23 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
+      # this is 3301.68 MHz + 22*12*30e-3 MHz = 3309.6
+      #absoluteFrequencySSB                                          = 620640;
      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
      absoluteFrequencySSB                                          = 621312;
+      # this is 3503.28 MHz + 22*12*30e-3 MHz = 3511.2
+      #absoluteFrequencySSB                                          = 634080;
+      # this is 3600.48 MHz
+      #absoluteFrequencySSB                                          = 640032;
+      #dl_frequencyBand                                                 = 78;
+      # this is 3301.68 MHz
+      #dl_absoluteFrequencyPointA                                       = 620112;
      # this is 3300.60 MHz
      dl_absoluteFrequencyPointA                                       = 620040;
+      # this is 3502.56 MHz
+      #dl_absoluteFrequencyPointA                                       = 633552;
+      # this is 3600.48 MHz
+      #dl_absoluteFrequencyPointA                                       = 640032;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -54,8 +71,6 @@ gNBs =
        initialDLBWPcontrolResourceSetZero                                      = 11;
        initialDLBWPsearchSpaceZero                                             = 0;

-
-
  #uplinkConfigCommon
     #frequencyInfoUL
      ul_frequencyBand                                                 = 78;
@@ -164,7 +179,7 @@ gNBs =
    };

    ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "192.168.71.132";
+        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                                  ipv6       = "192:168:30::17";
                                  active     = "yes";
                                  preference = "ipv4";
@@ -174,10 +189,10 @@ gNBs =
        NETWORK_INTERFACES :
        {

-           GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
        };

@@ -189,8 +204,9 @@ MACRLCs = (
    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
-    pusch_TargetSNRx10 = 200;
-    pucch_TargetSNRx10 = 200;
+    pusch_TargetSNRx10 = 220;
+    pucch_TargetSNRx10 = 220;
+    ulsch_max_frame_inactivity = 10;
  }
 );

@@ -206,8 +222,8 @@ L1s = (
 RUs = (
    {
       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
+         nb_tx          = 2
+         nb_rx          = 2
         att_tx         = 0
         att_rx         = 0;
         bands          = [78];
@@ -223,7 +239,7 @@ RUs = (
         ## beamforming 4x4 matrix:
         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
         sf_extension = 0
-         sdr_addrs = "serial=XXXXXXX"
+         sdr_addrs = "mgmt_addr=172.21.19.14,addr=192.168.10.2,second_addr=192.168.20.2,clock_source=internal,time_source=internal"
    }
 );

@@ -236,25 +252,21 @@ THREAD_STRUCT = (
  }
 );

-rfsimulator: {
-    serveraddr = "server";
-};
-
 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
+  ciphering_algorithms = ( "nea2" );

  # preferred integrity algorithms
  # the first one of the list that an UE supports in chosen
  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
+  integrity_algorithms = ( "nia1", "nia2" );

  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
  drb_ciphering = "yes";
-  drb_integrity = "no";
+  drb_integrity = "yes";
 };

     log_config :
@@ -266,5 +278,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                        ="info";
    };
--- 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
@@ -25,6 +25,7 @@ gNBs =

    pdsch_AntennaPorts_XP                                     = 2;
    pusch_AntennaPorts                                        = 2;
+    do_SRS                                                    = 0;

    servingCellConfigCommon = (
    {
@@ -34,10 +35,23 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
+      # this is 3301.68 MHz + 22*12*30e-3 MHz = 3309.6
+      #absoluteFrequencySSB                                          = 620640;
      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
      absoluteFrequencySSB                                          = 621312;
+      # this is 3503.28 MHz + 22*12*30e-3 MHz = 3511.2
+      #absoluteFrequencySSB                                          = 634080;
+      # this is 3600.48 MHz
+      #absoluteFrequencySSB                                          = 640032;
+      #dl_frequencyBand                                                 = 78;
+      # this is 3301.68 MHz
+      #dl_absoluteFrequencyPointA                                       = 620112;
      # this is 3300.60 MHz
      dl_absoluteFrequencyPointA                                       = 620040;
+      # this is 3502.56 MHz
+      #dl_absoluteFrequencyPointA                                       = 633552;
+      # this is 3600.48 MHz
+      #dl_absoluteFrequencyPointA                                       = 640032;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
--- 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
@@ -25,6 +25,7 @@ gNBs =

    pusch_AntennaPorts                                        = 2;
    ul_prbblacklist                                           = "51,52,53,54"
+    do_SRS                                                    = 0;

    servingCellConfigCommon = (
    {
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
--- 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
@@ -25,7 +25,10 @@ gNBs =

    pdsch_AntennaPorts_XP                                     = 2;
    pusch_AntennaPorts                                        = 2;
+    #pusch_TargetSNRx10                                        = 200;
+    #pucch_TargetSNRx10                                        = 200;
    ul_prbblacklist                                           = "79,80,81,82"
+    do_SRS                                                    = 0;

    servingCellConfigCommon = (
    {
--- a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf
@@ -15,7 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
+    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});	 

    tr_s_preference     = "local_mac"

--- a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -1,269 +0,0 @@
-Active_gNBs = ( "gNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    cell_type =  "CELL_MACRO_GNB";
-    gNB_name  =  "gNB-in-docker";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({mcc = 222; mnc = 01; mnc_length = 2;});   
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
- 
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 84 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641272;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640000;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialDLBWPsubcarrierSpacing                                           = 1;
-
-  #uplinkConfigCommon 
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -100;
-#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                                           = 5;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #  
-        msg1_SubcarrierSpacing                                      = 1,
-
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1; #0x80;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1 
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7; //8; //7;
-      nrofDownlinkSymbols                                           = 6; //0; //6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4; //0; //4;
-
-  ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-#    mme_ip_address      = ( { ipv4       = "192.168.68.130";
-#                              ipv6       = "192:168:30::17";
-#                              port       = 36412 ;
-#                              active     = "yes";
-#                              preference = "ipv4";
-#                            }
-#                          );
-
-    ///X2
-    enable_x2         = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    target_enb_x2_ip_address = ( { ipv4       = "192.168.68.130";
-                                   ipv6       = "192:168:30::17";
-                                   preference = "ipv4";
-                                 }
-                               );
-
-    NETWORK_INTERFACES :
-    {
-      GNB_INTERFACE_NAME_FOR_S1_MME  = "eth0";
-      GNB_IPV4_ADDRESS_FOR_S1_MME    = "192.168.68.194";
-      GNB_INTERFACE_NAME_FOR_S1U     = "eth0";
-      GNB_IPV4_ADDRESS_FOR_S1U       = "192.168.68.194";
-      GNB_PORT_FOR_S1U               = 2152; # Spec 2152
-      GNB_IPV4_ADDRESS_FOR_X2C       = "192.168.68.194";
-      GNB_PORT_FOR_X2C               = 36422; # Spec 36422
-    };
-
-  }
-);
-
-MACRLCs = (
-  {
-    num_cc              = 1;
-    tr_s_preference     = "local_L1";
-    tr_n_preference     = "local_RRC";
-    pusch_TargetSNRx10  = 200;
-    pucch_TargetSNRx10  = 200;
-    ulsch_max_frame_inactivity = 0;
-  }
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-  {
-    local_rf       = "yes"
-    nb_tx          = 1
-    nb_rx          = 1
-    att_tx         = 12
-    att_rx         = 12;
-    bands          = [7];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain     = 114;
-    eNB_instances  = [0];
-#    sdr_addrs = "serial=30C51D4";
-#    clock_src      = "external";
-  }
-);  
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level      ="info";
-  hw_log_level          ="info";
-  phy_log_level         ="info";
-  mac_log_level         ="info";
-  rlc_log_level         ="info";
-  pdcp_log_level        ="info";
-  rrc_log_level         ="info";
-};
-
-uicc: {
-  opc = "testopc";
-};
--- a/Show More
+++ b/Show More