Changes to support multiple TDD patterns

- Updated the configuration changes for 2 Patterns
- Update the TDD table configuration for NFAPI
- Added the tdd config map for the period

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

README.md

@@ -25,6 +25,7 @@
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-cuup"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-cuup?label=NR-CUUP%20docker%20pulls"></a>
 </p>
 
 # OpenAirInterface License #

charts/physims/values.yaml

@@ -30,11 +30,11 @@ global:
     nrpsbchsim: dedale
     nrprachsim: dedale
     nrpucchsim: dedale
-    nrulschsim: theseus
-    nrulsim3gpp: theseus
-    nrulsimmimo: theseus
-    nrulsimmisc: theseus
-    nrulsimscfdma: theseus
-    polartest: theseus
-    smallblocktest: theseus
-    ulsim: theseus
+    nrulschsim: demophon
+    nrulsim3gpp: demophon
+    nrulsimmimo: demophon
+    nrulsimmisc: demophon
+    nrulsimscfdma: demophon
+    polartest: demophon
+    smallblocktest: demophon
+    ulsim: demophon

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

@@ -97,7 +97,7 @@ ltebox-nepes:
 
 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

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_containerize.py

@@ -1021,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')
@@ -1043,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)
@@ -1053,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):

ci-scripts/cls_oaicitest.py

@@ -129,10 +129,10 @@ def Iperf_analyzeV3BIDIRJson(filename):
 	with open(filename) as file:
 		filename = json.load(file)
 		try:
-			sender_bitrate_dl   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate_dl = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
-			sender_bitrate_ul   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate_ul = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
+			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!')
 

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

@@ -204,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;
         }  
 );
 
@@ -224,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

@@ -204,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;
         }  
 );
 
@@ -224,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/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -4,7 +4,6 @@ Asn1_verbosity = "none";
 
 sa = 1;
 nfapi = "AERIAL";
-pdcp-drop = 1;
 
 gNBs =
 (
@@ -16,8 +15,8 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
     plmn_list = ({
-                  mcc = 001;
-                  mnc = 01;
+                  mcc = 208;
+                  mnc = 97;
                   mnc_length = 2;
                   snssaiList = (
                     {
@@ -31,11 +30,10 @@ gNBs =
     ////////// Physical parameters:
 
     pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
     do_SRS                = 0;
-    min_rxtxtime          = 3;
+    min_rxtxtime          = 2;
 
     pdcch_ConfigSIB1 = (
       {
@@ -170,19 +168,13 @@ gNBs =
       # pattern1
       # dl_UL_TransmissionPeriodicity
       # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5; #6;
+      nrofDownlinkSlots                                             = 3; #7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1; #2;
+      nrofUplinkSymbols                                             = 0;
 
-#      dl_UL_TransmissionPeriodicity                                 = 5; #6;
-#      nrofDownlinkSlots                                             = 3; #7;
-#      nrofDownlinkSymbols                                           = 6;
-#      nrofUplinkSlots                                               = 1; #2;
-#      nrofUplinkSymbols                                             = 0;
-      dl_UL_TransmissionPeriodicity                                 = 6; 
-      nrofDownlinkSlots                                             = 6; 
-      nrofDownlinkSymbols                                           = 10; 
-      nrofUplinkSlots                                               = 3; 
-      nrofUplinkSymbols                                             = 0
-
-      ssPBCH_BlockPower                                             = -34;
+      ssPBCH_BlockPower                                             = -25;
   }
 
   );
@@ -197,22 +189,14 @@ 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.71.132"; });
+    ////////// AMF parameters:
+    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.70.129/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24"; 
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -230,11 +214,11 @@ MACRLCs = (
   remote_s_portd   = 50010; // pnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 280; # 150;
-  pucch_TargetSNRx10          = 100; #200;
+  pusch_TargetSNRx10          = 200; # 150;
+  pucch_TargetSNRx10          = 200; #200;
   ulsch_max_frame_inactivity  = 10;
-  dl_max_mcs = 27;
-  ul_max_mcs = 25;
+  dl_max_mcs = 28;
+  ul_max_mcs = 28;
 }
 );
 

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

@@ -167,19 +167,12 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.61.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.61.132"; });
 
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

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

@@ -164,20 +164,11 @@ gNBs = (
 
 
   ////////// AMF parameters:
-  amf_ip_address = (
-  {
-    ipv4       = "192.168.61.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
+  amf_ip_address = ({ ipv4 = "192.168.61.132"; });
 
   NETWORK_INTERFACES :
   {
-    GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
     GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/24";
-    GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
     GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/24";
     GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
   }

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

@@ -13,7 +13,7 @@ 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
 

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

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

ci-scripts/epc.py

@@ -298,39 +298,18 @@ class EPCManagement():
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			self.testCase_id = HTML.testCase_id
-			imageNames = ["oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "mysql","oai-traffic-server"]
-			logging.debug('Deploying OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = "/opt/oai-cn5g-fed-develop-2023-04-28-20897"
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
+			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			for ii in imageNames:
-					mySSH.run(f'helm uninstall {ii}', reportNonZero=False)
-			mySSH.run(f'helm spray {lSourcePath}/ci-scripts/charts/oai-5g-basic/.')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			if ret.stdout.count('Running') != 9:
-				logging.error('\u001B[1m Deploying 5GCN Failed using helm chart on OC Cluster\u001B[0m')
-				for ii in imageNames:
-					mySSH.run('helm uninstall '+ ii)
-				ret = mySSH.run(f'oc get pods')
-				if re.search('No resources found', ret.stdout):
-					logging.debug('All pods uninstalled')
-					OC.OC_logout(mySSH)
-					mySSH.close()
-					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
-					return False
-			ret = mySSH.run(f'oc get pods', silent=True)
-			for line in ret.stdout.split('\n')[1:]:
+				HTML.CreateHtmlTestRow('N/A', 'KO', report)
+				HTML.CreateHtmlTabFooter(False)
+				mySSH.close()
+				sys.exit("OC OAI CN5G: CN deployment failed!")
+			for line in report.stdout.split('\n')[1:]:
 				columns = line.strip().split()
 				name = columns[0]
 				status = columns[2]
 				html_cell += status + '    ' + name
 				html_cell += '\n'
-			OC.OC_logout(mySSH)
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
@@ -562,8 +541,6 @@ class EPCManagement():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
 	def Terminate5GCN(self, HTML):
-		imageNames = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-		containerInPods = ["", "-c nrf", "-c amf", "-c smf", "-c spgwu", "-c ausf", "-c udm", "-c udr", ""]
 		mySSH = cls_cmd.getConnection(self.IPAddress)
 		message = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
@@ -598,36 +575,13 @@ class EPCManagement():
 			mySSH.copyin(f'{self.SourceCodePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
 			logging.debug(message)
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			logging.debug('Terminating OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = self.SourceCodePath
-			mySSH.run(f'rm -Rf {lSourcePath}/logs')
-			mySSH.run(f'mkdir -p {lSourcePath}/logs')
-			logging.debug('OC OAI CN5G - Collecting Log files to workspace')
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
+			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			mySSH.run(f'oc describe pod &> {lSourcePath}/logs/describe-pods-post-test.log')
-			mySSH.run(f'oc get pods.metrics.k8s &> {lSourcePath}/logs/nf-resource-consumption.log')
-			for ii, ci in zip(imageNames, containerInPods):
-			       podName = mySSH.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-			       if not podName:
-				       logging.debug(f'{ii} pod not found!')
-				       HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-				       HTML.CreateHtmlTabFooter(False)
-			       mySSH.run(f'oc logs -f {podName} {ci} &> {lSourcePath}/logs/{ii}.log &')
-			       mySSH.run(f'helm uninstall {ii}')
-			       podName = ''
-			mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq test_logs_CN.zip *.log')
-			mySSH.copyin(f'{lSourcePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			res = re.search(f'No resources found in {OC.CI_OC_CORE_NAMESPACE} namespace.', ret.stdout)
-			if res is not None:
-			       logging.debug('OC OAI CN5G components uninstalled')
-			       message = 'OC OAI CN5G components uninstalled'
-			OC.OC_logout(mySSH)
+				HTML.CreateHtmlTestRow('N/A', 'KO', report)
+				HTML.CreateHtmlTabFooter(False)
+				sys.exit("OC OAI CN5G: CN undeployment failed!")
+			else:
+				message = report.stdout
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml

@@ -31,15 +31,15 @@
 111111
 100000
 010010
-030101
+031101
 010001
 000001
-050000
-050001
-070000
-070001
+051000
+051001
+071000
+071001
 010010
-030201
+031201
 
 </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
@@ -65,7 +65,7 @@
     <command>sudo cpupower idle-set -E</command>
   </testCase>
 
-  <testCase id="030101">
+  <testCase id="031101">
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
@@ -85,7 +85,7 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="050000">
+  <testCase id="051000">
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
     <id>up2</id>
@@ -94,7 +94,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
- <testCase id="050001">
+ <testCase id="051001">
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
     <id>up2</id>
@@ -103,7 +103,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
    </testCase>
 
-  <testCase id="070000">
+  <testCase id="071000">
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 1M -t 60 -R</iperf_args>
@@ -113,7 +113,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
    </testCase>
 
-   <testCase id="070001">
+   <testCase id="071001">
      <class>Iperf</class>
      <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
      <iperf_args>-u -b 7M -t 60</iperf_args>
@@ -129,7 +129,7 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="030201">
+  <testCase id="031201">
     <class>Undeploy_Object</class>
     <desc>Undeploy gNB</desc>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -48,9 +48,9 @@
     000100
     000010
     000020
-    002016
     000030
     000040
+    002016
     000200
     003000
     004000

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -165,7 +165,7 @@
 
   <testCase id="070003">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
@@ -174,7 +174,7 @@
 
   <testCase id="070004">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -157,7 +157,7 @@
 
   <testCase id="370003">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
@@ -166,7 +166,7 @@
 
   <testCase id="370004">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -189,7 +189,7 @@
 
   <testCase id="170003">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
@@ -198,7 +198,7 @@
 
   <testCase id="170004">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -159,7 +159,7 @@
 
   <testCase id="270003">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
@@ -168,7 +168,7 @@
 
   <testCase id="270004">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     oai_enb0:
         image: oaisoftwarealliance/oai-enb:develop

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     oai_enb0:
         image: oaisoftwarealliance/oai-enb:develop

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     oai_enb0:
         image: oaisoftwarealliance/oai-enb:develop

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "l2sim-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     oai-du:
         image: oaisoftwarealliance/oai-gnb:develop

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     mysql:
         container_name: "rfsim5g-mysql"

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     oai-nr-ue:
         image: oai-nr-ue:latest
@@ -10,7 +9,7 @@ services:
         #entrypoint: /bin/bash -c "sleep infinity"
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 208970000000111 --uicc0.nssai_sd 16777215
+            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 001020000000111 --uicc0.nssai_sd 16777215
         volumes:
             - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     rru_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     lte_ue0:
         image: oai-lte-ue:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     rru_tdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_tdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_tdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_tdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_tdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_tdd:
         image: oai-enb:latest

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     oai-enb:
         image: oai-enb:latest

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

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     oai-enb:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     cassandra:
         image: cassandra:2.1

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     enb_mono_fdd:
         image: oai-enb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     gnb_mono_tdd:
         image: oai-gnb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     gnb_mono_tdd:
         image: oai-gnb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     gnb_cucp:
         image: oai-gnb:latest

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     gnb_cu:
         image: oai-gnb:latest
@@ -30,7 +28,7 @@ services:
           core: -1 # for core dumps
         environment:
             USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
         volumes:
             - ../../conf_files/gnb-du.sa.band1.52prb.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev

ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh

@@ -3,7 +3,10 @@
 # Check if cuBB_SDK is defined, if not, use default path
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
 
+# Run gdrcopy insmod
+cd "$cuBB_Path"/cuPHY-CP/external/gdrcopy/ || exit 1
 
+./insmod.sh
 cd "$cuBB_Path" || exit 1
 # Add gdrcopy to LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
@@ -18,8 +21,8 @@ export CUDA_MPS_LOG_DIRECTORY=/var
 echo quit | nvidia-cuda-mps-control
 
 # Start MPS
-sudo -E nvidia-cuda-mps-control -d
-sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
+nvidia-cuda-mps-control -d
+echo start_server -uid 0 | nvidia-cuda-mps-control
 
 # Start cuphycontroller_scf
 # Check if an argument is provided
@@ -31,12 +34,4 @@ else
     argument="$1"
 fi
 
-#sed -i "s/ nic:.*/ nic: 0000:cc:00.1/" ${cuBB_SDK}/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_FXN_R750.yaml
-#sed -i "s/ dst_mac_addr:.*/ dst_mac_addr: 6c:ad:ad:00:04:6c/" ${cuBB_SDK}/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_FXN_R750.yaml
-sed -i "s/ nic:.*/ nic: 0000:b5:00.0/" ${cuBB_SDK}/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_FXN.yaml
-sed -i "s/ dst_mac_addr:.*/ dst_mac_addr: 6c:ad:ad:00:04:6c/" ${cuBB_SDK}/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_FXN.yaml
-
-sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf P5G_FXN
-sudo ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
-sudo mv nvipc.pcap /var/log/aerial/
-sleep infinity
+"$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   nv-cubb:
     container_name: nv-cubb
@@ -24,11 +23,10 @@ services:
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:23-4
+    image: cubb-build:23-2
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
-    command: bash -c " sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
-#    command: bash -c "sleep infinity"
+    command: bash -c " rm -rf /tmp/phy.log && chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
     healthcheck:
       test: ["CMD-SHELL",'grep -q "L1 is ready!" /tmp/phy.log && echo 0 || echo 1']
       interval: 20s
@@ -36,7 +34,7 @@ services:
       retries: 5
   oai-gnb-aerial:
     cpuset: "13-20"
-    image: oai-gnb-aerial:w15 # oai-gnb-aerial:latest
+    image: oai-gnb-aerial:latest
     depends_on:
       nv-cubb:
         condition: service_healthy
@@ -58,9 +56,6 @@ services:
     tty: true
     volumes:
       - ../../conf_files/gnb-vnf.sa.band78.273prb.aerial.conf:/opt/oai-gnb/etc/gnb.conf
-      - /var/log/aerial:/var/log/aerial
-    command: bash -c "chrt -f 99 /opt/oai-gnb/bin/nr-softmodem -O /opt/oai-gnb/etc/gnb.conf | ts | tee /var/log/aerial/oai.log"
-#    command: bash -c "/opt/oai-gnb/bin/nr-softmodem -O /opt/oai-gnb/etc/gnb.conf | ts | tee /var/log/aerial/oai.log"
     container_name: oai-gnb-aerial
     healthcheck:
       test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"

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

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     gnb_mono_tdd:
         image: oai-gnb:latest

cmake_targets/build_oai

@@ -418,8 +418,6 @@ function main() {
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_UNDEFINED=True"
             shift;;
         --sanitize-memory | -fsanitize=memory)
-            echo_warning "Note: memory sanitizer\n* requires clang (tested: v17)\n* is incompatible with address/undefined behavior sanitizer\n* requires cmake_targets/tools/memsan.patch"
-            sleep 2
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_MEMORY=ON -DSANITIZE_ADDRESS=OFF -DSANITIZE_UNDEFINED=OFF"
             shift;;
        --trace-asn1c-enc-dec)

cmake_targets/tools/build_helper

@@ -128,6 +128,7 @@ check_supported_distribution() {
         "rhel9.1")     return 0 ;;
         "rhel9.2")     return 0 ;;
         "rhel9.3")     return 0 ;;
+        "rhel9.4")     return 0 ;;
         "centos7")     return 0 ;;
         "centos8")     return 0 ;;
         "rocky8.7")    return 0 ;;

cmake_targets/tools/memsan.patch

@@ -1,53 +0,0 @@
-commit bf7f0c4f0f1bfce586667b50050640b67a7a747a
-Author: Robert Schmidt <robert.schmidt@openairinterface.org>
-Date:   Wed Jun 7 18:24:50 2023 +0200
-
-    Fix dlopen() linker errors in dfts, ldpc, ldpc_parityCheck, and params_libconfig
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c29105d503..3b9e7d1246 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -508,7 +508,7 @@ add_library(CONFIG_LIB
- )
- target_link_libraries(CONFIG_LIB PRIVATE dl UTIL)
- add_library(params_libconfig MODULE ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c)
--target_link_libraries(params_libconfig config)
-+target_link_libraries(params_libconfig config CONFIG_LIB minimal_lib)
- # shared library loader
- set (SHLIB_LOADER_SOURCES
-   ${OPENAIR_DIR}/common/utils/load_module_shlib.c
-@@ -1018,16 +1018,19 @@ if (ENABLE_LDPC_CUDA)
-   endif()
- endif()
- 
--add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c)
- target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
-+target_link_libraries(ldpc PRIVATE UTIL)
- 
- add_library(ldpc_parityCheck MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
- target_compile_definitions(ldpc_parityCheck PUBLIC NR_LDPC_ENABLE_PARITY_CHECK)
- target_link_libraries(ldpc_parityCheck  PRIVATE ldpc_gen_HEADERS)
-+target_link_libraries(ldpc_parityCheck PRIVATE UTIL minimal_lib)
- 
- add_library(coding MODULE ${PHY_TURBOSRC} )
- 
- add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c )
-+target_link_libraries(dfts PRIVATE minimal_lib)
- 
- 
- set(PHY_SRC_COMMON
-diff --git a/common/utils/minimal_stub.c b/common/utils/minimal_stub.c
-index be9c1b399d..7ad0df4d56 100644
---- a/common/utils/minimal_stub.c
-+++ b/common/utils/minimal_stub.c
-@@ -1,6 +1,8 @@
-+#include <stdlib.h>
- #ifndef T_TRACER
- int T_stdout;
- #endif
-+int oai_exit = 0;
- 
- void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
- {

common/config/libconfig/config_libconfig.c

@@ -322,19 +322,16 @@ int config_libconfig_set(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
 int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
 {
   config_setting_t *setting;
-  char *str;
-  int i,u;
-  long long int llu;
-  double dbl;
-  int rst;
-  int status=0;
-  int notfound;
-  int defval;
-  int fatalerror=0;
-  int numdefvals=0;
+  char *str = NULL;
+  int u = 0;
+  long long int llu = 0;
+  double dbl = 0.0f;
+  int status = 0;
+  int fatalerror = 0;
+  int numdefvals = 0;
   char cfgpath[512];  /* 512 should be enough for the sprintf below */
 
-  for(i=0; i<numoptions; i++) {
+  for(int i=0; i<numoptions; i++) {
     if (prefix != NULL) {
       sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
     } else {
@@ -346,8 +343,8 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
       continue;
     }
 
-    notfound=0;
-    defval=0;
+    int notfound = 0;
+    int defval = 0;
 
     switch(cfgoptions[i].type) {
       case TYPE_STRING:
@@ -436,7 +433,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
         if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
           defval = config_setdefault_ipv4addr(cfg, &(cfgoptions[i]), prefix);
         } else {
-          rst = config_assign_ipv4addr(cfg, cfgoptions, str);
+          int rst = config_assign_ipv4addr(cfg, cfgoptions, str);
 
           if (rst < 0) {
             fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", str, cfgpath);

common/utils/T/DOC/T/howto_new_trace.patch

@@ -164,7 +164,7 @@ index 0000000000..00baf34774
 +  }
 +
 +  /* a buffer needed to receive events from the nr-softmodem */
-+  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
++  OBUF ebuf = { .osize = 0, .omaxsize = 0, .obuf = NULL };
 +
 +  /* read events */
 +  while (1) {

common/utils/T/tracer/enb.c

@@ -874,7 +874,7 @@ int main(int n, char **v)
   if (pthread_mutex_init(&enb_data.lock, NULL)) abort();
   setup_event_selector(g, database, is_on, is_on_changed, &enb_data);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
 restart:
   clear_remote_config();

common/utils/T/tracer/event.c

@@ -49,7 +49,7 @@ again:
 #endif
 
 read_error:
-  return (event){type: -1};
+  return (event){.type = -1};
 }
 
 #ifdef T_SEND_TIME

common/utils/T/tracer/extract.c

@@ -113,7 +113,7 @@ int main(int n, char **v)
 
   found = 0;
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   while (1) {
     event e;

common/utils/T/tracer/extract_config.c

@@ -36,7 +36,7 @@ int main(int n, char **v)
   in = fopen(input_filename, "r");
   if (in == NULL) { perror(input_filename); abort(); }
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   while (1) {
     int type;

common/utils/T/tracer/extract_input_subframe.c

@@ -104,7 +104,7 @@ err:
   fd = open(file, O_RDONLY);
   if (fd == -1) { perror(file); exit(1); }
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   /* get wanted frame/subframe */
   while (1) {

common/utils/T/tracer/extract_output_subframe.c

@@ -101,7 +101,7 @@ err:
   int last_subframe = -1;
   int subframe_written = 0;
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   while (1) {
     event e;

common/utils/T/tracer/gnb.c

@@ -265,7 +265,7 @@ int main(int n, char **v)
 
   gnb_main_gui(&eg, g, h, database, &gnb_data);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
 restart:
   clear_remote_config();

common/utils/T/tracer/hacks/dump_nack_signal.c

@@ -85,7 +85,7 @@ int main(int n, char **v) {
       socket_send(socket, is_on, number_of_events * sizeof(int)) == -1)
     abort();
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
   char dump[10][T_BUFFER_MAX];
   event dump_ev[10];
   FILE *z = fopen("/tmp/dd", "w");

common/utils/T/tracer/hacks/multi-rru-clean.c

@@ -145,7 +145,7 @@ int main(int n, char **v)
 
   clear_cache(number_of_tags, cache);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   while (1) {
     int type;

common/utils/T/tracer/hacks/time_meas.c

@@ -86,7 +86,7 @@ int main(int n, char **v)
       socket_send(socket, is_on, number_of_events * sizeof(int)) == -1)
     abort();
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   while (1) {
     event e;

common/utils/T/tracer/logger/textlog.c

@@ -131,7 +131,7 @@ static struct chunk next_chunk(char **s, database_event_format f)
     cur++;
     *s = cur;
     if (find_argument(name, f, &it, &event_arg) == 0) goto error;
-    return (struct chunk){type:C_ARG_NAME, s:name, it:it, event_arg:event_arg};
+    return (struct chunk){.type = C_ARG_NAME, .s = name, .it = it, .event_arg = event_arg};
   }
 
   /* { } is name of event (anything in between is smashed) */
@@ -143,7 +143,7 @@ static struct chunk next_chunk(char **s, database_event_format f)
     *cur = 0;
     cur++;
     *s = cur;
-    return (struct chunk){type:C_EVENT_NAME};
+    return (struct chunk){.type = C_EVENT_NAME};
   }
 
   /* anything but [ and { is raw string */
@@ -151,10 +151,10 @@ static struct chunk next_chunk(char **s, database_event_format f)
   name = cur;
   while (*cur && *cur != '[' && *cur != '{') cur++;
   *s = cur;
-  return (struct chunk){type:C_STRING, s:name};
+  return (struct chunk){.type = C_STRING, .s = name};
 
 error:
-  return (struct chunk){type:C_ERROR};
+  return (struct chunk){.type = C_ERROR};
 }
 
 logger *new_textlog(event_handler *h, void *database,

common/utils/T/tracer/macpdu2wireshark.c

@@ -808,7 +808,7 @@ int main(int n, char **v)
   d.to.sin_port = htons(port);
   d.to.sin_addr.s_addr = inet_addr(ip);
   new_thread(receiver, &d);
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   /* read messages */
   while (1) {

common/utils/T/tracer/multi.c

@@ -52,7 +52,7 @@ int send_messages_txt(int s, char *T_messages_txt, int T_messages_txt_len)
     /* TODO: be careful, we use internal T stuff, to rewrite? */
     T_LOCAL_size = 0;
     T_HEADER(T_ID(-1));
-    T_PUT_buffer(1, ((T_buffer){addr:(src), length:(send_size)}));
+    T_PUT_buffer(1, ((T_buffer){.addr = src, .length = send_size}));
     if (socket_send(s, &T_LOCAL_size, 4) == -1) return -1;
     if (socket_send(s, buf, T_LOCAL_size) == -1) return -1;
     src += send_size;
@@ -242,7 +242,7 @@ int main(int n, char **v)
   /* create listener socket */
   l = create_listen_socket("0.0.0.0", local_port);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   current_nfd = 0;
 

common/utils/T/tracer/record.c

@@ -123,7 +123,7 @@ int main(int n, char **v)
   if (signal(SIGINT, force_stop) == SIG_ERR) abort();
   if (signal(SIGTSTP, force_stop) == SIG_ERR) abort();
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   /* read messages */
   while (run) {

common/utils/T/tracer/replay.c

@@ -136,7 +136,7 @@ int main(int n, char **v)
 
   new_thread(get_message_thread, &socket);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   while (1) {
     int type;

common/utils/T/tracer/textlog.c

@@ -130,7 +130,7 @@ int main(int n, char **v)
   /* send the first message - activate selected traces */
   activate_traces(socket, is_on, number_of_events);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   /* read messages */
   while (1) {

common/utils/T/tracer/to_vcd.c

@@ -366,7 +366,7 @@ int main(int n, char **v)
   if (signal(SIGINT, force_stop) == SIG_ERR) abort();
   if (signal(SIGTSTP, force_stop) == SIG_ERR) abort();
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   /* read messages */
   while (run) {

common/utils/T/tracer/ue.c

@@ -758,7 +758,7 @@ int main(int n, char **v)
   if (pthread_mutex_init(&ue_data.lock, NULL)) abort();
   setup_event_selector(g, database, is_on, is_on_changed, &ue_data);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
 restart:
   clear_remote_config();

common/utils/T/tracer/vcd.c

@@ -187,7 +187,7 @@ int main(int n, char **v)
   /* send the first message - activate selected traces */
   is_on_changed(&vcd_data);
 
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
+  OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
   /* read messages */
   while (1) {

common/utils/T/tracer/view/ticktime.c

@@ -129,8 +129,7 @@ static void *ticktime_thread(void *_this)
     pixel_length = this->pixel_length;
 
     if (this->autoscroll) {
-      tnext = time_add(this->latest_time,
-          (struct timespec){tv_sec:0,tv_nsec:1});
+      tnext = time_add(this->latest_time, (struct timespec){.tv_sec = 0, .tv_nsec = 1});
       tstart = time_sub(tnext, nano_to_time(pixel_length * width));
       this->start_time = tstart;
     } else {

common/utils/T/tracer/view/time.c

@@ -122,8 +122,7 @@ static void *time_thread(void *_this)
     pixel_length = this->pixel_length;
 
     if (this->autoscroll) {
-      tnext = time_add(this->latest_time,
-          (struct timespec){tv_sec:0,tv_nsec:1});
+      tnext = time_add(this->latest_time, (struct timespec){.tv_sec = 0, .tv_nsec = 1});
       tstart = time_sub(tnext, nano_to_time(pixel_length * width));
       this->start_time = tstart;
     } else {

common/utils/nr/nr_common.c

@@ -105,7 +105,6 @@ int get_supported_band_index(int scs, frequency_range_t freq_range, int n_rbs)
   return (-1); // not found
 }
 
-
 // Table 5.2-1 NR operating bands in FR1 & FR2 (3GPP TS 38.101)
 // Table 5.4.2.3-1 Applicable NR-ARFCN per operating band in FR1 & FR2 (3GPP TS 38.101)
 // Notes:
@@ -119,10 +118,12 @@ const nr_bandentry_t nr_bandtable[] = {
   {5,    824000,  849000,  869000,  894000, 20, 173800, 100},
   {7,   2500000, 2570000, 2620000, 2690000, 20, 524000, 100},
   {8,    880000,  915000,  925000,  960000, 20, 185000, 100},
-  {12,   698000,  716000,  729000,  746000, 20, 145800, 100},
+  {12,   699000,  716000,  729000,  746000, 20, 145800, 100},
+  {13,   777000,  787000,  746000,  756000, 20, 149200, 100},
   {14,   788000,  798000,  758000,  768000, 20, 151600, 100},
   {18,   815000,  830000,  860000,  875000, 20, 172000, 100},
   {20,   832000,  862000,  791000,  821000, 20, 158200, 100},
+  {24,  1627500, 1656500, 1526000, 1536000, 20, 305000, 100},
   {25,  1850000, 1915000, 1930000, 1995000, 20, 386000, 100},
   {26,   814000,  849000,  859000,  894000, 20, 171800, 100},
   {28,   703000,  758000,  758000,  813000, 20, 151600, 100},
@@ -142,6 +143,7 @@ const nr_bandentry_t nr_bandtable[] = {
   {53,  2483500, 2495000, 2483500, 2495000, 20, 496700, 100},
   {65,  1920000, 2010000, 2110000, 2200000, 20, 422000, 100},
   {66,  1710000, 1780000, 2110000, 2200000, 20, 422000, 100},
+  {67,      000,     000,  738000,  758000, 20, 147600, 100},
   {70,  1695000, 1710000, 1995000, 2020000, 20, 399000, 100},
   {71,   663000,  698000,  617000,  652000, 20, 123400, 100},
   {74,  1427000, 1470000, 1475000, 1518000, 20, 295000, 100},
@@ -158,6 +160,7 @@ const nr_bandentry_t nr_bandtable[] = {
   {82,   832000,  862000,     000,     000, 20, 166400, 100},
   {83,   703000,  748000,     000,     000, 20, 140600, 100},
   {84,  1920000, 1980000,     000,     000, 20, 384000, 100},
+  {85,   698000,  716000,  728000,  746000, 20, 145600, 100},
   {86,  1710000, 1785000,     000,     000, 20, 342000, 100},
   {89,   824000,  849000,     000,     000, 20, 342000, 100},
   {90,  2496000, 2690000, 2496000, 2690000,  3, 499200,  15},
@@ -179,8 +182,9 @@ const nr_bandentry_t nr_bandtable[] = {
   {261,27500040,28350000,27500040,28350000,  2,2070833, 120}
 };
 
-int get_supported_bw_mhz(frequency_range_t frequency_range, int bw_index)
+int get_supported_bw_mhz(frequency_range_t frequency_range, int scs, int nb_rb)
 {
+  int bw_index = get_supported_band_index(scs, frequency_range, nb_rb);
   if (frequency_range == FR1) {
     switch (bw_index) {
       case 0 :
@@ -232,8 +236,8 @@ bool compare_relative_ul_channel_bw(int nr_band, int scs, int nb_ul, frame_type_
   // 38.101-1 section 6.2.2
   // Relative channel bandwidth <= 4% for TDD bands and <= 3% for FDD bands
   int index = get_nr_table_idx(nr_band, scs);
-  int bw_index = get_supported_band_index(scs, nr_band > 256 ? FR2 : FR1, nb_ul);
-  int band_size_khz = get_supported_bw_mhz(nr_band > 256 ? FR2 : FR1, bw_index) * 1000;
+
+  int band_size_khz = get_supported_bw_mhz(nr_band > 256 ? FR2 : FR1, scs, nb_ul) * 1000;
   float limit = frame_type == TDD ? 0.04 : 0.03;
   float rel_bw = (float) (2 * band_size_khz) / (float) (nr_bandtable[index].ul_max + nr_bandtable[index].ul_min);
   return rel_bw <= limit;