Fixed merge conflicts

Following changes are made:
1) Added essential data structures for HARQ
2) Moved gNB specific list functions to common file
3) Implemented preconfigurations for HARQ
4) Developed thread lock functions for NR_UE_SL_SCHED
5) Included header files for common moved functions in gNB code

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "openair2/E2AP/flexric"]
+	path = openair2/E2AP/flexric
+	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
+	branch = remotes/origin/mir_dev

ci-scripts/Jenkinsfile-GitLab-Container

@@ -464,6 +464,26 @@ pipeline {
             }
           }
         }
+        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'
+              }
+            }
+          }
+        }
       }
     }
     stage ("DockerHub-Push") {

ci-scripts/Jenkinsfile-cluster

@@ -204,7 +204,9 @@ 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

ci-scripts/Jenkinsfile-nrue

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

ci-scripts/Jenkinsfile-physim-deploy

@@ -192,7 +192,9 @@ 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

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -200,7 +200,9 @@ 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

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -196,7 +196,9 @@ 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

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

@@ -215,7 +215,9 @@ 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

ci-scripts/Jenkinsfile-tmp-ran

@@ -211,7 +211,9 @@ 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

ci-scripts/Jenkinsfile-tmp-ue

@@ -185,7 +185,9 @@ 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

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
-  UENetworkScript: ip a show dev wwan0
+  NetworkScript: 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
-  UENetworkScript: ip a show dev wwan0
+  NetworkScript: 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"
-  UENetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
+  NetworkScript: 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,7 +42,7 @@ 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"
-  UENetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
+  NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
   CmdPrefix: adb -s 5200c00db4413517 shell
   MTU: 1500
   LogStore: /media/usb-drive/ci_adb_2-logs
@@ -55,74 +55,145 @@ amarisoft_ue_1:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
-  UENetworkScript: ip netns exec ue1 ip a show dev pdn0
+  NetworkScript: ip netns exec ue1 ip a show dev pdn0
   CmdPrefix: ip netns exec ue1
   MTU: 1500
 amarisoft_ue_2:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
-  UENetworkScript: ip netns exec ue2 ip a show dev pdn0
+  NetworkScript: ip netns exec ue2 ip a show dev pdn0
   CmdPrefix: ip netns exec ue2
   MTU: 1500
 amarisoft_ue_3:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
-  UENetworkScript: ip netns exec ue3 ip a show dev pdn0
+  NetworkScript: ip netns exec ue3 ip a show dev pdn0
   CmdPrefix: ip netns exec ue3
   MTU: 1500
 amarisoft_ue_4:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
-  UENetworkScript: ip netns exec ue4 ip a show dev pdn0
+  NetworkScript: ip netns exec ue4 ip a show dev pdn0
   CmdPrefix: ip netns exec ue4
   MTU: 1500
 amarisoft_ue_5:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
-  UENetworkScript: ip netns exec ue5 ip a show dev pdn0
+  NetworkScript: ip netns exec ue5 ip a show dev pdn0
   CmdPrefix: ip netns exec ue5
   MTU: 1500
 amarisoft_ue_6:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
-  UENetworkScript: ip netns exec ue6 ip a show dev pdn0
+  NetworkScript: ip netns exec ue6 ip a show dev pdn0
   CmdPrefix: ip netns exec ue6
   MTU: 1500
 amarisoft_ue_7:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
-  UENetworkScript: ip netns exec ue7 ip a show dev pdn0
+  NetworkScript: ip netns exec ue7 ip a show dev pdn0
   CmdPrefix: ip netns exec ue7
   MTU: 1500
 amarisoft_ue_8:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
-  UENetworkScript: ip netns exec ue8 ip a show dev pdn0
+  NetworkScript: ip netns exec ue8 ip a show dev pdn0
   CmdPrefix: ip netns exec ue8
   MTU: 1500
 amarisoft_ue_9:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
-  UENetworkScript: ip netns exec ue9 ip a show dev pdn0
+  NetworkScript: ip netns exec ue9 ip a show dev pdn0
   CmdPrefix: ip netns exec ue9
   MTU: 1500
 amarisoft_ue_10:
   Host: amariue
   AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
   DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
-  UENetworkScript: ip netns exec ue10 ip a show dev pdn0
+  NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
 
-oai_ue_obelix:
-  Host: obelix
-  UENetworkScript: ip a show dev oaitun_ue1
+oai_ue_caracal:
+  Host: caracal
+  AttachScript: 'docker start oai-nr-ue'
+  DetachScript: 'docker stop oai-nr-ue'
+  NetworkScript: 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

ci-scripts/cls_cluster.py

@@ -82,6 +82,7 @@ class Cluster:
 		self.ranTargetBranch = ""
 		self.cmd = None
 		self.imageToPull = ''
+		self.testSvrId = None
 
 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
@@ -195,12 +196,13 @@ class Cluster:
 		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)
-			HELP.EPCSrvHelp(self.imageToPull)
-			sys.exit('Insufficient eNB Parameters')
+			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.eNBIPAddress)
+		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')

ci-scripts/cls_cmd.py

@@ -118,11 +118,14 @@ class LocalCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout
 
-	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
-		self.run(f'cp -r {src} {tgt}')
+	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 copyout(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)
 
 class RemoteCmd(Cmd):
 	def __init__(self, hostname, d=None):

ci-scripts/cls_containerize.py

@@ -52,11 +52,14 @@ 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()')
@@ -800,8 +803,7 @@ class Containerize():
 			logging.debug('Removing test images locally')
 			myCmd = cls_cmd.LocalCmd()
 
-		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup', 'oai-gnb-aw2s']
-		for image in imageNames:
+		for image in IMAGES:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			cmd = f'docker rmi oai-ci/{imageTag}'
 			myCmd.run(cmd, reportNonZero=False)
@@ -838,12 +840,9 @@ class Containerize():
 
 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
 		mySSH.command('cp docker-compose.y*ml ci-docker-compose.yml', '\$', 5)
-		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s']
-		for image in imagesList:
+		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)
-		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]
@@ -877,6 +876,7 @@ 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'):
@@ -903,7 +903,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', mySSH.getBefore())
+				result = re.search('got sync|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -993,7 +993,6 @@ 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:
@@ -1005,6 +1004,16 @@ 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'
@@ -1188,8 +1197,7 @@ class Containerize():
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
 		myCmd.run(cmd, silent=self.displayedNewTags)
-		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
-		for image in imageNames:
+		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'
 			myCmd.run(cmd, silent=self.displayedNewTags)
@@ -1341,62 +1349,6 @@ 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])

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('UENetworkScript'),
+				"getNetwork": m.get('NetworkScript'),
 				"check": m.get('CheckStatusScript'),
 				"dataEnable": m.get('DataEnableScript'),
 				"dataDisable": m.get('DataDisableScript'),

ci-scripts/cls_oaicitest.py

@@ -134,9 +134,9 @@ class OaiCiTest():
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
-		SSH.command('mkdir -p ' + self.UESourceCodePath, '\$', 5)
-		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
-		SSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		SSH.command(f'mkdir -p {self.UESourceCodePath}', '\$', 5)
+		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
+		SSH.command(f'if [ ! -e .git ]; then stdbuf -o0 git clone {full_ran_repo_name} .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
 		# here add a check if git clone or git fetch went smoothly
 		SSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
 		SSH.command('git config user.name "OAI Jenkins"', '\$', 5)
@@ -170,11 +170,11 @@ class OaiCiTest():
 					HTML.CreateHtmlTestRow(self.Build_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK)
 					return
 
-			SSH.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)
+			SSH.command(f'echo {self.UEPassword} | sudo -S git clean -x -d -ff', '\$', 30)
 
 		# if the commit ID is provided use it to point to it
 		if self.ranCommitID != '':
-			SSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+			SSH.command(f'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:
@@ -182,33 +182,33 @@ class OaiCiTest():
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
 					SSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 			else:
-				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				SSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+				logging.debug(f'Merging with the target branch: {self.ranTargetBranch}')
+				SSH.command(f'git merge --ff origin/{self.ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)
 		SSH.command('source oaienv', '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('mkdir -p log', '\$', 5)
 		SSH.command('chmod 777 log', '\$', 5)
 		# no need to remove in log (git clean did the trick)
-		SSH.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 1200)
+		SSH.command(f'stdbuf -o0 ./build_oai {self.Build_OAI_UE_args} 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 1200)
 		SSH.command('ls ran_build/build', '\$', 3)
 		SSH.command('ls ran_build/build', '\$', 3)
 		buildStatus = True
 		result = re.search(self.air_interface, SSH.getBefore())
 		if result is None:
 			buildStatus = False
-		SSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
-		SSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
-		SSH.command('mv compile_oai_ue.log ' + 'build_log_' + self.testCase_id, '\$', 5)
+		SSH.command(f'mkdir -p build_log_{self.testCase_id}', '\$', 5)
+		SSH.command(f'mv log/* build_log_{self.testCase_id}', '\$', 5)
+		SSH.command(f'mv compile_oai_ue.log build_log_{self.testCase_id}', '\$', 5)
 		if buildStatus:
 			# Generating a BUILD INFO file
-			SSH.command('echo "SRC_BRANCH: ' + self.ranBranch + '" > ../LAST_BUILD_INFO.txt', '\$', 2)
-			SSH.command('echo "SRC_COMMIT: ' + self.ranCommitID + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+			SSH.command(f'echo "SRC_BRANCH: {self.ranBranch}" > ../LAST_BUILD_INFO.txt', '\$', 2)
+			SSH.command(f'echo "SRC_COMMIT: {self.ranCommitID}" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 			if self.ranAllowMerge:
 				SSH.command('echo "MERGED_W_TGT_BRANCH: YES" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 				if self.ranTargetBranch == '':
 					SSH.command('echo "TGT_BRANCH: develop" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 				else:
-					SSH.command('echo "TGT_BRANCH: ' + self.ranTargetBranch + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+					SSH.command(f'echo "TGT_BRANCH: {self.ranTargetBranch}" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 			else:
 				SSH.command('echo "MERGED_W_TGT_BRANCH: NO" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 			SSH.close()
@@ -248,7 +248,7 @@ class OaiCiTest():
 			UE_prefix = 'NR '
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
+		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
 		# Initialize_OAI_UE_args usually start with -C and followed by the location in repository
 		SSH.command('source oaienv', '\$', 5)
 		SSH.command('cd cmake_targets/ran_build/build', '\$', 5)
@@ -262,11 +262,11 @@ class OaiCiTest():
 					SSH.command('sed -f /tmp/adapt_usim_parameters.sed ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
 				else:
 					SSH.command('sed -e "s#93#92#" -e "s#8baf473f2f8fd09487cccbd7097c6862#fec86ba6eb707ed08905757b1bb44b8f#" -e "s#e734f8734007d6c5ce7a0508809e7e9c#C42449363BBAD02B66D16BC975D77CC1#" ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
-				SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf .u*', '\$', 5)
-				SSH.command('echo ' + self.UEPassword + ' | sudo -S ../../nas_sim_tools/build/conf2uedata -c ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf -o .', '\$', 5)
+				SSH.command(f'echo {self.UEPassword} | sudo -S rm -Rf .u*', '\$', 5)
+				SSH.command(f'echo {self.UEPassword} | sudo -S ../../nas_sim_tools/build/conf2uedata -c ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf -o .', '\$', 5)
 		else:
-			SSH.command('if [ -e rbconfig.raw ]; then echo ' + self.UEPassword + ' | sudo -S rm rbconfig.raw; fi', '\$', 5)
-			SSH.command('if [ -e reconfig.raw ]; then echo ' + self.UEPassword + ' | sudo -S rm reconfig.raw; fi', '\$', 5)
+			SSH.command(f'if [ -e rbconfig.raw ]; then echo {self.UEPassword} | sudo -S rm rbconfig.raw; fi', '\$', 5)
+			SSH.command(f'if [ -e reconfig.raw ]; then echo {self.UEPassword} | sudo -S rm reconfig.raw; fi', '\$', 5)
 			# Copy the RAW files from gNB running directory (maybe on another machine)
 			copyin_res = SSH.copyin(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath + '/cmake_targets/rbconfig.raw', '.')
 			if (copyin_res == 0):
@@ -275,9 +275,9 @@ class OaiCiTest():
 			if (copyin_res == 0):
 				SSH.copyout(self.UEIPAddress, self.UEUserName, self.UEPassword, './reconfig.raw', self.UESourceCodePath + '/cmake_targets/ran_build/build')
 		SSH.command(f'echo "ulimit -c unlimited && {self.cmd_prefix} ./{self.air_interface} {self.Initialize_OAI_UE_args}" > ./my-lte-uesoftmodem-run{self.UE_instance}.sh', '\$', 5)
-		SSH.command('chmod 775 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
-		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
-		self.UELogFile = 'ue_' + self.testCase_id + '.log'
+		SSH.command(f'chmod 775 ./my-lte-uesoftmodem-run {self.UE_instance}.sh', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm -Rf {self.UESourceCodePath}/cmake_targets/ue_{self.testCase_id}.log', '\$', 5)
+		self.UELogFile = f'ue_{self.testCase_id}.log'
 
 		# We are now looping several times to hope we really sync w/ an eNB
 		doOutterLoop = True
@@ -285,9 +285,9 @@ class OaiCiTest():
 		gotSyncStatus = True
 		fullSyncStatus = True
 		while (doOutterLoop):
-			SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets/ran_build/build', '\$', 5)
-			SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
-			SSH.command('echo $USER; nohup sudo -E stdbuf -o0 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh' + ' > ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ' + ' 2>&1 &', self.UEUserName, 5)
+			SSH.command(f'cd {self.UESourceCodePath}/cmake_targets/ran_build/build', '\$', 5)
+			SSH.command(f'echo {self.UEPassword} | sudo -S rm -Rf {self.UESourceCodePath}/cmake_targets/ue_{self.testCase_id}.log', '\$', 5)
+			SSH.command(f'echo $USER; nohup sudo -E stdbuf -o0 ./my-lte-uesoftmodem-run {self.UE_instance}.sh > {self.UESourceCodePath}/cmake_targets/ue_{self.testCase_id}.log 2>&1 &', self.UEUserName, 5)
 			time.sleep(6)
 			SSH.command('cd ../..', '\$', 5)
 			doLoop = True
@@ -302,7 +302,7 @@ class OaiCiTest():
 					gotSyncStatus = False
 					doLoop = False
 					continue
-				SSH.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
+				SSH.command(f'stdbuf -o0 cat ue_{self.testCase_id}.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
 				if self.air_interface == 'nr-uesoftmodem':
 					result = re.search('Starting sync detection', SSH.getBefore())
 				else:
@@ -317,7 +317,7 @@ class OaiCiTest():
 				SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
 				result = re.search('-uesoftmodem', SSH.getBefore())
 				if result is not None:
-					SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT -r *-uesoftmodem', '\$', 4)
+					SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal=SIGINT -r *-uesoftmodem', '\$', 4)
 					time.sleep(3)
 				outterLoopCounter = outterLoopCounter - 1
 				if (outterLoopCounter == 0):
@@ -347,7 +347,7 @@ class OaiCiTest():
 						SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
 						result = re.search('nr-uesoftmodem', SSH.getBefore())
 						if result is not None:
-							SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT nr-uesoftmodem', '\$', 4)
+							SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal=SIGINT nr-uesoftmodem', '\$', 4)
 						time.sleep(6)
 					else:
 						# Here we do have a great chance that the UE did cell-sync w/ eNB
@@ -355,7 +355,7 @@ class OaiCiTest():
 						doOutterLoop = False
 						fullSyncStatus = True
 						continue
-				SSH.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync|Frequency"', '\$', 4)
+				SSH.command(f'stdbuf -o0 cat ue_{self.testCase_id}.log | egrep --text --color=never -i "wait|sync|Frequency"', '\$', 4)
 				if self.air_interface == 'nr-uesoftmodem':
 					# Positive messaging -->
 					result = re.search('Measured Carrier Frequency', SSH.getBefore())
@@ -378,7 +378,7 @@ class OaiCiTest():
 						SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
 						result = re.search('lte-uesoftmodem', SSH.getBefore())
 						if result is not None:
-							SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT lte-uesoftmodem', '\$', 4)
+							SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal=SIGINT lte-uesoftmodem', '\$', 4)
 			outterLoopCounter = outterLoopCounter - 1
 			if (outterLoopCounter == 0):
 				doOutterLoop = False
@@ -511,48 +511,45 @@ class OaiCiTest():
 			return (False, f"UE {ue.getName()} has no IP address")
 		ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
 		ping_time = re.findall("-c *(\d+)",str(self.ping_args))
-		#target address is different depending on EPC type
-		if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
-			Target = EPC.MmeIPAddress
-		elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
-			Target = EPC.MmeIPAddress
-		elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE):
-			Target = "172.21.6.100"
-		else:
-			Target = EPC.IPAddress
+		local_ping_log_file = f'{os.getcwd()}/{ping_log_file}'
+		# if has pattern %cn_ip%, replace with core IP address, else we assume the IP is present
+		if re.search('%cn_ip%', self.ping_args):
+			#target address is different depending on EPC type
+			if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
+				self.ping_args = re.sub('%cn_ip%', EPC.MmeIPAddress, self.ping_args)
+			elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
+				self.ping_args = re.sub('%cn_ip%', EPC.MmeIPAddress, self.ping_args)
+			elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE):
+				self.ping_args = re.sub('%cn_ip%', '172.21.6.100', self.ping_args)
+			else:
+				self.ping_args = re.sub('%cn_ip%', EPC.IPAddress, self.ping_args)
 		#ping from module NIC rather than IP address to make sure round trip is over the air
 		interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
-		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {Target} &> /tmp/{ping_log_file}'
+		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} 2>&1 | tee /tmp/{ping_log_file}'
 		cmd = cls_cmd.getConnection(ue.getHost())
 		response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
 		if response.returncode != 0:
-			ping_status = -1
-		else:
-			#copy the ping log file to have it locally for analysis (ping stats)
-			cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=ping_log_file)
-
-		cmd.close()
-
-		# TIMEOUT CASE
-		ue_header = f'UE {ue.getName()} ({ueIP})'
-		if ping_status < 0:
 			message = ue_header + ': ping crashed: TIMEOUT?'
 			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
 			return (False, message)
-		#search is done on cat result
-		logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
-		with open(ping_log_file, 'r') as f:
+
+		#copy the ping log file to have it locally for analysis (ping stats)
+		cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=local_ping_log_file)
+		cmd.close()
+
+		ue_header = f'UE {ue.getName()} ({ueIP})'
+		with open(local_ping_log_file, 'r') as f:
 			ping_output = "".join(f.readlines())
 		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
 		if result is None:
 			message = ue_header + ': Packet Loss Not Found!'
-			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
+			logging.error(f'\u001B[1;37;41m {message} \u001B[0m')
 			return (False, message)
 		packetloss = result.group('packetloss')
 		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', ping_output)
 		if result is None:
 			message = ue_header + ': Ping RTT_Min RTT_Avg RTT_Max Not Found!'
-			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
+			logging.error(f'\u001B[1;37;41m {message} \u001B[0m')
 			return (False, message)
 		rtt_min = result.group('rtt_min')
 		rtt_avg = result.group('rtt_avg')
@@ -564,10 +561,10 @@ class OaiCiTest():
 		max_msg = f'RTT(Max)   : {rtt_max} ms'
 
 		logging.info(f'\u001B[1;37;44m ping result for {ue_header} \u001B[0m')
-		logging.info(f'\u001B[1;34m    ' + pal_msg + '\u001B[0m')
-		logging.info(f'\u001B[1;34m    ' + min_msg + '\u001B[0m')
-		logging.info(f'\u001B[1;34m    ' + avg_msg + '\u001B[0m')
-		logging.info(f'\u001B[1;34m    ' + max_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    {pal_msg} \u001B[0m')
+		logging.info(f'\u001B[1;34m    {min_msg} \u001B[0m')
+		logging.info(f'\u001B[1;34m    {avg_msg} \u001B[0m')
+		logging.info(f'\u001B[1;34m    {max_msg} \u001B[0m')
 
 		message = f'{ue_header}\n{pal_msg}\n{min_msg}\n{avg_msg}\n{max_msg}'
 
@@ -583,7 +580,7 @@ class OaiCiTest():
 		if self.ping_rttavg_threshold != '':
 			if float(rtt_avg) > float(self.ping_rttavg_threshold):
 				ping_rttavg_error_msg = f'RTT(Avg) too high: {rtt_avg} ms; Target: {self.ping_rttavg_threshold} ms'
-				message += '\n' + ping_rttavg_error_msg
+				message += f'\n {ping_rttavg_error_msg}'
 				logging.error('\u001B[1;37;41m'+ ping_rttavg_error_msg +' \u001B[0m')
 				return (False, message)
 
@@ -634,8 +631,8 @@ class OaiCiTest():
 				iperf_bandwidth_new = float(iperf_bandwidth) - ((ue_num - 1) * residualBW)
 			else:
 				iperf_bandwidth_new = residualBW
-		iperf_bandwidth_str = '-b ' + iperf_bandwidth
-		iperf_bandwidth_str_new = '-b ' + ('%.2f' % iperf_bandwidth_new)
+		iperf_bandwidth_str = f'-b {iperf_bandwidth}'
+		iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}"
 		result = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(self.iperf_args))
 		if result is None:
 			logging.debug('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
@@ -651,17 +648,17 @@ class OaiCiTest():
 			maxbitrate = result.group('maximum')
 			minbitrate = result.group('minimum')
 			lock.acquire()
-			logging.debug('\u001B[1;37;44m TCP iperf result (' + UE_IPAddress + ') \u001B[0m')
+			logging.debug(f'\u001B[1;37;44m TCP iperf result ({UE_IPAddress}) \u001B[0m')
 			msg = 'TCP Stats   :\n'
 			if avgbitrate is not None:
-				logging.debug('\u001B[1;34m    Avg Bitrate : ' + avgbitrate + '\u001B[0m')
-				msg += 'Avg Bitrate : ' + avgbitrate + '\n'
+				logging.debug(f'\u001B[1;34m    Avg Bitrate : {avgbitrate} \u001B[0m')
+				msg += f'Avg Bitrate : {avgbitrate} \n'
 			if maxbitrate is not None:
-				logging.debug('\u001B[1;34m    Max Bitrate : ' + maxbitrate + '\u001B[0m')
-				msg += 'Max Bitrate : ' + maxbitrate + '\n'
+				logging.debug(f'\u001B[1;34m    Max Bitrate : {maxbitrate} \u001B[0m')
+				msg += f'Max Bitrate : {maxbitrate} \n'
 			if minbitrate is not None:
-				logging.debug('\u001B[1;34m    Min Bitrate : ' + minbitrate + '\u001B[0m')
-				msg += 'Min Bitrate : ' + minbitrate + '\n'
+				logging.debug(f'\u001B[1;34m    Min Bitrate : {minbitrate} \u001B[0m')
+				msg += f'Min Bitrate : {minbitrate} \n'
 			statusQueue.put(0)
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
@@ -675,9 +672,9 @@ class OaiCiTest():
 		result = re.search('-u', str(iperf_real_options))
 		if result is None:
 			logging.debug('Into Iperf_analyzeV2TCPOutput client')
-			filename = EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log'
+			filename = f'{EPC.SourceCodePath}/scripts/iperf_{self.testCase_id}_{device_id}.log'
 			response = self.Iperf_analyzeV2TCPOutput(lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, EPC, SSH, filename)
-			logging.debug('Iperf_analyzeV2TCPOutput response returned value = ' + str(response))
+			logging.debug(f'Iperf_analyzeV2TCPOutput response returned value = {response}')
 			return response
 
 		result = re.search('Server Report:', SSH.getBefore())
@@ -712,13 +709,13 @@ class OaiCiTest():
 			packetloss = result.group('packetloss')
 			jitter = result.group('jitter')
 			lock.acquire()
-			logging.debug('\u001B[1;37;44m iperf result (' + UE_IPAddress + ') \u001B[0m')
+			logging.debug(f'\u001B[1;37;44m iperf result {UE_IPAddress} \u001B[0m')
 			iperfStatus = True
-			msg = 'Req Bitrate : ' + req_bandwidth + '\n'
-			logging.debug('\u001B[1;34m    Req Bitrate : ' + req_bandwidth + '\u001B[0m')
+			msg = f'Req Bitrate : {req_bandwidth} \n'
+			logging.debug(f'\u001B[1;34m    Req Bitrate : {req_bandwidth} \u001B[0m')
 			if bitrate is not None:
-				msg += 'Bitrate     : ' + bitrate + '\n'
-				logging.debug('\u001B[1;34m    Bitrate     : ' + bitrate + '\u001B[0m')
+				msg += f'Bitrate     : {bitrate} \n'
+				logging.debug(f'\u001B[1;34m    Bitrate : {bitrate}  \u001B[0m')
 				result = re.search('(?P<real_bw>[0-9\.]+) [KMG]bits/sec', str(bitrate))
 				if result is not None:
 					actual_bw = float(str(result.group('real_bw')))
@@ -733,18 +730,18 @@ class OaiCiTest():
 						actual_bw = actual_bw * 1000000000
 					br_loss = 100 * actual_bw / req_bw
 					bitperf = '%.2f ' % br_loss
-					msg += 'Bitrate Perf: ' + bitperf + '%\n'
-					logging.debug('\u001B[1;34m    Bitrate Perf: ' + bitperf + '%\u001B[0m')
+					msg += f'Bitrate Perf: {bitperf} %\n'
+					logging.debug(f'\u001B[1;34m    Bitrate Perf: {bitperf} %\u001B[0m')
 			if packetloss is not None:
-				msg += 'Packet Loss : ' + packetloss + '%\n'
-				logging.debug('\u001B[1;34m    Packet Loss : ' + packetloss + '%\u001B[0m')
+				msg += f'Packet Loss : {packetloss} %\n'
+				logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
 				if float(packetloss) > float(self.iperf_packetloss_threshold):
 					msg += 'Packet Loss too high!\n'
 					logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
 					iperfStatus = False
 			if jitter is not None:
-				msg += 'Jitter      : ' + jitter + '\n'
-				logging.debug('\u001B[1;34m    Jitter      : ' + jitter + '\u001B[0m')
+				msg += f'Jitter      : {jitter} \n'
+				logging.debug(f'\u001B[1;34m    Jitter      : {jitter} \u001B[0m')
 			if (iperfStatus):
 				statusQueue.put(0)
 			else:
@@ -788,16 +785,15 @@ class OaiCiTest():
 				if result is not None:
 					report.append(str(line))
 					report_msg+=result.group('role') + ' ' + result.group('direction')+ '\t = ' +result.group('bitrate')+'\n'
-
 		if len(report)>0:
 			lock.acquire()
 			statusQueue.put(0)
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
 			statusQueue.put(report_msg)
-			logging.debug('\u001B[1;37;45m TCP Bidir Iperf Result (' + UE_IPAddress + ') \u001B[0m')
+			logging.debug(f'\u001B[1;37;45m TCP Bidir Iperf Result ({UE_IPAddress}) \u001B[0m')
 			for rLine in report_msg.split('\n'):
-				logging.debug('\u001B[1;35m    ' + rLine + '\u001B[0m')
+				logging.debug(f'\u001B[1;35m    {rLine} \u001B[0m')
 			lock.release()
 		else:
 			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from Log file')
@@ -899,20 +895,20 @@ class OaiCiTest():
 				statusQueue.put(0)
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
-			req_msg = 'Req Bitrate : ' + req_bandwidth
-			bir_msg = 'Bitrate     : ' + bitrate
-			brl_msg = 'Bitrate Perf: ' + bitperf
-			jit_msg = 'Jitter      : ' + jitter
-			pal_msg = 'Packet Loss : ' + packetloss
-			statusQueue.put(req_msg + '\n' + bir_msg + '\n' + brl_msg + '\n' + jit_msg + '\n' + pal_msg + '\n' + pal_too_high_msg + '\n' + bit_too_low_msg + '\n')
-			logging.debug('\u001B[1;37;45m iperf result (' + UE_IPAddress + ') \u001B[0m')
-			logging.debug('\u001B[1;35m    ' + req_msg + '\u001B[0m')
-			logging.debug('\u001B[1;35m    ' + bir_msg + '\u001B[0m')
-			logging.debug('\u001B[1;35m    ' + brl_msg + '\u001B[0m')
-			logging.debug('\u001B[1;35m    ' + jit_msg + '\u001B[0m')
-			logging.debug('\u001B[1;35m    ' + pal_msg + '\u001B[0m')
-			logging.debug('\u001B[1;35m    ' + pal_too_high_msg + '\u001B[0m')
-			logging.debug('\u001B[1;35m    ' + bit_too_low_msg + '\u001B[0m')
+			req_msg = f'Req Bitrate : {req_bandwidth}'
+			bir_msg = f'Bitrate     : {bitrate}'
+			brl_msg = f'Bitrate Perf: {bitperf}'
+			jit_msg = f'Jitter      : {jitter}'
+			pal_msg = f'Packet Loss : {packetloss}'
+			statusQueue.put(f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}\n{pal_too_high_msg}\n{bit_too_low_msg}\n')
+			logging.debug(f'\u001B[1;37;45m iperf result ({UE_IPAddress}) \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {req_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {bir_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {brl_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {jit_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {pal_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {pal_too_high_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {bit_too_low_msg} \u001B[0m')
 			lock.release()
 		else:
 			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
@@ -930,7 +926,7 @@ class OaiCiTest():
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
 			if result is not None:
-				logging.debug('\u001B[1;37;41m ' + result.group('error') + ' \u001B[0m')
+				logging.debug(f"\u001B[1;37;41m {result.group('error')} \u001B[0m")
 				statusQueue.put(result.group('error'))
 			else:
 				logging.debug('\u001B[1;37;41m Bitrate and/or Packet Loss Not Found! \u001B[0m')
@@ -940,13 +936,13 @@ class OaiCiTest():
 		bitrate = result.group('bitrate')
 		packetloss = result.group('packetloss')
 		lock.acquire()
-		logging.debug('\u001B[1;37;44m iperf result (' + UE_IPAddress + ') \u001B[0m')
-		logging.debug('\u001B[1;34m    Bitrate     : ' + bitrate + '\u001B[0m')
-		msg = 'Bitrate     : ' + bitrate + '\n'
+		logging.debug(f'\u001B[1;37;44m iperf result ({UE_IPAddress}) \u001B[0m')
+		logging.debug(f'\u001B[1;34m    Bitrate     : {bitrate} \u001B[0m')
+		msg = f'Bitrate     : {bitrate} \n'
 		iperfStatus = True
 		if packetloss is not None:
-			logging.debug('\u001B[1;34m    Packet Loss : ' + packetloss + '%\u001B[0m')
-			msg += 'Packet Loss : ' + packetloss + '%\n'
+			logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
+			msg += f'Packet Loss : {packetloss} %\n'
 			if float(packetloss) > float(self.iperf_packetloss_threshold):
 				logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
 				msg += 'Packet Loss too high!\n'
@@ -1062,7 +1058,7 @@ class OaiCiTest():
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{server_filename}', reportNonZero=False)
 			port = f'{5002+idx}'
-			cmd.run(f'{ue.getCmdPrefix()} iperf3 -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ue.getIP()} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{server_filename}', server_filename)
 			cmd.close()
 			if udpIperf:
@@ -1105,8 +1101,8 @@ class OaiCiTest():
 			# -B 10.0.1.1 -u -s -i 1 -fm
 			server_options = re.sub('-u.*$', '-u -s -i 1 -fm', str(self.iperf_args))
 			server_options = server_options.replace('-c','-B')
-			SSH.command('rm -f /tmp/tmp_iperf_server_' + self.testCase_id + '.log', '\$', 5)
-			SSH.command('echo $USER; nohup iperf ' + server_options + ' > /tmp/tmp_iperf_server_' + self.testCase_id + '.log 2>&1 &', iServerUser, 5)
+			SSH.command(f'rm -f /tmp/tmp_iperf_server_{self.testCase_id}.log', '\$', 5)
+			SSH.command(f'echo $USER; nohup iperf {server_options} > /tmp/tmp_iperf_server_{self.testCase_id}.log 2>&1 &', iServerUser, 5)
 			time.sleep(0.5)
 			SSH.close()
 
@@ -1115,13 +1111,13 @@ class OaiCiTest():
 		modified_options = modified_options.replace('-R','')
 		iperf_time = self.Iperf_ComputeTime()
 		SSH.open(iClientIPAddr, iClientUser, iClientPasswd)
-		SSH.command('rm -f /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', 5)
-		iperf_status = SSH.command('stdbuf -o0 iperf ' + modified_options + ' 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', int(iperf_time)*5.0)
+		SSH.command(f'rm -f /tmp/tmp_iperf_{self.testCase_id}.log', '\$', 5)
+		iperf_status = SSH.command(f'stdbuf -o0 iperf {modified_options} 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_{self.testCase_id}.log', '\$', int(iperf_time)*5.0)
 		status_queue = SimpleQueue()
 		lock = Lock()
 		if iperf_status < 0:
 			message = 'iperf on OAI UE crashed due to TIMEOUT !'
-			logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
+			logging.debug(f'\u001B[1;37;41m {message} \u001B[0m')
 			clientStatus = -2
 		else:
 			if self.iperf_options == 'sink':
@@ -1142,20 +1138,20 @@ class OaiCiTest():
 			SSH.close()
 
 		if (clientStatus == -1):
-			if (os.path.isfile('iperf_server_' + self.testCase_id + '.log')):
-				os.remove('iperf_server_' + self.testCase_id + '.log')
-			SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
-			filename='iperf_server_' + self.testCase_id + '_OAI-UE.log'
+			if (os.path.isfile(f'iperf_server_{self.testCase_id}.log')):
+				os.remove(f'iperf_server_{self.testCase_id}.log')
+			SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
+			filename=f'iperf_server_{self.testCase_id}_OAI-UE.log'
 			self.Iperf_analyzeV2Server(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options,filename,0)
 
 		# copying on the EPC server for logCollection
 		if (clientStatus == -1):
-			copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
+			copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
 			if (copyin_res == 0):
-				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_OAI-UE.log', EPC.SourceCodePath + '/scripts')
-		copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, '/tmp/tmp_iperf_' + self.testCase_id + '.log', 'iperf_' + self.testCase_id + '_OAI-UE.log')
+				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_server_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
+		copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, f'/tmp/tmp_iperf_{self.testCase_id}.log', f'iperf_{self.testCase_id}_OAI-UE.log')
 		if (copyin_res == 0):
-			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_' + self.testCase_id + '_OAI-UE.log', EPC.SourceCodePath + '/scripts')
+			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
 		iperf_noperf = False
 		if status_queue.empty():
 			iperf_status = False
@@ -1251,9 +1247,9 @@ class OaiCiTest():
 				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
-		if (not os.path.isfile('./' + UElogFile)):
+		if (not os.path.isfile(f'./{UElogFile}')):
 			return -1
-		ue_log_file = open('./' + UElogFile, 'r')
+		ue_log_file = open(f'./{UElogFile}', 'r')
 		exitSignalReceived = False
 		foundAssertion = False
 		msgAssertion = ''
@@ -1355,59 +1351,59 @@ class OaiCiTest():
 				try:
 					mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					mibMsg = "    nidcell = " + result.group('nidcell')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					mibMsg = "    n_rb_dl = " + result.group('n_rb_dl')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					mibMsg = "    phich_duration = " + result.group('phich_duration')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					mibMsg = "    phich_resource = " + result.group('phich_resource')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					mibMsg = "    tx_ant = " + result.group('tx_ant')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					mib_found = True
 				except Exception as e:
-					logging.error('\033[91m' + "MIB marker was not found" + '\033[0m')
+					logging.error(f'\033[91m MIB marker was not found \033[0m')
 			result = re.search("Measured Carrier Frequency (?P<measured_carrier_frequency>\d{1,15}) Hz", str(line))
 			if result is not None and (not frequency_found):
 				try:
-					mibMsg = "Measured Carrier Frequency = " + result.group('measured_carrier_frequency') + ' Hz'
+					mibMsg = f"Measured Carrier Frequency = {result.group('measured_carrier_frequency')} Hz"
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					frequency_found = True
 				except Exception as e:
-					logging.error('\033[91m' + "Measured Carrier Frequency not found" + '\033[0m')
+					logging.error(f'\033[91m Measured Carrier Frequency not found \033[0m')
 			result = re.search("PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
 			if result is not None and (not plmn_found):
 				try:
-					mibMsg = 'PLMN MCC = ' + result.group('mcc') + ' MNC = ' + result.group('mnc')
+					mibMsg = f"PLMN MCC = {result.group('mcc')} MNC = {result.group('mnc')}"
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					plmn_found = True
 				except Exception as e:
-					logging.error('\033[91m' + "PLMN not found" + '\033[0m')
+					logging.error(f'\033[91m PLMN not found \033[0m')
 			result = re.search("Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
 			if result is not None:
 				try:
-					mibMsg = "The operator is: " + result.group('operator')
+					mibMsg = f"The operator is: {result.group('operator')}"
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 				except Exception as e:
-					logging.error('\033[91m' + "Operator name not found" + '\033[0m')
+					logging.error(f'\033[91m Operator name not found \033[0m')
 			result = re.search("SIB5 InterFreqCarrierFreq element (.{1,4})/(.{1,4})", str(line))
 			if result is not None:
 				try:
-					mibMsg = "SIB5 InterFreqCarrierFreq element " + result.group(1) + '/' + result.group(2)
+					mibMsg = f'SIB5 InterFreqCarrierFreq element {result.group(1)}/{result.group(2)}'
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + ' -> '
-					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					logging.debug(f'\033[94m{mibMsg}\033[0m')
 				except Exception as e:
-					logging.error('\033[91m' + "SIB5 InterFreqCarrierFreq element not found" + '\033[0m')
+					logging.error(f'\033[91m SIB5 InterFreqCarrierFreq element not found \033[0m')
 			result = re.search("DL Carrier Frequency/ARFCN : \-*(?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
 			if result is not None:
 				try:
@@ -1415,78 +1411,78 @@ class OaiCiTest():
 					new_freq = re.sub('/[0-9]+','',freq)
 					float_freq = float(new_freq) / 1000000
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
-					logging.debug('\033[94m' + "    DL Carrier Frequency is: " + str(freq) + '\033[0m')
+					logging.debug(f'\033[94m    DL Carrier Frequency is:  {freq}\033[0m')
 				except Exception as e:
-					logging.error('\033[91m' + "    DL Carrier Frequency not found" + '\033[0m')
+					logging.error(f'\033[91m    DL Carrier Frequency not found \033[0m')
 			result = re.search("AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
 			if result is not None:
 				try:
 					prb = result.group('allowed_bandwidth')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + ' -- PRB: ' + prb + '\n'
-					logging.debug('\033[94m' + "    AllowedMeasBandwidth: " + prb + '\033[0m')
+					logging.debug(f'\033[94m    AllowedMeasBandwidth: {prb}\033[0m')
 				except Exception as e:
-					logging.error('\033[91m' + "    AllowedMeasBandwidth not found" + '\033[0m')
+					logging.error(f'\033[91m    AllowedMeasBandwidth not found \033[0m')
 		ue_log_file.close()
 		if rrcConnectionRecfgComplete > 0:
-			statMsg = 'UE connected to eNB (' + str(rrcConnectionRecfgComplete) + ' RRCConnectionReconfigurationComplete message(s) generated)'
-			logging.debug('\033[94m' + statMsg + '\033[0m')
+			statMsg = f'UE connected to eNB ({rrcConnectionRecfgComplete}) RRCConnectionReconfigurationComplete message(s) generated)'
+			logging.debug(f'\033[94m{statMsg}\033[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if nrUEFlag:
 			if nrDecodeMib > 0:
-				statMsg = 'UE showed ' + str(nrDecodeMib) + ' "MIB decode" message(s)'
-				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				statMsg = f'UE showed {nrDecodeMib} "MIB decode" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nrFoundDCI > 0:
-				statMsg = 'UE showed ' + str(nrFoundDCI) + ' "DCI found" message(s)'
-				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				statMsg = f'UE showed {nrFoundDCI} "DCI found" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nrCRCOK > 0:
-				statMsg = 'UE showed ' + str(nrCRCOK) + ' "PDSCH decoding" message(s)'
-				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				statMsg = f'UE showed {nrCRCOK} "PDSCH decoding" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if not frequency_found:
 				statMsg = 'NR-UE could NOT synch!'
-				logging.error('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				logging.error(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nbPduSessAccept > 0:
-				statMsg = 'UE showed ' + str(nbPduSessAccept) + ' "Received PDU Session Establishment Accept" message(s)'
-				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				statMsg = f'UE showed {nbPduSessAccept} "Received PDU Session Establishment Accept" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nbPduDiscard > 0:
-				statMsg = 'UE showed ' + str(nbPduDiscard) + ' "warning: discard PDU, sn out of window" message(s)'
-				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				statMsg = f'UE showed {nbPduDiscard} "warning: discard PDU, sn out of window" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if uciStatMsgCount > 0:
-			statMsg = 'UE showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
-			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			statMsg = f'UE showed {uciStatMsgCount} "uci->stat" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if pdcpDataReqFailedCount > 0:
-			statMsg = 'UE showed ' + str(pdcpDataReqFailedCount) + ' "PDCP data request failed" message(s)'
-			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			statMsg = f'UE showed {pdcpDataReqFailedCount} "PDCP data request failed" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if badDciCount > 0:
-			statMsg = 'UE showed ' + str(badDciCount) + ' "bad DCI 1(A)" message(s)'
-			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			statMsg = f'UE showed {badDciCount} "bad DCI 1(A)" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if f1aRetransmissionCount > 0:
-			statMsg = 'UE showed ' + str(f1aRetransmissionCount) + ' "Format1A Retransmission but TBS are different" message(s)'
-			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			statMsg = f'UE showed {f1aRetransmissionCount} "Format1A Retransmission but TBS are different" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if fatalErrorCount > 0:
-			statMsg = 'UE showed ' + str(fatalErrorCount) + ' "FATAL ERROR:" message(s)'
-			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			statMsg = f'UE showed {fatalErrorCount} "FATAL ERROR:" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if macBsrTimerExpiredCount > 0:
-			statMsg = 'UE showed ' + str(fatalErrorCount) + ' "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
-			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			statMsg = f'UE showed {fatalErrorCount} "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
+			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if RAN.eNBmbmsEnables[0]:
 			if mbms_messages > 0:
-				statMsg = 'UE showed ' + str(mbms_messages) + ' "TRIED TO PUSH MBMS DATA" message(s)'
-				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+				statMsg = f'UE showed {mbms_messages} "TRIED TO PUSH MBMS DATA" message(s)'
+				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
 			else:
 				statMsg = 'UE did NOT SHOW "TRIED TO PUSH MBMS DATA" message(s)'
-				logging.debug('\u001B[1;30;41m ' + statMsg + ' \u001B[0m')
+				logging.debug(f'\u001B[1;30;41m{statMsg}\u001B[0m')
 				global_status = CONST.OAI_UE_PROCESS_NO_MBMS_MSGS
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if foundSegFault:
@@ -1530,22 +1526,22 @@ class OaiCiTest():
 	def TerminateOAIUE(self,HTML,RAN,EPC,CONTAINERS):
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
+		SSH.command(f'cd {self.UESourceCodePath}/cmake_targets', '\$', 5)
 		SSH.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
 		result = re.search('-uesoftmodem', SSH.getBefore())
 		if result is not None:
-			SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT -r .*-uesoftmodem || true', '\$', 5)
+			SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal SIGINT -r .*-uesoftmodem || true', '\$', 5)
 			time.sleep(10)
 			SSH.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
 			result = re.search('-uesoftmodem', SSH.getBefore())
 			if result is not None:
-				SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL -r .*-uesoftmodem || true', '\$', 5)
+				SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal SIGKILL -r .*-uesoftmodem || true', '\$', 5)
 				time.sleep(5)
-		SSH.command('rm -f my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		SSH.command(f'rm -f my-lte-uesoftmodem-run {self.UE_instance}.sh', '\$', 5)
 		SSH.close()
 		result = re.search('ue_', str(self.UELogFile))
 		if result is not None:
-			copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
+			copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword,f'{self.UESourceCodePath}/cmake_targets/{self.UELogFile}', '.')
 			if (copyin_res == -1):
 				logging.debug('\u001B[1;37;41m Could not copy UE logfile to analyze it! \u001B[0m')
 				HTML.htmlUEFailureMsg='Could not copy UE logfile to analyze it!'
@@ -1560,7 +1556,7 @@ class OaiCiTest():
 			else:
 				ueAction = 'Connection'
 			if (logStatus < 0):
-				logging.debug('\u001B[1m' + ueAction + ' Failed \u001B[0m')
+				logging.debug(f'\u001B[1m {ueAction} Failed \u001B[0m')
 				HTML.htmlUEFailureMsg='<b>' + ueAction + ' Failed</b>\n' + HTML.htmlUEFailureMsg
 				HTML.CreateHtmlTestRow('N/A', 'KO', logStatus, 'UE')
 				if self.air_interface == 'lte-uesoftmodem':
@@ -1574,7 +1570,7 @@ class OaiCiTest():
 						self.Initialize_OAI_UE_args = ''
 						self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 			else:
-				logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
+				logging.debug(f'\u001B[1m {ueAction} Completed \u001B[0m')
 				HTML.htmlUEFailureMsg='<b>' + ueAction + ' Completed</b>\n' + HTML.htmlUEFailureMsg
 				HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 			self.UELogFile = ''
@@ -1599,7 +1595,7 @@ class OaiCiTest():
 			#terminate all RAN nodes eNB/gNB/OCP
 			for instance in range(0, len(RAN.air_interface)):
 				if RAN.air_interface[instance]!='':
-					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
+					logging.debug(f'Auto Termination of Instance {instance} : {RAN.air_interface[instance]}')
 					RAN.eNB_instance=instance
 					RAN.TerminateeNB(HTML,EPC)
 		if CONTAINERS.yamlPath[0] != '':
@@ -1626,7 +1622,7 @@ class OaiCiTest():
 			#terminate all RAN nodes eNB/gNB/OCP
 			for instance in range(0, len(RAN.air_interface)):
 				if RAN.air_interface[instance]!='':
-					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
+					logging.debug(f'Auto Termination of Instance {instance} : {RAN.air_interface[instance]}')
 					RAN.eNB_instance=instance
 					RAN.TerminateeNB(HTML,EPC)
 		if CONTAINERS.yamlPath[0] != '':
@@ -1688,7 +1684,7 @@ class OaiCiTest():
 	def Perform_X2_Handover(self,HTML,RAN,EPC):
 		html_queue = SimpleQueue()
 		fullMessage = '<pre style="background-color:white">'
-		msg = 'Doing X2 Handover w/ option ' + self.x2_ho_options
+		msg = f'Doing X2 Handover w/ option {self.x2_ho_options}'
 		logging.debug(msg)
 		fullMessage += msg + '\n'
 		if self.x2_ho_options == 'network':
@@ -1714,7 +1710,7 @@ class OaiCiTest():
 			sys.exit('Insufficient Parameter')
 		SSH = sshconnection.SSHConnection()
 		SSH.open(IPAddress, UserName, Password)
-		SSH.command('cd ' + SourceCodePath, '\$', 5)
+		SSH.command(f'cd {SourceCodePath}', '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('rm -f build.log.zip', '\$', 5)
 		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
@@ -1727,7 +1723,7 @@ class OaiCiTest():
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
+		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
 		SSH.command('cd scripts', '\$', 5)
 		SSH.command('rm -f ping.log.zip', '\$', 5)
 		SSH.command('zip ping.log.zip ping*.log', '\$', 60)
@@ -1741,7 +1737,7 @@ class OaiCiTest():
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
+		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
 		SSH.command('cd scripts', '\$', 5)
 		SSH.command('rm -f iperf.log.zip', '\$', 5)
 		SSH.command('zip iperf.log.zip iperf*.log', '\$', 60)
@@ -1755,11 +1751,11 @@ class OaiCiTest():
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
-		SSH.command('cd cmake_targets', '\$', 5)
-		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -f ue.log.zip', '\$', 5)
-		SSH.command('echo ' + self.UEPassword + ' | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
-		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
+		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
+		SSH.command(f'cd cmake_targets', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm -f ue.log.zip', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
 		SSH.close()
 
 	def ConditionalExit(self):
@@ -1769,7 +1765,7 @@ class OaiCiTest():
 		sys.exit(1)
 
 	def ShowTestID(self):
-		logging.info('\u001B[1m----------------------------------------\u001B[0m')
-		logging.info('\u001B[1mTest ID:' + self.testCase_id + '\u001B[0m')
-		logging.info('\u001B[1m' + self.desc + '\u001B[0m')
-		logging.info('\u001B[1m----------------------------------------\u001B[0m')
+		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
+		logging.info(f'\u001B[1m Test ID: {self.testCase_id} \u001B[0m')
+		logging.info(f'\u001B[1m {self.desc} \u001B[0m')
+		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')

ci-scripts/cls_static_code_analysis.py

@@ -42,9 +42,10 @@ 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
@@ -95,53 +96,31 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-
+		cmd = cls_cmd.getConnection(lIpAddr)
 		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)
 
-		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)
+		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 
-		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)
+		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')
 
 		# Analyzing the logs
-		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()
+		cmd.copyin(f'{logDir}/cppcheck-bionic.txt', 'cppcheck-bionic.txt')
+		cmd.copyin(f'{logDir}/cppcheck-focal.txt', 'cppcheck-focal.txt')
+		cmd.close()
 
-		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')
 		CCR = CppCheckResults()
 		CCR_ref = CppCheckResults()
 		vId = 0
@@ -251,57 +230,37 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-
+		cmd = cls_cmd.getConnection(lIpAddr)
 		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)
 
-		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
+		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}'
 			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)
-					argToPass += ' --build-arg TARGET_BRANCH=develop '
+				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
+					check_options += ' --build-arg TARGET_BRANCH=develop'
 			else:
-				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 + ' '
+				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
 
-		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)
+		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 image prune --force', '\$', 60)
-		mySSH.command('docker volume prune --force', '\$', 60)
+		cmd.run('docker image rm oai-formatting-check:latest')
+		cmd.run('docker image prune --force')
+		cmd.run('docker volume prune --force')
 
 		# Analyzing the logs
-		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 + '/*', '.')
+		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
+		cmd.close()
 
 		finalStatus = 0
 		if (os.path.isfile('./oai-formatting-check.txt')):

ci-scripts/conf_files/README.md

@@ -29,7 +29,8 @@ 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`
-- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`
+- monolithic eNB: `enb.band7.25prb.usrpb200.conf`
+- RCC (4G eNB with IF4.5 split): `enb-rcc.band7.25prb.tm1.if4p5.conf`
 
 Notes:
 - there is no need for TDD/FDD, this is encoded in the band number

ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf

@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "rcc-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -13,7 +13,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "rcc-in-docker";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code = 1;
@@ -137,7 +137,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
                               ipv6       = "192:168:30::17";
                               port       = 36412 ;
                               active     = "yes";
@@ -157,17 +157,17 @@ eNBs =
     NETWORK_INTERFACES :
     {
         ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
 
     log_config :
     {
-      global_log_level                      ="debug";
+      global_log_level                      ="info";
       hw_log_level                          ="info";
       phy_log_level                         ="info";
       mac_log_level                         ="info";
@@ -200,7 +200,7 @@ RUs = (
   {
     local_if_name  = "lo";
     remote_address = "127.0.0.2";
-    local_address  = "127.0.0.1";
+    local_address  = "127.0.0.3";
     local_portc    = 50000;
     remote_portc   = 50000;
     local_portd    = 50001;

ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf

@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
+Active_eNBs = ( "rcc-in-docker");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -13,7 +13,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB-Eurecom-LTEBox";
+    eNB_name  =  "rcc-in-docker";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code = 1;
@@ -174,7 +174,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
                               ipv6       = "192:168:30::17";
                               port       = 36412 ;
                               active     = "yes";
@@ -194,11 +194,11 @@ eNBs =
     NETWORK_INTERFACES :
     {
         ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
@@ -226,7 +226,7 @@ RUs = (
     {
         local_if_name  = "lo";
         remote_address = "127.0.0.2";
-        local_address  = "127.0.0.1";
+        local_address  = "127.0.0.3";
         local_portc    = 50000;
         remote_portc   = 50000;
         local_portd    = 50001;

ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.conf

@@ -2,7 +2,7 @@ RUs =
 (
   {
     local_if_name                 = "lo";
-    remote_address                = "127.0.0.1"
+    remote_address                = "127.0.0.3"
     local_address                 = "127.0.0.2";
     local_portc                   = 50000;
     remote_portc                  = 50000;
@@ -13,7 +13,7 @@ RUs =
     nb_tx                         = 1;
     nb_rx                         = 1;
     max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
+    max_rxgain                    = 125;
     bands                         = [40];
   }
 );

ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.conf

@@ -2,7 +2,7 @@ RUs =
 (
   {
     local_if_name                 = "lo";
-    remote_address                = "127.0.0.1"
+    remote_address                = "127.0.0.3"
     local_address                 = "127.0.0.2";
     local_portc                   = 50000;
     remote_portc                  = 50000;
@@ -13,7 +13,7 @@ RUs =
     nb_tx                         = 1;
     nb_rx                         = 1;
     max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
+    max_rxgain                    = 125;
     bands                         = [7];
   }
 );

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

@@ -208,6 +208,10 @@ 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"

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

@@ -241,6 +241,10 @@ RUs =
   }
 );
 
+rfsimulator: {
+    serveraddr = "server";
+};
+
 THREAD_STRUCT =
 (
   {

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

@@ -241,6 +241,10 @@ RUs =
   }
 );
 
+rfsimulator: {
+    serveraddr = "server";
+};
+
 THREAD_STRUCT =
 (
   {

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

@@ -241,6 +241,10 @@ RUs =
   }
 );
 
+rfsimulator: {
+    serveraddr = "server";
+};
+
 THREAD_STRUCT =
 (
   {

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

@@ -241,6 +241,10 @@ RUs =
   }
 );
 
+rfsimulator: {
+    serveraddr = "server";
+};
+
 THREAD_STRUCT =
 (
   {

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

@@ -374,6 +374,10 @@ 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"

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

@@ -217,13 +217,6 @@ THREAD_STRUCT = (
     worker_config      = "WORKER_ENABLE";
   }
 );
-rfsimulator: {
-serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs"
-}
 
      log_config :
      {

ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf

@@ -234,6 +234,10 @@ 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"

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

@@ -212,6 +212,10 @@ 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"

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

@@ -0,0 +1,264 @@
+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";
+    };
+

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf

@@ -1,282 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });
-
-    nr_cellid = 12345678L
-
-#     tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    pusch_AntennaPorts                                        = 2;
-    pdsch_AntennaPorts_XP                                     = 2;
-    ul_prbblacklist                                           = "51,52,53,54"
-    do_SRS                                                    = 0;
-    do_CSIRS                                                  = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  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
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 11;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          preambleReceivedTargetPower                               = -104;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -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       = "CI_MME_IP_ADDR";
-                                  ipv6       = "192:168:30::17";
-                                  active     = "yes";
-                                  preference = "ipv4";
-                                                                                                                              }
-                                                                                                                                          );
-
-        NETWORK_INTERFACES :
-        {
-
-           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
-        };
-
-  }
-);
-
-MACRLCs = (
-  {
-    num_cc           = 1;
-    tr_s_preference  = "local_L1";
-    tr_n_preference  = "local_RRC";
-    pusch_TargetSNRx10 = 220;
-    pucch_TargetSNRx10 = 220;
-    ulsch_max_frame_inactivity = 10;
-  }
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 200;
-#  pucch0_dtx_threshold = 150;
-}
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 2
-         nb_rx          = 2
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-         ##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];
-         sf_extension = 0
-         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"
-    }
-);
-
-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";
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  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 = ( "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 = "yes";
-};
-
-     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                        ="info";
-    };

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

@@ -29,7 +29,7 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3600 MHz + 84 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641272; //641032;      #641968; 641968=start of ssb at 3600MHz + 82 RBs    641032=center of SSB at center of cell
+      absoluteFrequencySSB                                          = 641272;
       dl_frequencyBand                                                 = 78;
       # this is 3600 MHz
       dl_absoluteFrequencyPointA                                       = 640000;

ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf

@@ -0,0 +1,261 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_CU_ID = 0xe00;
+
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({sst = 1;}); });
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    min_rxtxtime                                              = 5;
+    do_SRS                                                    = 0;
+    force_256qam_off                                          = 1;
+    pdsch_AntennaPorts_N1                                     = 1;
+    pdsch_AntennaPorts_XP                                     = 1;
+    pusch_AntennaPorts                                        = 1;
+
+
+    pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+    );
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+# downlinkConfigCommon
+    #frequencyInfoDL
+      dl_frequencyBand                                               = 78;
+      absoluteFrequencySSB                                           = 634080;
+      dl_absoluteFrequencyPointA                                     = 632808;
+      #scs-SpecificCarrierList
+      dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                         = 1;
+        dl_carrierBandwidth                                          = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=0,L=106 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                           = 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                                  = 12;
+          preambleReceivedTargetPower                                = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                           = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                             = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                            = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                 = 3;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                    = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                 = 7;
+        rsrp_ThresholdSSB                                            = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                   = 2;
+        prach_RootSequenceIndex                                      = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                       = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                          = 0,
+
+        msg3_DeltaPreamble                                           = 1;
+        p0_NominalWithGrant                                          = -90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                            = 0;
+        hoppingId                                                    = 40;
+        p0_nominal                                                   = -70;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                        = 2;
+      ssb_PositionsInBurst_Bitmap                                    = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spar e1
+      ssb_periodicityServingCell                                     = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                            = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                              = 1;
+
+
+#tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                     = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                  = 6;
+      nrofDownlinkSlots                                              = 7;
+      nrofDownlinkSymbols                                            = 6;
+      nrofUplinkSlots                                                = 2;
+      nrofUplinkSymbols                                              = 4;
+
+      ssPBCH_BlockPower                                              = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// AMF parameters:
+        amf_ip_address      = ( { ipv4       = "172.21.6.100";
+                                  ipv6       = "192:168:30::17";
+                                  active     = "yes";
+                                  preference = "ipv4";
+                                                                                                                              }
+                                                                                                                                          );
+
+        NETWORK_INTERFACES :
+        {
+
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/22";
+           GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/22";
+           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc           = 1;
+  tr_s_preference  = "local_L1";
+  tr_n_preference  = "local_RRC";
+  pusch_TargetSNRx10 = 180;
+  pucch_TargetSNRx10 = 200;
+  ulsch_max_frame_inactivity = 1;
+  ul_max_mcs = 16;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 120;
+  #pucch0_dtx_threshold = 150;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes";
+  nb_tx          = 1;
+  nb_rx          = 1;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
+  sf_extension = 0
+  sdr_addrs = "addr=192.168.80.52,clock_source=internal,time_source=internal"
+}
+);
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  f1ap_log_level                        ="debug";
+  gtpu_log_level                        ="info";
+};
+

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

@@ -32,10 +32,10 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-      absoluteFrequencySSB                                             = 621312; # 641280
+      absoluteFrequencySSB                                             = 621312;
       dl_frequencyBand                                                 = 78;
       # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                       = 620040; # 640008
+      dl_absoluteFrequencyPointA                                       = 620040;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing

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

@@ -23,11 +23,7 @@ gNBs =
 
     ////////// Physical parameters:
 
-    #pusch_TargetSNRx10                                        = 200;
-    #pucch_TargetSNRx10                                        = 200;
-    ul_prbblacklist                                           = "51,52,53,54"
     min_rxtxtime = 6;
-    do_SRS                                                    = 1;
 
     servingCellConfigCommon = (
     {
@@ -37,23 +33,10 @@ 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
@@ -208,7 +191,6 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
-     ulsch_max_frame_inactivity = 1;
   }
 );
 
@@ -254,6 +236,10 @@ THREAD_STRUCT = (
   }
 );
 
+rfsimulator: {
+    serveraddr = "server";
+};
+
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

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

@@ -25,7 +25,6 @@ gNBs =
 
     pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
-    do_SRS                                                    = 0;
 
     servingCellConfigCommon = (
     {
@@ -35,23 +34,10 @@ 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

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

@@ -0,0 +1,247 @@
+Active_gNBs = ( "gNB-in-docker");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    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; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.30 MHz + (19 PRBs + 10 SCs)@30kHz SCS (GSCN: 7715)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3300.30 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;
+# 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;
+# SC-FDMA: 0 = enabled, 1 = disabled
+      msg3_transformPrecoder                                        = 0;
+  #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
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
+  ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 10;
+  ul_max_mcs                  = 9;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference       = "local_mac";
+  prach_dtx_threshold   = 120;
+  pucch0_dtx_threshold  = 100;
+  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 1
+  nb_rx          = 1
+  att_tx         = 14;
+  att_rx         = 14;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 114;
+  eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+  clock_src = "internal";
+}
+);
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="info";
+  f1ap_log_level                        ="info";
+};

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

@@ -25,7 +25,6 @@ gNBs =
 
     pusch_AntennaPorts                                        = 2;
     ul_prbblacklist                                           = "51,52,53,54"
-    do_SRS                                                    = 0;
 
     servingCellConfigCommon = (
     {

ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf

@@ -25,10 +25,7 @@ gNBs =
 
     pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
-    #pusch_TargetSNRx10                                        = 200;
-    #pucch_TargetSNRx10                                        = 200;
     ul_prbblacklist                                           = "79,80,81,82"
-    do_SRS                                                    = 0;
 
     servingCellConfigCommon = (
     {

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

@@ -17,7 +17,7 @@ gNBs =
 
     ////////// Physical parameters:
 
-    sib1_tda                                                  = 15;
+    sib1_tda = 15;
     min_rxtxtime = 6;
 
     servingCellConfigCommon = (
@@ -219,6 +219,10 @@ 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"
@@ -228,15 +232,6 @@ THREAD_STRUCT = (
 }
 );
 
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = "4043";
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

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

@@ -17,8 +17,6 @@ gNBs =
 
     ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
 
     servingCellConfigCommon = (
     {
@@ -226,15 +224,6 @@ THREAD_STRUCT = (
 }
 );
 
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = "4043";
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

ci-scripts/conf_files/lteue.usim.conf

@@ -1,153 +0,0 @@
-# List of known PLMNS
-PLMN: {
-    PLMN0: {
-           FULLNAME="OpenAirInterface";
-           SHORTNAME="OAICN";
-           MNC="96";
-           MCC="208";
-    };
-};
-
-UE0:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="0100001111";
-        USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
-        OPC="e734f8734007d6c5ce7a0508809e7e9c";
-        MSISDN="33611123456";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20896";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20896");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};
-
-UE1:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="0100001111";
-        USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
-        OPC="e734f8734007d6c5ce7a0508809e7e9c";
-        MSISDN="33611123456";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20896";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20896");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};
-
-UE2:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="0100001111";
-        USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
-        OPC="e734f8734007d6c5ce7a0508809e7e9c";
-        MSISDN="33611123456";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20896";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20896");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};
-
-UE3:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="0100001111";
-        USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
-        OPC="e734f8734007d6c5ce7a0508809e7e9c";
-        MSISDN="33611123456";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20896";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20896");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};

ci-scripts/conf_files/nr-ue-sim.conf

@@ -1,7 +0,0 @@
-uicc0 = {
-  imsi = "@FULL_IMSI@";
-  key = "@FULL_KEY@";
-  opc= "@OPC@";
-  dnn= "@DNN@";
-  nssai_sst=@NSSAI_SST@;
-}

ci-scripts/conf_files/nr-ue.nfapi.conf

@@ -1,37 +0,0 @@
-log_config = {
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-};
-
-
-L1s = (
-        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "ens3";
-	remote_n_address = "127.0.0.1"; //Proxy IP
-	local_n_address  = "127.0.0.1";
-	local_n_portc    = 50600;
-	remote_n_portc   = 50601;
-	local_n_portd    = 50610;
-	remote_n_portd   = 50611;
-        }  
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
-);

ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -1,225 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// 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 = 92; mnc_length = 2; } );
-
-       ////////// Physical parameters:
-
-    component_carriers = (
-      {
-        node_function                                         = "NGFI_RCC_IF4p5";
-        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              			      = 40;
-        downlink_frequency      			      = 2350000000L;
-        uplink_frequency_offset 			      = 0;
-        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                                            = 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 			      =-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                                   = -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       = "CI_MME_IP_ADDR";
-                              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              = "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                      ="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     =  200;
-        puCch10xSnr     =  200;
-        }  
-);
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
-);
-
-RUs = (
-    {		  
-        local_if_name  = "lo";
-        remote_address = "127.0.0.2";
-        local_address  = "127.0.0.1";
-        local_portc    = 50000;
-        remote_portc   = 50000;
-        local_portd    = 50001;
-        remote_portd   = 50001;
-        local_rf       = "no"
-        tr_preference  = "udp_if4p5"
-        nb_tx          = 1
-        nb_rx          = 1
-        att_tx         = 0
-        att_rx         = 0;
-        eNB_instances  = [0];
-    }
-);  
-
-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";
-  }
-);

ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -1,225 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// 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 = 92; mnc_length = 2; } );
-
-       ////////// Physical parameters:
-
-    component_carriers = (
-      {
-        node_function                                         = "NGFI_RCC_IF4p5";
-        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              			      = 40;
-        downlink_frequency      			      = 2350000000L;
-        uplink_frequency_offset 			      = 0;
-        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                                            = 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       = "CI_MME_IP_ADDR";
-                              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              = "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                      ="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     =  200;
-        puCch10xSnr     =  200;
-        }  
-);
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
-);
-
-RUs = (
-    {		  
-        local_if_name  = "lo";
-        remote_address = "127.0.0.2";
-        local_address  = "127.0.0.1";
-        local_portc    = 50000;
-        remote_portc   = 50000;
-        local_portd    = 50001;
-        remote_portd   = 50001;
-        local_rf       = "no"
-        tr_preference  = "udp_if4p5"
-        nb_tx          = 1
-        nb_rx          = 1
-        att_tx         = 6
-        att_rx         = 6;
-        eNB_instances  = [0];
-    }
-);  
-
-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";
-  }
-);

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf

@@ -1,262 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// 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 = 92; mnc_length = 2; } );
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "NGFI_RCC_IF4p5";
-      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                                            = 125;
-      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                                   = -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";
-                            }
-                          );
-
-    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              = "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
-    };
-  }
-);
-
-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_if_name  = "lo";
-        remote_address = "127.0.0.2";
-        local_address  = "127.0.0.1";
-        local_portc    = 50000;
-        remote_portc   = 50000;
-        local_portd    = 50001;
-        remote_portd   = 50001;
-        local_rf       = "no"
-        tr_preference  = "udp_if4p5"
-        nb_tx          = 1
-        nb_rx          = 1
-        att_tx         = 0
-        att_rx         = 0;
-        eNB_instances  = [0];
-    }
-);
-
-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";
-    };

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf

@@ -1,262 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// 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 = 92; mnc_length = 2; } );
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "NGFI_RCC_IF4p5";
-      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                                            = 125;
-      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_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                                   = -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";
-                            }
-                          );
-
-    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              = "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
-    };
-  }
-);
-
-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_if_name  = "lo";
-        remote_address = "127.0.0.2";
-        local_address  = "127.0.0.1";
-        local_portc    = 50000;
-        remote_portc   = 50000;
-        local_portd    = 50001;
-        remote_portd   = 50001;
-        local_rf       = "no"
-        tr_preference  = "udp_if4p5"
-        nb_tx          = 1
-        nb_rx          = 1
-        att_tx         = 0
-        att_rx         = 0;
-        eNB_instances  = [0];
-    }
-);
-
-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";
-    };

ci-scripts/conf_files/ue.nfapi.conf

@@ -1,37 +0,0 @@
-log_config = {
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-};
-
-
-L1s = (
-        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "ens3";
-	remote_n_address = "CI_ENB_IP_ADDR";
-	local_n_address  = "CI_UE_IP_ADDR";
-	local_n_portc    = 50000;
-	remote_n_portc   = 50001;
-	local_n_portd    = 50010;
-	remote_n_portd   = 50011;
-        }  
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
-);

ci-scripts/datalog_rt_stats.default.yaml

@@ -16,9 +16,9 @@ Ref :
   L1 Rx processing : 305.0
   PUSCH inner-receiver : 150.0
   PUSCH decoding : 210.0
-  Schedule Response : 20.0
+  Schedule Response : 30.0
   DL & UL scheduling timing : 10.0
-  UL Indication : 30.0
+  UL Indication : 40.0
 Threshold :
   feprx : 1.25
   feptx_prec : 1.25

ci-scripts/epc.py

@@ -166,6 +166,8 @@ class EPCManagement():
 			mySSH.command('echo ' + self.Password + ' | sudo -S ./run_mme 2>&1 | stdbuf -o0 tee -a mme_' + self.testCase_id + '.log &', 'MME app initialization complete', 100)
 		elif re.match('ltebox', self.Type, re.IGNORECASE):
 			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
+			# Clean-up the logs from previous runs
+			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f ../var/log/*.0', '\$', 5)
 			mySSH.command('echo ' + self.Password + ' | sudo -S ./start_mme', '\$', 5)
 		else:
 			logging.error('This option should not occur!')

ci-scripts/main.py

@@ -374,17 +374,6 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
 
-	elif action == 'PingFromContainer':
-		string_field = test.findtext('container_name')
-		if (string_field is not None):
-			CONTAINERS.pingContName = string_field
-		string_field = test.findtext('options')
-		if (string_field is not None):
-			CONTAINERS.pingOptions = string_field
-		string_field = test.findtext('loss_threshold')
-		if (string_field is not None):
-			CONTAINERS.pingLossThreshold = string_field
-
 	elif action == 'IperfFromContainer':
 		string_field = test.findtext('server_container_name')
 		if (string_field is not None):
@@ -431,10 +420,12 @@ def GetParametersFromXML(action):
 		RAN.command = test.findtext('command')
 		RAN.command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
 	elif action == 'Pull_Cluster_Image':
-		# CLUSTER.imageToPull.clear()
 		string_field = test.findtext('images_to_pull')
 		if (string_field is not None):
 			CLUSTER.imageToPull = string_field.split()
+		string_field = test.findtext('test_svr_id')
+		if (string_field is not None):
+			CLUSTER.testSvrId = string_field
 	else:
 		logging.warning(f"unknown action {action} from option-parsing point-of-view")
 
@@ -881,10 +872,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
 					if CONTAINERS.exitStatus==1:
 						RAN.prematureExit = True
-				elif action == 'PingFromContainer':
-					CONTAINERS.PingFromContainer(HTML, RAN, CiTestObj)
-					if CONTAINERS.exitStatus==1:
-						RAN.prematureExit = True
 				elif action == 'IperfFromContainer':
 					CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
 					if CONTAINERS.exitStatus==1:

ci-scripts/ran.py

@@ -895,7 +895,7 @@ class RANManagement():
 						htmleNBFailureMsg += '<span class="glyphicon glyphicon-ok-circle"></span> Command line option(s) correctly applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
 					else:
 						htmleNBFailureMsg += '<span class="glyphicon glyphicon-ban-circle"></span> Command line option(s) NOT applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
-			result = re.search('Exiting OAI softmodem', str(line))
+			result = re.search('Exiting OAI softmodem|Caught SIGTERM, shutting down', str(line))
 			if result is not None:
 				exitSignalReceived = True
 			result = re.search('[Ss]egmentation [Ff]ault', str(line))

ci-scripts/xml_class_list.yml

@@ -40,7 +40,6 @@
   - Deploy_Run_PhySim
   - DeployGenObject
   - UndeployGenObject
-  - PingFromContainer
   - IperfFromContainer
   - StatsFromGenObject
   - LicenceAndFormattingCheck

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -89,19 +89,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping trf-gen from LTE-UE 1</desc>
-                <container_name>l2sim4g-oai-lte-ue1</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>0</loss_threshold>
+                <id>l2sim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE 1 from trf-gen</desc>
-                <container_name>l2sim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>l2sim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -95,19 +95,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -75,19 +75,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 10.0.1.1</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from eNB</desc>
-                <container_name>rfsim4g-oai-enb</container_name>
-                <options>-I oaitun_enb1 -c 20 10.0.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_enb_nos1</id>
+                <ping_args> -c 20 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -95,19 +95,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -95,19 +95,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -96,19 +96,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -87,19 +87,19 @@
         </testCase>
 
         <testCase id="020021">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.73.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.73.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020022">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030021">

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -87,19 +87,19 @@
         </testCase>
 
         <testCase id="020021">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020022">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030021">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -87,19 +87,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>l2sim-oai-nr-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>l2sim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>l2sim-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>l2sim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -39,6 +39,12 @@
  020004
  030001
  030002
+ 444444
+ 333333
+ 020005
+ 444444
+ 333333
+ 020005
  100001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -91,35 +97,43 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020003">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue2</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020004">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.3</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.3</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="020005">
+                <class>Ping</class>
+                <desc>Ping ext-dn from both UEs</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <ping_args>-c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
@@ -140,6 +154,18 @@
                 <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
+        <testCase id="333333">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+        </testCase>
+
+        <testCase id="444444">
+                <class>Detach_UE</class>
+                <desc>Detach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+        </testCase>
+
         <testCase id="100001">
                 <class>UndeployGenObject</class>
                 <desc>Undeploy all OAI 5G stack</desc>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 -i0.2 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 -i0.2 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2 -i0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml

@@ -58,11 +58,11 @@
         </testCase>
 
         <testCase id="020021">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Test Connectivity (ping)</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 12.1.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c 20 12.1.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100022">

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -62,19 +62,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-c20 -i0.2 10.0.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
-                <container_name>rfsim5g-oai-gnb</container_name>
-                <options>-c20 -i0.2 10.0.1.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -60,19 +60,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-c20 -i0.2 10.0.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
-                <container_name>rfsim5g-oai-gnb</container_name>
-                <options>-c20 -i0.2 10.0.1.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -60,19 +60,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-c20 -i0.2 10.0.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
-                <container_name>rfsim5g-oai-gnb</container_name>
-                <options>-c20 -i0.2 10.0.1.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -110,7 +110,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <testCase id="040501">
         <class>Ping</class>
         <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
+        <ping_args>-c 20 %cn_ip%</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -0,0 +1,184 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+    <htmlTabRef>test-fdd-05-tm1-if4-5</htmlTabRef>
+    <htmlTabName>Test-FDD-05MHz-TM1-IF4.5</htmlTabName>
+    <htmlTabIcon>tasks</htmlTabIcon>
+    <TestCaseRequestedList>
+100000
+111110
+300000
+040101
+030131 030132
+040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
+030231
+200000
+    </TestCaseRequestedList>
+    <TestCaseExclusionList></TestCaseExclusionList>
+
+    <testCase id="111110">
+        <class>Pull_Local_Registry</class>
+        <desc>Pull Images from Local Registry</desc>
+        <test_svr_id>0</test_svr_id>
+        <images_to_pull>oai-enb</images_to_pull>
+    </testCase>
+
+    <testCase id="100000">
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
+    </testCase>
+    <testCase id="200000">
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
+    </testCase>
+    <testCase id="300000">
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>hutch</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
+    </testCase>
+
+    <testCase id="030131">
+        <class>Deploy_Object</class>
+        <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+        <services>rru_fdd</services>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="030132">
+        <class>Deploy_Object</class>
+        <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+        <services>rcc_fdd</services>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="000001">
+        <class>IdleSleep</class>
+        <desc>Sleep</desc>
+        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+    </testCase>
+
+    <testCase id="030231">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy RCC/RRU</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="040101">
+        <class>Initialize_UE</class>
+        <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+    <testCase id="040201">
+        <class>Terminate_UE</class>
+        <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+    <testCase id="040301">
+        <class>Attach_UE</class>
+        <desc>Attach UEs</desc>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+    <testCase id="040401">
+        <class>Detach_UE</class>
+        <desc>Detach UEs</desc>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+
+    <testCase id="040531">
+        <class>Ping</class>
+        <desc>ping (5MHz - 20 sec)</desc>
+        <ping_args>-c 20 %cn_ip%</ping_args>
+        <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+
+    <testCase id="040633">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+
+    <testCase id="040634">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
+    </testCase>
+
+    <testCase id="040636">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_2</id>
+    </testCase>
+
+    <testCase id="040671">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
+    </testCase>
+
+    <testCase id="040672">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
+    </testCase>
+
+    <testCase id="040673">
+        <class>Iperf</class>
+        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
+    </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
 040101
 030102
 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
-030201
+030202
 200000
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
@@ -64,7 +64,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <eNB_serverId>0</eNB_serverId>
     </testCase>
 
-    <testCase id="030201">
+    <testCase id="030202">
         <class>Undeploy_Object</class>
         <desc>Undeploy eNB</desc>
         <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
@@ -148,7 +148,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
     <testCase id="040502">
         <class>Ping</class>
         <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
+        <ping_args>-c 20 %cn_ip%</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
@@ -156,7 +156,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
     <testCase id="040503">
         <class>Ping</class>
         <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
+        <ping_args>-c 20 %cn_ip%</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -34,7 +34,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 030111
 000001
 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
-030201
+030211
 200000
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
@@ -72,7 +72,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
     </testCase>
 
-    <testCase id="030201">
+    <testCase id="030211">
         <class>Undeploy_Object</class>
         <desc>Undeploy eNB</desc>
         <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
@@ -104,7 +104,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040511">
         <class>Ping</class>
         <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
+        <ping_args>-c 20 %cn_ip%</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 030112
 040301 040302 040512 040612 040650 040401
 040201
-030201
+030212
 200000
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
@@ -65,7 +65,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <eNB_serverId>0</eNB_serverId>
     </testCase>
 
-    <testCase id="030201">
+    <testCase id="030212">
         <class>Undeploy_Object</class>
         <desc>Undeploy eNB</desc>
         <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
@@ -97,7 +97,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040512">
         <class>Ping</class>
         <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
+        <ping_args>-c 20 %cn_ip%</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 030121
 000001
 040301 040521 040623 040624 040625 040662 040401 040201
-030201
+030221
 200000
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
@@ -71,7 +71,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
     </testCase>
 
-    <testCase id="030201">
+    <testCase id="030221">
         <class>Undeploy_Object</class>
         <desc>Undeploy eNB</desc>
         <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
@@ -103,7 +103,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040521">
         <class>Ping</class>
         <desc>ping (20MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
+        <ping_args>-c 20 %cn_ip%</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>