add the F patch that work on both Benetel and LiteOn RU. support fh_config parameters RunSlotPrbMapBySymbol and LiteOnIgnoreUPSectionId.

Integration `2025.w45`

* !3736 fix bugs in scope for pdcch, and optimize cpu cost of pdcch decoding
* !3743 NR UE: fix PDCCH LLR indexing for different search space RB sizes
* !3739 Bugfix: save old tunnel info to remain the user plane connection while rolling back to source DU due to handover failure
* !3742 Simplify node management in CI, handle SIGINT
* !3670 PRS bug fix and CI Integration
* !3746 Fix unsigned to signed decoding parameters to allow for 'no affinity'/'no pin' threads to CPUs
* !3738 CI: Add new Jenkinsfiles

Closes #984 and #1021

See merge request oai/openairinterface5g!3744

CHANGELOG.md

@@ -1,5 +1,51 @@
 # RELEASE NOTES: #
 
+## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##
+
+General new features and improvements (both RAN and UE):
+- Preliminary support for RedCap UEs
+- Support for NTN LEO scenarios including SIB19 and channel emulation (see
+  doc/RUNMODEM.md)
+- VRTSIM: new shared memory realtime radio (see develop/radio/vrtsim/README.md)
+- Support for TDD pattern 2
+- Support for long PRACH
+- Support for SIB2
+- Add unit tests using ctest (see doc/UnitTests.md)
+
+Stability and bug fixes:
+- Improve various procedures (e.g., RRC reestablishment, RRC Reject, ...)
+- Add improvements for ImScope
+- Bugfixes in the entire stack (e.g., #803, #805, #810, #812, #818, #852, #878,
+  #884, #890, #895, #901, #907, #932, #939 ...)
+- Documentation updates
+- And many other small fixes, like memory leaks, crashes, ...
+
+RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
+- Stability and performance improvements when running with 4-layer DL MIMO
+- Stability and performance improvements when running with 2-layer UL MIMO
+- Interoperability testing with Metanoia Jura and Foxconn RUs
+- Support of O-RAN 7.2 M-plane (Start-up procedure including configuration
+  management, see also doc/ORAN_FHI7.2_Tutorial.md)
+- Upgrade OSC FHI (xran) from E to F release
+- Refactoring of LDPC interface and performance improvements
+- Support for nFAPI in all scenarios for FR1 (see doc/nfapi.md)
+- Support at least 32 UEs concurrently
+- Improve robustness when running in split modes (F1, E1)
+- Add basic support for beam management in FR2
+- Add support for O1 on DU (see also https://gitlab.eurecom.fr/oai/o1-adapter)
+- E2 agent: Support for multiple E2SM-RC report service styles
+
+nrUE changes:
+- Refactoring of threading towards better code and performance
+- Add or rework various procedures (e.g., RA with C-RNTI, Going to Idle, RA, ...)
+- Refactor and extend NAS implementation (e.g., Service Request, Registration
+  Request, Service Acept, Service Reject, ...)
+- Support for continuous frequency offset compensation
+- Reduce minimum RX-to-TX time to 3
+
+Regression:
+- Multiple BWPs do not work reliably on gNB; use tag 2025.w17
+
 ## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##
 
 General 5G improvements (both gNB and UE):

CMakeLists.txt

@@ -1184,7 +1184,6 @@ set(NR_L2_SRC_UE
   ${NR_UE_RRC_DIR}/L2_interface_ue.c
   ${NR_UE_RRC_DIR}/main_ue.c
   ${NR_UE_RRC_DIR}/rrc_UE.c
-  ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
   ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
   )
@@ -1977,7 +1976,6 @@ target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_psbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
@@ -1998,7 +1996,6 @@ target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2028,7 +2025,6 @@ target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c

ci-scripts/Jenkinsfile

@@ -0,0 +1,233 @@
+#!/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
+ */
+
+def pythonExecutor = params.pythonExecutor
+def testXMLFile = params.pythonTestXmlFile
+def mainPythonAllXmlFiles = ""
+def buildStageStatus = true
+def JOB_TIMESTAMP
+
+// Choose test stage name or fallback default
+def testStageName = params.pipelineTestStageName != null ? params.pipelineTestStageName : 'Template Test Stage'
+
+// 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 sourceRepository = params.eNB_Repository ?: env.GIT_URL
+def sourceBranch = params.eNB_Branch ?: env.GIT_BRANCH
+def targetRepository = params.Target_Repository ?: sourceRepository
+def targetBranch = params.eNB_TargetBranch ?: 'develop'
+def commitID = params.eNB_CommitID ?: env.GIT_COMMIT
+def is_MR = params.eNB_mergeRequest ?: false
+
+def flexricOption = ""
+def runWithOC = false
+
+//-------------------------------------------------------------------------------
+// Pipeline start
+pipeline {
+  agent {
+    label pythonExecutor
+  }
+  options {
+    timestamps()
+    ansiColor('xterm')
+    lock(extra: lockResources)
+  }
+
+  stages {
+    stage("Build Init") {
+      steps {
+        script {
+          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
+          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
+        }
+        // update the build name and description
+        buildName "${params.eNB_MR}"
+        buildDescription "Branch : ${sourceBranch}"
+      }
+    }
+    stage ('Verify Parameters') {
+      steps {
+        script {
+          echo '\u2705 \u001B[94mVerify Parameters\u001B[0m'
+          def allParametersPresent = true
+
+          if (params.LockResources == null) {
+            echo "no LockResources given"
+            allParametersPresent = false
+          }
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.OC_Credentials != null) {
+            echo "This pipeline is configured to run with Opensift Cluster."
+            runWithOC = true
+            if (params.OC_ProjectName == null) {
+              echo "no OC_ProjectName given"
+              allParametersPresent = false
+            }
+          }
+          if (params.Flexric_Tag != null) {
+            echo "This pipeline is configured to run with a FlexRIC deployment."
+            echo "Appending FlexRicTag option to the list of options"
+            flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
+            echo "Using new Flexric option: ${flexricOption}"
+          }
+
+          echo "CI executor node    :   ${pythonExecutor}"
+          echo "Source Repository   :   ${sourceRepository}"
+          echo "Source Branch       :   ${sourceBranch}"
+          echo "Target Repository   :   ${targetRepository}"
+          echo "Target Branch       :   ${targetBranch}"
+          echo "Commit ID           :   ${commitID}"
+
+          if (allParametersPresent) {
+            echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
+            if (is_MR) {
+              sh "git fetch"
+              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${sourceBranch} --src-commit ${commitID} --target-branch ${targetBranch} --target-commit latest"
+            } else {
+              sh "git fetch"
+              sh "git checkout -f ${commitID}"
+            }
+          } else {
+            echo "\u274C Some parameters are missing"
+            sh "./ci-scripts/fail.sh"
+          }
+        }
+      }
+    }
+    stage ("Deploy and Test") {
+      steps {
+        script {
+          dir ('ci-scripts') {
+            echo "\u2705 \u001B[94m Deploy and Test: ${testStageName}\u001B[0m"
+            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+            for (xmlFile in myXmlTestSuite) {
+              if (fileExists(xmlFile)) {
+                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                echo "Test XML file         :   ${xmlFile}"
+              } else {
+                echo "Test XML file ${xmlFile}: no such file"
+              }
+            }
+            sh """
+              python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                              --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                              --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                              ${flexricOption} ${mainPythonAllXmlFiles}
+            """
+            if (runWithOC) {
+              withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
+                sh """
+                  python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                                  --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                  --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                  ${flexricOption} ${mainPythonAllXmlFiles}
+                """
+                for (xmlFile in myXmlTestSuite) {
+                  if (fileExists(xmlFile)) {
+                    try {
+                      timeout (time: 60, unit: 'MINUTES') {
+                        sh """
+                          python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                          --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                          --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                          --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
+                                          --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
+                                          ${flexricOption}
+                        """
+                      }
+                    } catch (Exception e) {
+                      currentBuild.result = 'FAILURE'
+                      buildStageStatus = false
+                    }
+                  }
+                }
+              }
+            } else {
+              for (xmlFile in myXmlTestSuite) {
+                if (fileExists(xmlFile)) {
+                  try {
+                    timeout (time: 60, unit: 'MINUTES') {
+                      sh """
+                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
+                                        ${flexricOption}
+                      """
+                    }
+                  } catch (Exception e) {
+                    currentBuild.result = 'FAILURE'
+                    buildStageStatus = false
+                  }
+                }
+              }
+            }
+          sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
+          }
+        }
+      }
+    }
+    stage ("Log Collection") {
+      steps {
+        script {
+	  echo '\u2705 \u001B[94mLog Collection\u001B[0m'
+          dir ('ci-scripts') {
+            // Zipping all archived log files
+              sh "mkdir test_logs"
+              sh "mv *.log* test_logs || true"
+              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
+              if (fileExists('../cmake_targets/log')) {
+                sh "mv ../cmake_targets/log/* test_logs || true"
+              }
+              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
+              sh "rm -rf *test_log*/"
+              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
+                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
+              }
+            if (fileExists("test_results.html")) {
+              def reportName = "test_results-${env.JOB_NAME}.html"
+              sh "mv test_results.html ${reportName}"
+              sh """
+                sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' \
+                       -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}#' ${reportName}
+	      """
+              archiveArtifacts artifacts: "${reportName}"
+            }
+          }
+        }
+      }
+    }
+  }
+}

ci-scripts/Jenkinsfile-GitLab-Container

@@ -267,6 +267,24 @@ pipeline {
         }
       }
     }
+    stage ("DockerHub-Push") {
+      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
+      steps {
+        script {
+          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
+          }
+        }
+      }
+      post {
+        failure {
+          script {
+            echo "Push to Docker-Hub KO"
+            failingStages += '\n * RAN-DockerHub-Push'
+          }
+        }
+      }
+    }
     stage ("Image Test Processes") {
       when { expression {doBuild} }
       parallel {
@@ -756,23 +774,6 @@ pipeline {
         }
       }
     }
-    stage ("DockerHub-Push") {
-      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
-      steps {
-        script {
-          triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
-        }
-      }
-      post {
-        failure {
-          script {
-            echo "Push to Docker-Hub KO"
-            currentBuild.result = 'FAILURE'
-            failingStages += '\n * RAN-DockerHub-Push'
-          }
-        }
-      }
-    }
   }
   post {
     success {

ci-scripts/Jenkinsfile-push-registry

@@ -84,12 +84,20 @@ pipeline {
             sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
             sh "docker login -u oaicicd -p oaicicd ${OAI_Registry} > /dev/null 2>&1"
             listOfImages.eachWithIndex { item, iindex ->
-              sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-              sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
-              sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
-              sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
-              sh "docker push --quiet ${DH_Account}/${item}:develop"
-              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
+              if (["oai-gnb", "oai-nr-ue", "oai-nr-cuup"].contains(item)) {
+                // For images built on AMD64 and ARMv8 Jetson
+                echo "Pushing image '${item}' for both AMD64 and ARM64 architectures with tags: ${WEEK_TAG} and develop"
+                sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop || true"
+                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:${WEEK_TAG} ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
+                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
+              } else {
+                sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
+                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
+                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
+                sh "docker push --quiet ${DH_Account}/${item}:develop"
+                sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
+              }
+              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA} || true"
             }
             // Proxy is not following the same pattern.
             sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"

ci-scripts/args_parse.py

@@ -43,10 +43,6 @@ import constants as CONST
 
 def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
 
-
-    py_param_file_present = False
-    py_params={}
-
     force_local = False
     while len(argvs) > 1:
         myArgv = argvs.pop(1)	# 0th is this file's name
@@ -172,4 +168,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             HELP.GenericHelp(CONST.Version)
             sys.exit('Invalid Parameter: ' + myArgv)
 
-    return py_param_file_present, py_params, mode, force_local
+    return mode, force_local

ci-scripts/attenuatorctl.py

@@ -0,0 +1,175 @@
+#!/usr/bin/env python3
+
+import argparse
+import logging
+import itertools
+import usb.core
+import usb.util
+import sys
+import time
+
+logging.basicConfig(
+    level=logging.DEBUG,
+    stream=sys.stdout,
+    format="%(message)s"
+)
+
+# helper class parsing command line options for channels and attenuators
+class ValidateChAtt(argparse.Action):
+    def _parse_channels(s):
+        if len(s.split("-")) == 2:
+            s, e = [int(x) for x in s.split("-")]
+            chs = [x for x in range(s, e+1)]
+            if len(chs) == 0:
+                raise Exception(f"empty range")
+        elif len(s.split(",")) > 1:
+            chs = [int(x) for x in s.split(",")]
+        elif s.isdigit():
+            chs = [int(s)]
+        else:
+            raise Exception(f"could not parse channel expression")
+        for c in chs:
+            if not 1 <= c <= 4:
+                raise Exception(f"channel number must be within [1,4], but have {c}")
+        return chs
+
+    def __call__(self, parse, args, values, option_string=None):
+        ch, att = values
+        try:
+            chs = ValidateChAtt._parse_channels(ch)
+        except Exception as e:
+            parse.exit(1, f"while parsing channel expression {ch}: {e}\n")
+        if not att.isdigit():
+            parse.exit(1, f'expected number for attenuation, but got {att}\n')
+        if not 0 <= int(att) <= 63:
+            parse.exit(1, f'attenuation must be within [0,63], but is {att}\n')
+        opts = getattr(args, self.dest) or {}
+        for c in chs:
+            opts[c] = int(att)
+        setattr(args, self.dest, opts)
+
+def _parse_args() -> argparse.Namespace:
+    epilog = '''
+[CHs] can have the following forms:
+  (1) single channel number w (within [1-4])
+  (2) a range of channels in the form x-y (x <= y)
+  (3) a list of channels in the form a,b,c
+[ATT] must be within [0,63] (dB)
+
+--set and --reach are mutually exclusive
+
+Examples:
+- reset all channels to 0: -s 1-4 0
+- set channels 3 and 4 to attenuation 60: -s 3,4 60
+- perform attenuation sweep during 10s, reaching ch. 1+2 to 60: -r 1,2 60 -d 10
+'''
+    parser = argparse.ArgumentParser(description='Mini-Circuit RC*DAT attenuator controller',
+                                     epilog=epilog,
+                                     formatter_class=argparse.RawDescriptionHelpFormatter)
+
+    parser.add_argument('--info', '-i', action='store_true', default=False,
+                        help='Get Infos for all connected Mini-Circuits RC*DAT',)
+    parser.add_argument('--set', '-s', nargs=2, metavar=("[CHs]","[ATT]"),
+                        action=ValidateChAtt, help="Set a fixed attenuation ATT on channels CHs")
+    parser.add_argument('--reach', '-r', nargs=2, metavar=("[CHs]","[ATT]"),
+                        action=ValidateChAtt, help="Perform an \"attenuation sweep\": reach attenuation ATT on channels CHs")
+    parser.add_argument('--duration', '-d', action='store', type=float, default=5.0,
+                        help='DURATION for attenuation sweep to --reach given attenuation (Default: 5)',)
+    parser.add_argument('--progress', '-p', action='store_true', default=False,
+                        help='If provided, will show progress during attenuation sweep',)
+    return parser.parse_args()
+
+def _exec(dev, cmd):
+    dev.write(1, cmd)
+    ans = dev.read(0x81,64)
+    # take from ans(wer) while valid bytes
+    sn = itertools.takewhile(lambda x: x < 255 and x > 0, ans)
+    # turn bytes into characters and accumulate into string
+    return "".join(map(chr, sn))
+
+def devId(dev):
+    return f"{dev.idVendor:04x}:{dev.idProduct:04x}"
+
+def _info(dev):
+    ident = devId(dev)
+    SerialN = _exec(dev, "*:SN?")
+    ModelN = _exec(dev, "*:MN?")
+    Fw = _exec(dev, "*:FIRMWARE?")
+
+    logging.info(f'{ident}: model is {ModelN}')
+    logging.info(f'{ident}: serial number is {SerialN}')
+    logging.info(f'{ident}: FW version is {Fw}')
+
+def _get_attenuation(dev):
+    ident = devId(dev)
+    att = _exec(dev, "*:ATT?")
+    # remove leading "*" and split by channels
+    return [float(n) for n in att[1:].split(" ")]
+
+def _set_attenuation(dev, ch_att):
+    ident = devId(dev)
+    for ch, att in ch_att:
+        #logging.debug(f"{ident}: Set attenuation channel {ch}: {att} dB")
+        att = round(4 * att) / 4 # round to closest 0.25dB
+        resp = _exec(dev, f"*:CHAN:{ch}:SETATT:{att};" )
+
+def _continuous_set_attenuation(dev, ch_att_end, duration, show_progress=False, step_duration=0.25):
+    ident = devId(dev)
+
+    current = _get_attenuation(dev)
+    steps = duration / step_duration
+    ch_att_step = [(ch, (att_end - current[ch - 1]) / steps) for ch, att_end in ch_att_end]
+    logging.info(f"{ident}: sweep attenuation during {duration} s in {steps} steps: increments {ch_att_step}")
+    for i in range(1, int(steps)+1):
+        next_att = [(ch, current[ch - 1] + i * att_step) for ch, att_step in ch_att_step]
+        _set_attenuation(dev, next_att)
+        if show_progress:
+            logging.debug(f"{ident}: attenuation for channel(s): {next_att}")
+        time.sleep(step_duration)
+    _set_attenuation(dev, ch_att_end)
+
+def _get_usb_devs(idVendor, idProduct):
+    devs = []
+    for dev in usb.core.find(idVendor=idVendor, idProduct=idProduct, find_all=True):
+        for configuration in dev:
+            for interface in configuration:
+                ifnum = interface.bInterfaceNumber
+                if not dev.is_kernel_driver_active(ifnum):
+                    continue
+                try:
+                    dev.detach_kernel_driver(ifnum)
+                except e:
+                    pass
+        devs.append(dev)
+    return devs
+
+if __name__ == '__main__':
+    # Parse the arguments
+    args = _parse_args()
+    if args.set and args.reach:
+        logging.error("--set and --reach are mutually exclusive")
+        sys.exit(1)
+
+    # 20ce:0023 is Mini-Circuit RC*DAT device
+    devs = _get_usb_devs(idVendor=0x20ce, idProduct=0x0023)
+    if len(devs) == 0:
+        logging.error('no Mini-Circuits RC*DAT device detected')
+        sys.exit(-1)
+    if len(devs) > 1:
+        logging.error('more than one Mini-Circuits RC*DAT device detected')
+        sys.exit(-1)
+    dev = devs[0]
+
+    if args.info:
+        _info(dev)
+
+    if args.set:
+        _set_attenuation(dev, [(k,v) for k,v in args.set.items()])
+
+    if args.reach:
+        _continuous_set_attenuation(dev, [(k,v) for k,v in args.reach.items()], args.duration, args.progress)
+
+    ident = devId(dev)
+    for i, a in enumerate(_get_attenuation(dev)):
+        logging.info(f"{ident}: Attenuation channel {i+1}: {a} dB")
+    sys.exit(0)

ci-scripts/ci_infra.yaml

@@ -85,7 +85,7 @@ oc-cn5g-20897:
   Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
   LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
 
-oc-cn5g-00102-ho:
+oc-cn5g-00103-ho:
   Host: groot
   NetworkScript: echo "inet 172.21.6.111"
   RunIperf3Server: False

ci-scripts/cls_containerize.py

@@ -119,7 +119,7 @@ def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
 
 def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
-	registry = "oai-ci" # pull_images() gives us this registry path
+	registry = "oai-ci/" # pull_images() gives us this registry path
 	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
@@ -134,7 +134,8 @@ def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 		# or -asan images. We need to detect which kind we did pull.
 		fullImageName = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
 		image = fullImageName.split("/")[-1].split(":")[0]
-		checkimg = f"{registry}/{image}-asan:{tag}"
+		# registry now includes the trailing slash ("oai-ci/")
+		checkimg = f"{registry}{image}-asan:{tag}"
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
@@ -395,13 +396,13 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.08.27.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.10.09.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2025.08.27.tar.gz')
+				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:

ci-scripts/cls_oaicitest.py

@@ -233,10 +233,10 @@ def Custom_Command(HTML, node, command):
     HTML.CreateHtmlTestRowQueue(command, status, message)
     return status == 'OK' or status == 'Warning'
 
-def Custom_Script(HTML, node, script):
+def Custom_Script(HTML, node, script, args):
 	logging.info(f"Executing custom script on {node}")
 	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 90)
+		ret = c.exec_script(script, 90, args)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
@@ -299,18 +299,16 @@ class OaiCiTest():
 		self.iperf_packetloss_threshold = ''
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
-		self.iperf_options = ''
 		self.iperf_tcp_rate_target = ''
 		self.finalStatus = False
 		self.air_interface=''
 		self.ue_ids = []
-		self.nodes = []
 		self.svr_node = None
 		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
-	def InitializeUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def InitializeUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -321,8 +319,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 		return True
 
-	def AttachUE(self, HTML):
-		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+	def AttachUE(self, node, HTML):
+		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -337,8 +335,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"])
 		return success
 
-	def DetachUE(self, HTML):
-		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+	def DetachUE(self, node, HTML):
+		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -346,8 +344,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def DataDisableUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def DataDisableUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -360,8 +358,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 		return success
 
-	def DataEnableUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def DataEnableUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -375,8 +373,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 		return success
 
-	def CheckStatusUE(self,HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def CheckStatusUE(self, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
@@ -446,10 +444,10 @@ class OaiCiTest():
 
 		return (True, message)
 
-	def Ping(self, ctx, HTML, infra_file="ci_infra.yaml"):
+	def Ping(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(self.Ping_common, ctx, cn, ue) for ue in ues]
@@ -503,6 +501,11 @@ class OaiCiTest():
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
 			if cn.runIperf3Server():
+				# Clean up any existing iperf3 server processes on this port.
+				ret = cmd_svr.run(f"{cn.getCmdPrefix()} pkill -f '.*iperf3.*{port}'", reportNonZero=False)
+				# If pkill succeeds, it means there was a leftover iperf3 server.
+				if ret.returncode == 0:
+					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
 			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
 			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
@@ -515,12 +518,12 @@ class OaiCiTest():
 
 		return (status, f'{ue_header}\n{msg}')
 
-	def Iperf(self, ctx, HTML, infra_file="ci_infra.yaml"):
-		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
+	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}"')
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(self.Iperf_Module, ctx, cn, ue, i, len(ues)) for i, ue in enumerate(ues)]
@@ -544,10 +547,10 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 		return success
 
-	def Iperf2_Unidir(self, ctx, HTML, infra_file="ci_infra.yaml"):
+	def Iperf2_Unidir(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip(), infra_file)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(), node, infra_file)
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -847,8 +850,8 @@ class OaiCiTest():
 				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
 		return global_status
 
-	def TerminateUE(self, ctx, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+	def TerminateUE(self, ctx, node, HTML):
+		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.terminate, ctx) for ue in ues]
 			archives = [f.result() for f in futures]

ci-scripts/conf_files/gnb-cu.sa.f1.ho.conf

@@ -1,4 +1,4 @@
-Active_gNBs = ( "oai-cu");
+Active_gNBs = ( "CU-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ gNBs =
 
 #     cell_type =  "CELL_MACRO_GNB";
 
-    gNB_name  =  "oai-cu";
+    gNB_name  =  "CU-OAI";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code =  1;

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

@@ -23,7 +23,6 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime = 2;
-    do_CSIRS     = 1;
     do_SRS       = 1;
 
     servingCellConfigCommon = (
@@ -135,11 +134,11 @@ gNBs =
       # 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;
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 10;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 2;
 
       ssPBCH_BlockPower                                             = -25;
      }

ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf

@@ -1,4 +1,4 @@
-Active_gNBs = ( "oai-du0");
+Active_gNBs = ( "DU0-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -8,7 +8,7 @@ gNBs =
     ////////// Identification parameters:
     gNB_ID    = 0xe88;
     gNB_DU_ID = 0xe00;
-    gNB_name  = "oai-du0";
+    gNB_name  = "DU0-OAI";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  = 1 ;
@@ -107,7 +107,7 @@ gNBs =
         pucchGroupHopping                                           = 0;
         hoppingId                                                   = 40;
         p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
+
       ssb_PositionsInBurst_Bitmap                                   = 1;
 
 # ssb_periodicityServingCell
@@ -159,9 +159,7 @@ MACRLCs = (
   tr_n_preference       = "f1";
   local_n_address       = "172.21.19.98";
   remote_n_address      = "172.21.19.98";
-  local_n_portc         = 500;
   local_n_portd         = 2154;
-  remote_n_portc        = 501;
   remote_n_portd        = 2153;
   pusch_TargetSNRx10    = 200;
   pucch_TargetSNRx10    = 230;
@@ -176,7 +174,6 @@ L1s = (
   prach_dtx_threshold   = 100;
   pucch0_dtx_threshold  = 10;
   max_ldpc_iterations   = 20;
-  sl_ahead              = 3;
   ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -188,6 +185,7 @@ RUs = (
   nb_rx            = 1
   att_tx           = 0;
   att_rx           = 0;
+  sl_ahead         = 3;
   bands            = [77];
   max_pdschReferenceSignalPower = -27;
   max_rxgain       = 114;

ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf

@@ -1,4 +1,4 @@
-Active_gNBs = ( "oai-du1");
+Active_gNBs = ( "DU1-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -8,7 +8,7 @@ gNBs =
     ////////// Identification parameters:
     gNB_ID    = 0xe88;
     gNB_DU_ID = 0xe01;
-    gNB_name  = "oai-du1";
+    gNB_name  = "DU1-OAI";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  = 1 ;
@@ -107,8 +107,8 @@ gNBs =
         pucchGroupHopping                                           = 0;
         hoppingId                                                   = 40;
         p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+      ssb_PositionsInBurst_Bitmap                                   = 2;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
@@ -159,9 +159,7 @@ MACRLCs = (
   tr_n_preference       = "f1";
   local_n_address       = "172.21.19.99";
   remote_n_address      = "172.21.19.98";
-  local_n_portc         = 500;
   local_n_portd         = 2154;
-  remote_n_portc        = 501;
   remote_n_portd        = 2153;
   pusch_TargetSNRx10    = 200;
   pucch_TargetSNRx10    = 230;
@@ -176,7 +174,6 @@ L1s = (
   prach_dtx_threshold   = 100;
   pucch0_dtx_threshold  = 10;
   max_ldpc_iterations   = 20;
-  sl_ahead              = 3;
   ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -188,6 +185,7 @@ RUs = (
   nb_rx            = 1
   att_tx           = 0;
   att_rx           = 0;
+  sl_ahead         = 3;
   bands            = [77];
   max_pdschReferenceSignalPower = -27;
   max_rxgain       = 114;

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

@@ -0,0 +1,227 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+nfapi = "AERIAL";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_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;
+    uess_agg_levels = [0,6,0,0,0];
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pdsch_AntennaPorts_N1 = 2;
+    pusch_AntennaPorts    = 2;
+    do_CSIRS              = 1;
+    do_SRS                = 0;
+    min_rxtxtime          = 2;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # center frequency = 3350.01 MHz
+      # selected SSB frequency = 3349.92 MHz
+      absoluteFrequencySSB                                          = 623328;
+      dl_frequencyBand                                              = 78;
+      # frequency point A = 3300.87 MHz
+      dl_absoluteFrequencyPointA                                    = 620058;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
+     #initialDownlinkBWP
+      #genericParameters
+       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
+       initialDLBWPlocationAndBandwidth                             = 1099;
+       #
+# 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                                           = 273;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 1099;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 159;# testMAC 158; OAI gNB 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;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         = -90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 1;
+      nrofDownlinkSymbols                                           = 10;
+      nrofUplinkSlots                                               = 3;
+      nrofUplinkSymbols                                             = 0;
+
+      ssPBCH_BlockPower                                             = -10;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc           = 1;
+  remote_s_address = "127.0.0.1"; // pnf addr [!]
+  local_s_address  = "127.0.0.2"; // vnf addr
+  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
+  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
+  tr_s_preference             = "aerial";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 220; # 150;
+  pucch_TargetSNRx10          = 200; #200;
+  dl_max_mcs = 28;
+  ul_max_mcs = 28;
+  ul_min_mcs = 16;
+}
+);
+
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
+};

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

@@ -16,7 +16,7 @@ gNBs =
 
     ////////// Physical parameters:
 
-    do_SINR                                                   = 1;
+    CSI_report_type = "ssb_sinr";
     min_rxtxtime                                              = 6;
     disable_harq                                              = 1;
     cu_sibs = [2];

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf

@@ -106,8 +106,7 @@ gNBs =
         pucchGroupHopping                                           = 0;
         hoppingId                                                   = 40;
         p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
+
       ssb_PositionsInBurst_Bitmap                                   = 1;
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1

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

@@ -0,0 +1,237 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+
+    // Include neighbour configuration for N2 handover
+    @include "neighbour-config-ho.conf"
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3610.56 MHz
+      absoluteFrequencySSB                                             = 679104;
+      dl_frequencyBand                                                 = 77;
+      # this is 3599.94 MHz
+      dl_absoluteFrequencyPointA                                       = 678388;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 51;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 77;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 51;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 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;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 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_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.109"; });
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.19.98";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.19.98";
+        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;
+}
+);
+
+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         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 114;
+  eNB_instances  = [0];
+  clock_src = "external";
+  time_src = "external";
+}
+);
+
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
+};
+

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

@@ -18,8 +18,6 @@ gNBs =
 
  ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
     min_rxtxtime = 6;
 
     servingCellConfigCommon = (

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

@@ -0,0 +1,256 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_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;});
+
+    ////////// Physical parameters:
+
+    min_rxtxtime                                              = 6;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+# downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
+      absoluteFrequencySSB                                           = 621312;
+      # this is 3300.60 MHz
+      dl_absoluteFrequencyPointA                                     = 620040;
+      #scs-SpecificCarrierList
+      dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                         = 1;
+        dl_carrierBandwidth                                          = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=0,L=106 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                           = 11;
+        initialDLBWPsearchSpaceZero                                  = 0;
+
+#uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                               = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 106;
+      pMax                                                           = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                   = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                             = 0;
+          prach_msg1_FrequencyStart                                  = 0;
+          zeroCorrelationZoneConfig                                  = 12;
+          preambleReceivedTargetPower                                = -104;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                           = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                             = 1;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen 
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                 = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                    = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                 = 7;
+        rsrp_ThresholdSSB                                            = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                   = 2;
+        prach_RootSequenceIndex                                      = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                       = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                          = 0,
+
+        msg3_DeltaPreamble                                           = 1;
+        p0_NominalWithGrant                                          =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                            = 0;
+        hoppingId                                                    = 40;
+        p0_nominal                                                   = -90;
+
+      ssb_PositionsInBurst_Bitmap                                    = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=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 = "CI_MME_IP_ADDR"; });
+
+        NETWORK_INTERFACES :
+        {
+
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
+           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc           = 1;
+  tr_s_preference  = "local_L1";
+  tr_n_preference  = "local_RRC";
+  pusch_TargetSNRx10 = 200;
+  pucch_TargetSNRx10 = 200;
+}
+);
+
+prs_config = (
+{
+  NumPRSResources       = 1;
+  PRSResourceSetPeriod  = [20, 2];
+  SymbolStart           = [7];
+  NumPRSSymbols         = [6];
+  NumRB                 = 106;
+  RBOffset              = 0;
+  CombSize              = 4;
+  REOffset              = [0];
+  PRSResourceOffset     = [0];
+  PRSResourceRepetition = 1;
+  PRSResourceTimeGap    = 1;
+  NPRS_ID               = [0];
+  MutingPattern1        = [];
+  MutingPattern2        = [];
+  MutingBitRepetition   = 1;
+}
+);
+
+L1s = (
+{
+  num_cc              = 1;
+  tr_n_preference     = "local_mac";
+  prach_dtx_threshold = 120;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 1
+  nb_rx          = 1
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain     = 75;
+  sf_extension   = 0;
+  eNB_instances  = [0];
+}
+);
+
+
+rfsimulator :
+{
+  serveraddr = "server";
+  serverport = 4043;
+  options    = (); #("saviq"); or/and "chanmod"
+  modelname  = "AWGN";
+  IQfile     = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level = "info";
+  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";
+};

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

@@ -146,6 +146,7 @@ MACRLCs:
     tr_n_preference: local_RRC
     pusch_TargetSNRx10: 200
     pucch_TargetSNRx10: 200
+    stats_max_ue: 17
 
 L1s:
   - num_cc: 1

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

@@ -196,6 +196,7 @@ RUs = (
   att_tx         = 0
   att_rx         = 0;
   bands          = [78];
+  sl_ahead=3;
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
   sf_extension                  = 0;

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

@@ -21,10 +21,6 @@ gNBs =
     nr_cellid = 12345678L
 
     ////////// Physical parameters:
-    pdsch_AntennaPorts_XP                                     = 1;
-    pusch_AntennaPorts                                        = 1;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
     uess_agg_levels = [2, 2, 2, 0, 0];
 
     servingCellConfigCommon = (
@@ -186,6 +182,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
+    stats_max_ue = 17;
   }
 );
 

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

@@ -14,7 +14,6 @@ key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
 dnn= "oai";
 nssai_sst=1;
-nssai_sd=16777215;
 }
 
 MACRLCs = (

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

@@ -0,0 +1,89 @@
+PRSs =
+(
+  {
+    Active_gNBs = 1;
+    prs_config0 = (
+    {
+      gNB_id = 0;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [0];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [0];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+
+    prs_config1 = (
+    {
+      gNB_id = 1;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [1];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [1];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+
+    prs_config2 = (
+    {
+      gNB_id = 2;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [2];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [2];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+
+    prs_config3 = (
+    {
+      gNB_id = 3;
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [3];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [3];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
+    }
+    );
+  }
+);

ci-scripts/conf_files/ue.sa.conf

@@ -4,7 +4,6 @@ uicc0 = {
   opc= "c42449363bbad02b66d16bc975d77cc1";
   dnn= "oai";
   nssai_sst=1;
-  nssai_sd=66051;
 }
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

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

@@ -17,9 +17,6 @@ gNBs =
 
     ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-
     servingCellConfigCommon = (
     {
  #spCellConfigCommon

ci-scripts/main.py

@@ -85,15 +85,7 @@ def CheckClassValidity(xml_class_list,action,id):
 		resp=True
 	return resp
 
-#assigning parameters to object instance attributes (even if the attributes do not exist !!)
-def AssignParams(params_dict):
-
-	for key,value in params_dict.items():
-		setattr(CiTestObj, key, value)
-		setattr(RAN, key, value)
-		setattr(HTML, key, value)
-
-def ExecuteActionWithParam(action, ctx):
+def ExecuteActionWithParam(action, ctx, node):
 	global RAN
 	global HTML
 	global CONTAINERS
@@ -102,7 +94,6 @@ def ExecuteActionWithParam(action, ctx):
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
-		node = test.findtext('node')
 		proxy_commit = test.findtext('proxy_commit')
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
@@ -118,7 +109,6 @@ def ExecuteActionWithParam(action, ctx):
 			success = CONTAINERS.BuildRunTests(ctx, node, HTML)
 
 	elif action == 'Initialize_eNB':
-		node = test.findtext('node')
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
 		if datalog_rt_stats_file is None:
 			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -139,7 +129,6 @@ def ExecuteActionWithParam(action, ctx):
 		success = RAN.InitializeeNB(ctx, node, HTML)
 
 	elif action == 'Terminate_eNB':
-		node = test.findtext('node')
 		#retx checkers
 		string_field = test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -158,68 +147,35 @@ def ExecuteActionWithParam(action, ctx):
 
 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		if force_local:
-			# Change all execution targets to localhost
-			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
-		else:
-			if test.findtext('nodes'):
-				CiTestObj.nodes = test.findtext('nodes').split(' ')
-				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-					logging.error('Number of Nodes are not equal to the total number of UEs')
-					sys.exit("Mismatch in number of Nodes and UIs")
-			else:
-				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if action == 'Initialize_UE':
-			success = CiTestObj.InitializeUE(HTML)
+			success = CiTestObj.InitializeUE(node, HTML)
 		elif action == 'Attach_UE':
-			success = CiTestObj.AttachUE(HTML)
+			success = CiTestObj.AttachUE(node, HTML)
 		elif action == 'Detach_UE':
-			success = CiTestObj.DetachUE(HTML)
+			success = CiTestObj.DetachUE(node, HTML)
 		elif action == 'Terminate_UE':
-			success = CiTestObj.TerminateUE(ctx, HTML)
+			success = CiTestObj.TerminateUE(ctx, node, HTML)
 		elif action == 'CheckStatusUE':
-			success = CiTestObj.CheckStatusUE(HTML)
+			success = CiTestObj.CheckStatusUE(node, HTML)
 		elif action == 'DataEnable_UE':
-			success = CiTestObj.DataEnableUE(HTML)
+			success = CiTestObj.DataEnableUE(node, HTML)
 		elif action == 'DataDisable_UE':
-			success = CiTestObj.DataDisableUE(HTML)
+			success = CiTestObj.DataDisableUE(node, HTML)
 
 	elif action == 'Ping':
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
+		CiTestObj.svr_id = test.findtext('svr_id')
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
-		if force_local:
-			# Change all execution targets to localhost
-			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
-		else:
-			if test.findtext('nodes'):
-				CiTestObj.nodes = test.findtext('nodes').split(' ')
-				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-					logging.error('Number of Nodes are not equal to the total number of UEs')
-					sys.exit("Mismatch in number of Nodes and UIs")
-			else:
-				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
-		success = CiTestObj.Ping(ctx, HTML)
+		success = CiTestObj.Ping(ctx, node, HTML)
 
 	elif action == 'Iperf' or action == 'Iperf2_Unidir':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
-		if force_local:
-			# Change all execution targets to localhost
-			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
-		else:
-			if test.findtext('nodes'):
-				CiTestObj.nodes = test.findtext('nodes').split(' ')
-				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-					logging.error('Number of Nodes are not equal to the total number of UEs')
-					sys.exit("Mismatch in number of Nodes and UIs")
-			else:
-				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
+		CiTestObj.svr_id = test.findtext('svr_id')
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
@@ -229,14 +185,10 @@ def ExecuteActionWithParam(action, ctx):
 		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
 			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
-		CiTestObj.iperf_options = test.findtext('iperf_options') or 'check'
-		if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
-			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
-			CiTestObj.iperf_options = 'check'
 		if action == 'Iperf':
-			success = CiTestObj.Iperf(ctx, HTML)
+			success = CiTestObj.Iperf(ctx, node, HTML)
 		elif action == 'Iperf2_Unidir':
-			success = CiTestObj.Iperf2_Unidir(ctx, HTML)
+			success = CiTestObj.Iperf2_Unidir(ctx, node, HTML)
 
 	elif action == 'IdleSleep':
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
@@ -244,7 +196,6 @@ def ExecuteActionWithParam(action, ctx):
 
 	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
-		node = test.findtext('node') or None
 		script = "scripts/oc-deploy-physims.sh"
 		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
 		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
@@ -252,7 +203,6 @@ def ExecuteActionWithParam(action, ctx):
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
-		node = test.findtext('node') or None
 		ctest_opt = test.findtext('ctest-opt') or ''
 		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
 		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
@@ -265,7 +215,6 @@ def ExecuteActionWithParam(action, ctx):
 		success = core_op(cn_id, ctx, HTML)
 
 	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
-		node = test.findtext('node')
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		string_field=test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -287,15 +236,12 @@ def ExecuteActionWithParam(action, ctx):
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
 	elif action == 'LicenceAndFormattingCheck':
-		node = test.findtext('node')
 		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)
 
 	elif action == 'Cppcheck_Analysis':
-		node = test.findtext('node')
 		success = SCA.CppCheckAnalysis(ctx, node, HTML)
 
 	elif action == 'Push_Local_Registry':
-		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		success = CONTAINERS.Push_Image_to_Local_Registry(node, HTML, tag_prefix)
 
@@ -303,7 +249,6 @@ def ExecuteActionWithParam(action, ctx):
 		if force_local:
 			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup
 			return True
-		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
 		# hack: for FlexRIC, we need to overwrite the tag to use
@@ -316,22 +261,21 @@ def ExecuteActionWithParam(action, ctx):
 			success = CONTAINERS.Clean_Test_Server_Images(HTML, node, images, tag=tag)
 
 	elif action == 'Custom_Command':
-		node = test.findtext('node')
-		if force_local:
-			# Change all execution targets to localhost
-			node = 'localhost'
 		command = test.findtext('command')
+		# Allow referencing repository workspace path in XML via %%workspace%%
+		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)
 
 	elif action == 'Custom_Script':
-		node = test.findtext('node')
 		script = test.findtext('script')
-		success = cls_oaicitest.Custom_Script(HTML, node, script)
+		args = test.findtext('args')
+		# Allow referencing repository workspace path in XML via %%workspace%%
+		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
+		success = cls_oaicitest.Custom_Script(HTML, node, script, args)
 
 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
-		node = test.findtext('node')
 		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)
 
 	else:
@@ -349,8 +293,16 @@ def test_in_list(test, list):
 			return True
 	return False
 
+test_runner_abort = False
 def receive_signal(signum, frame):
-	sys.exit(1)
+    global test_runner_abort
+    if not test_runner_abort:
+        logging.warning("received signal, canceling steps")
+        logging.info("send signal again to exit immediately")
+        test_runner_abort = True
+    else:
+        logging.warning("received signal again, exiting")
+        sys.exit(1)
 
 def ShowTestID(ctx, desc):
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
@@ -395,16 +347,7 @@ CLUSTER = cls_cluster.Cluster()
 import args_parse
 # Force local execution, move all execution targets to localhost
 force_local = False
-py_param_file_present, py_params, mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
-
-
-
-#-----------------------------------------------------------
-# TEMPORARY params management (UNUSED)
-#-----------------------------------------------------------
-#temporary solution for testing:
-if py_param_file_present == True:
-	AssignParams(py_params)
+mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
 
 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
@@ -550,7 +493,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			#logging.info('test will be run: ' + test)
 			todo_tests.append(test)
 
-	signal.signal(signal.SIGUSR1, receive_signal)
+	signal.signal(signal.SIGINT, receive_signal)
 
 	HTML.CreateHtmlTabHeader()
 
@@ -560,6 +503,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	i = 0
 	for test_case_id in todo_tests:
 		for test in all_tests:
+			if test_runner_abort:
+				task_set_succeeded = False
 			id = test.get('id')
 			if test_case_id != id:
 				continue
@@ -568,6 +513,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			ctx = TestCaseCtx(i, int(id), logPath)
 			HTML.testCase_id=CiTestObj.testCase_id
 			desc = test.findtext('desc')
+			node = test.findtext('node') if not force_local else 'localhost'
 			always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
 			may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
 			HTML.desc = desc
@@ -582,7 +528,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
 				break
 			try:
-				test_succeeded = ExecuteActionWithParam(action, ctx)
+				test_succeeded = ExecuteActionWithParam(action, ctx, node)
 				if not test_succeeded and may_fail:
 					logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
 				elif not test_succeeded:

ci-scripts/scripts/set-and-verify-distance-prs.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+[[ $# -lt 1 ]] && { echo "Usage: $0 <distance_in_meters...>"; exit 1; }
+DISTANCES=("$@")
+
+IP=192.168.71.150
+PORT=8091
+NCAT_TIMEOUT=1 #s
+SLEEP_WAIT=4 #s
+MAX_RETRIES=3
+
+set_and_verify_distance() {
+  local distance=$1
+  echo "Testing PRS ToA estimation for distance: $distance m"
+
+  # it seems that grep returns immediately with this syntax, but not echo | ncat | grep
+  # so prefer this to receive new distance immediately. We use --idle to keep
+  # ncat open for some additional time
+  local setdist_resp="$(grep --max-count 1 new_offset <(echo rfsimu setdistance rfsimu_channel_enB0 $distance | ncat --idle ${NCAT_TIMEOUT} ${IP} ${PORT}))"
+  echo "> response: ${setdist_resp}"
+
+  local gettoa_resp="$(echo "ciUE get_max_dl_toa" | ncat ${IP} ${PORT} | grep "UE max PRS DL ToA")"
+  echo "> response: ${gettoa_resp}"
+
+  [[ -z "$setdist_resp" || -z "$gettoa_resp" ]] && return 1
+
+  # Extract ToA values 
+  [[ "$setdist_resp" =~ new_offset\ ([0-9]+) ]] && local set_toa="${BASH_REMATCH[1]}" || { echo "> Set ToA extraction failed for distance: $distance m"; return 1; }
+
+  [[ "$gettoa_resp" =~ UE\ max\ PRS\ DL\ ToA\ ([0-9]+) ]] && local est_toa="${BASH_REMATCH[1]}" || { echo "> Estimated ToA extraction failed for distance: $distance m"; return 1; }
+
+  # Compare extracted ToA values
+  [[ $set_toa == $est_toa ]] && echo "PRS SUCCESS for distance: $distance m" || { echo "PRS FAILURE for distance: $distance m (Actual ToA=$set_toa, Estimated ToA=$est_toa)" ; return 1; }
+
+}
+
+test_distance() {
+  local distance=$1 retries=0
+
+  # retry loop incase we didn't receive the response
+  while (( retries < MAX_RETRIES )); do
+    echo "  Attempt $((retries + 1))/$MAX_RETRIES"
+
+    # Always reset to 0 m before testing target distance
+    if ! set_and_verify_distance 0; then
+      echo " Set distance 0 m failed during attempt $((retries + 1))"
+    else
+      sleep "$SLEEP_WAIT"
+      # Now test the actual target distance
+      if set_and_verify_distance "$distance"; then
+        return 0
+      fi
+    fi
+
+    ((retries++))
+    if (( retries < MAX_RETRIES )); then
+      sleep "$SLEEP_WAIT"
+    else
+      echo " ERROR: No valid response after $MAX_RETRIES retries for distance: $distance m"
+      return 1
+    fi
+  done
+}
+
+num_success=0
+num_fail=0
+
+for d in "${DISTANCES[@]}"; do
+  if test_distance "$d"; then
+    ((num_success++))
+  else
+    ((num_fail++))
+  fi
+  sleep "$SLEEP_WAIT"
+done
+
+# ---- Summary ----
+echo
+echo "==================== SUMMARY ===================="
+echo "Total tests run : ${#DISTANCES[@]}"
+echo "Successful tests: ${num_success}"
+echo "Failed tests    : ${num_fail}"
+echo "================================================="
+
+if [ $num_success -gt 0 ]; then
+  exit 0
+else
+  exit 1
+fi

ci-scripts/tests/ping-iperf.py

@@ -23,7 +23,7 @@ class TestPingIperf(unittest.TestCase):
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.ci.ue_ids = ["test"]
-		self.ci.nodes = ["localhost"]
+		self.node = "localhost"
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
 	def tearDown(self):
 		with cls_cmd.LocalCmd() as c:
@@ -35,7 +35,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.svr_id = "test"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Ping(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Ping(self.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf(self):
@@ -50,7 +50,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf2_unidir(self):
@@ -62,7 +62,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf2_Unidir(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Iperf2_Unidir(self.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf_highrate(self):
@@ -77,7 +77,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
+		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 if __name__ == '__main__':

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -44,7 +44,7 @@
         <testCase id="111111">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
-                <node>obelix</node>
+                <node>localhost</node>
                 <images>oai-enb oai-lte-ue</images>
         </testCase>
         <testCase id="800813">
@@ -88,16 +88,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE</desc>
                 <id>l2sim4g_ue</id>
-                <nodes>obelix</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping trf-gen from LTE-UE 1</desc>
                 <id>l2sim4g_ue</id>
-                <nodes>obelix</nodes>
+                <node>localhost</node>
                 <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>obelix</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -106,9 +106,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE 1 from trf-gen</desc>
                 <id>l2sim4g_ext_dn</id>
-                <nodes>obelix</nodes>
+                <node>localhost</node>
                 <svr_id>l2sim4g_ue</svr_id>
-                <svr_node>obelix</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -117,9 +117,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP Downlink</desc>
                 <id>l2sim4g_ue</id>
-                <nodes>obelix</nodes>
+                <node>localhost</node>
                 <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>obelix</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -129,9 +129,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP Uplink</desc>
                 <id>l2sim4g_ue</id>
-                <nodes>obelix</nodes>
+                <node>localhost</node>
                 <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>obelix</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 3M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -149,7 +149,7 @@
                 <class>Clean_Test_Server_Images</class>
                 <always_exec>true</always_exec>
                 <desc>Clean Test Images on Test Server</desc>
-                <node>obelix</node>
+                <node>localhost</node>
                 <images>oai-enb oai-lte-ue</images>
         </testCase>
 

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -103,16 +103,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -121,9 +121,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -136,8 +136,8 @@
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>acamas</nodes>
-                <svr_node>acamas</svr_node>
+                <node>localhost</node>
+                <svr_node>localhost</svr_node>
         </testCase>
 
         <testCase id="030011">
@@ -148,8 +148,8 @@
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>acamas</nodes>
-                <svr_node>acamas</svr_node>
+                <node>localhost</node>
+                <svr_node>localhost</svr_node>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -83,9 +83,9 @@
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -94,9 +94,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from eNB</desc>
                 <id>rfsim4g_enb_nos1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -105,9 +105,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -117,9 +117,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -103,16 +103,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -121,9 +121,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -132,9 +132,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -144,9 +144,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -103,16 +103,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -121,9 +121,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -132,9 +132,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -144,9 +144,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -80,9 +80,9 @@
                 <class>Iperf2_Unidir</class>
                 <desc>Iperf2 UDP DL</desc>
                 <id>rfsim4g_ue_fembms</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_enb_fembms</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -80,9 +80,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -103,9 +103,9 @@
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -114,9 +114,9 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -125,9 +125,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -137,9 +137,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -76,16 +76,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>acamas acamas acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>acamas acamas acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -55,6 +55,10 @@
  000031
  020022
  040026
+ 040025
+ 000031
+ 020022
+ 040027
  100021
  222222
         </TestCaseRequestedList>
@@ -64,7 +68,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
@@ -103,7 +107,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="000024">
@@ -118,9 +122,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -128,30 +132,30 @@
         <testCase id="030020">
                 <class>Custom_Command</class>
                 <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
         </testCase>
 
         <testCase id="030021">
                 <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030022">
                 <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -159,7 +163,7 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Trigger Reestablishment</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci force_reestab | ncat 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
         </testCase>
 
@@ -167,9 +171,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.5 -w25</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -177,56 +181,56 @@
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Verify Reestablishment</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
         </testCase>
 
         <testCase id="040021">
                 <class>Custom_Command</class>
                 <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
         </testCase>
 
         <testCase id="040022">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
         </testCase>
 
         <testCase id="040023">
                 <class>Custom_Command</class>
                 <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
         </testCase>
 
         <testCase id="040024">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
         </testCase>
 
         <testCase id="040025">
                 <class>Custom_Command</class>
                 <desc>Trigger Handover</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
         </testCase>
 
         <testCase id="040026">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
         </testCase>
 
         <testCase id="040027">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
         </testCase>
 
@@ -245,7 +249,7 @@
                 <always_exec>true</always_exec>
                 <desc>Clean Test Images on Test Server</desc>
                 <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -70,16 +70,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -88,9 +88,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -100,9 +100,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -112,9 +112,9 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -121,7 +121,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>carabe carabe</nodes>
+                <node>carabe</node>
                 <svr_id>oai_ext_dn</svr_id>
                 <svr_node>carabe</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -132,14 +132,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>carabe carabe</nodes>
+                <node>carabe</node>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>carabe carabe</nodes>
+                <node>carabe</node>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -125,16 +125,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -143,9 +143,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -154,9 +154,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_ue2</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -165,9 +165,9 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue2</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -176,9 +176,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -187,33 +187,33 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
                 <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -222,21 +222,21 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="444445">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 3 to 10</desc>
                 <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -88,7 +88,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="000004">
@@ -101,9 +101,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args> -c 20 -i0.5</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -112,33 +112,33 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
                 <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -146,14 +146,14 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Force Msg3 C-RNTI RA</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
         </testCase>
 
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Force RRC_IDLE (UE ID 0)</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
         </testCase>
 

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -70,16 +70,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -88,33 +88,33 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
                 <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -49,7 +49,7 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>acamas</node>
+            <node>localhost</node>
             <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
         </testCase>
         <testCase id="800813">
@@ -77,9 +77,9 @@
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -88,33 +88,33 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
                 <class>Iperf</class>
-                <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030012">
                 <class>Iperf</class>
-                <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -70,16 +70,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -88,9 +88,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_multiue.xml

@@ -48,56 +48,52 @@
         <testCase id="111111">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
-                <svr_id>0</svr_id>
+                <node>localhost</node>
                 <images>oai-gnb-asan oai-nr-ue</images>
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
                 <desc>Create new Workspace</desc>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
         </testCase>
         <testCase id="000001">
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                 <services>oai-gnb</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                 <services>oai-nr-ue</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000008">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_multiue1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -106,9 +102,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_multiue1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -117,9 +113,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_multiue2</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -128,9 +124,9 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_multiue2</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -139,9 +135,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_multiue1 rfsim5g_multiue2</id>
-                <nodes>acamas acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -150,33 +146,33 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all UEs</desc>
                 <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
                 <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_multiue1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_multiue1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -185,7 +181,7 @@
                 <class>Detach_UE</class>
                 <desc>Detach OAI UEs</desc>
                 <id>rfsim5g_multiue1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="100001">
@@ -195,15 +191,14 @@
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="222222">
                 <class>Clean_Test_Server_Images</class>
                 <always_exec>true</always_exec>
                 <desc>Clean Test Images on Test Server</desc>
-                <svr_id>0</svr_id>
+                <node>localhost</node>
                 <images>oai-gnb-asan oai-nr-ue</images>
         </testCase>
 

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -55,58 +55,54 @@
         <testCase id="111111">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
-                <svr_id>0</svr_id>
+                <node>localhost</node>
                 <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
         </testCase>
 
         <testCase id="800813">
                 <class>Create_Workspace</class>
                 <desc>Create new Workspace</desc>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="000001">
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
                 <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="000004">
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
                 <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 50 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -115,33 +111,33 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 50 -i 0.25</ping_args>
                 <ping_packetloss_threshold>10</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
                 <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -155,7 +151,7 @@
         <testCase id="050001">
                 <class>Custom_Command</class>
                 <desc>Trigger N2 Handover</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -163,14 +159,14 @@
         <testCase id="050002">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
         </testCase>
 
         <testCase id="050003">
                 <class>Custom_Command</class>
                 <desc>Trigger N2 Handover</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci trigger_n2_ho 0,1 | ncat 192.168.71.180 9090</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -178,7 +174,7 @@
         <testCase id="050004">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
         </testCase>
 
@@ -186,9 +182,8 @@
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>
                 <desc>Undeploy all OAI 5G stack</desc>
+                <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
                 <d_retx_th>10,100,100,100</d_retx_th>
                 <u_retx_th>10,100,100,100</u_retx_th>
         </testCase>
@@ -197,7 +192,7 @@
                 <class>Clean_Test_Server_Images</class>
                 <always_exec>true</always_exec>
                 <desc>Clean Test Images on Test Server</desc>
-                <svr_id>0</svr_id>
+                <node>localhost</node>
                 <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
         </testCase>
 

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -74,16 +74,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -92,9 +92,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -102,7 +102,7 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Trigger Reestablishment</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -111,9 +111,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.5 -w25</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -121,7 +121,7 @@
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Verify Reestablishment</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
                 <command_fail>yes</command_fail>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -69,16 +69,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -87,9 +87,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_prs.xml

@@ -0,0 +1,100 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
+        <htmlTabName>Monolithic gNB with PRS</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 111111
+ 800813
+ 000012
+ 000013
+ 040001
+ 040023
+ 100011
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <node>localhost</node>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
+	</testCase>
+
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Create new Workspace</desc>
+                <node>localhost</node>
+	</testCase>
+
+        <testCase id="000012">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+                <node>localhost</node>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
+                <services>oai-gnb oai-nr-ue</services>
+        </testCase>
+
+        <testCase id="000013">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <node>localhost</node>
+	</testCase>
+
+        <testCase id="040001">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+        </testCase>
+
+	<testCase id="040023">
+		<class>Custom_Script</class>
+		<always_exec>true</always_exec>
+		<desc>Set and verify distance at 50, 100, 150 m</desc>
+		<node>localhost</node>
+		<script>scripts/set-and-verify-distance-prs.sh</script>
+		<args>50 100 150</args>
+	</testCase>
+
+        <testCase id="100011">
+                <class>Undeploy_Object</class>
+                <always_exec>true</always_exec>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <node>localhost</node>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
+                <d_retx_th>30,100,100,100</d_retx_th>
+                <u_retx_th>30,100,100,100</u_retx_th>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <always_exec>true</always_exec>
+                <desc>Clean Test Images on Test Server</desc>
+                <node>localhost</node>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -74,7 +74,7 @@
         <testCase id="000005">
                 <class>Custom_Command</class>
                 <desc>Check that UE synched</desc>
-                <node>acamas</node>
+                <node>localhost</node>
                 <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
         </testCase>
 

ci-scripts/xml_files/container_5g_rfsim_simple.xml

@@ -63,14 +63,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -81,7 +81,7 @@
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -49,7 +49,7 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>acamas</node>
+            <node>localhost</node>
             <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
         </testCase>
         <testCase id="800813">
@@ -83,9 +83,9 @@
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -94,9 +94,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -72,16 +72,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -90,9 +90,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -101,40 +101,40 @@
                 <class>Attach_UE</class>
                 <desc>Verify 2nd PDU session is up</desc>
                 <id>rfsim5g_ue_pdu_2</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020003">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
                 <id>rfsim5g_ue_pdu_2</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
                 <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_sa_aerial_cn_start.xml

@@ -0,0 +1,37 @@
+<!--
+
+ 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-AERIAL-SA-CN-START</htmlTabRef>
+        <htmlTabName>Deploy 5GC</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+        <TestCaseRequestedList>
+                555000
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+        <testCase id="555000">
+                <class>DeployCoreNetwork</class>
+                <desc>Initialize 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
+        </testCase>
+</testCaseList>
+

ci-scripts/xml_files/container_sa_aerial_cn_stop.xml

@@ -0,0 +1,38 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>TEST-AERIAL-SA-CN-STOP</htmlTabRef>
+        <htmlTabName>Undeploy 5GC</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+        <TestCaseRequestedList>
+                000555
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+        <testCase id="000555">
+                <class>UndeployCoreNetwork</class>
+                <always_exec>true</always_exec>
+                <desc>Terminate 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
+        </testCase>
+</testCaseList>
+

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -25,7 +25,6 @@
         <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>
         <TestCaseRequestedList>
-                555000
                 111111
                 000222
                 800813
@@ -40,15 +39,8 @@
                 000222
                 222222
                 333333
-                000555
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="555000">
-                <class>DeployCoreNetwork</class>
-                <desc>Initialize 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
-
         <testCase id="111111">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
@@ -160,12 +152,5 @@
                 <node>gracehopper1-oai</node>
                 <images>oai-gnb-aerial</images>
         </testCase>
-
-        <testCase id="000555">
-                <class>UndeployCoreNetwork</class>
-                <always_exec>true</always_exec>
-                <desc>Terminate 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
 </testCaseList>
 

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -0,0 +1,144 @@
+<!--
+
+ 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-AERIAL-SA-UL-Heavy</htmlTabRef>
+        <htmlTabName>AERIAL 100 MHz DSUUU SA</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+        <TestCaseRequestedList>
+                111111
+                000222
+                800813
+                002222
+                002223
+                000111
+                000011
+                000032
+                000033
+                000022
+                000222
+                222222
+                333333
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <node>gracehopper1-oai</node>
+                <images>oai-gnb-aerial</images>
+                <tag_prefix>arm_</tag_prefix>
+        </testCase>
+
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Create new Workspace for server 0</desc>
+                <node>gracehopper1-oai</node>
+        </testCase>
+
+        <testCase id="002222">
+                <class>Deploy_Object</class>
+                <desc>Deploy PNF/Nvidia CUBB in a container</desc>
+                <node>gracehopper1-oai</node>
+                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
+                <services>nv-cubb</services>
+        </testCase>
+
+        <testCase id="002223">
+                <class>Deploy_Object</class>
+                <desc>Deploy VNF in a container</desc>
+                <node>gracehopper1-oai</node>
+                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
+                <services>oai-gnb-aerial</services>
+        </testCase>
+
+        <testCase id="000111">
+                <class>Attach_UE</class>
+                <desc>Attach Quectel</desc>
+                <id>up2-aerial</id>
+        </testCase>
+
+        <testCase id="000011">
+                <class>Ping</class>
+                <desc>Ping: 100pings in 20sec</desc>
+                <id>up2-aerial</id>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
+                <ping_args>-c 100 -i 0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="000022">
+                <class>Iperf</class>
+                <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 200M -t 30 -R</iperf_args>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
+                <id>up2-aerial</id>
+                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="000032">
+                <class>Iperf</class>
+                <desc>iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 200M -t 30 -l 1428</iperf_args>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
+                <id>up2-aerial</id>
+                <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="000033">
+                <class>Iperf</class>
+                <desc>iperf (UL/UDP/220M)(30 sec)(single-ue profile)</desc>
+                <may_fail>true</may_fail>
+                <iperf_args>-u -b 220M -t 30 -l 1428</iperf_args>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
+                <id>up2-aerial</id>
+                <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="000222">
+                <class>Detach_UE</class>
+                <always_exec>true</always_exec>
+                <desc>Detach Quectel</desc>
+                <id>up2-aerial</id>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Undeploy_Object</class>
+                <always_exec>true</always_exec>
+                <desc>Undeploy gNB</desc>
+                <node>gracehopper1-oai</node>
+                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
+                <d_retx_th>20,100,100,100</d_retx_th>
+                <u_retx_th>20,100,100,100</u_retx_th>
+        </testCase>
+
+        <testCase id="333333">
+                <class>Clean_Test_Server_Images</class>
+                <always_exec>true</always_exec>
+                <desc>Clean Test Images on Test Server</desc>
+                <node>gracehopper1-oai</node>
+                <images>oai-gnb-aerial</images>
+        </testCase>
+</testCaseList>
+

ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml

@@ -51,6 +51,8 @@
     000024
     000025
     000026
+    000027
+    000028
 
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
@@ -58,7 +60,7 @@
   <testCase id="000001">
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00102-ho</cn_id>
+    <cn_id>oc-cn5g-00103-ho</cn_id>
   </testCase>
 
   <testCase id="000002">
@@ -88,127 +90,134 @@
   </testCase>
 
   <testCase id="000006">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-CU in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <node>groot</node>
-    <services>oai_cu</services>
+    <class>Custom_Command</class>
+    <desc>Set attenuator to 0 for DU0 and 17 for DU1</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
   </testCase>
 
   <testCase id="000007">
     <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
+    <desc>Deploy gNB-CU in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <services>oai_du0</services>
     <node>groot</node>
+    <services>oai-cu</services>
   </testCase>
 
   <testCase id="000008">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+    <services>oai-du0</services>
+    <node>groot</node>
+  </testCase>
+
+  <testCase id="000009">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+    <node>rocket</node>
+    <services>oai-du1</services>
+  </testCase>
+
+  <testCase id="000010">
     <class>Attach_UE</class>
     <desc>Attach Quectel</desc>
     <id>raspix</id>
   </testCase>
 
-  <testCase id="000009">
+  <testCase id="000011">
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>raspix</id>
-    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 100 -i 0.2</ping_args>
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000010">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <node>rocket</node>
-    <services>oai_du1</services>
-  </testCase>
-
-  <testCase id="000011">
+  <testCase id="000012">
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="000012">
+  <testCase id="000013">
     <class>Custom_Command</class>
-    <desc>Trigger Handover</desc>
-    <node>groot</node>
-    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
+    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
-  <testCase id="000013">
+  <testCase id="000014">
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
-    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 50 -i 0.2</ping_args>
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000014">
+  <testCase id="000015">
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
-  <testCase id="000015">
-    <class>Custom_Command</class>
-    <desc>Trigger Handover</desc>
-    <node>groot</node>
-    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
+  <testCase id="000016">
+   <class>Custom_Command</class>
+    <desc>Attenuate DU1 by 17dB and remove attenuation on DU0 to trigger Handover</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
   </testCase>
 
-  <testCase id="000016">
+  <testCase id="000017">
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
-    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 50 -i 0.2</ping_args>
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000017">
+  <testCase id="000018">
     <class>Custom_Command</class>
     <desc>UE connected to DU0?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
-  <testCase id="000018">
-    <class>Custom_Command</class>
-    <desc>Trigger Handover</desc>
-    <node>groot</node>
-    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
+  <testCase id="000019">
+   <class>Custom_Command</class>
+    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
-  <testCase id="000019">
+  <testCase id="000020">
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
-    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 50 -i 0.2</ping_args>
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000020">
+  <testCase id="000021">
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
-  <testCase id="000021">
+  <testCase id="000022">
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach Quectel</desc>
     <id>raspix</id>
   </testCase>
 
-  <testCase id="000022">
+  <testCase id="000023">
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy CU-DU0</desc>
@@ -216,7 +225,7 @@
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
   </testCase>
 
-  <testCase id="000023">
+  <testCase id="000024">
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy DU1 </desc>
@@ -224,7 +233,15 @@
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
   </testCase>
 
-  <testCase id="000024">
+  <testCase id="000025">
+   <class>Custom_Command</class>
+    <desc>Reset all channels on the attenuator to 0</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
+    <always_exec>true</always_exec>
+  </testCase>
+
+  <testCase id="000026">
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -232,7 +249,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="000025">
+  <testCase id="000027">
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -240,11 +257,11 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="000026">
+  <testCase id="000028">
     <class>UndeployCoreNetwork</class>
     <always_exec>true</always_exec>
     <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00102-ho</cn_id>
+    <cn_id>oc-cn5g-00103-ho</cn_id>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml

@@ -0,0 +1,230 @@
+<!--
+
+ 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-MONO-N2-HO-B210</htmlTabRef>
+  <htmlTabName>Monolithic N2 Handover 20 MHz TDD SA</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <TestCaseRequestedList>
+    000001
+    000002
+    000023
+    000003
+    000004
+    000005
+    000006
+    000007
+    000008
+    000009
+    000010
+    000011
+    000012
+    000013
+    000014
+    000015
+    000017
+    000018
+    000019
+    000016
+    000020
+    000021
+    000022
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+	
+  <testCase id="000001">
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-00103-ho</cn_id>
+  </testCase>
+
+  <testCase id="000002">
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <images>oai-gnb</images>
+    <node>groot</node>
+  </testCase>
+
+  <testCase id="000023">
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <images>oai-gnb</images>
+    <node>rocket</node>
+  </testCase>
+
+  <testCase id="000003">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for groot</desc>
+    <node>groot</node>
+  </testCase>
+
+  <testCase id="000005">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace on rocket</desc>
+    <node>rocket</node>
+  </testCase>
+
+  <testCase id="000004">
+    <class>Custom_Command</class>
+    <desc>Set initial attenuation on target gNB</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
+  </testCase>
+
+  <testCase id="000005">
+    <class>Deploy_Object</class>
+    <desc>Deploy Monolithic gNB-PCI0 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
+    <node>groot</node>
+    <services>oai-gnb-pci0</services>
+  </testCase>
+
+  <testCase id="000006">
+    <class>Deploy_Object</class>
+    <desc>Deploy Monolithic gNB-PCI1 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
+    <node>rocket</node>
+    <services>oai-gnb-pci1</services>
+  </testCase>
+
+  <testCase id="000007">
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>raspix</id>
+  </testCase>
+
+  <testCase id="000008">
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000009">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase id="000010">
+    <class>Custom_Command</class>
+    <desc>Gradually attenuate gNB-PCI0 (ch1-2=15dB) and gNB-PCI1 (ch3-4=0dB) over 5s to trigger N2 Handover to gNB-PCI1</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
+  </testCase>
+
+  <testCase id="000011">
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <ping_args>-c 50 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000012">
+    <class>Custom_Command</class>
+    <desc>UE connected to gNB-PCI1?</desc>
+    <node>rocket</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+  </testCase>
+
+  <testCase id="000013">
+    <class>Custom_Command</class>
+    <desc>Gradually attenuate gNB-PCI0 (ch1-2=0dB) and gNB-PCI1 (ch3-4=15dB) over 5s to trigger N2 Handover back to gNB-PCI0</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
+  </testCase>
+
+  <testCase id="000014">
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <ping_args>-c 50 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000015">
+    <class>Custom_Command</class>
+    <desc>UE connected to gNB-PCI0?</desc>
+    <node>groot</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
+  </testCase>
+
+  <testCase id="000016">
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Reset all attenuators to 0dB</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
+  </testCase>
+
+  <testCase id="000017">
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>raspix</id>
+  </testCase>
+
+  <testCase id="000018">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy Monolithic gNB-PCI0</desc>
+    <node>groot</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
+  </testCase>
+
+  <testCase id="000019">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy Monolithic gNB-PCI1</desc>
+    <node>rocket</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
+  </testCase>
+
+  <testCase id="000020">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>groot</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase id="000021">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>rocket</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase id="000022">
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-00103-ho</cn_id>
+  </testCase>
+
+</testCaseList>

ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: l2sim4g-oai-enb
         network_mode: "host"
@@ -210,7 +210,7 @@ services:
             retries: 5
 
     oai_ue1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: l2sim4g-oai-lte-ue1
         network_mode: "host"
@@ -229,7 +229,7 @@ services:
             retries: 5
 
     oai_ue2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: l2sim4g-oai-lte-ue2
         network_mode: "host"

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -197,7 +197,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -19,7 +19,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -197,7 +197,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -197,7 +197,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -19,7 +19,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -19,7 +19,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -197,7 +197,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -92,7 +92,7 @@ services:
             retries: 5
 
     oai-cu:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-cu
         cap_drop:
             - ALL
@@ -121,7 +121,7 @@ services:
             retries: 5
 
     oai-du-pci0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du-pci0
         cap_drop:
             - ALL
@@ -152,7 +152,7 @@ services:
             retries: 5
 
     oai-du-pci1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du-pci1
         cap_drop:
             - ALL
@@ -187,7 +187,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

@@ -90,7 +90,7 @@ services:
             start_period: 10s
             start_interval: 500ms
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -113,7 +113,7 @@ services:
             retries: 5
         ipc: host
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -90,7 +90,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_add:
             - SYS_NICE
@@ -114,7 +114,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL
@@ -141,7 +141,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue2
         cap_drop:
             - ALL
@@ -168,7 +168,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue3:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue3
         cap_drop:
             - ALL
@@ -195,7 +195,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue4:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue4
         cap_drop:
             - ALL
@@ -222,7 +222,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue5:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue5
         cap_drop:
             - ALL
@@ -249,7 +249,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue6:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue6
         cap_drop:
             - ALL
@@ -276,7 +276,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue7:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue7
         cap_drop:
             - ALL
@@ -303,7 +303,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue8:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue8
         cap_drop:
             - ALL
@@ -330,7 +330,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue9:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue9
         cap_drop:
             - ALL
@@ -357,7 +357,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue10:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue10
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

@@ -90,7 +90,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -112,7 +112,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml

@@ -90,7 +90,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -115,7 +115,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml

@@ -71,7 +71,7 @@ services:
                 interface_name: eth1
 
     oai-cucp:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-cucp
         cap_drop:
             - ALL
@@ -100,7 +100,7 @@ services:
             retries: 5
 
     oai-cuup:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup
         cap_drop:
             - ALL
@@ -131,7 +131,7 @@ services:
             retries: 5
 
     oai-cuup2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup2
         cap_drop:
             - ALL
@@ -165,7 +165,7 @@ services:
             retries: 5
 
     oai-cuup3:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup3
         cap_drop:
             - ALL
@@ -199,7 +199,7 @@ services:
             retries: 5
 
     oai-du:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du
         cap_drop:
             - ALL
@@ -230,7 +230,7 @@ services:
             retries: 5
 
     oai-du2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du2
         cap_drop:
             - ALL
@@ -264,7 +264,7 @@ services:
             retries: 5
 
     oai-du3:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du3
         cap_drop:
             - ALL
@@ -298,7 +298,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL
@@ -328,7 +328,7 @@ services:
             retries: 5
 
     oai-nr-ue2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue2
         cap_drop:
             - ALL
@@ -358,7 +358,7 @@ services:
             retries: 5
 
     oai-nr-ue3:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue3
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai-flexric:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
         container_name: oai-flexric
         networks:
             public_net:
@@ -13,7 +13,7 @@ services:
             timeout: 5s
 
     xapp-rc-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni"
         container_name: xapp-rc-moni
         depends_on:
@@ -30,7 +30,7 @@ services:
             timeout: 5s
 
     xapp-kpm-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni"
         container_name: xapp-kpm-moni
         depends_on:
@@ -47,7 +47,7 @@ services:
             timeout: 5s
 
     xapp-kpm-rc:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc"
         container_name: xapp-kpm-rc
         depends_on:
@@ -64,7 +64,7 @@ services:
             timeout: 5s
 
     xapp-gtp-mac-rlc-pdcp-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni"
         container_name: xapp-gtp-mac-rlc-pdcp-moni
         depends_on:
@@ -81,7 +81,7 @@ services:
             timeout: 5s
 
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         privileged: true
         container_name: rfsim5g-oai-gnb
         environment:
@@ -101,7 +101,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
@@ -120,7 +120,7 @@ services:
             retries: 5
 
     oai-nr-ue2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         privileged: true
         container_name: rfsim5g-oai-nr-ue2
         environment:

ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml

@@ -91,7 +91,7 @@ services:
             retries: 5
 
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -112,7 +112,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml

@@ -83,7 +83,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -103,7 +103,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml

@@ -84,7 +84,7 @@ services:
             retries: 5
 
     oai-cucp-0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-cucp-0
         cap_drop:
             - ALL
@@ -111,7 +111,7 @@ services:
             retries: 5
 
     oai-cuup-0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup-0
         cap_drop:
             - ALL
@@ -139,7 +139,7 @@ services:
 
 
     oai-du-0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du-0
         cap_drop:
             - ALL
@@ -150,7 +150,6 @@ services:
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
                                     --rfsimulator.serveraddr 192.168.71.190
-                                    --gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow 5
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cucp-0
@@ -169,7 +168,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL
@@ -195,7 +194,7 @@ services:
             retries: 5
 
     oai-cucp-1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-cucp-1
         cap_drop:
             - ALL
@@ -227,7 +226,7 @@ services:
             retries: 5
 
     oai-cuup-1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup-1
         cap_drop:
             - ALL
@@ -254,7 +253,7 @@ services:
             retries: 5
 
     oai-du-1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du-1
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

@@ -90,7 +90,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -115,7 +115,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml

@@ -87,7 +87,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -110,7 +110,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_prs/docker-compose.yaml

@@ -0,0 +1,71 @@
+services:
+    oai-gnb:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - NET_ADMIN  # for interface bringup
+            - NET_RAW    # for ping
+        environment:
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
+                                    --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        devices:
+            - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../conf_files/gnb.sa.band78.106prb.rfsim.prs.conf:/opt/oai-gnb/etc/gnb.conf
+            - rrc.config:/opt/oai-gnb/
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        container_name: rfsim5g-oai-nr-ue
+        cap_drop:
+            - ALL
+        cap_add:
+            - NET_ADMIN  # for interface bringup
+            - NET_RAW    # for ping
+        environment:
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
+                                    --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw
+                                    --rfsimulator.serveraddr 192.168.71.140
+                                    --log_config.global_log_options level,nocolor,time
+                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
+                                    --telnetsrv.shrmod ciUE
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        devices:
+            - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../conf_files/nrue.band78.106prb.prs.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+            - rrc.config:/opt/oai-nr-ue/etc/rrc/
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+volumes:
+    rrc.config:
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"

ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
     oai-nr-ue-1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue-1
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     oai-nr-ue-2:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue-2
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -91,7 +91,7 @@ services:
             retries: 5
 
     oai-vnf:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-vnf
         cap_drop:
             - ALL
@@ -115,7 +115,7 @@ services:
             retries: 5
 
     oai-pnf:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-pnf
         cap_drop:
             - ALL
@@ -139,7 +139,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_sa_f1_b210_ho/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
-    oai_cu:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+    oai-cu:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: oai-cu
         cap_drop:
             - ALL
@@ -25,8 +25,8 @@ services:
             timeout: 5s
             retries: 5
 
-    oai_du0:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+    oai-du0:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: oai-du0
         cap_drop:
             - ALL
@@ -57,8 +57,8 @@ services:
             timeout: 5s
             retries: 5
 
-    oai_du1:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+    oai-du1:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: oai-du1
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_sa_n2_ho_b210/docker-compose.yml

@@ -0,0 +1,61 @@
+services:
+    oai-gnb-pci0:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: oai-gnb-pci0
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+            - IPC_LOCK
+        ulimits:
+          core: -1 # for core dumps
+        environment:
+            USE_B2XX: 'yes'
+            USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=30AD30F
+                                    --telnetsrv --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,utc_time,line_num,function
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        devices:
+            - /dev/bus/usb/:/dev/bus/usb/
+        volumes:
+            - ../../conf_files/neighbour-config-ho.conf:/opt/oai-gnb/etc/neighbour-config-ho.conf
+            - ../../conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf:/opt/oai-gnb/etc/gnb.conf
+        network_mode: "host"
+        healthcheck:
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-gnb-pci1:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: oai-gnb-pci1
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+            - IPC_LOCK
+        ulimits:
+          core: -1 # for core dumps
+        environment:
+            USE_B2XX: 'yes'
+            USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=31F8010
+                                    --gNBs.[0].nr_cellid 11111111
+                                    --gNBs.[0].gNB_ID 0xe01
+                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 1
+                                    --gNBs.[0].servingCellConfigCommon.[0].ssb_PositionsInBurst_Bitmap 2
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NG_AMF 172.21.19.99
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 172.21.19.99
+                                    --telnetsrv --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,utc_time,line_num,function
+        devices:
+            - /dev/bus/usb/:/dev/bus/usb/
+        volumes:
+            - ../../conf_files/neighbour-config-ho.conf:/opt/oai-gnb/etc/neighbour-config-ho.conf
+            - ../../conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf:/opt/oai-gnb/etc/gnb.conf
+        network_mode: "host"
+        healthcheck:
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5

ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai-vnf:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-vnf
         cap_drop:
@@ -20,7 +20,7 @@ services:
             timeout: 5s
             retries: 5
     oai-pnf:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-pnf
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai-gnb:
-        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     oai-nr-ue:
-        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         network_mode: host
         container_name: oai-nr-ue
         cap_drop:
@@ -17,7 +17,7 @@ services:
         #entrypoint: /bin/bash -c "sleep infinity"
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3425010000 --ssb 509 --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 90 --log_config.global_log_options level,nocolor,time --uicc0.imsi 001020000000111 --uicc0.nssai_sd 16777215
+            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3425010000 --ssb 509 --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 90 --log_config.global_log_options level,nocolor,time --uicc0.imsi 001020000000111
         volumes:
             - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     enb_mono_fdd:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-enb:${TAG:-develop}
         privileged: true
         container_name: prod-enb-mono-fdd
         environment:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     rru_fdd:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-rru-fdd-05Mhz-tm1
         network_mode: "host"
@@ -17,7 +17,7 @@ services:
             timeout: 5s
             retries: 5
     rcc_fdd:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-rcc-fdd-05Mhz-tm1
         network_mode: "host"

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     enb_mono_fdd:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     enb_mono_fdd:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     lte_ue0:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: lte-b200-ue-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
     enb_mono_fdd:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
+        image: ${REGISTRY-oaisoftwarealliance/}oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment: