Dockerfiles to build OAI gNB using the split

Integration `2024.w18`

See merge request oai/openairinterface5g!2713

* !2705 Fix CRC check in UE DCI detection
* !2708 Adding few more NR bands to the list of supported ones
* !2701 gNB archi fixes
* !2203 DL-MMSE
* !2684 remove asserts on min RX/TX, set the RX/TX shift as 2 in the UE
* !2594 F1AP refactoring to align with O-RAN.WG5.C.1-v11

CMakeLists.txt

@@ -158,11 +158,16 @@ endif()
 # add autotools definitions that were maybe used!
 add_definitions("-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP")
 
-set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing")
+# we need -rdynamic to incorporate all symbols in shared objects, see man page
+set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing -rdynamic")
 # GNU C/C++ Compiler might throw many warnings without packed-bitfield-compat, see man page
-# also, we need -rdynamic to incorporate all symbols in shared objects, again, see man page
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat -rdynamic")
+  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat")
+endif()
+# clang: suppress complaints about unused command line argument (-rdynamic only
+# used during linking)
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument")
 endif()
 
 set(CMAKE_C_FLAGS
@@ -498,7 +503,6 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 ##########################################################
 
 add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
-set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
 if (ENABLE_LDPC_T2)
   pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
   find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
@@ -718,6 +722,7 @@ target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 set(SCHED_SRC_NR_UE
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
@@ -1085,8 +1090,11 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -2238,6 +2246,22 @@ target_link_libraries(nr_pbchsim PRIVATE
 )
 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
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.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
+  )
+target_link_libraries(nr_psbchsim PRIVATE
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
+  )
+target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim

README.md

@@ -76,3 +76,20 @@ openairinterface5g
 ├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
 └── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
+
+# How to get support from the OAI Community # 
+
+You can ask your question on the [mailing lists](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/MailingList).
+
+Your email should contain below information:
+
+- A clear subject in your email.
+- For all the queries there should be [Query\] in the subject of the email and for problems there should be [Problem\].
+- In case of a problem, add a small description.
+- Do not share any photos unless you want to share a diagram.
+- OAI gNB/DU/CU/CU-CP/CU-UP configuration file in `.conf` format only.
+- Logs of OAI gNB/DU/CU/CU-CP/CU-UP in `.log` or `.txt` format only.
+- In case your question is related to performance, include a small description of the machine (Operating System, Kernel version, CPU, RAM and networking card) and diagram of your testing environment.
+- Known/open issues are present on [GitLab](https://gitlab.eurecom.fr/oai/openairinterface5g/-/issues), so keep checking.
+
+Always remember a structured email will help us understand your issues quickly.

charts/physims/charts/nr-psbchsim/Chart.yaml

@@ -0,0 +1,36 @@
+apiVersion: v1
+name: oai-nr-psbchsim
+description: A Helm subchart for nr-psbchsim network function
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+appVersion: v1
+
+keywords:
+  - Physical Simulator
+  - nr-psbchsim
+  - RAN
+  - 5G
+
+sources:
+  - https://gitlab.eurecom.fr/oai/openairinterface5g
+
+maintainers:
+  - name:  OPENAIRINTERFACE
+    email: contact@openairinterface.org

charts/physims/charts/nr-psbchsim/templates/_helpers.tpl

@@ -0,0 +1,63 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "oai-nr-psbchsim.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "oai-nr-psbchsim.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "oai-nr-psbchsim.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "oai-nr-psbchsim.labels" -}}
+helm.sh/chart: {{ include "oai-nr-psbchsim.chart" . }}
+{{ include "oai-nr-psbchsim.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "oai-nr-psbchsim.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oai-nr-psbchsim.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "oai-nr-psbchsim.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "oai-nr-psbchsim.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}

charts/physims/charts/nr-psbchsim/templates/job.yaml

@@ -0,0 +1,42 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Chart.Name }}
+spec:
+  template:
+    metadata:
+      labels:
+        app: physim
+    spec:
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+    {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      containers:
+      - name: physim
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        env:
+        - name: OPENAIR_DIR
+          value: /opt/oai-physim
+        command: ["/bin/sh", "-c"]
+        args:
+        - >
+          cmake_targets/autotests/run_exec_autotests.bash -g "nr_psbchsim" -d bin/ &&
+          echo "FINISHED" && sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Never
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrpsbchsim}}
+      nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
+      {{- end }}

charts/physims/charts/nr-psbchsim/values.yaml

@@ -0,0 +1,48 @@
+# Default values for oai-nr-psbchsim
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  # pullPolicy: IfNotPresent or Never or Always
+  pullPolicy: Always
+
+imagePullSecrets: []
+
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: "oai-nr-psbchsim"
+
+podSecurityContext:
+  runAsUser: 0
+  runAsGroup: 0
+
+securityContext:
+  privileged: false
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

charts/physims/values.yaml

@@ -27,6 +27,7 @@ global:
     nrpbschsim106rb: dedale
     nrpbchsim217rb: dedale
     nrpbchsim273rb: dedale
+    nrpsbchsim: dedale
     nrprachsim: dedale
     nrpucchsim: dedale
     nrulschsim: theseus

ci-scripts/Jenkinsfile-GitLab-Container

@@ -308,29 +308,6 @@ pipeline {
             }
           }
         }
-        stage ("L2-Sim-Test-5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                l2Sim5GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += l2Sim5GStatus
-              }
-            }
-          }
-        }
         stage ("LTE-B200-FDD-LTEBOX-Container") {
           when { expression {do4Gtest} }
           steps {
@@ -585,6 +562,29 @@ pipeline {
             }
           }
         }
+        stage ("SA-2x2-Module-CN5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-CN5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += saTDD2x2Status
+              }
+            }
+          }
+        }
         stage ("SA-OAIUE-CN5G") {
           when { expression {do5Gtest} }
           steps {

ci-scripts/add_user_to_conf_file.awk

@@ -1,33 +0,0 @@
-BEGIN{lineIdx=0;captureUEDesc=0}
-{
-    if ($0 ~/UE0/) {
-        captureUEDesc = 1
-    }
-    if (captureUEDesc == 1) {
-        captureLine[lineIdx] = $0
-        lineIdx = lineIdx + 1
-    }
-    print $0
-}
-END {
-   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
-       print ""
-       for (k = 0; k < lineIdx; k++) {
-           if (captureLine[k] ~/UE0/) {
-               mLine = captureLine[k]
-               gsub("UE0", "UE"ueIdx, mLine)
-               print mLine
-           } else {
-               if (captureLine[k] ~/MSIN=/) {
-                   mLine = captureLine[k]
-                   MSIN=sprintf("%08d", 1111+int(ueIdx))
-                   gsub("00001111", MSIN, mLine)
-                   print mLine
-               } else {
-                   print captureLine[k]
-               }
-           }
-
-       }
-   }
-}

ci-scripts/add_user_to_subscriber_list.awk

@@ -1,27 +0,0 @@
-BEGIN{lineIdx=0}
-{
-    captureLine[lineIdx] = $0
-    lineIdx = lineIdx + 1
-    print $0
-}
-END{
-   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
-       for (k = 0; k < lineIdx; k++) {
-           if (captureLine[k] ~/UserName=/) {
-               mLine = captureLine[k]
-               MSIN=sprintf("%08d", 1111+int(ueIdx))
-               gsub("00001111", MSIN, mLine)
-               print mLine
-           } else {
-               if (captureLine[k] ~/SubscriptionIndex/) {
-                   mLine = captureLine[k]
-                   MSIN=sprintf("%d", 111+int(ueIdx))
-                   gsub("111", MSIN, mLine)
-                   print mLine
-               } else {
-                   print captureLine[k]
-               }
-           }
-       }
-   }
-}

ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg

@@ -25,8 +25,8 @@ allow dynamic UE creation from remote API */
       rf_port: 0,
       bandwidth: 20,
       band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
+      dl_nr_arfcn:630048,
+      ssb_nr_arfcn:630048,
       subcarrier_spacing: 30,
       n_antenna_dl: N_ANTENNA_DL,
       n_antenna_ul: N_ANTENNA_UL,
@@ -39,7 +39,7 @@ allow dynamic UE creation from remote API */
   ue_list: [
     {
       "ue_id" : 1,
-      "imsi": "208970000000111",
+      "imsi": "001020000000001",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -54,7 +54,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 2,
-      "imsi": "208970000000112",
+      "imsi": "001020000000002",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -69,7 +69,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 3,
-      "imsi": "208970000000113",
+      "imsi": "001020000000003",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -84,7 +84,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 4,
-      "imsi": "208970000000114",
+      "imsi": "001020000000004",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -99,7 +99,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 5,
-      "imsi": "208970000000115",
+      "imsi": "001020000000005",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -114,7 +114,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 6,
-      "imsi": "208970000000116",
+      "imsi": "001020000000006",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -129,7 +129,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 7,
-      "imsi": "208970000000100",
+      "imsi": "001020000000007",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -144,7 +144,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 8,
-      "imsi": "208970000000102",
+      "imsi": "001020000000008",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -159,7 +159,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 9,
-      "imsi": "208970000000103",
+      "imsi": "001020000000009",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -174,7 +174,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 10,
-      "imsi": "208970000000104",
+      "imsi": "001020000000010",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -189,7 +189,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 11,
-      "imsi": "208970000000110",
+      "imsi": "001020000000011",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -204,7 +204,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 12,
-      "imsi": "208970000000105",
+      "imsi": "001020000000012",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -219,7 +219,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 13,
-      "imsi": "208970000000106",
+      "imsi": "001020000000013",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -234,7 +234,7 @@ allow dynamic UE creation from remote API */
     },
         {
       "ue_id" : 14,
-      "imsi": "208970000000107",
+      "imsi": "001020000000014",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -249,7 +249,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 15,
-      "imsi": "208970000000108",
+      "imsi": "001020000000015",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -264,7 +264,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 16,
-      "imsi": "208970000000109",
+      "imsi": "001020000000016",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",

ci-scripts/as_ue/aw2s-multi-20897.cfg

@@ -1,280 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 2
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-                    
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */     
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "208970000000111",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "208970000000112",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "208970000000113",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "208970000000114",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "208970000000115",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "208970000000116",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "208970000000117",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "208970000000118",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "208970000000119",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "208970000000120",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "208970000000121",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "208970000000122",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "208970000000123",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "208970000000124",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "208970000000125",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "208970000000126",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}

ci-scripts/ci_infra.yaml

@@ -56,9 +56,48 @@ adb_ue_2:
   MTU: 1500
   LogStore: /media/usb-drive/ci_adb_2-logs
 
+oc-cn5g:
+  Host: avra
+  NetworkScript: echo "inet 172.21.6.102"
+  RunIperf3Server: False
+
+matix-cn5g:
+  Host: matix
+  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec prod-trf-gen
+  RunIperf3Server: False
+
+porcepix-cn4g:
+  Host: porcepix
+  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec prod-trf-gen
+
+porcepix-cn5g:
+  Host: porcepix
+  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec prod-trf-gen
+  RunIperf3Server: False
+
+nano-cn4g:
+  Host: nano
+  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec prod-trf-gen
+
+ltebox-nano:
+  Host: nano
+  NetworkScript: ip a show dev tun1
+
+sabox-nepes:
+  Host: nepes
+  NetworkScript: ip a show dev tun1
+
+ltebox-nepes:
+  Host: nepes
+  NetworkScript: ip a show dev tun1
+
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2.cfg &
   TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
   Host: amariue
@@ -294,6 +333,9 @@ rfsim4g_ue:
   NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim4g-oai-lte-ue0
   IF: oaitun_ue1
+  AttachScript: docker start rfsim4g-oai-lte-ue0
+  DetachScript: docker stop rfsim4g-oai-lte-ue0
+  MTU: 1500
 
 rfsim4g_ext_dn:
   Host: localhost
@@ -306,6 +348,18 @@ rfsim4g_enb_nos1:
   CmdPrefix: docker exec rfsim4g-oai-enb
   IF: oaitun_enb1
 
+rfsim4g_enb_fembms:
+  Host: localhost
+  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enm1
+  CmdPrefix: docker exec rfsim4g-oai-enb
+  IF: oaitun_enm1
+
+rfsim4g_ue_fembms:
+  Host: localhost
+  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
+  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
+  IF: oaitun_uem1
+
 l2sim5g_ue:
   Host: localhost
   AttachScript: docker start l2sim-oai-nr-ue0

ci-scripts/cls_cluster.py

@@ -44,6 +44,9 @@ OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
 CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
+CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
+CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
+
 
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
@@ -65,6 +68,51 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
+def OC_deploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
+	if not succeeded:
+		return False, CONST.OC_LOGIN_FAIL
+	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
+	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Deployment failed')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
+def OC_undeploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Terminating CN on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
+	if not succeeded:
+		return False, CONST.OC_LOGIN_FAIL
+	cmd.run(f'rm -Rf {path}/logs')
+	cmd.run(f'mkdir -p {path}/logs')
+	logging.debug('OC OAI CN5G: Collecting log files to workspace')
+	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
+	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
+	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
+		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
+		if not podName:
+			logging.debug(f'{ii} pod not found!')
+		else:
+			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
+	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
+	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
+	ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Undeployment failed')
+		cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""

ci-scripts/cls_cmd.py

@@ -31,7 +31,8 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import sys 
+import sys
+import time
 
 SSHTIMEOUT=7
 
@@ -106,6 +107,7 @@ class LocalCmd(Cmd):
 				# if we wait for stdout, subprocess does not return before the end of the command
 				# however, we don't want to wait for commands with &, so just return fake command
 				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
+				time.sleep(0.1)
 			else:
 				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
@@ -210,6 +212,7 @@ class RemoteCmd(Cmd):
 				# however, we don't want to wait for commands with &, so just return fake command
 				self.client.exec_command(line, timeout = 5)
 				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
+				time.sleep(0.1)
 			else:
 				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
 				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))

ci-scripts/cls_containerize.py

@@ -169,97 +169,27 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo
 
-def AnalyzeIperf(cliOptions, clientReport, serverReport):
-	req_bw = 1.0 # default iperf throughput, in Mbps
-	result = re.search('-b *(?P<iperf_bandwidth>[0-9\.]+)(?P<magnitude>[kKMG])', cliOptions)
-	if result is not None:
-		req_bw = float(result.group('iperf_bandwidth'))
-		magn = result.group('magnitude')
-		if magn == "k" or magn == "K":
-			req_bw /= 1000
-		elif magn == "G":
-			req_bw *= 1000
-	req_dur = 10 # default iperf send duration
-	result = re.search('-t *(?P<duration>[0-9]+)', cliOptions)
-	if result is not None:
-		req_dur = int(result.group('duration'))
-
-	reportLine = None
-	# find server report in client status
-	clientReportLines = clientReport.split('\n')
-	for l in range(len(clientReportLines)):
-		res = re.search('read failed: Connection refused', clientReportLines[l])
-		if res is not None:
-			message = 'iperf connection refused by server!'
-			logging.error(f'\u001B[1;37;41mIperf Test FAIL: {message}\u001B[0m')
-			return (False, message)
-		res = re.search('Server Report:', clientReportLines[l])
-		if res is not None and l + 1 < len(clientReportLines):
-			reportLine = clientReportLines[l+1]
-			logging.debug(f'found server report: "{reportLine}"')
-
-	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
-	# if we do not find a server report in the client logs, check the server logs
-	# and use the last line which is typically close/identical to server report
-	if reportLine is None:
-		for l in serverReport.split('\n'):
-			res = re.search(statusTemplate, l)
-			if res is not None:
-				reportLine = l
-		if reportLine is None:
-			logging.warning('no report in server status found!')
-			return (False, 'could not parse iperf logs')
-		logging.debug(f'found client status: {reportLine}')
-
-	result = re.search(statusTemplate, reportLine)
-	if result is None:
-		logging.error('could not analyze report from statusTemplate')
-		return (False, 'could not parse iperf logs')
-
-	duration = float(result.group('duration'))
-	bitrate = float(result.group('bitrate'))
-	magn = result.group('magnitude')
-	if magn == "k" or magn == "K":
-		bitrate /= 1000
-	elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
-		bitrate *= 1000
-	jitter = float(result.group('jitter'))
-	packetloss = float(result.group('packetloss'))
-
-	logging.debug('\u001B[1;37;44m iperf result \u001B[0m')
-	msg = f'Req Bitrate: {req_bw}'
-	logging.debug(f'\u001B[1;34m{msg}\u001B[0m')
-
-	br_loss = bitrate/req_bw
-	bmsg = f'Bitrate    : {bitrate} (perf {br_loss})'
-	logging.debug(f'\u001B[1;34m{bmsg}\u001B[0m')
-	msg += '\n' + bmsg
-	if br_loss < 0.9:
-		msg += '\nBitrate performance too low (<90%)'
-		logging.debug(f'\u001B[1;37;41mBitrate performance too low (<90%)\u001B[0m')
-		return (False, msg)
-
-	plmsg = f'Packet Loss: {packetloss}%'
-	logging.debug(f'\u001B[1;34m{plmsg}\u001B[0m')
-	msg += '\n' + plmsg
-	if packetloss > 5.0:
-		msg += '\nPacket Loss too high!'
-		logging.debug(f'\u001B[1;37;41mPacket Loss too high \u001B[0m')
-		return (False, msg)
-
-	dmsg = f'Duration   : {duration} (req {req_dur})'
-	logging.debug(f'\u001B[1;34m{dmsg}\u001B[0m')
-	msg += '\n' + dmsg
-	if duration < float(req_dur):
-		msg += '\nDuration of iperf too short!'
-		logging.debug(f'\u001B[1;37;41mDuration of iperf too short\u001B[0m')
-		return (False, msg)
-
-	jmsg = f'Jitter     : {jitter}'
-	logging.debug(f'\u001B[1;34m{jmsg}\u001B[0m')
-	msg += '\n' + jmsg
-	return (True, msg)
+# pyshark livecapture launches 2 processes:
+# * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
+# * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
+# but in fact the packets are read by the following loop before being in fact
+# really written to loFile.
+# So it is mandatory to keep the loop
+def LaunchPySharkCapture(lIfs, lFilter, loFile):
+	capture = pyshark.LiveCapture(interface=lIfs, bpf_filter=lFilter, output_file=loFile, debug=False)
+	for packet in capture.sniff_continuously():
+		pass
 
+def StopPySharkCapture(testcase):
+	with cls_cmd.LocalCmd() as myCmd:
+		cmd = 'killall tshark'
+		myCmd.run(cmd, reportNonZero=False)
+		cmd = 'killall dumpcap'
+		myCmd.run(cmd, reportNonZero=False)
+		time.sleep(5)
+		cmd = f'mv /tmp/capture_{testcase}.pcap ../cmake_targets/log/{testcase}/.'
+		myCmd.run(cmd, timeout=100, reportNonZero=False)
+	return False
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -1026,7 +956,6 @@ class Containerize():
 					cnt = 100
 					status = True
 					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
-					time.sleep(10)
 		else:
 			# containers are unhealthy, so we won't start. However, logs are stored at the end
 			# in UndeployObject so we here store the logs of the unhealthy container to report it
@@ -1092,18 +1021,18 @@ class Containerize():
 		for s in allServices:
 			# outputs the hash if the container is running
 			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
-			running = ret.stdout.splitlines()
-			logging.debug(f'running services: {running}')
+			c = ret.stdout
+			logging.debug(f'running service {s} with container id {c}')
 			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
-				services.append(s)
-		logging.info(f'stopping services {services}')
+				services.append((s, c))
+		logging.info(f'stopping services {[s for s, _ in services]}')
 
 		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
 		copyin_res = True
-		for svcName in services:
+		for service_name, container_id in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
-			filename = f'{svcName}-{HTML.testCase_id}.log'
-			mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}')
+			filename = f'{service_name}-{HTML.testCase_id}.log'
+			mySSH.run(f'docker logs {container_id} &> {lSourcePath}/cmake_targets/log/{filename}')
 			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res
 
 		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')
@@ -1114,7 +1043,7 @@ class Containerize():
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
-		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
+		elif any(service_name == 'oai-nr-ue' or service_name == 'lte_ue0' for service_name, _ in services):
 			self.exitStatus == 0
 			logging.debug(f'Analyzing UE logfile {filename}')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
@@ -1124,12 +1053,12 @@ class Containerize():
 			else:
 				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
-			for svcName in services:
-				if svcName == 'nv-cubb':
+			for service_name, _ in services:
+				if service_name == 'nv-cubb':
 					msg = 'Undeploy PNF/Nvidia CUBB'
 					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					filename = f'{svcName}-{HTML.testCase_id}.log'
+					filename = f'{service_name}-{HTML.testCase_id}.log'
 					logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
 					logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
 					if (logStatus < 0):
@@ -1275,17 +1204,6 @@ class Containerize():
 			self.UndeployGenObject(HTML, RAN, UE)
 			self.exitStatus = 1
 
-	# pyshark livecapture launches 2 processes:
-	# * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
-	# * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
-	# but in fact the packets are read by the following loop before being in fact
-	# really written to loFile.
-	# So it is mandatory to keep the loop
-	def LaunchPySharkCapture(self, lIfs, lFilter, loFile):
-		capture = pyshark.LiveCapture(interface=lIfs, bpf_filter=lFilter, output_file=loFile, debug=False)
-		for packet in capture.sniff_continuously():
-			pass
-
 	def CaptureOnDockerNetworks(self):
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'docker-compose -f docker-compose-ci.yml config | grep com.docker.network.bridge.name | sed -e "s@^.*name: @@"'
@@ -1310,7 +1228,7 @@ class Containerize():
 			myCmd.run(cmd, timeout=5, reportNonZero=False)
 			myCmd.close()
 			return
-		x = threading.Thread(target = self.LaunchPySharkCapture, args = (interfaces,capture_filter,output_file,))
+		x = threading.Thread(target = LaunchPySharkCapture, args = (interfaces,capture_filter,output_file,))
 		x.daemon = True
 		x.start()
 
@@ -1399,21 +1317,9 @@ class Containerize():
 						HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
 					else:
 						HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
-
-			if self.tsharkStarted:
-				self.tsharkStarted = True
-				cmd = 'killall tshark'
-				myCmd2.run(cmd, reportNonZero=False)
-				cmd = 'killall dumpcap'
-				myCmd2.run(cmd, reportNonZero=False)
-				time.sleep(5)
-				ymlPath = self.yamlPath[0].split('/')
-				# The working dir is still logPath
-				cmd = f'mv /tmp/capture_{ymlPath[1]}.pcap .'
-				myCmd2.run(cmd, timeout=100, reportNonZero=False)
-				self.tsharkStarted = False
 		myCmd2.close()
-
+		if self.tsharkStarted:
+			self.tsharkStarted = StopPySharkCapture(ymlPath[1])
 		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		logging.debug(f'Working dir is back {self.yamlPath[0]}')
 		cmd = 'docker-compose -f docker-compose-ci.yml down -v'
@@ -1467,76 +1373,6 @@ class Containerize():
 
 		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
 
-	def PingExit(self, HTML, RAN, UE, status, message):
-		if status:
-			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
-		else:
-			logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', [message])
-			# Automatic undeployment
-			logging.warning('----------------------------------------')
-			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
-			logging.warning('----------------------------------------')
-			HTML.testCase_id = 'AUTO-UNDEPLOY'
-			HTML.desc = 'Automatic Un-Deployment'
-			self.UndeployGenObject(HTML, RAN, UE)
-			self.exitStatus = 1
-
-	def IperfFromContainer(self, HTML, RAN, UE):
-		myCmd = cls_cmd.LocalCmd()
-		self.exitStatus = 0
-
-		ymlPath = self.yamlPath[0].split('/')
-		logPath = '../cmake_targets/log/' + ymlPath[1]
-		cmd = f'mkdir -p {logPath}'
-		myCmd.run(cmd, silent=True)
-
-		# Start the server process
-		cmd = f'docker exec -d {self.svrContName} /bin/bash -c "nohup iperf {self.svrOptions} > /tmp/iperf_server.log 2>&1"'
-		myCmd.run(cmd)
-		time.sleep(3)
-
-		# Start the client process
-		cmd = f'docker exec {self.cliContName} /bin/bash -c "iperf {self.cliOptions}" 2>&1 | tee {logPath}/iperf_client_{HTML.testCase_id}.log'
-		clientStatus = myCmd.run(cmd, timeout=100)
-
-		# Stop the server process
-		cmd = f'docker exec {self.svrContName} /bin/bash -c "pkill iperf"'
-		myCmd.run(cmd)
-		time.sleep(3)
-		serverStatusFilename = f'{logPath}/iperf_server_{HTML.testCase_id}.log'
-		cmd = f'docker cp {self.svrContName}:/tmp/iperf_server.log {serverStatusFilename}'
-		myCmd.run(cmd, timeout=60)
-		myCmd.close()
-
-		# clientStatus was retrieved above. The serverStatus was
-		# written in the background, then copied to the local machine
-		with open(serverStatusFilename, 'r') as f:
-			serverStatus = f.read()
-		(iperfStatus, msg) = AnalyzeIperf(self.cliOptions, clientStatus.stdout, serverStatus)
-		if iperfStatus:
-			logging.info('\u001B[1m Iperf Test PASS\u001B[0m')
-		else:
-			logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m')
-		self.IperfExit(HTML, RAN, UE, iperfStatus, msg)
-
-	def IperfExit(self, HTML, RAN, UE, status, message):
-		html_cell = f'UE\n{message}'
-		if status:
-			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', [html_cell])
-		else:
-			logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', [html_cell])
-			# Automatic undeployment
-			logging.warning('----------------------------------------')
-			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
-			logging.warning('----------------------------------------')
-			HTML.testCase_id = 'AUTO-UNDEPLOY'
-			HTML.desc = 'Automatic Un-Deployment'
-			self.UndeployGenObject(HTML, RAN, UE)
-			self.exitStatus = 1
-
-
 	def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
 		logging.debug('Checking IP routing on ' + svrName)
 		mySSH = SSH.SSHConnection()

ci-scripts/cls_module.py

@@ -41,7 +41,7 @@ import cls_cmd
 
 class Module_UE:
 
-	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
+	def __init__(self, module_name, filename="ci_infra.yaml"):
 		with open(filename, 'r') as f:
 			all_ues = yaml.load(f, Loader=yaml.FullLoader)
 			m = all_ues.get(module_name)
@@ -64,7 +64,8 @@ class Module_UE:
 			self.trace = m.get('trace') == True
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
-			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')
+			self.runIperf3Server = m.get('RunIperf3Server', True)
+			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
 
 	def __str__(self):
 		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
@@ -189,6 +190,9 @@ class Module_UE:
 	def getHost(self):
 		return self.host
 
+	def getRunIperf3Server(self):
+		return self.runIperf3Server
+
 	def getCmdPrefix(self):
 		return self.cmd_prefix if self.cmd_prefix else ""
 

ci-scripts/cls_oaicitest.py

@@ -45,6 +45,7 @@ import signal
 import statistics as stat
 from multiprocessing import SimpleQueue, Lock
 import concurrent.futures
+import json
 
 #import our libs
 import helpreadme as HELP
@@ -52,13 +53,182 @@ import constants as CONST
 import cls_cluster as OC
 import sshconnection
 
-import cls_module_ue
+import cls_module
 import cls_cmd
 
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import matplotlib.pyplot as plt
 import numpy as np
 
+#-----------------------------------------------------------
+# Helper functions used here and in other classes
+#-----------------------------------------------------------
+def Iperf_ComputeModifiedBW(idx, ue_num, profile, args):
+	result = re.search('-b\s*(?P<iperf_bandwidth>[0-9\.]+)(?P<unit>[KMG])', str(args))
+	if result is None:
+		raise ValueError(f'requested iperf bandwidth not found in iperf options "{args}"')
+	iperf_bandwidth = float(result.group('iperf_bandwidth'))
+	if iperf_bandwidth == 0:
+		raise ValueError('iperf bandwidth set to 0 - invalid value')
+	if profile == 'balanced':
+		iperf_bandwidth_new = iperf_bandwidth/ue_num
+	if profile =='single-ue':
+		iperf_bandwidth_new = iperf_bandwidth
+	if profile == 'unbalanced':
+		# residual is 2% of max bw
+		residualBW = iperf_bandwidth / 50
+		if idx == 0:
+			iperf_bandwidth_new = iperf_bandwidth - ((ue_num - 1) * residualBW)
+		else:
+			iperf_bandwidth_new = residualBW
+	iperf_bandwidth_str = result.group(0)
+	iperf_bandwidth_unit = result.group(2)
+	iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}{iperf_bandwidth_unit}"
+	args_new = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(args))
+	if iperf_bandwidth_unit == 'K':
+		iperf_bandwidth_new = iperf_bandwidth_new / 1000
+	return iperf_bandwidth_new, args_new
+
+def Iperf_ComputeTime(args):
+	result = re.search('-t\s*(?P<iperf_time>\d+)', str(args))
+	if result is None:
+		raise Exception('Iperf time not found!')
+	return int(result.group('iperf_time'))
+
+def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute Iperf3 bitrate!')
+
+	snd_msg = f'Sender Bitrate   : {sender_bitrate} Mbps'
+	rcv_msg = f'Receiver Bitrate : {receiver_bitrate} Mbps'
+	success = True
+	if (iperf_tcp_rate_target is not None):
+		if (int(receiver_bitrate) < int(iperf_tcp_rate_target)):
+			rcv_msg += f" (too low! < {iperf_tcp_rate_target} Mbps)"
+			success = False
+		else:
+			rcv_msg += f" (target : {iperf_tcp_rate_target} Mbps)"
+	return(success, f'{snd_msg}\n{rcv_msg}')
+
+def Iperf_analyzeV3BIDIRJson(filename):
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 Bidir TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 Bidir TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate_ul   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_ul = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+			sender_bitrate_dl   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_dl = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute BIDIR bitrate!')
+
+	msg = f'Sender Bitrate DL   : {sender_bitrate_dl} Mbps\n'
+	msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n'
+	msg += f'Sender Bitrate UL   : {sender_bitrate_ul} Mbps\n'
+	msg += f'Receiver Bitrate UL : {receiver_bitrate_ul} Mbps\n'
+	return (True, msg)
+
+def Iperf_analyzeV3UDP(filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 UDP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 UDP: Log file is empty')
+	sender_bitrate = None
+	receiver_bitrate = None
+	with open(filename, 'r') as server_file:
+		for line in server_file.readlines():
+			res_sender = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<unit>[KMG]bits\/sec)\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>\d+)/(?P<sentPack>\d+) \((?P<lost>[0-9\.]+).*?\s+(sender)', line)
+			res_receiver = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<unit>[KMG]bits\/sec)\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>\d+)/(?P<receivedPack>\d+) \((?P<lost>[0-9\.]+).*?\s+(receiver)', line)
+			if res_sender is not None:
+				sender_bitrate = res_sender.group('bitrate')
+				sender_unit = res_sender.group('unit')
+				sender_jitter = res_sender.group('jitter')
+				sender_lostPack = res_sender.group('lostPack')
+				sender_sentPack = res_sender.group('sentPack')
+				sender_packetloss = res_sender.group('lost')
+			if res_receiver is not None:
+				receiver_bitrate = res_receiver.group('bitrate')
+				receiver_unit = res_receiver.group('unit')
+				receiver_jitter = res_receiver.group('jitter')
+				receiver_lostPack = res_receiver.group('lostPack')
+				receiver_receivedPack = res_receiver.group('receivedPack')
+				receiver_packetloss = res_receiver.group('lost')
+
+	if receiver_bitrate is not None and sender_bitrate is not None:
+		if sender_unit == 'Kbits/sec':
+			sender_bitrate = float(sender_bitrate) / 1000
+		if receiver_unit == 'Kbits/sec':
+			receiver_bitrate = float(receiver_bitrate) / 1000
+		br_perf = 100 * float(receiver_bitrate) / float(target_bitrate)
+		br_perf = '%.2f ' % br_perf
+		sender_bitrate = '%.2f ' % float(sender_bitrate)
+		receiver_bitrate = '%.2f ' % float(receiver_bitrate)
+		req_msg = f'Sender Bitrate  : {sender_bitrate} Mbps'
+		bir_msg = f'Receiver Bitrate: {receiver_bitrate} Mbps'
+		brl_msg = f'{br_perf}%'
+		jit_msg = f'Jitter          : {receiver_jitter}'
+		pal_msg = f'Packet Loss     : {receiver_packetloss} %'
+		if float(br_perf) < float(iperf_bitrate_threshold):
+			brl_msg = f'too low! < {iperf_bitrate_threshold}%'
+		if float(receiver_packetloss) > float(iperf_packetloss_threshold):
+			pal_msg += f' (too high! > {iperf_packetloss_threshold}%)'
+		result = float(br_perf) >= float(iperf_bitrate_threshold) and float(receiver_packetloss) <= float(iperf_packetloss_threshold)
+		return (result, f'{req_msg}\n{bir_msg} ({brl_msg})\n{jit_msg}\n{pal_msg}')
+	else:
+		return (False, 'Could not analyze iperf report')
+
+def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
+		result = None
+		if (not os.path.isfile(server_filename)):
+			return (False, 'Iperf UDP: Server report not found!')
+		if (os.path.getsize(server_filename)==0):
+			return (False, 'Iperf UDP: Log file is empty')
+		# Computing the requested bandwidth in float
+		statusTemplate = r'(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
+		with open(server_filename, 'r') as server_file:
+			for line in server_file.readlines():
+				result = re.search(statusTemplate, str(line))
+				if result is not None:
+					break
+		if result is None:
+			return (False, 'Could not parse server report!')
+		bitrate = float(result.group('bitrate'))
+		magn = result.group('magnitude')
+		if magn == "k" or magn == "K":
+			bitrate /= 1000
+		elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
+			bitrate *= 1000
+		jitter = float(result.group('jitter'))
+		packetloss = float(result.group('packetloss'))
+		br_perf = float(bitrate)/float(target_bitrate) * 100
+		br_perf = '%.2f ' % br_perf
+
+		result = float(br_perf) >= float(iperf_bitrate_threshold) and float(packetloss) <= float(iperf_packetloss_threshold)
+		req_msg = f'Req Bitrate : {target_bitrate}'
+		bir_msg = f'Bitrate     : {bitrate}'
+		brl_msg = f'Bitrate Perf: {br_perf} %'
+		if float(br_perf) < float(iperf_bitrate_threshold):
+			brl_msg += f' (too low! <{iperf_bitrate_threshold}%)'
+		jit_msg = f'Jitter      : {jitter}'
+		pal_msg = f'Packet Loss : {packetloss}'
+		if float(packetloss) > float(iperf_packetloss_threshold):
+			pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
+		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
+
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
@@ -86,7 +256,7 @@ class OaiCiTest():
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
 		self.iperf_options = ''
-		self.iperf_direction = ''
+		self.iperf_tcp_rate_target = ''
 		self.nbMaxUEtoAttach = -1
 		self.UEDevices = []
 		self.UEDevicesStatus = []
@@ -113,6 +283,7 @@ class OaiCiTest():
 		self.clean_repository = True
 		self.air_interface=''
 		self.ue_ids = []
+		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
 
@@ -222,7 +393,7 @@ class OaiCiTest():
 
 
 	def InitializeUE(self, HTML):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -438,7 +609,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AttachUE(self, HTML, RAN, EPC, CONTAINERS):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -453,7 +624,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML, RAN, EPC, CONTAINERS)
 
 	def DetachUE(self, HTML):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -461,7 +632,7 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
 	def DataDisableUE(self, HTML):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -473,7 +644,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 
 	def DataEnableUE(self, HTML):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -486,7 +657,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 
 	def CheckStatusUE(self,HTML):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor() as executor:
@@ -590,7 +761,7 @@ class OaiCiTest():
 		if self.ue_ids == []:
 			raise Exception("no module names in self.ue_ids provided")
 
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(ues)
 		pingLock = Lock()
 		with concurrent.futures.ThreadPoolExecutor() as executor:
@@ -604,372 +775,65 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
-	def Iperf_ComputeTime(self):
-		result = re.search('-t (?P<iperf_time>\d+)', str(self.iperf_args))
-		if result is None:
-			logging.debug('\u001B[1;37;41m Iperf time Not Found! \u001B[0m')
-			sys.exit(1)
-		return result.group('iperf_time')
-
-	def Iperf_ComputeModifiedBW(self, idx, ue_num):
-		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(self.iperf_args))
-		if result is None:
-			logging.error('\u001B[1;37;41m Iperf bandwidth Not Found! \u001B[0m')
-			sys.exit(1)
-		iperf_bandwidth = result.group('iperf_bandwidth')
-		if self.iperf_profile == 'balanced':
-			iperf_bandwidth_new = float(iperf_bandwidth)/ue_num
-		if self.iperf_profile == 'single-ue':
-			iperf_bandwidth_new = float(iperf_bandwidth)
-		if self.iperf_profile == 'unbalanced':
-			# residual is 2% of max bw
-			residualBW = float(iperf_bandwidth) / 50
-			if idx == 0:
-				iperf_bandwidth_new = float(iperf_bandwidth) - ((ue_num - 1) * residualBW)
-			else:
-				iperf_bandwidth_new = residualBW
-		iperf_bandwidth_str = f'-b {iperf_bandwidth}'
-		iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}"
-		result = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(self.iperf_args))
-		if result is None:
-			logging.error('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
-			sys.exit(1)
-		return result
-
-	def Iperf_analyzeV2TCPOutput(self, SSH, filename):
-
-		SSH.command(f'awk -f /tmp/tcp_iperf_stats.awk {filename}', '\$', 5)
-		result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
-		if result is not None:
-			avgbitrate = result.group('average')
-			maxbitrate = result.group('maximum')
-			minbitrate = result.group('minimum')
-			msg = 'TCP Stats   :\n'
-			if avgbitrate is not None:
-				msg += f'Avg Bitrate : {avgbitrate} \n'
-			if maxbitrate is not None:
-				msg += f'Max Bitrate : {maxbitrate} \n'
-			if minbitrate is not None:
-				msg += f'Min Bitrate : {minbitrate} \n'
-			return (True, msg)
-
-		return (False, "could not analyze log file")
-
-	def Iperf_analyzeV2Output(self, iperf_real_options, EPC, SSH):
-
-		result = re.search('-u', str(iperf_real_options))
-		if result is None:
-			filename = f'{EPC.SourceCodePath}/scripts/iperf_{self.testCase_id}_{device_id}.log'
-			response = self.Iperf_analyzeV2TCPOutput(SSH, filename)
-			return response
-
-		result = re.search('Server Report:', SSH.getBefore())
-		if result is None:
-			result = re.search('read failed: Connection refused', SSH.getBefore())
-			if result is not None:
-				msg = 'Could not connect to iperf server!'
-				return (False, msg)
-			else:
-				msg = 'Server Report and Connection refused Not Found!'
-				return (False, msg)
-		# Computing the requested bandwidth in float
-		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
-		if result is not None:
-			req_bandwidth = result.group('iperf_bandwidth')
-			req_bw = float(req_bandwidth)
-			result = re.search('-b [0-9\.]+K', str(iperf_real_options))
-			if result is not None:
-				req_bandwidth = '%.1f Kbits/sec' % req_bw
-				req_bw = req_bw * 1000
-			result = re.search('-b [0-9\.]+M', str(iperf_real_options))
-			if result is not None:
-				req_bandwidth = '%.1f Mbits/sec' % req_bw
-				req_bw = req_bw * 1000000
-			result = re.search('-b [0-9\.]+G', str(iperf_real_options))
-			if result is not None:
-				req_bandwidth = '%.1f Gbits/sec' % req_bw
-				req_bw = req_bw * 1000000000
-
-		result = re.search('Server Report:\r\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
-		if result is not None:
-			bitrate = result.group('bitrate')
-			packetloss = result.group('packetloss')
-			jitter = result.group('jitter')
-
-			iperfStatus = True
-			msg = f'Req Bitrate : {req_bandwidth} \n'
-			if bitrate is not None:
-				msg += f'Bitrate     : {bitrate} \n'
-				result = re.search('(?P<real_bw>[0-9\.]+) [KMG]bits/sec', str(bitrate))
-				if result is not None:
-					actual_bw = float(str(result.group('real_bw')))
-					result = re.search('[0-9\.]+ K', bitrate)
-					if result is not None:
-						actual_bw = actual_bw * 1000
-					result = re.search('[0-9\.]+ M', bitrate)
-					if result is not None:
-						actual_bw = actual_bw * 1000000
-					result = re.search('[0-9\.]+ G', bitrate)
-					if result is not None:
-						actual_bw = actual_bw * 1000000000
-					br_loss = 100 * actual_bw / req_bw
-					bitperf = '%.2f ' % br_loss
-					msg += f'Bitrate Perf: {bitperf} %\n'
-			if packetloss is not None:
-				msg += f'Packet Loss : {packetloss} %\n'
-				if float(packetloss) > float(self.iperf_packetloss_threshold):
-					msg += 'Packet Loss too high!\n'
-					iperfStatus = False
-			if jitter is not None:
-				msg += f'Jitter      : {jitter} \n'
-
-			return (iperfStatus, msg)
-		else:
-			return (False, "could not analyze server log")
-
-
-	def Iperf_analyzeV2BIDIR(self, server_filename, client_filename):
-
-		#check the 2 files are here 
-		if (not os.path.isfile(client_filename)) or (not os.path.isfile(server_filename)):
-			return (False, 'Bidir TCP: Client or Server Log File not present')
-		#check the 2 files size
-		if (os.path.getsize(client_filename)==0) and (os.path.getsize(server_filename)==0):
-			return (False, 'Bidir TCP: Client and Server Log File are empty')
-
-		report_msg = ''
-		#if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
-		client_filesize = os.path.getsize(client_filename)
-		if client_filesize == 0:
-			report_msg+="Client file (UE) present but !!! EMPTY !!!\n"
-			report_msg+="Partial report from server file"
-			filename = server_filename
-		else :		
-			report_msg+="Report from client file (UE)"
-			filename = client_filename
-
-		report=[] #used to check if relevant lines were found
-
-		with open(filename, 'r') as f_client:
-			for line in f_client.readlines():
-				result = re.search(rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)', str(line))
-				if result is not None:
-					report.append(str(line))
-					report_msg += f"\n{result.group('role')} {result.group('direction')}\t: {result.group('bitrate')}"
-		if len(report) == 0:
-			return (False, 'Bidir TCP: Could not analyze from Log file')
-
-		return (True, report_msg)
-
-	def Iperf_analyzeV2Server(self, iperf_real_options, filename, type):
-		if (not os.path.isfile(filename)):
-			return (False, 'Could not analyze from server log')
-		# Computing the requested bandwidth in float
-		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
-		if result is None:
-			return (False, 'Could not compute Iperf bandwidth!')
-		else:
-			req_bandwidth = result.group('iperf_bandwidth')
-			req_bw = float(req_bandwidth)
-			result = re.search('-b [0-9\.]+K', str(iperf_real_options))
-			if result is not None:
-				req_bandwidth = '%.1f Kbits/sec' % req_bw
-				req_bw = req_bw * 1000
-			result = re.search('-b [0-9\.]+M', str(iperf_real_options))
-			if result is not None:
-				req_bandwidth = '%.1f Mbits/sec' % req_bw
-				req_bw = req_bw * 1000000
-			result = re.search('-b [0-9\.]+G', str(iperf_real_options))
-			if result is not None:
-				req_bandwidth = '%.1f Gbits/sec' % req_bw
-				req_bw = req_bw * 1000000000
-
-		server_file = open(filename, 'r')
-		br_sum = 0.0
-		ji_sum = 0.0
-		pl_sum = 0
-		ps_sum = 0
-		row_idx = 0
-		for line in server_file.readlines():
-			if type==0:
-				result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(?P<lostPack>[0-9]+)/ +(?P<sentPack>[0-9]+)', str(line))
-			else:
-				result = re.search('^\[\s+\d\].+  (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(?P<lostPack>[0-9]+)\/\s*(?P<sentPack>[0-9]+)', str(line))
-
-			if result is not None:
-				bitrate = result.group('bitrate')
-				jitter = result.group('jitter')
-				packetlost = result.group('lostPack')
-				packetsent = result.group('sentPack')
-				br = bitrate.split(' ')
-				ji = jitter.split(' ')
-				row_idx = row_idx + 1
-				curr_br = float(br[0])
-				pl_sum = pl_sum + int(packetlost)
-				ps_sum = ps_sum + int(packetsent)
-				if (br[1] == 'Kbits/sec'):
-					curr_br = curr_br * 1000
-				if (br[1] == 'Mbits/sec'):
-					curr_br = curr_br * 1000 * 1000
-				br_sum = curr_br + br_sum
-				ji_sum = float(ji[0]) + ji_sum
-
-		server_file.close()
-
-		if (row_idx > 0):
-			br_sum = br_sum / row_idx
-			ji_sum = ji_sum / row_idx
-			br_loss = 100 * br_sum / req_bw
-			if (br_sum > 1000):
-				br_sum = br_sum / 1000
-				if (br_sum > 1000):
-					br_sum = br_sum / 1000
-					bitrate = '%.2f Mbits/sec' % br_sum
-				else:
-					bitrate = '%.2f Kbits/sec' % br_sum
-			else:
-				bitrate = '%.2f bits/sec' % br_sum
-			bitperf = '%.2f ' % br_loss
-			bitperf += '%'
-			jitter = '%.2f ms' % (ji_sum)
-			if (ps_sum > 0):
-				pl = float(100 * pl_sum / ps_sum)
-				packetloss = '%2.1f ' % (pl)
-				packetloss += '%'
-
-			result = float(br_loss) >= float(self.iperf_bitrate_threshold) and float(pl) <= float(self.iperf_packetloss_threshold)
-			req_msg = f'Req Bitrate : {req_bandwidth}'
-			bir_msg = f'Bitrate     : {bitrate}'
-			brl_msg = f'Bitrate Perf: {bitperf}'
-			if float(br_loss) < float(self.iperf_bitrate_threshold):
-				brl_msg += f' (too low! <{self.iperf_bitrate_threshold}%)'
-			jit_msg = f'Jitter      : {jitter}'
-			pal_msg = f'Packet Loss : {packetloss}'
-			if float(pl) > float(self.iperf_packetloss_threshold):
-				pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
-			return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
-		else:
-			return (False, 'Could not analyze from server log')
-
-	def Iperf_Module(self, EPC, ue, RAN, idx, ue_num):
+	def Iperf_Module(self, EPC, ue, svr, RAN, idx, ue_num, CONTAINERS):
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
-		SSH = sshconnection.SSHConnection()
-		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
-		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
-		if (re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE)) or (re.match('OAICN5G', EPC.Type, re.IGNORECASE)):
-			#retrieve trf-gen container IP address
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('docker inspect --format="TRF_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-trf-gen', '\$', 5)
-			result = re.search('TRF_IP_ADDR = (?P<trf_ip_addr>[0-9\.]+)', SSH.getBefore())
-			if result is None:
-				raise Exception("could not corver prod-trf-gen IP address")
-			cn_target_ip = result.group('trf_ip_addr')
-			SSH.close()
-			cn_iperf_prefix = "docker exec  prod-trf-gen" # -w /iperf-2.0.13  necessary?
-		elif (re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE)):
-			cn_target_ip = "172.21.6.102"
-		else: # lteboix, sabox
-			cn_target_ip = "192.172.0.1"
-			cn_iperf_prefix = ""
+		svrIP = svr.getIP()
+		if not svrIP:
+			return (False, f"Iperf server {ue.getName()} has no IP address")
 
+		runIperf3Server = svr.getRunIperf3Server()
 		iperf_opt = self.iperf_args
+		jsonReport = "--json"
+		serverReport = ""
 		udpIperf = re.search('-u', iperf_opt) is not None
-		udpSwitch = '-u' if udpIperf else ''
-		if udpIperf:
-			iperf_opt = self.Iperf_ComputeModifiedBW(idx, ue_num)
-			logging.info(f'iperf options modified from "{self.iperf_args}" to "{iperf_opt}" for {ue.getName()}')
-		iperf_time = int(self.Iperf_ComputeTime())
-		port = f'-p {5001+idx}'
-		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
-		iperf_ue = '/data/local/tmp/iperf' if re.search('adb', ue.getName()) else 'iperf'
+		bidirIperf = re.search('--bidir', iperf_opt) is not None
+		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
+		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
+		ymlPath = CONTAINERS.yamlPath[0].split('/')
+		logPath = f'../cmake_targets/log/{ymlPath[1]}'
 
+		if udpIperf:
+			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
+			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
+			jsonReport = ""
+			# note: enable server report collection on the UE side, no need to store and collect server report separately on the server side
+			serverReport = "--get-server-output"
+			logging.info(f'iperf options modified from "{self.iperf_args}" to "{iperf_opt}" for {ue.getName()}')
+		iperf_time = Iperf_ComputeTime(self.iperf_args)
+		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
+		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
 		ue_header = f'UE {ue.getName()} ({ueIP})'
 
-		if self.iperf_direction == "DL":
-			logging.debug("Iperf in DL requested")
-			cmd = cls_cmd.getConnection(ue.getHost())
-			cmd.run(f'rm {server_filename}')
-			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ueIP} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
-			cmd.close()
-
-			cmd = cls_cmd.getConnection(EPC.IPAddress)
-			cmd.run(f'rm {EPC.SourceCodePath}/{client_filename}')
-			cmd.run(f'{cn_iperf_prefix} iperf -c {ueIP} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
-			cmd.copyin(f'{EPC.SourceCodePath}/{client_filename}', client_filename)
-			cmd.close()
-
-			cmd = cls_cmd.getConnection(ue.getHost())
-			cmd.copyin(f'/tmp/{server_filename}', server_filename)
-			cmd.close()
-
+		if svr.getName() == "rfsim4g_enb_fembms":
+			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
+				port = 5002 + idx
+				cmd_ue.run(f'{ue.getCmdPrefix()} iperf -B {ueIP} -s -u -i1 >> {server_filename} &', timeout=iperf_time*1.5)
+				cmd_svr.run(f'{svr.getCmdPrefix()} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 2>&1 | tee {client_filename}', timeout=iperf_time*1.5)
+				cmd_ue.run(f'cp {client_filename} {logPath}/{client_filename}')
+				cmd_ue.run(f'cp {server_filename} {logPath}/{server_filename}')
+				status, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+		else:
+			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
+				port = 5002 + idx
+				# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
+				if runIperf3Server:
+					cmd_svr.run(f'{svr.getCmdPrefix()} nohup iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=iperf_time*1.5)
+				cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
+				cmd_ue.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=iperf_time*1.5)
+				if svr.getHost() == 'localhost':
+					cmd_ue.run(f'mkdir -p {logPath}')
+					cmd_ue.run(f'cp /tmp/{client_filename} {logPath}/{client_filename}')
+					cmd_ue.run(f'cp /tmp/{client_filename} {client_filename}')
+				else:
+					cmd_ue.copyin(f'/tmp/{client_filename}', client_filename)
 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				status, msg = Iperf_analyzeV3UDP(client_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+			elif bidirIperf:
+				status, msg = Iperf_analyzeV3BIDIRJson(client_filename)
 			else:
-				cmd = cls_cmd.getConnection(EPC.IPAddress)
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"{EPC.SourceCodePath}/{client_filename}")
-				cmd.close()
-
-		elif self.iperf_direction == "UL":
-			logging.debug("Iperf in UL requested")
-			cmd = cls_cmd.getConnection(EPC.IPAddress)
-			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
-			cmd.run(f'{cn_iperf_prefix} iperf -s {udpSwitch} -t {iperf_time * 1.5} {port} &> {EPC.SourceCodePath}/{server_filename} &')
-			cmd.close()
-
-			cmd = cls_cmd.getConnection(ue.getHost())
-			cmd.run(f'rm /tmp/{client_filename}')
-			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
-			cmd.copyin(f'/tmp/{client_filename}', client_filename)
-			cmd.close()
-
-			cmd = cls_cmd.getConnection(EPC.IPAddress)
-			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
-			cmd.close()
-
-			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
-			else:
-				cmd = cls_cmd.getConnection(ue.getHost())
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"/tmp/{client_filename}")
-				cmd.close()
-
-		elif self.iperf_direction=="BIDIR":
-			logging.debug("Bi-directional iperf requested")
-			cmd = cls_cmd.getConnection(EPC.IPAddress)
-			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
-			cmd.run(f'{cn_iperf_prefix} iperf3 -s -i 1 -1 {port} &> {EPC.SourceCodePath}/{server_filename} &')
-			cmd.close()
-
-			cmd = cls_cmd.getConnection(ue.getHost())
-			cmd.run(f'rm /tmp/{client_filename}')
-			cmd.run(f'iperf3 -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
-			cmd.copyin(f'/tmp/{client_filename}', client_filename)
-			cmd.close()
-
-			cmd = cls_cmd.getConnection(EPC.IPAddress)
-			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
-			cmd.close()
-
-			status, msg = self.Iperf_analyzeV2BIDIR(server_filename, client_filename)
-
-		elif self.iperf_direction == "IPERF3":
-			cmd = cls_cmd.getConnection(ue.getHost())
-			cmd.run(f'rm /tmp/{server_filename}', reportNonZero=False)
-			port = f'{5002+idx}'
-			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ueIP} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
-			cmd.copyin(f'/tmp/{server_filename}', server_filename)
-			cmd.close()
-			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
-			else:
-				cmd = cls_cmd.getConnection(EPC.IPAddress)
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f'/tmp/{server_filename}')
-				cmd.close()
-
-		else :
-			raise Exception("Incorrect or missing IPERF direction in XML")
+				status, msg = Iperf_analyzeV3TCPJson(client_filename, self.iperf_tcp_rate_target)
 
 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -988,12 +852,16 @@ class OaiCiTest():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 
-		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_direction "{self.iperf_direction}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
+		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}"')
 
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		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(n.strip()) for n in self.ue_ids]
+		svr = cls_module.Module_UE(self.svr_id)
 		logging.debug(ues)
 		with concurrent.futures.ThreadPoolExecutor() as executor:
-			futures = [executor.submit(self.Iperf_Module, EPC, ue, RAN, i, len(ues)) for i, ue in enumerate(ues)]
+			futures = [executor.submit(self.Iperf_Module, EPC, ue, svr, RAN, i, len(ues), CONTAINERS) for i, ue in enumerate(ues)]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -1127,15 +995,15 @@ class OaiCiTest():
 					mib_found = True
 				except Exception as e:
 					logging.error(f'\033[91m MIB marker was not found \033[0m')
-			result = re.search("Measured Carrier Frequency (?P<measured_carrier_frequency>\d{1,15}) Hz", str(line))
+			result = re.search("Initial sync: pbch decoded sucessfully", str(line))
 			if result is not None and (not frequency_found):
 				try:
-					mibMsg = f"Measured Carrier Frequency = {result.group('measured_carrier_frequency')} Hz"
+					mibMsg = f"UE decoded PBCH successfully"
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
 					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					frequency_found = True
 				except Exception as e:
-					logging.error(f'\033[91m Measured Carrier Frequency not found \033[0m')
+					logging.error(f'\033[91m UE did not find PBCH\033[0m')
 			result = re.search("PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
 			if result is not None and (not plmn_found):
 				try:
@@ -1272,7 +1140,7 @@ class OaiCiTest():
 		return global_status
 
 	def TerminateUE(self, HTML):
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.terminate) for ue in ues]
 			archives = [f.result() for f in futures]
@@ -1404,7 +1272,7 @@ class OaiCiTest():
 		time.sleep(self.idle_sleep_time)
 		HTML.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def X2_Status(self, idx, fileName):
+	def X2_Status(self, idx, fileName, EPC):
 		cmd = "curl --silent http://" + EPC.IPAddress + ":9999/stats | jq '.' > " + fileName
 		message = cmd + '\n'
 		logging.debug(cmd)

ci-scripts/cls_physim.py

@@ -33,9 +33,11 @@ import logging
 import sshconnection
 #to update the HTML object
 import cls_oai_html
+import cls_cmd
 from multiprocessing import SimpleQueue
 #for log folder maintenance
 import os
+import re
 
 class PhySim:
 	def __init__(self):
@@ -63,7 +65,7 @@ class PhySim:
 #PRIVATE Methods
 #-----------------
 
-	def __CheckResults_LDPCTest(self,HTML,CONST,testcase_id):
+	def __CheckResults_LDPCcudaTest(self,HTML,CONST,testcase_id):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
@@ -84,42 +86,44 @@ class PhySim:
 		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
 		return HTML
 
-	def __CheckResults_LDPCt1Test(self,HTML,CONST,testcase_id):
-		thrs_NOK = 500
-		thrs_KO = 1000
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+	def __CheckResults_LDPCt2Test(self,HTML,CONST,testcase_id):
+		thrs_KO = int(self.timethrs)
+		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
 		#retrieve run log file and store it locally$
-		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
+		mySSH.copyin(f'{self.__workSpacePath}{self.__runLogFile}', f'{self.__runLogFile}')
 		mySSH.close()
-		#parse results looking for Decoding values
-		runResultsT1=[]
+		#parse results looking for encoder/decoder processing time values
+
 		with open(self.__runLogFile) as g:
 			for line in g:
-				if 'decoding time' in line:
-					runResultsT1.append(line)
+				res_enc = re.search(r"DLSCH encoding time\s+(\d+\.\d+)\s+us",line)
+				res_dec = re.search(r'ULSCH total decoding time\s+(\d+\.\d+)\s+us',line)
+				if res_dec is not None:
+					time = res_dec.group(1)
+					info = res_dec.group(0)
+					break
+				if res_enc is not None:
+					time = res_enc.group(1)
+					info = res_enc.group(0)
+					break
 
-		# In case the T1 board does work properly, there is no statistics
-		if len(runResultsT1) == 0:
-			logging.error('no statistics')
+		# In case the T2 board does work properly, there is no statistics
+		if res_enc is None and res_dec is None:
+			logging.error(f'no statistics: res_enc {res_enc} res_dec {res_dec}')
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
 			self.exitStatus = 1
-			os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+			os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
 			return HTML
 
-		info = runResultsT1[0][15:-13]
-		result = int(''.join(filter(str.isdigit, info)))/100
-		#once parsed move the local logfile to its folder for tidiness
-		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
-		if result < thrs_NOK:
+		#once parsed move the local logfile to its folder
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+		if float(time) < thrs_KO:
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		elif result > thrs_KO:
-			error_msg = f'Decoding time exceeds a limit of {thrs_KO} us'
+		else:
+			error_msg = f'Processing time exceeds a limit of {thrs_KO} us'
 			logging.error(error_msg)
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
 			self.exitStatus = 1
-		else:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', [info])
 		return HTML
 
 	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
@@ -228,7 +232,7 @@ class PhySim:
 		return lHTML
 
 
-	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
+	def Run_CUDATest(self,htmlObj,constObj,testcase_id):
 		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
 		os.system('mkdir -p ./'+self.__runLogPath)
@@ -243,25 +247,24 @@ class PhySim:
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCcudaTest(htmlObj,constObj,testcase_id)
 		return lHTML
 
-	def Run_LDPCt1Test(self,htmlObj,constObj,testcase_id):
-		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
+	def Run_T2Test(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = f'{self.eNBSourceCodePath}/cmake_targets/'
 		#create run logs folder locally
-		os.system('mkdir -p ./'+self.__runLogPath)
+		os.system(f'mkdir -p ./{self.__runLogPath}')
 		#log file is tc_<testcase_id>.log remotely
-		self.__runLogFile='physim_'+str(testcase_id)+'.log'
+		self.__runLogFile=f'physim_{str(testcase_id)}.log'
 		#open a session for test run
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		mySSH.command('cd '+self.__workSpacePath,'\$',5)
+		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+		mySSH.run(f'cd {self.__workSpacePath}')
 		#run and redirect the results to a log file
-		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1')
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_LDPCt1Test(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id)
 		return lHTML
 
 	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):

ci-scripts/cls_physim1.py

@@ -166,7 +166,7 @@ class PhySim:
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 21:
+			if (running_count + completed_count) == 22:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())

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

@@ -137,13 +137,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -156,9 +150,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";

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

@@ -174,13 +174,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -193,9 +187,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

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

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -153,9 +147,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf

@@ -172,12 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.195";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
 
     enable_measurement_reports = "no";
 
@@ -190,9 +185,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -211,8 +204,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  190;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  250;
+        puCch10xSnr     =  230;
         }  
 );
 
@@ -231,8 +224,8 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 10
-         att_rx         = 5;
+         att_tx         = 12
+         att_rx         = 0;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf

@@ -172,12 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.195";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
 
     enable_measurement_reports = "no";
 
@@ -190,9 +185,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -211,8 +204,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  190;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  280;
+        puCch10xSnr     =  250;
         }  
 );
 
@@ -231,8 +224,8 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 10
-         att_rx         = 5;
+         att_tx         = 18
+         att_rx         = 0;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;

ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf

@@ -172,12 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
 
     enable_measurement_reports = "no";
 
@@ -190,9 +185,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -153,9 +147,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";

ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -153,9 +147,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";

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

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

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

@@ -172,13 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -191,9 +185,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.1";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.1";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.1";
@@ -206,7 +198,6 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
-	local_s_if_name  = "lo";
 	remote_s_address = "127.0.0.1";
 	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;

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

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

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

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

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

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.30";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.30";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.30";

ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

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

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

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

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.3";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

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

@@ -180,12 +180,7 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
  ////////// MCE parameters:
-    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
 
     ///M2
     enable_enb_m2 = "yes";
@@ -208,9 +203,7 @@ eNBs =
     NETWORK_INTERFACES :
     {
 
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -252,12 +245,7 @@ MCEs = (
             //M3
             enable_mce_m3 = "yes";
 
-            target_mme_m3_ip_address      = ( { ipv4       = "127.0.0.18";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+            target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
 
 
 

ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf

@@ -179,13 +179,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -198,9 +192,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "yes";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "172.21.16.137"; port = 36412; });
 
     ///X2
     enable_x2         = "yes";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.68.130";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.68.130";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.68.130";

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

@@ -22,7 +22,6 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_if_name = "eth0";
     local_s_address = "192.168.71.150";
     remote_s_address = "192.168.71.171";
     local_s_portc   = 501;
@@ -40,19 +39,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -22,7 +22,6 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_if_name = "eth0";
     local_s_address = "192.168.68.194";
     remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
@@ -40,19 +39,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb-cucp.sa.f1.conf

@@ -23,7 +23,6 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_if_name = "lo";
     local_s_address = "192.168.71.150";
     remote_s_address = "0.0.0.0"; # multiple DUs
     local_s_portc   = 501;
@@ -41,12 +40,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "oai-amf"; });
 
     E1_INTERFACE =
     (
@@ -61,8 +55,7 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150/24";
     };
   }
 );
@@ -94,5 +87,6 @@ security = {
        rrc_log_level                         ="info";
        f1ap_log_level                         ="info";
        ngap_log_level                         ="debug";
+       sctp_log_level                         ="info";
     };
 

ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf

@@ -23,7 +23,6 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_if_name = "eth0";
     local_s_address = "192.168.68.194";
     remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
@@ -41,12 +40,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
 
     E1_INTERFACE =
     (
@@ -61,7 +55,6 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
     };
   }

ci-scripts/conf_files/gnb-cuup.sa.f1.conf

@@ -21,7 +21,6 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_if_name = "lo";
     local_s_address = "192.168.72.161";
     remote_s_address = "192.168.72.171";
     local_s_portc   = 501;
@@ -48,9 +47,7 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.161/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.161/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf

@@ -21,7 +21,6 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_if_name = "lo";
     local_s_address = "192.168.68.196";
     remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
@@ -48,9 +47,7 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -168,7 +168,6 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
     local_n_address = "192.168.72.142";
     remote_n_address = "192.168.72.140";
     local_n_portc   = 500;

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

@@ -162,7 +162,6 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
     local_n_address = "192.168.68.195";
     remote_n_address = "192.168.68.194";
     local_n_portc   = 500;

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

@@ -168,7 +168,6 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
     local_n_address = "192.168.71.171";
     remote_n_address = "192.168.71.150";
     local_n_portc   = 500;
@@ -231,3 +230,31 @@ log_config: {
   rlc_log_level = "info";
   f1ap_log_level = "info";
 };
+
+#/* configuration for channel modelisation */
+#/* To be included in main config file when */
+#/* channel modelisation is used (rfsimulator with chanmod options enabled) */
+channelmod = {
+  max_chan = 10;
+  modellist = "modellist_rfsimu_1";
+  modellist_rfsimu_1 = (
+    { # DL, modify on UE side
+      model_name     = "rfsimu_channel_enB0"
+      type           = "AWGN";
+      ploss_dB       = 20;
+      noise_power_dB = -4;
+      forgetfact     = 0;
+      offset         = 0;
+      ds_tdl         = 0;
+    },
+    { # UL, modify on gNB side
+      model_name     = "rfsimu_channel_ue0"
+      type           = "AWGN";
+      ploss_dB       = 20;
+      noise_power_dB = -2;
+      forgetfact     = 0;
+      offset         = 0;
+      ds_tdl         = 0;
+    }
+  );
+};

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

@@ -169,7 +169,6 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
     local_n_address = "192.168.68.195";
     remote_n_address = "192.168.68.194";
     local_n_portc   = 500;
@@ -186,7 +185,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 150;
+  pucch0_dtx_threshold = 100;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

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

@@ -190,19 +190,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
@@ -213,7 +206,6 @@ gNBs =
 MACRLCs = (
 {
   num_cc           = 1;
-  local_s_if_name  = "lo:";
   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

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

@@ -150,19 +150,12 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.12.26"; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -162,20 +162,12 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -162,20 +162,12 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf

@@ -162,18 +162,10 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
 
     NETWORK_INTERFACES : {
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf

@@ -164,18 +164,10 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
 
     NETWORK_INTERFACES : {
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -158,13 +158,7 @@ gNBs =
 
 
     ////////// MME parameters:
-#    mme_ip_address      = ( { ipv4       = "192.168.68.130";
-#                              ipv6       = "192:168:30::17";
-#                              port       = 36412 ;
-#                              active     = "yes";
-#                              preference = "ipv4";
-#                            }
-#                          );
+#    mme_ip_address = ({ ipv4 = "192.168.68.130"; port = 36412; });
 
     ///X2
     enable_x2         = "yes";
@@ -173,17 +167,11 @@ gNBs =
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
 
-    target_enb_x2_ip_address = ( { ipv4       = "192.168.68.130";
-                                   ipv6       = "192:168:30::17";
-                                   preference = "ipv4";
-                                 }
-                               );
+    target_enb_x2_ip_address = ({ ipv4 = "192.168.68.130"; });
 
     NETWORK_INTERFACES :
     {
-      GNB_INTERFACE_NAME_FOR_S1_MME  = "eth0";
       GNB_IPV4_ADDRESS_FOR_S1_MME    = "192.168.68.194";
-      GNB_INTERFACE_NAME_FOR_S1U     = "eth0";
       GNB_IPV4_ADDRESS_FOR_S1U       = "192.168.68.194";
       GNB_PORT_FOR_S1U               = 2152; # Spec 2152
       GNB_IPV4_ADDRESS_FOR_X2C       = "192.168.68.194";

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

@@ -163,12 +163,7 @@ gNBs =
 
 
     ////////// MME parameters:
-    amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
 
     ///X2
     enable_x2 = "yes";
@@ -176,19 +171,12 @@ gNBs =
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "CI_FR1_CTL_ENB_IP_ADDR";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
+    target_enb_x2_ip_address = ({ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         GNB_IPV4_ADDRESS_FOR_X2C                 = "CI_GNB_IP_ADDR";

ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf

@@ -162,18 +162,11 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -160,19 +160,12 @@ gNBs =
 
 
     ////////// MME parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -161,18 +161,11 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/26";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno1";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/26";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -0,0 +1,253 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+sa = 1;
+usrp-tx-thread-config = 1;
+tune-offset = 30720000;
+
+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;
+
+    ////////// Physical parameters:
+
+    ssb_SubcarrierOffset  = 0;
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts    = 2;
+    do_CSIRS              = 1;
+    do_SRS                = 1;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.60 MHz + 81*12*30e-3 MHz = 3329.76
+      absoluteFrequencySSB                                             = 673344;
+      # this is 3300.60 MHz
+      dl_absoluteFrequencyPointA                                       = 671400;
+      dl_frequencyBand                                                 = 77;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 162;
+     #initialDownlinkBWP
+      #genericParameters
+       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
+       initialDLBWPlocationAndBandwidth                                        = 31624;
+       #
+# 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                                            = 162;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+     #genericParameters
+        initialULBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                           = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 12;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -70;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 2;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                             = -20;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "192.168.61.132"; });
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 300;
+  pucch_TargetSNRx10          = 300;
+  ulsch_max_frame_inactivity  = 0;
+  pusch_FailureThres          = 100;
+  ul_max_mcs		      = 28;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 120;
+  pusch_dtx_threshold = 20;
+  max_ldpc_iterations = 20;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 2;
+  nb_rx          = 2;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain     = 72;
+  eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
+  #clock_src = "internal";
+  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
+
+}
+);
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
+};

ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf

@@ -0,0 +1,248 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+sa = 1;
+usrp-tx-thread-config = 1;
+
+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;
+
+  ////////// Physical parameters:
+
+  pdsch_AntennaPorts_XP = 2;
+  pusch_AntennaPorts    = 2;
+  do_CSIRS              = 1;
+  do_SRS                = 1;
+  ul_prbblacklist       = "135,136,137,138"
+
+  servingCellConfigCommon = (
+  {
+    # spCellConfigCommon
+
+    physCellId = 0;
+
+    # downlinkConfigCommon
+      # frequencyInfoDL
+      # this is 3900.60 MHz + (134 PRBs + 4 SCs)@30kHz SCS (GSCN: 8158)
+      absoluteFrequencySSB                  = 673344;
+      dl_frequencyBand                      = 77;
+      # this is 3900.60 MHz
+      dl_absoluteFrequencyPointA            = 670068;
+
+      # scs-SpecificCarrierList
+      dl_offstToCarrier                      = 0;
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      dl_subcarrierSpacing                  = 1;
+      dl_carrierBandwidth                   = 273;
+
+      # initialDownlinkBWP
+        # genericParameters
+        initialDLBWPlocationAndBandwidth                = 1099;
+        # 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                               = 273;
+      pMax                                              = 20;
+
+      # initialUplinkBWP
+        # genericParameters
+        initialULBWPlocationAndBandwidth                = 1099;
+        # 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                   = -90;
+          # preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                              = 6;
+          # powerRampingStep
+          # 0=dB0,1=dB2,2=dB4,3=dB6
+          powerRampingStep                              = 1;
+          # ra_ReponseWindow
+          # 1,2,4,8,10,20,40,80
+          ra_ResponseWindow                             = 4;
+          # ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+          # 1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+          ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR  = 3;
+          # oneHalf (0..15) 4,8,12,16,...60,64
+          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 15;
+          # ra_ContentionResolutionTimer
+          # (0..7) 8,16,24,32,40,48,56,64
+          ra_ContentionResolutionTimer                  = 7;
+          rsrp_ThresholdSSB                             = 19;
+          # prach-RootSequenceIndex_PR
+          # 1 = 839, 2 = 139
+          prach_RootSequenceIndex_PR                    = 2;
+          prach_RootSequenceIndex                       = 1;
+          # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+          msg1_SubcarrierSpacing                        = 1,
+          # restrictedSetConfig
+          # 0=unrestricted, 1=restricted type A, 2=restricted type B
+          restrictedSetConfig                           = 0,
+          msg3_DeltaPreamble                            = 1;
+          p0_NominalWithGrant                           =-90;
+
+        # pucch-ConfigCommon
+          # pucchGroupHopping
+          # 0 = neither, 1= group hopping, 2=sequence hopping
+          pucchGroupHopping                             = 0;
+          hoppingId                                     = 40;
+          p0_nominal                                    = -70;
+
+      # dmrs_TypeA_position
+      # 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                               = 0;
+
+      # subcarrierSpacing
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                 = 1;
+
+
+    # ssb_PositionsInBurs_BitmapPR
+      # 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR       = 2;
+      ssb_PositionsInBurst_Bitmap   = 1;
+      # ssb_periodicityServingCell
+      # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell    = 2;
+
+    #tdd-UL-DL-ConfigurationCommon
+      # subcarrierSpacing
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity = 6;
+      nrofDownlinkSlots             = 7;
+      nrofDownlinkSymbols           = 6;
+      nrofUplinkSlots               = 2;
+      nrofUplinkSymbols             = 4;
+
+    ssPBCH_BlockPower               = -25;
+  }
+  );
+
+
+  # ------- SCTP definitions
+  SCTP :
+  {
+    # Number of streams to use in input/output
+    SCTP_INSTREAMS  = 2;
+    SCTP_OUTSTREAMS = 2;
+  };
+
+
+  ////////// AMF parameters:
+  amf_ip_address = ({ ipv4 = "192.168.61.132"; });
+
+  NETWORK_INTERFACES :
+  {
+    GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/24";
+    GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/24";
+    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;
+  pusch_FailureThres          = 1000;
+  ulsch_max_frame_inactivity  = 0;
+  ul_max_mcs                  = 25;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 120;
+  max_ldpc_iterations = 15;
+  pucch0_dtx_threshold = 80;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 2;
+  nb_rx          = 2;
+  att_tx         = 12;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 72;
+  eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
+  #clock_src = "internal";
+  sdr_addrs = "addr=192.168.80.53,clock_source=internal,time_source=internal"
+}
+);
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
+};

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

@@ -158,19 +158,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.128";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno1";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.128";
         GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
     };
@@ -181,7 +174,6 @@ gNBs =
 MACRLCs = (
         {
         num_cc = 1;
-        local_s_if_name  = "lo:";
         remote_s_address = "127.0.0.1"; // pnf addr [!]
         local_s_address  = "127.0.0.2"; // vnf addr
         local_s_portc    = 50601; // vnf p5 port

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

@@ -13,13 +13,13 @@ gNBs =
     // 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;}); });
+    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({sst = 1;}); });
 
     nr_cellid = 12345678L
 
     ////////// Physical parameters:
 
-    min_rxtxtime                                              = 5;
+    min_rxtxtime                                              = 2;
     do_SRS                                                    = 0;
     force_256qam_off                                          = 1;
     pdsch_AntennaPorts_N1                                     = 1;
@@ -170,19 +170,12 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "172.21.6.100";
-                                  ipv6       = "192:168:30::17";
-                                  active     = "yes";
-                                  preference = "ipv4";
-                                                                                                                              }
-                                                                                                                                          );
+        amf_ip_address = ({ ipv4 = "172.21.6.100"; });
 
         NETWORK_INTERFACES :
         {
 
-           GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/22";
-           GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/22";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };

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

@@ -85,7 +85,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
+        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
@@ -161,19 +161,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -88,7 +88,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
+        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
@@ -164,19 +164,12 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                                  ipv6       = "192:168:30::17";
-                                  active     = "yes";
-                                  preference = "ipv4";
-                                                                                                                              }
-                                                                                                                                          );
+        amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
         NETWORK_INTERFACES :
         {
 
-           GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };

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

@@ -163,19 +163,12 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                                  ipv6       = "192:168:30::17";
-                                  active     = "yes";
-                                  preference = "ipv4";
-                                                                                                                              }
-                                                                                                                                          );
+        amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
 
         NETWORK_INTERFACES :
         {
 
-           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };

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

@@ -156,19 +156,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -176,19 +176,12 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                                  ipv6       = "192:168:30::17";
-                                  active     = "yes";
-                                  preference = "ipv4";
-                                                                                                                              }
-                                                                                                                                          );
+        amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
 
         NETWORK_INTERFACES :
         {
 
-           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };

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

@@ -177,19 +177,12 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                                  ipv6       = "192:168:30::17";
-                                  active     = "yes";
-                                  preference = "ipv4";
-                                                                                                                              }
-                                                                                                                                          );
+        amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
 
         NETWORK_INTERFACES :
         {
 
-           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };

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

@@ -82,7 +82,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
+        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
@@ -159,19 +159,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -16,7 +16,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  0x1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
 
     nr_cellid = 12345678L
 
@@ -35,10 +35,10 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
-      absoluteFrequencySSB                                             = 627360;
+      absoluteFrequencySSB                                             = 630048;
       dl_frequencyBand                                                 = 78;
       # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
-      dl_absoluteFrequencyPointA                                       = 626748;
+      dl_absoluteFrequencyPointA                                       = 629436;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -166,19 +166,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.6.100";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "172.21.6.100"; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/20";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/20";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -30,7 +30,7 @@ gNBs =
       absoluteFrequencySSB                                             = 620736;
       dl_frequencyBand                                                 = 78;
       # this is 3300.30 MHz
-      dl_absoluteFrequencyPointA                                       = 620052;
+      dl_absoluteFrequencyPointA                                       = 620020;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -156,19 +156,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf

@@ -13,7 +13,6 @@ L1s = (
         {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
-	local_n_if_name  = "eno1";
 	remote_n_address = "127.0.0.1";
 	local_n_address  = "127.0.0.1";
 	local_n_portc    = 50000;

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

@@ -21,7 +21,6 @@ MACRLCs = (
         {
         num_cc = 1;
         tr_n_preference = "nfapi";
-        local_n_if_name  = "eno1";
         remote_n_address = "127.0.0.1"; //Proxy IP
         local_n_address  = "127.0.0.1";
         local_n_portc    = 50600;

ci-scripts/conf_files/nrue.uicc.conf

@@ -5,3 +5,31 @@ uicc0 = {
   dnn= "oai";
   nssai_sst=1;
 }
+
+#/* configuration for channel modelisation */
+#/* To be included in main config file when */
+#/* channel modelisation is used (rfsimulator with chanmod options enabled) */
+channelmod = {
+  max_chan = 10;
+  modellist = "modellist_rfsimu_1";
+  modellist_rfsimu_1 = (
+    { # DL, modify on UE side
+      model_name     = "rfsimu_channel_enB0"
+      type           = "AWGN";
+      ploss_dB       = 20;
+      noise_power_dB = -4;
+      forgetfact     = 0;
+      offset         = 0;
+      ds_tdl         = 0;
+    },
+    { # UL, modify on gNB side
+      model_name     = "rfsimu_channel_ue0"
+      type           = "AWGN";
+      ploss_dB       = 20;
+      noise_power_dB = -2;
+      forgetfact     = 0;
+      offset         = 0;
+      ds_tdl         = 0;
+    }
+  );
+};

ci-scripts/conf_files/untested/benetel-4g.conf

@@ -176,12 +176,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
 
     enable_measurement_reports = "yes";
 
@@ -194,9 +189,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.1";

ci-scripts/conf_files/untested/benetel-5g.conf

@@ -166,12 +166,7 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4  "CI_MME_IP_ADDR"; });
 
     ///X2
     enable_x2 = "yes";
@@ -179,19 +174,12 @@ gNBs =
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "127.0.0.1";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
+    target_enb_x2_ip_address = ({ ipv4 = "127.0.0.1"; });
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "CI_GNB_IP_ADDR";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "CI_GNB_IP_ADDR";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         GNB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.2/24";

ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf

@@ -173,13 +173,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     ///X2
     enable_x2 = "yes";
@@ -190,9 +184,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
 

ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf

@@ -354,13 +354,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port 36412; });
 
     enable_measurement_reports = "no";
 
@@ -373,9 +367,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf

@@ -175,13 +175,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf

@@ -176,13 +176,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -194,12 +188,7 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
     ///M2
-    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
 
     enable_enb_m2 = "yes";
     
@@ -219,9 +208,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -244,12 +231,7 @@ MCEs = (
             //M3
             enable_mce_m3 = "yes";
 
-            target_mme_m3_ip_address      = ( { ipv4       = "127.0.0.18";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+            target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
 
 
             NETWORK_INTERFACES :

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

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412 ; });
 
     enable_measurement_reports = "no";
 
@@ -153,9 +147,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -153,9 +147,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

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

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -153,9 +147,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf

@@ -134,13 +134,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     ///X2
     enable_x2 = "no";
@@ -151,9 +145,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf

@@ -171,13 +171,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -190,9 +184,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf

@@ -174,13 +174,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -190,18 +184,11 @@ eNBs =
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "CI_RCC_IP_ADDR";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
+    target_enb_x2_ip_address = ({ ipv4 = "CI_RCC_IP_ADDR"; });
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     ///X2
     enable_x2         = "no";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf

@@ -177,13 +177,7 @@ eNBs =
     enable_measurement_reports = "yes";
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     ///X2
     enable_x2         = "yes";
@@ -194,9 +188,7 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf

@@ -174,13 +174,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
 
     enable_measurement_reports = "no";
 
@@ -193,9 +187,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf

@@ -173,31 +173,19 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+
     ///X2
     enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "CI_RCC_IP_ADDR";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
+    target_enb_x2_ip_address = ({ ipv4 = "CI_RCC_IP_ADDR"; });
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
 

ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf

@@ -21,7 +21,6 @@ MACRLCs = (
         {
         num_cc = 1;
         tr_n_preference = "nfapi";
-        local_n_if_name  = "ens3";
         remote_n_address = "127.0.0.1"; //Proxy IP
         local_n_address  = "127.0.0.1";
         local_n_portc    = 50600;

ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf

@@ -172,13 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.195";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.195"; port = 36412; });
 
     enable_measurement_reports = "yes";
 
@@ -191,9 +185,7 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.0.1";
-        ENB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.16.0.1";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.16.0.1";
@@ -206,7 +198,6 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
-	local_s_if_name  = "lo";
 	remote_s_address = "127.0.0.1";
 	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;

ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf

@@ -162,32 +162,21 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.61.195";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+
     ///X2
     enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "172.16.0.1"; # rrc.band7.tm1.nfapi.conf:line 201
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
+    target_enb_x2_ip_address = ({ ipv4 = "172.16.0.1"; });
 
     NETWORK_INTERFACES :
     {   # All of these have to be IP addr of gNB
                 # if in CORE container, make it 172.16.0.X
                 # if not launched in CORE, can set to lo (127.0.0.2)
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.0.2";
-        GNB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "172.16.0.2";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         GNB_IPV4_ADDRESS_FOR_X2C                 = "172.16.0.2";
@@ -200,7 +189,6 @@ gNBs =
 MACRLCs = (
         {
         num_cc = 1;
-        local_s_if_name  = "lo:";
         remote_s_address = "127.0.0.1"; // pnf addr [!]
         local_s_address  = "127.0.0.2"; // vnf addr
         local_s_portc    = 50601; // vnf p5 port

ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf

@@ -13,7 +13,6 @@ L1s = (
         {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
-	local_n_if_name  = "ens3";
 	remote_n_address = "127.0.0.1"; //Proxy IP
 	local_n_address  = "127.0.0.1";
 	local_n_portc    = 50000;

ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf

@@ -161,19 +161,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.70.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "ctrl0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.16.0.1";
-        GNB_INTERFACE_NAME_FOR_NGU               = "ctrl0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "172.16.0.1";
         GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
     };
@@ -184,7 +177,6 @@ gNBs =
 MACRLCs = (
         {
         num_cc = 1;
-        local_s_if_name  = "lo:";
         remote_s_address = "127.0.0.1"; // pnf addr [!]
         local_s_address  = "127.0.0.2"; // vnf addr
         local_s_portc    = 50601; // vnf p5 port

ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf

@@ -21,7 +21,6 @@ MACRLCs = (
         {
         num_cc = 1;
         tr_n_preference = "nfapi";
-        local_n_if_name  = "lo:";
         remote_n_address = "127.0.0.1"; //Proxy IP
         local_n_address  = "127.0.0.1";
         local_n_portc    = 50600;