Stupid bug

integration_2023_w21

See merge request oai/openairinterface5g!2128

* !2097 Fix: NR UE timing adjust
* !2100 CI: AW2S pipeline - iperf test added, modifs in OC projects usage
* !2119 Set kernel parameters for X4x0
* !2121 Fix regression pdu session release
* !2124 handle --disable-stats in rrc gNB
* !2125 Tutorials: minor updates on NR SA Tutorial
* !2126 bugfix for PRACH format C2 at UE
* !1964 Merge secu osa into openair3/SECU
* !2101 Use F1 internally: UE Context Release
* !2120 Use F1 internally: UE Context Modification
* !2129 Adding a check to avoid having more logical antenna ports than physical in config file

CMakeLists.txt

@@ -244,7 +244,7 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${C
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
 set(CMAKE_C_FLAGS_DEBUG "${debugOpt} -O0")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${debugOpt} -O2")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "${debugOpt} -O3")
 set(CMAKE_C_FLAGS_RELEASE "-O3")
 
 # Enable assert() for RelWithDebInfo builds
@@ -773,34 +773,25 @@ add_library(UTIL
   ${OPENAIR_DIR}/common/utils/time_stat.c
 )
 
-set(SECU_OSA_SRC
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_snow3g.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eea.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eia.c
-    )
-add_library(SECU_OSA ${SECU_OSA_SRC} $<TARGET_OBJECTS:ds> )
-
-target_include_directories(SECU_OSA PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
-
-set(SECU_CN_SRC
+set(SECURITY_SRC
   ${OPENAIR3_DIR}/SECU/secu_defs.c
   ${OPENAIR3_DIR}/SECU/kdf.c
   ${OPENAIR3_DIR}/SECU/aes_128_ctr.c
   ${OPENAIR3_DIR}/SECU/aes_128_cbc_cmac.c
+  ${OPENAIR3_DIR}/SECU/aes_128_ecb.c
   ${OPENAIR3_DIR}/SECU/sha_256_hmac.c
   ${OPENAIR3_DIR}/SECU/rijndael.c
   ${OPENAIR3_DIR}/SECU/snow3g.c
   ${OPENAIR3_DIR}/SECU/key_nas_deriver.c
+  ${OPENAIR3_DIR}/SECU/nas_stream_eea0.c
   ${OPENAIR3_DIR}/SECU/nas_stream_eea1.c
   ${OPENAIR3_DIR}/SECU/nas_stream_eia1.c
   ${OPENAIR3_DIR}/SECU/nas_stream_eea2.c
   ${OPENAIR3_DIR}/SECU/nas_stream_eia2.c
   )
 
-add_library(SECU_CN ${SECU_CN_SRC} $<TARGET_OBJECTS:ds>)
-target_include_directories(SECU_CN PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
+add_library(SECURITY ${SECURITY_SRC} $<TARGET_OBJECTS:ds>)
+target_include_directories(SECURITY PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
 
 # Physical Channel Procedures Scheduling
 ################################"
@@ -1178,7 +1169,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/filt16a_32.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
@@ -1229,7 +1219,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/filt16a_32.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
@@ -1353,9 +1342,8 @@ set(NR_PDCP_SRC
   #these files should not be here, will be removed at some point when the
   #computation is done directly inside nr_pdcp_integrity_nia1.c instead
   #of reusing code of osa_stream_eia.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eia.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_snow3g.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c
+  #${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eia.c
+  #${OPENAIR2_DIR}/UTIL/OSA/osa_snow3g.c
   )
 
 set(NR_SDAP_SRC
@@ -1997,7 +1985,7 @@ add_library(LIB_5GNAS_GNB
   )
 
 target_include_directories(LIB_5GNAS_GNB PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
-target_link_libraries(LIB_5GNAS_GNB PRIVATE SECU_CN ${CRYPTO_LIBRARIES})
+target_link_libraries(LIB_5GNAS_GNB PRIVATE SECURITY ${CRYPTO_LIBRARIES})
 target_link_libraries(LIB_5GNAS_GNB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 # Simulation library
@@ -2160,7 +2148,7 @@ add_dependencies(lte-softmodem oai_iqplayer)
 
 target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
-  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
+  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
   PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI SIMU SIMU_ETH
   -Wl,--end-group z dl)
@@ -2169,7 +2157,6 @@ target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYP
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
-
 add_executable(oairu
   ${OPENAIR_DIR}/executables/lte-ru.c
   ${OPENAIR_DIR}/executables/ru_control.c
@@ -2222,7 +2209,7 @@ endif()
 target_link_libraries(lte-uesoftmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
-  SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
+  SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
   PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
   -Wl,--end-group z dl)
@@ -2243,6 +2230,8 @@ add_executable(nr-softmodem
   ${nr_rrc_h}
   ${s1ap_h}
 #  ${OPENAIR_BIN_DIR}/messages_xml.h
+  ${OPENAIR_DIR}/common/utils/thread_pool/task_manager.c
+
   ${OPENAIR_DIR}/executables/nr-gnb.c
   ${OPENAIR_DIR}/executables/nr-ru.c
   ${OPENAIR_DIR}/executables/nr-softmodem.c
@@ -2262,7 +2251,7 @@ add_executable(nr-softmodem
 
 target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
-  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECU_CN SECU_OSA
+  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
   ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
   ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU SIMU_ETH
   x2ap f1ap m2ap m3ap e1ap
@@ -2297,9 +2286,9 @@ add_executable(nr-cuup
 target_link_libraries(nr-cuup PRIVATE
                       CONFIG_LIB ITTI SCTP_CLIENT
                       GTPV1U e1ap e1_pdcp_if f1ap SIMU_ETH
-                      SECU_OSA SECU_CN ${OPENSSL_LIBRARIES} crypt z sctp dl pthread)
+                      SECURITY ${OPENSSL_LIBRARIES} crypt z sctp dl pthread)
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-                      
+                     
 # nr-uesoftmodem is  UE implementation
 #######################################
 
@@ -2324,7 +2313,7 @@ add_executable(nr-uesoftmodem
 
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
-  nr_rrc SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
+  nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
   PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
   NFAPI_USER_LIB MISC_NFAPI_NR_LIB
   ITTI ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU SIMU_ETH
@@ -2414,6 +2403,7 @@ target_link_libraries(ldpctest PRIVATE
   )
 
 add_executable(nr_dlschsim
+  ${OPENAIR_DIR}/common/utils/thread_pool/task_manager.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
@@ -2468,12 +2458,13 @@ add_executable(nr_dlsim
   ${SHLIB_LOADER_SOURCES}
   )
 target_link_libraries(nr_dlsim 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_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECU_CN ngap -lz -Wl,--end-group
+  -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_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
   )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_prachsim
+  ${OPENAIR_DIR}/common/utils/thread_pool/task_manager.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
@@ -2499,6 +2490,7 @@ target_link_libraries(nr_ulschsim PRIVATE
 target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_ulsim
+  ${OPENAIR_DIR}/common/utils/thread_pool/task_manager.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
@@ -2517,7 +2509,7 @@ if (ENABLE_LDPC_T1)
 endif()
 
 target_link_libraries(nr_ulsim 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_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECU_CN ngap -lz -Wl,--end-group
+  -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_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2556,7 +2548,7 @@ foreach(myExe s1ap
     ${OPENAIR3_DIR}/TEST/test_${myExe}.c
     )
   target_link_libraries (test_${myExe}
-    -Wl,--start-group SECU_CN UTIL -Wl,--end-group m rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} CONFIG_LIB
+    -Wl,--start-group SECURITY UTIL -Wl,--end-group m rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} CONFIG_LIB
     )
 endforeach(myExe)
 
@@ -2577,7 +2569,7 @@ if (${T_TRACER})
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
         oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
-        SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
+        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
         NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR ngap

ci-scripts/Jenkinsfile-GitLab-Container

@@ -36,7 +36,6 @@ pipeline {
     label nodeExecutor
   }
   options {
-    disableConcurrentBuilds()
     timestamps()
     gitLabConnection('OAI GitLab')
     ansiColor('xterm')
@@ -425,28 +424,26 @@ pipeline {
             }
           }
         }
-
-        //avra is offline, re-enable once it is available
-        //stage ("T1-Offload-Test") {
-        //  when { expression {do5Gtest} }
-        //  steps {
-        //    script {
-        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'T1-Offload-Test')
-        //    }
-        //  }
-        //  post {
-        //    always {
-        //      script {
-        //        finalizeSlaveJob('RAN-T1-Offload-Test')
-        //      }
-        //    }
-        //    failure {
-        //      script {
-        //        currentBuild.result = 'FAILURE'
-        //      }
-        //    }
-        //  }
-        //}
+        stage ("Interop-F1") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-Interop-F1')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
       }
     }
     stage ("DockerHub-Push") {

ci-scripts/Jenkinsfile-cluster

@@ -61,7 +61,6 @@ pipeline {
     label pythonExecutor
   }
   options {
-    disableConcurrentBuilds()
     timestamps()
     ansiColor('xterm')
     lock(extra: lockResources)

ci-scripts/Jenkinsfile-physim-deploy

@@ -55,7 +55,6 @@ pipeline {
     label pythonExecutor
   }
   options {
-    disableConcurrentBuilds()
     timestamps()
     ansiColor('xterm')
     lock(extra: lockResources)

ci-scripts/Jenkinsfile-push-registry

@@ -36,7 +36,6 @@ pipeline {
     label nodeExecutor
   }
   options {
-    disableConcurrentBuilds()
     ansiColor('xterm')
     lock(extra: lockResources)
   }

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -61,7 +61,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -50,7 +50,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

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

@@ -52,7 +52,6 @@ def StatusForDb = ""
 pipeline {
   agent {label pythonExecutor}
   options {
-    disableConcurrentBuilds()
     ansiColor('xterm')
     lock(extra: lockResources)
   }

ci-scripts/Jenkinsfile-tmp-ran

@@ -63,7 +63,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/Jenkinsfile-tmp-ue

@@ -63,7 +63,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/args_parse.py

@@ -227,14 +227,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
         elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
             EPC.ContainerPrefix=matchReg.group(1)
-        elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBIPAddress parameter")
-        elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBUserName parameter")
-        elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBType parameter")
-        elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
-            print("ignoring --ADBPassword parameter")
         elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.testXMLfiles.append(matchReg.group(1))

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

@@ -0,0 +1,280 @@
+/* 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_ueinfra.yaml

@@ -49,7 +49,7 @@ adb_ue_2:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-asue.cfg &
+  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
   TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
 amarisoft_ue_1:
   Host: amariue

ci-scripts/cls_cluster.py

@@ -42,7 +42,8 @@ IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
-
+CI_OC_RAN_NAMESPACE = "oaicicd-ran"
+CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
 
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
@@ -198,23 +199,22 @@ class Cluster:
 			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.imageToPull)
 			sys.exit('Insufficient eNB Parameters')
-		lIpAddr = self.eNBIPAddress
 		self.testCase_id = HTML.testCase_id
-		cmd = cls_cmd.getConnection(lIpAddr)
-		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, self.OCProjectName)
+		cmd = cls_cmd.getConnection(self.eNBIPAddress)
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
 		if not succeeded:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 			return False
 		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
 		if ret.returncode != 0:
-			logging.error(f'\u001B[1m Unable to access OC project {ocProjectName}\u001B[0m')
+			logging.error(f'\u001B[1m Unable to access OC project {CI_OC_RAN_NAMESPACE}\u001B[0m')
 			OC_logout(cmd)
 			cmd.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 			return False
 		for image in self.imageToPull:
-			imagePrefix = f'{self.OCRegistry}{self.OCProjectName}'
+			imagePrefix = f'{self.OCRegistry}{CI_OC_RAN_NAMESPACE}'
 			imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:

ci-scripts/cls_cmd.py

@@ -31,6 +31,9 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
+import sys 
+
+SSHTIMEOUT=7
 
 # helper that returns either LocalCmd or RemoteCmd based on passed host name
 def getConnection(host, d=None):
@@ -123,13 +126,21 @@ class LocalCmd(Cmd):
 
 class RemoteCmd(Cmd):
 	def __init__(self, hostname, d=None):
+		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
 		self.client = paramiko.SSHClient()
 		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
-		self.client.connect(**cfg)
 		self.cwd = d
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
+		while cIdx < 3:
+			try:
+				self.client.connect(**cfg)
+				return
+			except:
+				logging.error(f'Could not connect to {hostname}, tried for {cIdx} time')
+				cIdx +=1
+		raise Exception ("Error: max retries, did not connect to host")
 
 	def _lookup_ssh_config(hostname):
 		ssh_config = paramiko.SSHConfig()
@@ -142,7 +153,7 @@ class RemoteCmd(Cmd):
 		ucfg = ssh_config.lookup(hostname)
 		if 'identityfile' not in ucfg or 'user' not in ucfg:
 			raise KeyError(f'no identityfile or user in SSH config for host {hostname}')
-		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile']}
+		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile'], 'timeout':SSHTIMEOUT}
 		if 'hostname' in ucfg:
 			cfg['hostname'] = ucfg['hostname'] # override user-given hostname with what is in config
 		if 'port' in ucfg:

ci-scripts/cls_containerize.py

@@ -800,7 +800,7 @@ class Containerize():
 			logging.debug('Removing test images locally')
 			myCmd = cls_cmd.LocalCmd()
 
-		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup', 'oai-gnb-aw2s']
 		for image in imageNames:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			cmd = f'docker rmi oai-ci/{imageTag}'
@@ -879,8 +879,8 @@ class Containerize():
 					cnt += 1
 			mySSH.command('docker inspect --format="ImageUsed: {{.Config.Image}}" ' + containerName, '\$', 5)
 			for stdoutLine in mySSH.getBefore().split('\n'):
-				if stdoutLine.count('ImageUsed: porcepix'):
-					usedImage = stdoutLine.replace('ImageUsed: porcepix', 'porcepix').strip()
+				if stdoutLine.count('ImageUsed: oai-ci'):
+					usedImage = stdoutLine.replace('ImageUsed: oai-ci', 'oai-ci').strip()
 					logging.debug('Used image is ' + usedImage)
 			if usedImage != '':
 				mySSH.command('docker image inspect --format "* Size     = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id       = {{.Id}}" ' + usedImage, '\$', 5, silent=True)

ci-scripts/cls_module_ue.py

@@ -81,7 +81,7 @@ class Module_UE:
 			c = cls_cmd.RemoteCmd(self.host)
 		response = c.run(cmd, silent=silent)
 		c.close()
-		return response.stdout
+		return response
 
 #-----------------$
 #PUBLIC Methods$
@@ -95,7 +95,11 @@ class Module_UE:
 		if self.cmd_dict["detach"]:
 			self._command(self.cmd_dict["detach"], silent=True)
 		self._command(self.cmd_dict["terminate"], silent=True)
-		self._command(self.cmd_dict["initialize"])
+		ret = self._command(self.cmd_dict["initialize"])
+		logging.info(f'For command: {ret.args} | return output: {ret.stdout} | Code: {ret.returncode}')
+		# Here each UE returns differently for the successful initialization, requires check based on UE
+		return ret.returncode == 0
+
 
 	def terminate(self):
 		self._command(self.cmd_dict["terminate"])
@@ -122,9 +126,9 @@ class Module_UE:
 			self._command(self.cmd_dict["detach"])
 			time.sleep(5)
 		if ip:
-			logging.debug(f'\u001B[1mUE IP Address is {ip}\u001B[0m')
+			logging.debug(f'\u001B[1mUE IP Address for UE {self.module_name} is {ip}\u001B[0m')
 		else:
-			logging.debug('\u001B[1;37;41mUE IP Address Not Found!\u001B[0m')
+			logging.debug(f'\u001B[1;37;41mUE IP Address for UE {self.module_name} Not Found!\u001B[0m')
 		return ip
 
 	def detach(self):
@@ -133,7 +137,7 @@ class Module_UE:
 	def check(self):
 		cmd = self.cmd_dict["check"]
 		if cmd:
-			return self._command(cmd)
+			return self._command(cmd).stdout
 		else:
 			logging.warning(f"requested status check of UE {self.getName()}, but operation is not supported")
 			return f"UE {self.getName()} does not support status checking"
@@ -160,7 +164,7 @@ class Module_UE:
 
 	def getIP(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output)
+		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output.stdout)
 		if result and result.group('ip'):
 			ip = result.group('ip')
 			return ip
@@ -168,12 +172,12 @@ class Module_UE:
 
 	def checkMTU(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('mtu (?P<mtu>[0-9]+)', output)
+		result = re.search('mtu (?P<mtu>[0-9]+)', output.stdout)
 		if result and result.group('mtu') and int(result.group('mtu')) == self.MTU:
-			logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
+			logging.debug(f'\u001B[1mUE Module {self.module_name} NIC MTU is {self.MTU} as expected\u001B[0m')
 			return True
 		else:
-			logging.debug('\u001B[1;37;41m Incorrect Module NIC MTU or MTU not found! Expected: ' + str(self.MTU) + '\u001B[0m')
+			logging.debug(f'\u001B[1;37;41m UE module {self.module_name} has incorrect Module NIC MTU or MTU not found! Expected: {self.MTU} \u001B[0m')
 			return False
 
 	def getName(self):

ci-scripts/cls_oaicitest.py

@@ -49,6 +49,7 @@ import concurrent.futures
 #import our libs
 import helpreadme as HELP
 import constants as CONST
+import cls_cluster as OC
 import sshconnection
 
 import cls_module_ue
@@ -58,79 +59,6 @@ logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import matplotlib.pyplot as plt
 import numpy as np
 
-#-----------------------------------------------------------
-# Utility functions
-#-----------------------------------------------------------
-
-def GetPingTimeAnalysis(RAN,ping_log_file,ping_rttavg_threshold):
-	#ping time values read from file
-	t_ping=[]
-	#ping stats (dictionary) to be returned by the function
-	ping_stat={}
-	if (os.path.isfile(ping_log_file)):
-		with open(ping_log_file,"r") as f:
-			for line in f:
-				#looking for time=xxx ms field
-				result=re.match('^.+time=(?P<ping_time>[0-9\.]+)',line)
-				if result != None:
-					t_ping.append(float(result.group('ping_time')))
-
-		#initial stats
-		ping_stat['min_0']=min(t_ping)
-		ping_stat['mean_0']=stat.mean(t_ping)
-		ping_stat['median_0']=stat.median(t_ping)
-		ping_stat['max_0']=max(t_ping)
-
-		#get index of max value
-		
-		max_loc=t_ping.index(max(t_ping))
-		ping_stat['max_loc']=max_loc
-		#remove it
-		t_ping_post=t_ping.copy()
-		t_ping_post.pop(max_loc)
-		#new stats after removing max value
-		ping_stat['min_1']=min(t_ping_post)
-		ping_stat['mean_1']=stat.mean(t_ping_post)
-		ping_stat['median_1']=stat.median(t_ping_post)
-		ping_stat['max_1']=max(t_ping_post)
-
-		#plot ping over time and save png for artifacts
-		ticks = np.arange(0, len(t_ping), 1)
-		figure, axis = plt.subplots(figsize=(10, 10))
-		axis.plot(ticks,t_ping,marker='o')
-		axis.set_xlabel('Ping Events')
-		axis.set_ylabel("Ping RTT (in ms)")
-		axis.set_title(ping_log_file)
-		axis.set_xticks(ticks)
-		axis.set_xticklabels([])
-		YMAX=20 #base scale
-		if max(t_ping) > YMAX:
-			y_max=max(t_ping)+1
-		else:
-			y_max=YMAX+1
-		plt.ylim(0,y_max)
-		if ping_rttavg_threshold != '':
-			th_label="AVG Ping Fail Threshold="+ping_rttavg_threshold
-			plt.axhline(y=float(ping_rttavg_threshold), color='r', linestyle='-',label=th_label)
-			axis.legend()
-		plt.savefig(ping_log_file+'.png')
-
-		#copy the png file already to enb to move it move it later into the artifacts
-		try:
-			mySSH = sshconnection.SSHConnection()
-			mySSH.copyout(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, ping_log_file+'.png', RAN.eNBSourceCodePath + '/cmake_targets/')
-			mySSH.copyout(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, ping_log_file, RAN.eNBSourceCodePath + '/cmake_targets/')
-		except:
-			logging.debug('\u001B[1;37;41m Ping PNG SCP to eNB FAILED\u001B[0m')
-
-		return ping_stat
-
-	else:
-		logging.error("GetPingTimeAnalysis : Ping log file does not exist")
-		return -1
-
-	
-
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
@@ -295,13 +223,15 @@ class OaiCiTest():
 
 	def InitializeUE(self, HTML):
 		ues = [cls_module_ue.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]
+			for f, ue in zip(futures, ues):
+				uename = f'UE {ue.getName()}'
+				messages.append(f'{uename}: initialized' if f.result() else f'{uename}: ERROR during Initialization')
 			[f.result() for f in futures]
-		messages = [f'UE {ue.getName()}: initialized' for ue in ues]
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 
-
 	def InitializeOAIUE(self,HTML,RAN,EPC,CONTAINERS):
 		if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
@@ -573,298 +503,133 @@ class OaiCiTest():
 		statusQueue.put(message)
 		lock.release()
 
-	def Ping_common(self, lock, statusQueue,EPC, ue, RAN):
-		try:
-			# Launch ping on the EPC side (true for ltebox and old open-air-cn)
-			# But for OAI-Rel14-CUPS, we launch from python executor
-			ping_status = 0
+	def Ping_common(self, EPC, ue, RAN):
+		# Launch ping on the EPC side (true for ltebox and old open-air-cn)
+		# But for OAI-Rel14-CUPS, we launch from python executor
+		ping_status = 0
+		ueIP = ue.getIP()
+		if not ueIP:
+			return (False, f"UE {ue.getName()} has no IP address")
+		launchFromEpc = False
+		ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
+		if re.match('OAI-Rel14-CUPS', EPC.Type, re.IGNORECASE):
 			launchFromEpc = False
-			ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
-			if re.match('OAI-Rel14-CUPS', EPC.Type, re.IGNORECASE):
-				launchFromEpc = False
-			ping_time = re.findall("-c *(\d+)",str(self.ping_args))
-			if launchFromEpc:
-				SSH = sshconnection.SSHConnection()
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
-				SSH.command('cd scripts', '\$', 5)
-				# In case of a docker-based deployment, we need to ping from the trf-gen container
-				launchFromTrfContainer = False
-				if (re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE)) or (re.match('OAICN5G', EPC.Type, re.IGNORECASE)):
-					launchFromTrfContainer = True
-				if launchFromTrfContainer:
-					ping_status = SSH.command(f'docker exec -it prod-trf-gen /bin/bash -c "ping {self.ping_args} {ue.getIP()}" 2>&1 | tee {ping_log_file}', '\$', int(ping_time[0])*1.5)
-				else:
-					ping_status = SSH.command(f'stdbuf -o0 ping {self.ping_args} {ue.getIP()} 2>&1 | stdbuf -o0 tee {ping_log_file}', '\$', int(ping_time[0])*1.5)
-				#copy the ping log file to have it locally for analysis (ping stats)
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/{ping_log_file}', '.')				
-				SSH.close()
+		ping_time = re.findall("-c *(\d+)",str(self.ping_args))
+		if launchFromEpc:
+			SSH = sshconnection.SSHConnection()
+			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+			SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
+			SSH.command('cd scripts', '\$', 5)
+			# In case of a docker-based deployment, we need to ping from the trf-gen container
+			launchFromTrfContainer = False
+			if (re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE)) or (re.match('OAICN5G', EPC.Type, re.IGNORECASE)):
+				launchFromTrfContainer = True
+			if launchFromTrfContainer:
+				ping_status = SSH.command(f'docker exec -it prod-trf-gen /bin/bash -c "ping {self.ping_args} {ueIP}" 2>&1 | tee {ping_log_file}', '\$', int(ping_time[0])*1.5)
 			else:
-				#target address is different depending on EPC type
-				if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
-					Target = EPC.MmeIPAddress
-				elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
-					Target = EPC.MmeIPAddress
-				elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE):
-					Target = "172.21.6.100"
-				else:
-					Target = EPC.IPAddress
-				#ping from module NIC rather than IP address to make sure round trip is over the air	
-				interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
-				ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {Target} &> /tmp/{ping_log_file}'
-				cmd = cls_cmd.getConnection(ue.getHost())
-				response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
-				if response.returncode != 0:
-					ping_status = -1
-				else:
-					#copy the ping log file to have it locally for analysis (ping stats)
-					cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=ping_log_file)
-
-				cmd.close()
-
-			# TIMEOUT CASE
-			if ping_status < 0:
-				message = 'Ping with UE (' + str(ue.getIP()) + ') crashed due to TIMEOUT!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
-				return
-			#search is done on cat result
-			with open(ping_log_file, 'r') as f:
-				ping_output = "".join(f.readlines())
-			result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
-			if result is None:
-				message = 'Packet Loss Not Found!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
-				return
-			packetloss = result.group('packetloss')
-			if float(packetloss) == 100:
-				message = 'Packet Loss is 100%'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
-				return
-			result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', ping_output)
-			if result is None:
-				message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
-				return
-			rtt_min = result.group('rtt_min')
-			rtt_avg = result.group('rtt_avg')
-			rtt_max = result.group('rtt_max')
-			pal_msg = 'Packet Loss : ' + packetloss + '%'
-			min_msg = 'RTT(Min)    : ' + rtt_min + ' ms'
-			avg_msg = 'RTT(Avg)    : ' + rtt_avg + ' ms'
-			max_msg = 'RTT(Max)    : ' + rtt_max + ' ms'
-
-			lock.acquire()
-			logging.debug('\u001B[1;37;44m ping result (' + ue.getIP() + ') \u001B[0m')
-			logging.debug('\u001B[1;34m    ' + pal_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + min_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + avg_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + max_msg + '\u001B[0m')
-
-			#adding extra ping stats from local file
-			#ping_log_file variable is defined above in this function, depending on device/ue
-			ping_stat_msg=''
-			logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
-			ping_stat=GetPingTimeAnalysis(RAN,ping_log_file,self.ping_rttavg_threshold)
-
-			if (ping_stat!=-1) and (len(ping_stat)!=0):
-				ping_stat_msg+='Ping stats before removing largest value : \n'
-				ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_0'])) + 'ms \n'
-				ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_0'])) + 'ms \n'
-				ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_0'])) + 'ms \n'
-				ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_0'])) + 'ms \n'
-				ping_stat_msg+='Max Index   : ' + str(ping_stat['max_loc']) + '\n'
-				ping_stat_msg+='Ping stats after removing largest value : \n'
-				ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_1'])) + 'ms \n'
-				ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_1'])) + 'ms \n'
-				ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_1'])) + 'ms \n'
-				ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_1'])) + 'ms \n'
-
-			#building html message
-			qMsg = pal_msg + '\n' + min_msg + '\n' + avg_msg + '\n' + max_msg + '\n'  + ping_stat_msg
-
-			#checking packet loss compliance
-			packetLossOK = True
-			if (packetloss is not None) :
-				if float(packetloss) > float(self.ping_packetloss_threshold):
-					qMsg += '\nPacket Loss too high'
-					logging.debug('\u001B[1;37;41m Packet Loss too high; Target: '+ self.ping_packetloss_threshold + '%\u001B[0m')
-					packetLossOK = False
-				elif float(packetloss) > 0:
-					qMsg += '\nPacket Loss is not 0%'
-					logging.debug('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
-
-			#checking RTT avg compliance
-			rttavgOK = True
-			if self.ping_rttavg_threshold != '':
-				if float(rtt_avg)>float(self.ping_rttavg_threshold):
-					ping_rttavg_error_msg = 'RTT(Avg) too high: ' + rtt_avg + ' ms; Target: '+ self.ping_rttavg_threshold+ ' ms'
-					qMsg += '\n'+ping_rttavg_error_msg
-					logging.debug('\u001B[1;37;41m'+ ping_rttavg_error_msg +' \u001B[0m')
-					rttavgOK = False
-
-			if packetLossOK and rttavgOK:
-				statusQueue.put(0)
-			else:
-				statusQueue.put(-1)
-			statusQueue.put(ue.getName())
-			statusQueue.put(ue.getIP())
-			statusQueue.put(qMsg)
-			lock.release()
-		except:
-			logging.debug('exit from Ping_Common except')
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def PingNoS1_wrong_exit(self, qMsg,HTML):
-		message = 'OAI UE ping result\n{qMsg}'
-		HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', [message])
-
-	def PingNoS1(self,HTML,RAN,EPC,CONTAINERS):
-		SSH=sshconnection.SSHConnection()
-		check_eNB = True
-		check_OAI_UE = True
-		ping_from_eNB = re.search('oaitun_enb1', str(self.ping_args))
-		if ping_from_eNB is not None:
-			if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '':
-				HELP.GenericHelp(CONST.Version)
-				sys.exit('Insufficient Parameter')
-		else:
-			if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
-				HELP.GenericHelp(CONST.Version)
-				sys.exit('Insufficient Parameter')
-		try:
-			if ping_from_eNB is not None:
-				SSH.open(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword)
-				SSH.command('cd ' + RAN.eNBSourceCodePath + '/cmake_targets/', '\$', 5)
-			else:
-				SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-				SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets/', '\$', 5)
-			ping_time = re.findall("-c (\d+)",str(self.ping_args))
-			ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '.log', '\$', int(ping_time[0])*1.5)
-			# TIMEOUT CASE
-			if ping_status < 0:
-				message = 'Ping with OAI UE crashed due to TIMEOUT!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.PingNoS1_wrong_exit(message,HTML)
-				return
-			result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
-			if result is None:
-				message = 'Packet Loss Not Found!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.PingNoS1_wrong_exit(message,HTML)
-				return
-			packetloss = result.group('packetloss')
-			if float(packetloss) == 100:
-				message = 'Packet Loss is 100%'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.PingNoS1_wrong_exit(message,HTML)
-				return
-			result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', SSH.getBefore())
-			if result is None:
-				message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				self.PingNoS1_wrong_exit(message,HTML)
-				return
-			rtt_min = result.group('rtt_min')
-			rtt_avg = result.group('rtt_avg')
-			rtt_max = result.group('rtt_max')
-			pal_msg = 'Packet Loss : ' + packetloss + '%'
-			min_msg = 'RTT(Min)    : ' + rtt_min + ' ms'
-			avg_msg = 'RTT(Avg)    : ' + rtt_avg + ' ms'
-			max_msg = 'RTT(Max)    : ' + rtt_max + ' ms'
-			logging.debug('\u001B[1;37;44m OAI UE ping result \u001B[0m')
-			logging.debug('\u001B[1;34m    ' + pal_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + min_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + avg_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + max_msg + '\u001B[0m')
-			qMsg = pal_msg + '\n' + min_msg + '\n' + avg_msg + '\n' + max_msg
-			packetLossOK = True
-			if packetloss is not None:
-				if float(packetloss) > float(self.ping_packetloss_threshold):
-					qMsg += '\nPacket Loss too high'
-					logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
-					packetLossOK = False
-				elif float(packetloss) > 0:
-					qMsg += '\nPacket Loss is not 0%'
-					logging.debug('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
+				ping_status = SSH.command(f'stdbuf -o0 ping {self.ping_args} {ueIP} 2>&1 | stdbuf -o0 tee {ping_log_file}', '\$', int(ping_time[0])*1.5)
+			#copy the ping log file to have it locally for analysis (ping stats)
+			SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/{ping_log_file}', '.')
 			SSH.close()
-			message = f'OAI UE ping result\n{qMsg}'
-			if packetLossOK:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', [message])
+		else:
+			#target address is different depending on EPC type
+			if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
+				Target = EPC.MmeIPAddress
+			elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
+				Target = EPC.MmeIPAddress
+			elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE):
+				Target = "172.21.6.100"
 			else:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', [message])
+				Target = EPC.IPAddress
+			#ping from module NIC rather than IP address to make sure round trip is over the air
+			interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
+			ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {Target} &> /tmp/{ping_log_file}'
+			cmd = cls_cmd.getConnection(ue.getHost())
+			response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
+			if response.returncode != 0:
+				ping_status = -1
+			else:
+				#copy the ping log file to have it locally for analysis (ping stats)
+				cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=ping_log_file)
 
-			# copying on the EPC server for logCollection
-			if ping_from_eNB is not None:
-				copyin_res = SSH.copyin(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath + '/cmake_targets/ping_' + self.testCase_id + '.log', '.')
-			else:
-				copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/ping_' + self.testCase_id + '.log', '.')
-			if (copyin_res == 0):
-				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'ping_' + self.testCase_id + '.log', EPC.SourceCodePath + '/scripts')
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
+			cmd.close()
+
+		# TIMEOUT CASE
+		ue_header = f'UE {ue.getName()} ({ueIP})'
+		if ping_status < 0:
+			message = ue_header + ': ping crashed: TIMEOUT?'
+			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
+			return (False, message)
+		#search is done on cat result
+		logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
+		with open(ping_log_file, 'r') as f:
+			ping_output = "".join(f.readlines())
+		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
+		if result is None:
+			message = ue_header + ': Packet Loss Not Found!'
+			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
+			return (False, message)
+		packetloss = result.group('packetloss')
+		result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', ping_output)
+		if result is None:
+			message = ue_header + ': Ping RTT_Min RTT_Avg RTT_Max Not Found!'
+			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
+			return (False, message)
+		rtt_min = result.group('rtt_min')
+		rtt_avg = result.group('rtt_avg')
+		rtt_max = result.group('rtt_max')
+
+		pal_msg = f'Packet Loss: {packetloss}%'
+		min_msg = f'RTT(Min)   : {rtt_min} ms'
+		avg_msg = f'RTT(Avg)   : {rtt_avg} ms'
+		max_msg = f'RTT(Max)   : {rtt_max} ms'
+
+		logging.info(f'\u001B[1;37;44m ping result for {ue_header} \u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + pal_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + min_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + avg_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + max_msg + '\u001B[0m')
+
+		message = f'{ue_header}\n{pal_msg}\n{min_msg}\n{avg_msg}\n{max_msg}'
+
+		#checking packet loss compliance
+		if float(packetloss) > float(self.ping_packetloss_threshold):
+			message += '\nPacket Loss too high'
+			logging.error(f'\u001B[1;37;41m Packet Loss too high; Target: {self.ping_packetloss_threshold}%\u001B[0m')
+			return (False, message)
+		elif float(packetloss) > 0:
+			message += '\nPacket Loss is not 0%'
+			logging.info('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
+
+		if self.ping_rttavg_threshold != '':
+			if float(rtt_avg) > float(self.ping_rttavg_threshold):
+				ping_rttavg_error_msg = f'RTT(Avg) too high: {rtt_avg} ms; Target: {self.ping_rttavg_threshold} ms'
+				message += '\n' + ping_rttavg_error_msg
+				logging.error('\u001B[1;37;41m'+ ping_rttavg_error_msg +' \u001B[0m')
+				return (False, message)
+
+		return (True, message)
 
 	def Ping(self,HTML,RAN,EPC,CONTAINERS):
-		result = re.search('noS1', str(RAN.Initialize_eNB_args))
-		if result is not None:
-			self.PingNoS1(HTML,RAN,EPC,CONTAINERS)
-			return
 		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		check_eNB = True
-		if (len(self.UEDevices) == 1) and (self.UEDevices[0] == 'OAI-UE'):
-			check_OAI_UE = True
-		else:
-			check_OAI_UE = False
 
 		if self.ue_ids == []:
 			raise Exception("no module names in self.ue_ids provided")
-		ues = []
-		for ue_id in self.ue_ids:
-			ue = cls_module_ue.Module_UE(ue_id)
-			if not ue.getIP():
-				logging.error("no IP addresses returned")
-				HTML.CreateHtmlTestRow(self.ping_args, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
-			ues.append(ue)
+
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(ues)
-
-		multi_jobs = []
-		i = 0
-		lock = Lock()
-		status_queue = SimpleQueue()
-		for ue in ues:
-			p = Process(target = self.Ping_common, args = (lock,status_queue,EPC,ue,RAN,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-			i = i + 1
-		for job in multi_jobs:
-			job.join()
-
-		if (status_queue.empty()):
-			HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(self.Ping_common, EPC, ue, RAN) for ue in 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))
+		if len(successes) == len(ues) and all(successes):
+			HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', messages)
 		else:
-			ping_status = True
-			messages = []
-			while (not status_queue.empty()):
-				count = status_queue.get()
-				if (count < 0):
-					ping_status = False
-				device_id = status_queue.get()
-				ip_addr = status_queue.get()
-				message = status_queue.get()
-				messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{message}')
-			if (ping_status):
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', messages)
-			else:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
-				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+			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))
@@ -1230,7 +995,9 @@ class OaiCiTest():
 			cn_target_ip = result.group('trf_ip_addr')
 			SSH.close()
 			cn_iperf_prefix = "docker exec  prod-trf-gen" # -w /iperf-2.0.13  necessary?
-		else: # ltebox, sabox
+		if (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 = ""
 
@@ -1273,7 +1040,7 @@ class OaiCiTest():
 			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} -1 -t {iperf_time * 1.5} {port} &> {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())
@@ -1312,6 +1079,20 @@ class OaiCiTest():
 
 			self.Iperf_analyzeV2BIDIR(lock, ue.getHost(), ue.getName(), statusQueue, 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 -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:
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
+			else:
+				cmd = cls_cmd.getConnection(EPC.IPAddress)
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f'/tmp/{server_filename}')
+				cmd.close()
+
 		else :
 			raise Exception("Incorrect or missing IPERF direction in XML")
 
@@ -1451,7 +1232,6 @@ class OaiCiTest():
 		#result = re.search('iperf version 2.0.10', str(iperfStdout.strip()))
 		#if result is not None:
 		#	dummyIperfVersion = '2.0.10'
-
 		multi_jobs = []
 		ue_num = len(ues)
 		i = 0

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 = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
 
     nr_cellid = 12345678L
 
@@ -200,7 +200,7 @@ MACRLCs = (
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
     ulsch_max_frame_inactivity = 10;
-    ul_max_mcs         = 15;
+    ul_max_mcs         = 28;
   }
 );
 

ci-scripts/epc.py

@@ -75,7 +75,6 @@ class EPCManagement():
 		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 		self.OCUserName = ''
 		self.OCPassword = ''
-		self.OCProjectName = ''
 		self.imageToPull = ''
 		self.eNBSourceCodePath = ''
 
@@ -240,9 +239,9 @@ class EPCManagement():
 		HTML.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
 
 	def Initialize5GCN(self, HTML):
-		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
+		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.Type == '':
 			HELP.GenericHelp(CONST.Version)
-			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
+			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.Type)
 			sys.exit('Insufficient EPC Parameters')
 		mySSH = cls_cmd.getConnection(self.IPAddress)
 		html_cell = ''
@@ -299,8 +298,8 @@ class EPCManagement():
 			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 = self.SourceCodePath
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, self.OCProjectName)
+			lSourcePath = "/opt/oai-cn5g-fed-develop-2023-04-28-20897"
+			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
 			if not succeeded:
 				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
@@ -599,7 +598,7 @@ class EPCManagement():
 			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, self.OCProjectName)
+			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
 			if not succeeded:
 				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
@@ -618,7 +617,7 @@ class EPCManagement():
 			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('No resources found in oaicicd-ran namespace.', ret.stdout)
+			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'

ci-scripts/ran.py

@@ -263,7 +263,7 @@ class RANManagement():
 		cmd = cls_cmd.getConnection(self.node)
 		ret = cmd.run(self.command)
 		cmd.close()
-		logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode}')
+		logging.debug(f"Custum command : {self.command} on node : {self.node} returnCode : {ret.returncode}")
 		status = 'OK'
 		message = []
 		if ret.returncode != 0 and not self.command_fail:

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml

@@ -0,0 +1,74 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-5gnr-f1-accelleran</htmlTabRef>
+        <htmlTabName>F1 DU Interop Accelleran CU</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 111111
+ 000020
+ 000021
+ 020021
+ 100021
+ 100022
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000020">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI-DU</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <services>oai-du</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000021">
+                <class>DeployGenObject</class>
+                <desc>Deploy nrUE</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
+        </testCase>
+
+        <testCase id="020021">
+                <class>PingFromContainer</class>
+                <desc>Test Connectivity (ping)</desc>
+                <container_name>rfsim5g-oai-nr-ue</container_name>
+                <options>-I oaitun_ue1 -c 20 12.1.1.1</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="100022">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml

@@ -0,0 +1,45 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-5gnr-down-f1-accelleran</htmlTabRef>
+        <htmlTabName>CleanUp</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100022
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100022">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -69,8 +69,8 @@
 		<class>Custom_Command</class>
 		<desc>Reset USRP</desc>
 		<node>nepes</node>
-		<command>sudo -S b2xx_fx3_utils --reset-device</command>
-  </testCase>
+		<command>sudo -S /usr/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
+	</testCase>
 
 	<testCase id="200000">
 		<class>Custom_Command</class>
@@ -228,8 +228,8 @@
 		<yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
         <eNB_instance>1</eNB_instance>
         <eNB_serverId>1</eNB_serverId>
-        <d_retx_th>1,100,100,100</d_retx_th>
-        <u_retx_th>1,100,100,100</u_retx_th>
+        <d_retx_th>10,100,100,100</d_retx_th>
+        <u_retx_th>10,100,100,100</u_retx_th>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -30,8 +30,14 @@
     001000
     020000
     002000
+    002001
     002002
+    002003
+    002004
+    002005
     000100
+    000010
+    000020
     000200
     003000
     004000
@@ -43,6 +49,7 @@
   <testCase id="010000">
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
+    <oc_project>oaicicd-ran</oc_project>
     <images_to_pull>oai-gnb-aw2s</images_to_pull>
   </testCase>
 
@@ -60,7 +67,7 @@
     <id>amarisoft_ue</id>
   </testCase>
 
-  <testCase id="002000">
+  <testCase id="002001">
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_1</id>
@@ -72,28 +79,68 @@
     <id>amarisoft_ue_2</id>
   </testCase>
 
+  <testCase id="002003">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_3</id>
+  </testCase>
+
+  <testCase id="002004">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_4</id>
+  </testCase>
+
+  <testCase id="002005">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_5</id>
+  </testCase>
+
+  <testCase id="000010">
+    <class>Iperf</class>
+    <desc>iperf (DL/20Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 60M -t 30 -i 1 -R</iperf_args>
+    <direction>IPERF3</direction>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3</id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+  </testCase>
+
+  <testCase id="000020">
+    <class>Iperf</class>
+    <desc>iperf (UL/5Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -i 1 </iperf_args>
+    <direction>IPERF3</direction>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3</id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+  </testCase>
+
   <testCase id="000100">
     <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2</id>
+    <desc>Ping: 20pings in 20sec, multi-ue</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5</id>
     <ping_args>-c 20</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
   <testCase id="000200">
     <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2</id>
+    <desc>Ping: 100pings in 20sec, multi-ue</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5</id>
     <ping_args>-c 100 -i 0.2</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+    <ping_rttavg_threshold>30</ping_rttavg_threshold>
   </testCase>
 
   <testCase id="003000">
     <class>Detach_UE</class>
     <desc>Detach UE</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5</id>
   </testCase>
 
   <testCase id="004000">
@@ -119,4 +166,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml

@@ -0,0 +1,46 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+  <htmlTabRef>test-aw2s-cleanup</htmlTabRef>
+  <htmlTabName>CleanUp AW2S ASUE</htmlTabName>
+  <htmlTabIcon>trash</htmlTabIcon>
+  <TestCaseRequestedList>
+    111111
+    222222
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="111111">
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <test_svr_id>0</test_svr_id>
+  </testCase>
+
+  <testCase id="222222">
+    <class>Terminate_UE</class>
+    <desc>Terminate UE</desc>
+    <id>amarisoft_ue</id>
+  </testCase>
+
+</testCaseList>
+

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -179,8 +179,8 @@
     <yaml_path>ci-scripts/yaml_files/sa_b200_gnb</yaml_path>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
-    <d_retx_th>1,100,100,100</d_retx_th>
-    <u_retx_th>1,100,100,100</u_retx_th>
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
 </testCaseList>

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

@@ -0,0 +1,38 @@
+version: '3.8'
+services:
+    oai-du:
+        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-du
+        network_mode: "host"
+        environment:
+            RFSIMULATOR: server
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --MACRLCs.[0].local_n_address 172.21.16.109 --MACRLCs.[0].remote_n_address 172.21.6.22 --log_config.global_log_options level,nocolor,time
+        volumes:
+            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-nr-ue:
+        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue
+        network_mode: "host"
+        environment:
+            RFSIMULATOR: 127.0.0.1
+            FULL_IMSI: '208990100001140'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
+        depends_on:
+            - oai-du
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5

cmake_targets/tools/build_helper

@@ -33,6 +33,7 @@ OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "
 case "$OS_DISTRO" in
   fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
   rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
+  rocky)  OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
   centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
   debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
   ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
@@ -120,12 +121,20 @@ check_supported_distribution() {
         "rhel8.5")     return 0 ;;
         "rhel8.6")     return 0 ;;
         "rhel8.7")     return 0 ;;
+        "rhel8.8")     return 0 ;;
+        "rhel8.9")     return 0 ;;
         "rhel9.0")     return 0 ;;
         "rhel9.1")     return 0 ;;
         "rhel9.2")     return 0 ;;
         "rhel9.3")     return 0 ;;
         "centos7")     return 0 ;;
         "centos8")     return 0 ;;
+        "rocky8.7")    return 0 ;;
+        "rocky8.8")    return 0 ;;
+        "rocky8.9")    return 0 ;;
+        "rocky9.1")    return 0 ;;
+        "rocky9.2")    return 0 ;;
+        "rocky9.3")    return 0 ;;
     esac
     return 1
 }
@@ -300,7 +309,7 @@ install_usrp_uhd_driver_from_source(){
         if [[ "$OS_DISTRO" == "ubuntu" ]]; then
             $SUDO /usr/local/lib/uhd/utils/uhd_images_downloader.py
         fi
-        if [[ "$OS_DISTRO" == "rhel" ]]; then
+        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
             $SUDO /usr/local/lib64/uhd/utils/uhd_images_downloader.py
         fi
     fi
@@ -367,7 +376,7 @@ check_install_usrp_uhd_driver(){
             $SUDO $INSTALLER -y install $boost_libs_fedora $CMAKE
             $SUDO pip3 install mako requests
         fi
-        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
+        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
             if [ $IS_CONTAINER -eq 0 ]
             then
                 # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
@@ -389,13 +398,13 @@ install_usrp_uhd_driver() {
     # quick workaround for RHE7.6
     local distribution=$(get_distribution_release)
     if [ -z $1 ]; then
-      if [[ "$OS_DISTRO" == "rhel" ]]; then
+      if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
           $SUDO /usr/local/bin/uhd_images_downloader
       else
           $SUDO uhd_images_downloader
       fi
     else
-      if [[ "$OS_DISTRO" == "rhel" ]]; then
+      if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
           $SUDO /usr/local/bin/uhd_images_downloader -i $1
       else
           $SUDO uhd_images_downloader -i $1
@@ -562,7 +571,7 @@ check_install_additional_tools (){
         libforms-bin \
         libforms-dev \
         xmlstarlet"
-  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
+  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
     PACKAGE_LIST="\
       doxygen \
       ctags \
@@ -623,7 +632,7 @@ check_install_oai_software() {
         xxd
 
   elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
+    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
       if rpm -q epel-release > /dev/null; then
         echo "EPEL repos already present. Good."
       else

common/utils/LOG/log.c

@@ -45,6 +45,7 @@
 #include "common/config/config_userapi.h"
 #include <time.h>
 #include <sys/time.h>
+#include "common/utils/LOG/log_extern.h"
 
 // main log variables
 
@@ -66,32 +67,30 @@ char __log_mem_filename[1024]={0};
 char * log_mem_filename = &__log_mem_filename[0];
 char logmem_filename[1024] = {0};
 
-mapping log_level_names[] = {
-  {"error",  OAILOG_ERR},
-  {"warn",   OAILOG_WARNING},
-  {"analysis", OAILOG_ANALYSIS},
-  {"info",   OAILOG_INFO},
-  {"debug",  OAILOG_DEBUG},
-  {"trace",  OAILOG_TRACE},
-  {NULL, -1}
-};
+const mapping log_level_names[] = {{"error", OAILOG_ERR},
+                                   {"warn", OAILOG_WARNING},
+                                   {"analysis", OAILOG_ANALYSIS},
+                                   {"info", OAILOG_INFO},
+                                   {"debug", OAILOG_DEBUG},
+                                   {"trace", OAILOG_TRACE},
+                                   {NULL, -1}};
 
-mapping log_options[] = {
-  {"nocolor", FLAG_NOCOLOR  },
-  {"level",   FLAG_LEVEL  },
-  {"thread",  FLAG_THREAD },
-  {"line_num",    FLAG_FILE_LINE },
-  {"function", FLAG_FUNCT},
-  {"time",     FLAG_TIME},
-  {"thread_id", FLAG_THREAD_ID},
-  {"wall_clock", FLAG_REAL_TIME},
-  {NULL,-1}
-};
+const mapping log_options[] = {{"nocolor", FLAG_NOCOLOR},
+                               {"level", FLAG_LEVEL},
+                               {"thread", FLAG_THREAD},
+                               {"line_num", FLAG_FILE_LINE},
+                               {"function", FLAG_FUNCT},
+                               {"time", FLAG_TIME},
+                               {"thread_id", FLAG_THREAD_ID},
+                               {"wall_clock", FLAG_REAL_TIME},
+                               {NULL, -1}};
 
 mapping log_maskmap[] = LOG_MASKMAP_INIT;
 
-char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, LOG_GREEN, "", LOG_BLUE, LOG_CYBL};  /*!< \brief Optional start-format strings for highlighting */
-char *log_level_highlight_end[]   = {LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET};   /*!< \brief Optional end-format strings for highlighting */
+static const char *log_level_highlight_start[] =
+    {LOG_RED, LOG_ORANGE, LOG_GREEN, "", LOG_BLUE, LOG_CYBL}; /*!< \brief Optional start-format strings for highlighting */
+static const char *log_level_highlight_end[] =
+    {LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET}; /*!< \brief Optional end-format strings for highlighting */
 static void log_output_memory(log_component_t *c, const char *file, const char *func, int line, int comp, int level, const char* format,va_list args);
 
 
@@ -754,8 +753,7 @@ void close_component_filelog(int comp)
  * with string value NULL
  */
 /* map a string to an int. Takes a mapping array and a string as arg */
-int map_str_to_int(mapping *map,
-		           const char *str)
+int map_str_to_int(const mapping *map, const char *str)
 {
   while (1) {
     if (map->name == NULL) {
@@ -771,8 +769,7 @@ int map_str_to_int(mapping *map,
 }
 
 /* map an int to a string. Takes a mapping array and a value */
-char *map_int_to_str(mapping *map,
-		             int val)
+char *map_int_to_str(const mapping *map, const int val)
 {
   while (1) {
     if (map->name == NULL) {

common/utils/LOG/log.h

@@ -315,8 +315,8 @@ void set_glog_filelog(int enable);
 void set_component_filelog(int comp);
 void close_component_filelog(int comp);
 void set_component_consolelog(int comp);
-int  map_str_to_int(mapping *map, const char *str);
-char *map_int_to_str(mapping *map, int val);
+int map_str_to_int(const mapping *map, const char *str);
+char *map_int_to_str(const mapping *map, const int val);
 void logClean (void);
 int  is_newline( char *str, int size);
 

common/utils/LOG/log_extern.h

@@ -23,9 +23,8 @@
 
 extern log_t *g_log;
 
-
-extern mapping log_level_names[];
-extern mapping log_options[];
+extern const mapping log_level_names[];
+extern const mapping log_options[];
 extern mapping log_maskmap[];
 extern int log_mem_flag;
 extern char * log_mem_filename;

common/utils/nr/nr_common.c

@@ -449,6 +449,7 @@ void get_samplerate_and_bw(int mu,
         *tx_bw = 50e6;
         *rx_bw = 50e6;
       }
+      break;
     case 216:
       if (threequarter_fs) {
         *sample_rate=46.08e6;
@@ -474,6 +475,7 @@ void get_samplerate_and_bw(int mu,
         *tx_bw = 20e6;
         *rx_bw = 20e6;
       }
+      break;
     case 106:
       if (threequarter_fs) {
         *sample_rate=23.04e6;
@@ -501,6 +503,7 @@ void get_samplerate_and_bw(int mu,
         *tx_bw = 10e6;
         *rx_bw = 10e6;
       }
+      break;
     case 25:
       if (threequarter_fs) {
         *sample_rate=5.76e6;
@@ -706,3 +709,27 @@ void SLIV2SL(int SLIV,int *S,int *L) {
   }
 }
 
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA)
+{
+  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
+  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
+  return ((absolute_diff / scaling_5khz) % 24);
+}
+
+uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
+                                  uint32_t absoluteFrequencyPointA,
+                                  int ssbSubcarrierSpacing,
+                                  int frequency_range)
+{
+  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
+  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
+  int sco = get_ssb_subcarrier_offset(absoluteFrequencySSB, absoluteFrequencyPointA);
+  const int scs_scaling = frequency_range == FR2 ? 1 << (ssbSubcarrierSpacing - 2) : 1 << ssbSubcarrierSpacing;
+  const int scaled_abs_diff = absolute_diff / scaling_5khz;
+  const int ssb_offset_point_a =
+      (scaled_abs_diff - sco) / 12
+      - 10 * scs_scaling; // absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
+  AssertFatal(ssb_offset_point_a % scs_scaling == 0, "PRB offset %d can create frequency offset\n", ssb_offset_point_a);
+  AssertFatal(sco % scs_scaling == 0, "ssb offset %d can create frequency offset\n", sco);
+  return ssb_offset_point_a;
+}

common/utils/nr/nr_common.h

@@ -101,7 +101,11 @@ void get_samplerate_and_bw(int mu,
                            unsigned int *samples_per_frame,
                            double *tx_bw,
                            double *rx_bw);
-
+uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
+                                  uint32_t absoluteFrequencyPointA,
+                                  int ssbSubcarrierSpacing,
+                                  int frequency_range);
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA);
 #define CEILIDIV(a,b) ((a+b-1)/b)
 #define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
 

common/utils/system.c

@@ -231,7 +231,9 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
   int settingPriority = 1;
   ret=pthread_attr_init(&attr);
   AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
-  
+
+  LOG_I(UTIL,"Creating thread %s with affinity %d and priority %d\n",name,affinity,priority);
+
   if (checkIfFedoraDistribution())
     if (checkIfGenericKernelOnFedora())
       if (checkIfInsideContainer())

common/utils/thread_pool/README.md

@@ -0,0 +1,2 @@
+Thread Pool implemented in C following the talk of Sean Parent "Better Code: Concurrency" from 2016
+

common/utils/thread_pool/main.c

@@ -0,0 +1,107 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "task_manager.h"
+
+#define NUM_THREADS 4
+#define NUM_JOBS 1024
+
+
+int64_t time_now_us(void)
+{
+  struct timespec tms;
+
+  /* The C11 way */
+  /* if (! timespec_get(&tms, TIME_UTC))  */
+
+  /* POSIX.1-2008 way */
+  if (clock_gettime(CLOCK_MONOTONIC_RAW,&tms)) {
+    return -1;
+  }
+  /* seconds, multiplied with 1 million */
+  int64_t micros = tms.tv_sec * 1000000;
+  /* Add full microseconds */
+  int64_t const tv_nsec = tms.tv_nsec;
+  micros += tv_nsec/1000;
+  /* round up if necessary */
+  if (tv_nsec % 1000 >= 500) {
+    ++micros;
+  }
+  return micros;
+}
+
+typedef struct{
+  int64_t a;
+  int64_t time;
+} pair_t;
+
+
+static inline
+int64_t naive_fibonnacci(int64_t a)
+{
+  assert(a < 1000);
+  if(a < 2)
+    return a;
+  
+  return naive_fibonnacci(a-1) + naive_fibonnacci(a-2);
+}
+
+//static _Thread_local int64_t counter = 0;
+
+static
+int marker_fd;
+
+void do_work(void* arg)
+{
+  int64_t now = time_now_us();
+
+  pair_t* a = (pair_t*)arg;
+
+  naive_fibonnacci(23 + a->a);
+  int64_t stop = time_now_us();
+
+  char buffer[100] = {0};
+  int ret = snprintf(buffer, 100, "ID %lu Fib elapsed %ld start-stop %ld - %ld \n", pthread_self(),  stop - now, now, stop);
+  assert(ret > 0 && ret < 100);
+
+//  write_marker_ft_mir(marker_fd, buffer);
+  // puts(buffer);
+}
+
+int main()
+{
+  task_manager_t man = {0};
+  init_task_manager(&man, NUM_THREADS);
+  usleep(100);
+
+  pair_t* arr = calloc(NUM_JOBS, sizeof(pair_t));
+  assert(arr != NULL);
+
+  int64_t now = time_now_us();
+
+  for(int k = 0; k < NUM_JOBS/8; ++k){
+    for(int i = 0; i < 8; ++i){
+      pair_t* pa = &arr[i]; 
+      pa->a = 0; //i%10;
+      pa->time = 0;
+      task_t t = {.args = pa, t.func = do_work};
+      async_task_manager(&man, t);
+    }
+    printf("Waiting %ld \n", time_now_us());
+    trigger_and_wait_all_task_manager(&man);
+    printf("Done %ld \n", time_now_us());
+    //usleep(1024);
+  }
+
+  free_task_manager(&man, NULL);
+
+  printf("Total elapsed %ld \n", time_now_us() - now);
+
+  free(arr);
+  return EXIT_SUCCESS;
+}
+

common/utils/thread_pool/run

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Full dyntick CPU on which we'll run the user loop,
+# it must be part of nohz_full kernel parameter
+TARGET=4
+
+# Migrate all possible tasks to CPU 0
+for P in $(ls /proc)
+do
+	if [ -x "/proc/$P/task/" ]
+	then
+		echo $P
+		taskset -acp 0 $P
+	fi
+done
+
+# Migrate irqs to CPU 0
+for D in $(ls /proc/irq)
+do
+	if [[ -x "/proc/irq/$D" && $D != "0" ]]
+	then
+		echo $D
+		echo 1 > /proc/irq/$D/smp_affinity
+	fi
+done
+
+# Delay the annoying vmstat timer far away
+sysctl vm.stat_interval=120
+
+# Shutdown nmi watchdog as it uses perf events
+sysctl -w kernel.watchdog=0
+
+# Remove -rt task runtime limit
+echo -1 > /proc/sys/kernel/sched_rt_runtime_us
+
+# Pin the writeback workqueue to CPU0
+echo 1 > /sys/bus/workqueue/devices/writeback/cpumask
+
+DIR=/sys/kernel/debug/tracing
+echo > $DIR/trace
+echo 0 > $DIR/tracing_on
+# Uncomment the below for more details on what disturbs the CPU
+echo 0 > $DIR/events/irq/enable
+echo 1 > $DIR/events/sched/sched_switch/enable
+echo 1 > $DIR/events/workqueue/workqueue_queue_work/enable
+echo 1 > $DIR/events/workqueue/workqueue_execute_start/enable
+echo 1 > $DIR/events/timer/hrtimer_expire_entry/enable
+echo 1 > $DIR/events/timer/tick_stop/enable
+echo nop > $DIR/current_tracer
+echo 1 > $DIR/tracing_on
+
+# Run a 10 secs user loop on target
+taskset -c 3-7 ./a.out 
+#sleep 20
+#killall a.out
+
+# Checkout the trace in trace.* file
+cat /sys/kernel/debug/tracing/per_cpu/cpu4/trace > trace.4 
+cat /sys/kernel/debug/tracing/per_cpu/cpu5/trace > trace.5 
+cat /sys/kernel/debug/tracing/per_cpu/cpu6/trace > trace.6 
+cat /sys/kernel/debug/tracing/per_cpu/cpu7/trace > trace.7 
+
+

common/utils/thread_pool/task.h

@@ -0,0 +1,10 @@
+#ifndef TASK_WORK_STEALING_THREAD_POOL_H
+#define TASK_WORK_STEALING_THREAD_POOL_H 
+
+typedef struct{
+  void* args;
+  void (*func)(void* args);
+} task_t;
+
+#endif
+

common/utils/thread_pool/task_manager.c

@@ -0,0 +1,615 @@
+#define _GNU_SOURCE
+#include <unistd.h>
+
+#include "task_manager.h"
+
+#include <assert.h> 
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <poll.h>
+#include <sys/types.h>
+#include <sys/sysinfo.h>
+
+#include <fcntl.h>
+
+#include <linux/futex.h>      /* Definition of FUTEX_* constants */
+#include <sys/syscall.h>      /* Definition of SYS_* constants */
+#include <unistd.h>
+
+#if defined (__i386__) || defined(__x86_64__)
+  #define pause_or_yield  __builtin_ia32_pause
+#elif __aarch64__
+  #define pause_or_yield() asm volatile("yield" ::: "memory")
+#else
+    static_assert(0!=0, "Unknown CPU architecture");
+#endif
+
+
+static
+int64_t time_now_us(void)
+{
+  struct timespec tms;
+
+  /* The C11 way */
+  /* if (! timespec_get(&tms, TIME_UTC))  */
+
+  /* POSIX.1-2008 way */
+  if (clock_gettime(CLOCK_MONOTONIC_RAW, &tms)) {
+    return -1;
+  }
+  /* seconds, multiplied with 1 million */
+  int64_t micros = tms.tv_sec * 1000000;
+  /* Add full microseconds */
+  int64_t const tv_nsec = tms.tv_nsec;
+  micros += tv_nsec/1000;
+  /* round up if necessary */
+  if (tv_nsec % 1000 >= 500) {
+    ++micros;
+  }
+  return micros;
+}
+
+static
+void pin_thread_to_core(int core_num)
+{
+  cpu_set_t set = {0};
+  CPU_ZERO(&set);
+  CPU_SET(core_num, &set);
+  int ret = sched_setaffinity(gettid(), sizeof(set), &set);
+  assert(ret != -1); 
+  printf("Pining into core %d id %ld \n", core_num, pthread_self());
+}
+
+
+//////////////////////////////
+//////////////////////////////
+////////// RING //
+//////////////////////////////
+//////////////////////////////
+//////////////////////////////
+
+
+
+typedef struct seq_ring_buf_s
+{
+//  const size_t elt_size;
+  task_t* array;
+
+  size_t cap;
+  uint32_t head;
+  uint32_t tail;
+
+  _Atomic uint64_t sz;
+
+} seq_ring_task_t;
+
+typedef void (*seq_free_func)(task_t*); 
+
+// For working correctly, maintain the default elements to a multiple of 2
+#define DEFAULT_ELM 32
+
+static
+size_t size_seq_ring_task(seq_ring_task_t* r)
+{
+  assert(r != NULL);
+
+  return r->head - r->tail;
+}
+
+inline static
+uint32_t mask(uint32_t cap, uint32_t val)
+{
+  return val & (cap-1);
+}
+
+static 
+bool full(seq_ring_task_t* r)
+{
+  return size_seq_ring_task(r) == r->cap -1;
+}
+
+static
+void enlarge_buffer(seq_ring_task_t* r)
+{
+  assert(r != NULL);
+  assert(full(r));
+
+  const uint32_t factor = 2;
+  task_t* tmp_buffer = calloc(r->cap * factor, sizeof(task_t) );
+  assert(tmp_buffer != NULL);
+
+  const uint32_t head_pos = mask(r->cap, r->head);
+  const uint32_t tail_pos = mask(r->cap, r->tail);
+
+  if(head_pos > tail_pos){
+    memcpy(tmp_buffer, r->array + tail_pos , (head_pos-tail_pos)*sizeof(task_t) );
+  } else {
+    memcpy(tmp_buffer, r->array + tail_pos, (r->cap-tail_pos)*sizeof(task_t));
+    memcpy(tmp_buffer + (r->cap-tail_pos), r->array, head_pos*sizeof(task_t));
+  }
+  r->cap *= factor;
+  free(r->array);
+  r->array = tmp_buffer;
+  r->tail = 0;
+  r->head = r->cap/2 - 1;
+}
+
+static
+void init_seq_ring_task(seq_ring_task_t* r)
+{
+  assert(r != NULL);
+  task_t* tmp_buffer = calloc(DEFAULT_ELM, sizeof(task_t)); 
+  assert(tmp_buffer != NULL);
+  seq_ring_task_t tmp = {.array = tmp_buffer, .head = 0, .tail = 0, .cap = DEFAULT_ELM};
+  memcpy(r, &tmp, sizeof(seq_ring_task_t));
+  r->sz = 0;
+}
+
+static
+void free_seq_ring_task(seq_ring_task_t* r, seq_free_func fp)
+{
+  assert(r != NULL);
+  assert(fp == NULL);
+  free(r->array);
+}
+
+
+static
+void push_back_seq_ring_task(seq_ring_task_t* r, task_t t)
+{
+  assert(r != NULL);
+
+  if(full(r))
+    enlarge_buffer(r);
+  
+  const uint32_t pos = mask(r->cap, r->head);
+  r->array[pos] = t;
+  r->head += 1;
+  r->sz += 1;
+}
+
+static
+task_t pop_seq_ring_task(seq_ring_task_t* r )
+{
+  assert(r != NULL);
+  assert(size_seq_ring_task(r) > 0);
+
+  const uint32_t pos = mask(r->cap, r->tail);
+  task_t t = r->array[pos];
+  r->tail += 1; 
+  r->sz -= 1;
+  return t;
+}
+
+//////////////////////////////
+//////////////////////////////
+////////// END RING //
+//////////////////////////////
+//////////////////////////////
+//////////////////////////////
+
+
+
+//////////////////////////////
+//////////////////////////////
+////////// Start Notification Queue //
+//////////////////////////////
+//////////////////////////////
+//////////////////////////////
+
+typedef struct {
+  pthread_mutex_t mtx;
+  pthread_cond_t cv;
+  seq_ring_task_t r;
+  _Atomic int32_t* futex;
+  _Atomic bool* waiting;
+  _Atomic int done;
+} not_q_t;
+
+typedef struct{
+  task_t t;
+  bool success;
+} ret_try_t;
+
+
+static
+void init_not_q(not_q_t* q, _Atomic int32_t* futex, _Atomic bool* waiting)
+{
+  assert(q != NULL);
+
+  q->done = 0;
+  q->waiting = waiting;
+  init_seq_ring_task(&q->r);
+
+  pthread_mutexattr_t attr = {0};
+#ifdef _DEBUG
+  int const rc_mtx = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+  assert(rc_mtx == 0);
+#endif
+  int rc = pthread_mutex_init(&q->mtx, &attr);
+  assert(rc == 0 && "Error while creating the mtx");
+
+  pthread_condattr_t* c_attr = NULL; 
+  rc = pthread_cond_init(&q->cv, c_attr);
+  assert(rc == 0);
+
+  q->futex = futex;
+}
+
+static
+void free_not_q(not_q_t* q, void (*clean)(task_t*) )
+{
+  assert(q != NULL);
+  assert(q->done == 1);
+
+  free_seq_ring_task(&q->r, clean);
+
+  int rc = pthread_mutex_destroy(&q->mtx);
+  assert(rc == 0);
+
+  rc = pthread_cond_destroy(&q->cv);
+  assert(rc == 0);
+}
+
+static
+bool try_push_not_q(not_q_t* q, task_t t)
+{
+  assert(q != NULL);
+  assert(q->done == 0 || q->done ==1);
+  assert(t.func != NULL);
+  assert(t.args != NULL);
+
+  if(pthread_mutex_trylock(&q->mtx ) != 0)
+    return false;
+
+  push_back_seq_ring_task(&q->r, t);
+
+  int const rc = pthread_mutex_unlock(&q->mtx);
+  assert(rc == 0);
+
+  return true;
+}
+
+static
+void push_not_q(not_q_t* q, task_t t)
+{
+  assert(q != NULL);
+  assert(q->done == 0 || q->done ==1);
+  assert(t.func != NULL);
+  
+  int const rc = pthread_mutex_lock(&q->mtx);
+  assert(rc == 0);
+
+  push_back_seq_ring_task(&q->r, t);
+
+  pthread_mutex_unlock(&q->mtx);
+}
+
+
+static
+ret_try_t try_pop_not_q(not_q_t* q)
+{
+  assert(q != NULL);
+
+  ret_try_t ret = {.success = false}; 
+
+  int rc = pthread_mutex_trylock(&q->mtx);
+  assert(rc == 0 || rc == EBUSY);
+
+  if(rc == EBUSY)
+    return ret;
+
+  assert(q->done == 0 || q->done ==1);
+
+  size_t sz = size_seq_ring_task(&q->r); 
+  if(sz == 0){
+    rc = pthread_mutex_unlock(&q->mtx);
+    assert(rc == 0);
+
+    return ret;
+  }
+
+  ret.t = pop_seq_ring_task(&q->r);
+
+  rc = pthread_mutex_unlock(&q->mtx);
+  assert(rc == 0);
+  ret.success = true; 
+
+  return ret;
+}
+
+static
+bool pop_not_q(not_q_t* q, ret_try_t* out)
+{
+  assert(q != NULL);
+  assert(out != NULL);
+  assert(q->done == 0 || q->done ==1);
+
+label:
+  // Let's be conservative and not use memory_order_relaxed
+  while (atomic_load_explicit(q->waiting, memory_order_seq_cst) == true){ //
+      // Issue X86 PAUSE or ARM YIELD instruction to reduce contention between
+      // hyper-threads
+      pause_or_yield();
+    }
+
+  pthread_mutex_lock(&q->mtx);
+
+  if(size_seq_ring_task(&q->r) == 0 && q->done == 0){
+    int rc = pthread_mutex_unlock(&q->mtx);
+    assert(rc == 0);
+
+    int val = *q->futex; // atomic_load_explicit(q->futex, memory_order_acquire);
+    long r = syscall(SYS_futex, q->futex, FUTEX_WAIT_PRIVATE, val, NULL, 0);
+    assert(r != -1);
+    goto label;
+  }
+
+  assert(q->done == 0 || q->done ==1);
+
+  //printf("Waking %ld id %ld \n", time_now_us(), pthread_self());
+
+  if(q->done == 1){
+    //printf("Done, returning \n");
+    int rc = pthread_mutex_unlock(&q->mtx);
+    assert(rc == 0);
+    return false;
+  }
+
+  out->t = pop_seq_ring_task(&q->r);
+
+  int rc = pthread_mutex_unlock(&q->mtx);
+  assert(rc == 0);
+
+  return true;
+}
+
+static
+void done_not_q(not_q_t* q)
+{
+  assert(q != NULL);
+
+  int rc = pthread_mutex_lock(&q->mtx);
+  assert(rc == 0);
+  
+  q->done = 1;
+  long r = syscall(SYS_futex, q->futex, FUTEX_WAKE_PRIVATE, 1 , NULL, NULL, 0);
+  assert(r != -1);
+  rc = pthread_mutex_unlock(&q->mtx);
+  assert(rc == 0);
+
+//  rc = pthread_cond_signal(&q->cv);
+//  assert(rc == 0);
+
+//  q->futex++;
+}
+
+
+//////////////////////////////
+//////////////////////////////
+////////// END Notification Queue //
+//////////////////////////////
+//////////////////////////////
+//////////////////////////////
+
+
+//static int marker_fd;
+
+typedef struct{
+  task_manager_t* man;
+  int idx;
+} task_thread_args_t;
+
+
+
+static
+void* worker_thread(void* arg)
+{
+  assert(arg != NULL);
+
+  task_thread_args_t* args = (task_thread_args_t*)arg; 
+  int const idx = args->idx;
+
+  int const log_cores = get_nprocs_conf();
+  assert(log_cores > 0);
+  // Assuming: 2 x Physical cores = Logical cores
+  pin_thread_to_core(idx+log_cores/2);
+
+  task_manager_t* man = args->man;
+
+  uint32_t const len = man->len_thr;
+  uint32_t const num_it = 2*(man->len_thr + idx); 
+
+  not_q_t* q_arr = (not_q_t*)man->q_arr;
+
+  int acc_num_task = 0;
+  for(;;){
+
+    ret_try_t ret = {.success = false}; 
+
+    for(uint32_t i = idx; i < num_it; ++i){
+      ret = try_pop_not_q(&q_arr[i%len]);
+      if(ret.success == true){
+        break;
+      } 
+    }
+
+    if(ret.success == false){
+      man->num_task -= acc_num_task;
+      acc_num_task = 0;
+      if(pop_not_q(&q_arr[idx], &ret) == false)
+        break;
+    }
+
+    //int64_t now = time_now_us();
+    //printf("Calling fuinc \n");
+    ret.t.func(ret.t.args); 
+    //printf("Returning from func \n");
+    //int64_t stop = time_now_us(); 
+
+    acc_num_task +=1;
+  }
+
+  free(args);
+  return NULL;
+}
+
+
+void init_task_manager(task_manager_t* man, uint32_t num_threads)
+{
+  assert(man != NULL);
+  assert(num_threads > 0 && num_threads < 33 && "Do you have zero or more than 32 processors??");
+
+  man->q_arr = calloc(num_threads, sizeof(not_q_t));
+  assert(man->q_arr != NULL && "Memory exhausted");
+  man->futex = 0; 
+
+  man->waiting = false;
+
+  not_q_t* q_arr = (not_q_t*)man->q_arr;
+  for(uint32_t i = 0; i < num_threads; ++i){
+    init_not_q(&q_arr[i], &man->futex, &man->waiting);   
+  }
+
+  man->t_arr = calloc(num_threads, sizeof(pthread_t));
+  assert(man->t_arr != NULL && "Memory exhausted" );
+  man->len_thr = num_threads;
+
+  for(uint32_t i = 0; i < num_threads; ++i){
+    task_thread_args_t* args = malloc(sizeof(task_thread_args_t) ); 
+    args->idx = i;
+    args->man = man;
+
+    pthread_attr_t attr = {0};
+    int ret=pthread_attr_init(&attr);
+    assert(ret == 0);
+    ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+    assert(ret == 0);
+    ret=pthread_attr_setschedpolicy(&attr, SCHED_RR);
+    assert(ret == 0);
+    struct sched_param sparam={0};
+    sparam.sched_priority = 94;
+    ret=pthread_attr_setschedparam(&attr, &sparam);
+
+    int rc = pthread_create(&man->t_arr[i], &attr, worker_thread, args);
+    assert(rc == 0);
+  }
+
+  man->index = 0;
+
+  pthread_mutexattr_t attr = {0};
+#ifdef _DEBUG
+  int const rc_mtx = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+  assert(rc_mtx == 0);
+#endif
+  int rc = pthread_mutex_init(&man->wait_mtx, &attr);
+  assert(rc == 0 && "Error while creating the mtx");
+
+  pthread_condattr_t* c_attr = NULL; 
+  rc = pthread_cond_init(&man->wait_cv, c_attr);
+  assert(rc == 0);
+
+  //pin_thread_to_core(3);
+}
+
+void free_task_manager(task_manager_t* man, void (*clean)(task_t*))
+{
+  not_q_t* q_arr = (not_q_t*)man->q_arr;
+  atomic_store(&man->waiting, false);
+  for(uint32_t i = 0; i < man->len_thr; ++i){
+    done_not_q(&q_arr[i]);
+  }
+
+  for(uint32_t i = 0; i < man->len_thr; ++i){
+    int rc = pthread_join(man->t_arr[i], NULL); 
+    assert(rc == 0);
+  }
+
+  for(uint32_t i = 0; i < man->len_thr; ++i){
+    free_not_q(&q_arr[i], clean); 
+  }
+
+  free(man->q_arr);
+
+  free(man->t_arr);
+
+  int rc = pthread_mutex_destroy(&man->wait_mtx);
+  assert(rc == 0);
+
+  rc = pthread_cond_destroy(&man->wait_cv);
+  assert(rc == 0);
+}
+
+void async_task_manager(task_manager_t* man, task_t t)
+{
+  assert(man != NULL);
+  assert(t.func != NULL);
+  //assert(t.args != NULL);
+
+  uint64_t const index = man->index++;
+  const uint32_t len_thr = man->len_thr;
+
+  not_q_t* q_arr = (not_q_t*)man->q_arr;
+  for(uint32_t i = 0; i < len_thr ; ++i){
+    if(try_push_not_q(&q_arr[(i+index) % len_thr], t)){
+      man->num_task +=1;
+      return;
+    }
+  }
+
+  push_not_q(&q_arr[index%len_thr], t);
+  man->num_task +=1;
+}
+
+void trigger_and_spin(task_manager_t* man)
+{
+  assert(man != NULL);
+  
+  atomic_store(&man->waiting, true);
+
+  //  FUTEX_WAKE_PRIVATE
+  man->futex = 0;
+  long r = syscall(SYS_futex, &man->futex, FUTEX_WAKE_PRIVATE, INT_MAX, NULL, NULL, 0);
+  //printf("Number of threads woken %ld \n", r);
+  if(r == -1){
+    printf("%d errno \n", errno);
+  }
+  assert(r != -1);
+}
+
+void trigger_and_wait_all_task_manager(task_manager_t* man)
+{
+  assert(man != NULL);
+
+  trigger_and_spin(man);
+  atomic_store(&man->waiting, false);
+
+  // GCC thread sanitizer complains, while Clang does not. Let's be conservative and pay some cycles
+  // memory_order_relaxed
+  //printf("Main func waiting \n");
+  while (atomic_load_explicit(&man->num_task,  memory_order_relaxed)){
+      // Issue X86 PAUSE or ARM YIELD instruction to reduce contention between
+      // hyper-threads
+      pause_or_yield();
+    }
+
+  //printf("Main func returnning \n");
+
+  atomic_store(&man->waiting, true);
+}
+
+void wait_all_task_manager(task_manager_t* man)
+{
+  assert(man != NULL);
+
+  while (atomic_load_explicit(&man->num_task, memory_order_relaxed)){
+    // Issue X86 PAUSE or ARM YIELD instruction to reduce contention between
+    // hyper-threads
+    pause_or_yield();
+  }
+}
+

common/utils/thread_pool/task_manager.h

@@ -0,0 +1,48 @@
+#ifndef TASK_MANAGER_WORKING_STEALING_H
+#define TASK_MANAGER_WORKING_STEALING_H 
+
+// Comment for deactivating ws tpool
+#define TASK_MANAGER
+
+
+#include "task.h"
+
+#include <pthread.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+typedef struct{
+
+  pthread_t* t_arr;
+  size_t len_thr;
+  
+  atomic_uint_fast64_t index;
+
+  void* q_arr;
+
+  atomic_uint_fast64_t num_task;
+
+  pthread_cond_t  wait_cv; 
+  pthread_mutex_t wait_mtx;
+
+  _Atomic int32_t futex;
+
+  _Atomic bool waiting;
+
+} task_manager_t;
+
+void init_task_manager(task_manager_t* man, uint32_t num_threads);
+
+void free_task_manager(task_manager_t* man, void (*clean)(task_t* args) );
+
+void async_task_manager(task_manager_t* man, task_t t);
+
+void trigger_and_spin(task_manager_t* man);
+
+void trigger_and_wait_all_task_manager(task_manager_t* man);
+
+void wait_all_task_manager(task_manager_t* man);
+
+#endif
+

doc/F1-design.md

@@ -11,6 +11,7 @@
     </td>
   </tr>
 </table>
+
 # 1. Introduction
 
 We use OpenAirInterface source code, and it's regular deployment scheme.
@@ -208,3 +209,46 @@ DU rlc north output goes to du_pdcp_data_ind() that push a outgoing packet reque
 CU pdcp south output calls cu_rlc_data_ind() that do the same symetric processing.
 
 
+# High-level F1-C code structure
+
+The F1 interface is used internally between CU (mostly RRC) and DU (mostly MAC)
+to exchange information. In DL, the CU sends messages as defined by the
+callbacks in `mac_rrc_dl.h`, whose implementation is defined in files
+`mac_rrc_dl_direct.c` (monolithic) and `mac_rrc_dl_f1ap.c` (for F1AP). In the
+monolithic case, the RRC calls directly into the message handler on the DU side
+(`mac_rrc_dl_handler.c`). In the F1 case, an ITTI message is sent to the CU
+task, sending an ASN.1-encoded F1AP message. The DU side's DU task decodes the
+message, and then calls the corresponding handler in `mac_rrc_dl_handler.c`.
+Thus, the message flow is the same in both F1 and monolithic cases, with the
+difference that F1AP encodes the messages using ASN.1 and sends over a socket.
+
+In UL, the callbacks defined in `mac_rrc_ul.h` are implemented by
+`mac_rrc_ul_direct.c` (monolithic) and `mac_rrc_ul_f1ap.c` (F1). In the direct
+case, an ITTI message is directly sent to the RRC task (hence, there is no
+dedicated handler). In F1, the DU task receives the ITTI message, encodes using
+ASN.1, and sends it over a network socket.  The CU task decodes, and sends the
+same ITTI message to the RRC task as done directly in the monolithic case.
+
+```
+                             +-------------+
+                             |             |
+                             |   CU/RRC    |
+                             |             |
+                             +-------------+
+                                |       ^
+     Callback def: mac_rrc_dl.h |       | No handler needed:
+     F1 impl: mac_rrc_dl_f1ap.c |       | RRC has ITTI
+Monolithic: mac_rrc_dl_direct.c |       |
+                                |       |
+                             DL |       | UL
+                                |       |
+                                |       | Callback def: mac_rrc_ul.h
+               Message handler: |       | F1 impl: mac_rrc_ul_f1ap.c
+           mac_rrc_dl_handler.c |       | Monolithic: mac_rrc_ul_direct.c
+                                v       |
+                             +-------------+
+                             |             |
+                             |   DU/MAC    |
+                             |             |
+                             +-------------+
+```

doc/NR_SA_Tutorial_COTS_UE.md

@@ -21,14 +21,14 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
 
 Minimum hardware requirements:
 - Laptop/Desktop/Server for OAI CN5G and OAI gNB
-    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.1-desktop-amd64.iso)
+    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.2-desktop-amd64.iso)
     - CPU: 8 cores x86_64 @ 3.5 GHz
     - RAM: 32 GB
 - Laptop for UE
     - Operating System: Microsoft Windows 10 x64
     - CPU: 4 cores x86_64
     - RAM: 8 GB
-    - Windows driver for Quectel MUST be equal or higher than version **2.2.4**
+    - Windows driver for Quectel MUST be equal or higher than version **2.4.6**
 - [USRP B210](https://www.ettus.com/all-products/ub210-kit/), [USRP N300](https://www.ettus.com/all-products/USRP-N300/) or [USRP X300](https://www.ettus.com/all-products/x300-kit/)
     - Please identify the network interface(s) on which the USRP is connected and update the gNB configuration file
 - Quectel RM500Q

doc/NR_SA_Tutorial_OAI_CN5G.md

@@ -21,7 +21,7 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
 
 Minimum hardware requirements:
 - Laptop/Desktop/Server for OAI CN5G and OAI gNB
-    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.1-desktop-amd64.iso)
+    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.2-desktop-amd64.iso)
     - CPU: 8 cores x86_64 @ 3.5 GHz
     - RAM: 32 GB
 
@@ -71,13 +71,13 @@ docker build --target ims --tag asterisk-ims:latest --file ~/oai-cn5g/Dockerfile
 ## 3.1 Start OAI CN5G
 ```bash
 cd ~/oai-cn5g
-docker-compose up -d
+docker compose up -d
 ```
 
 ## 3.2 Stop OAI CN5G
 ```bash
 cd ~/oai-cn5g
-docker-compose down
+docker compose down
 ```
 
 # 4. Run 5G NR SA end-to-end setup with OAI gNB
@@ -87,4 +87,4 @@ Please check this link:
 
 ## 4.2 Testing with OAI nrUE
 Please check this link:
-[Testing with OAI gNB and OAI nrUE](NR_SA_Tutorial_OAI_nrUE.md)
+[Testing with OAI gNB and OAI nrUE](NR_SA_Tutorial_OAI_nrUE.md)

doc/NR_SA_Tutorial_OAI_nrUE.md

@@ -21,11 +21,11 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
 
 Minimum hardware requirements:
 - Laptop/Desktop/Server for OAI CN5G and OAI gNB
-    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.1-desktop-amd64.iso)
+    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.2-desktop-amd64.iso)
     - CPU: 8 cores x86_64 @ 3.5 GHz
     - RAM: 32 GB
 - Laptop for UE
-    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.1-desktop-amd64.iso)
+    - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.2-desktop-amd64.iso)
     - CPU: 8 cores x86_64 @ 3.5 GHz
     - RAM: 8 GB
 - [USRP B210](https://www.ettus.com/all-products/ub210-kit/), [USRP N300](https://www.ettus.com/all-products/USRP-N300/) or [USRP X300](https://www.ettus.com/all-products/x300-kit/)
@@ -155,7 +155,7 @@ Run OAI nrUE
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --ue-fo-compensation --sa -E --uicc0.imsi 001010000000001
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --ue-fo-compensation --sa -E --uicc0.imsi 001010000000001
 ```
 
 ## 5.2 Testing OAI nrUE with RFsimulator
@@ -168,7 +168,7 @@ Run OAI nrUE with RFsimulator
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --rfsim --sa --uicc0.imsi 001010000000001
+sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa --uicc0.imsi 001010000000001
 ```
 
 ### 5.2.1 Ping test

doc/README.md

@@ -36,7 +36,6 @@ There is some general information in the [OpenAirInterface Gitlab Wiki](https://
   * (5G) Using SDAP and custom DRBs
   * IF setups and arbitrary frequencies
   * MIMO
-- [How to run a 5G-SA setup](./TESTING_5GSA_setup.md)
 - [How to run a 5G-NSA setup](./TESTING_GNB_W_COTS_UE.md)
 - [How to run a 4G setup using L1 simulator](./L1SIM.md) _Note: we recommend the RFsimulator_
 - [How to use the L2 simulator](./L2NFAPI.md)
@@ -94,6 +93,7 @@ The other SDRs (AW2S, LimeSDR, ...) have no READMEs.
 
 ## Special-purpose libraries
 
+- OAI has two scopes, one based on Xforms, one on Qt5, described in [this README](../openair1/PHY/TOOLS/readme.md)
 - OAI comes with an integrated [telnet server](../common/utils/telnetsrv/DOC/telnethelp.md) to monitor and control
 - OAI comes with an integrated [web server](../common/utils/websrv/DOC/websrv.md)
 

doc/RUN_NR_PRS.md

@@ -64,7 +64,7 @@ In our case the output is 0 and hence we use `numactl --cpunodebind=0 --membind=
 ## FR1 test
 Open a terminal on the host machine, and execute below command to launch gNB with **X310 USRPs**
 
-```sudo numactl --cpunodebind=0 --membind=0 ./nr-softmodem -E -O../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.sa.band78.fr1.106PRB.prs.usrpx310.conf --phy-test```
+```sudo numactl --cpunodebind=0 --membind=0 ./nr-softmodem -E -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.sa.band78.fr1.106PRB.prs.usrpx310.conf --phy-test```
 
 If **N310 USRPs** are used, then run above command `without -E option` i.e without 3/4 sampling rate.<br><br>
 
@@ -187,4 +187,4 @@ This script will read the IQ data from extracted PRS dumps(chF_gnbX_Y.raw and ch
          <figcaption align = "center"><b>Fig.1 - FR2 100MHz test</b></figcaption>
     </td>
   </tr>
-</table>
+</table>

doc/SW-archi-graph.md

@@ -31,7 +31,6 @@ rx_func_implem[rx_func]
       --> handle_nr_ulsch
       subgraph gNB_dlsch_ulsch_scheduler
           run_pdcp
-          --> nr_rrc_trigger
           --> schedule_xxxx
       end
       handle_nr_ulsch --> gNB_dlsch_ulsch_scheduler

doc/TESTBenches.md

@@ -55,7 +55,7 @@ Note: The available resources, and their current usage, is indicated here:
 
 ### 5G AW2S Testbench
 
-**Purpose**: AW2S tests with Amarisoft
+**Purpose**: AW2S tests with Amarisoft UE simulator
 
 ![5G AW2S Testbench](testbenches_doc_resources/5g-aw2s-bench.png)
 
@@ -82,7 +82,10 @@ Webhook
 - [RAN-gNB-N300-Timing-Phytest-LDPC](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-gNB-N300-Timing-Phytest-LDPC/)
   - caracal + N310
   - pure performance test through phy-test scheduler, see command line for more details
-- [RAN-L2-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-4G/)
+- [RAN-Interop-F1](https://jenkins-oai.eurecom.fr/job/RAN-Interop-F1/)
+  - ofqot (DU, 1x UE)
+  - F1 interoperability testing: sets up connection to Accelleran CU, UE connection and connectivity test
+- [RAN-L2-Sim-Test-4G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-4G/)
   - obelix (eNB, 1x UE, OAI EPC)
   - L2simulator: skips physical layer and uses proxy between eNB and UE
 - [RAN-L2-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-5G/)
@@ -92,7 +95,7 @@ Webhook
   - hutch + B210, nano w/ ltebox + 2x UE
   - tests RRC inactivity timers, different bandwidths
 - [RAN-LTE-TDD-2x2-Container](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-LTE-TDD-2x2-Container/)
-  - obelix + N310, porcepix, quectel
+  - obelix + N310, porcepix, nrmodule2 + Quectel
   - TM1 and TM2 test
 - [RAN-LTE-TDD-LTEBOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-LTE-TDD-LTEBOX-Container/)
   - starsky + B210, nano w/ ltebox + 2x UE
@@ -111,14 +114,15 @@ Webhook
   - uses RFsimulator, TDD 40MHz, FDD 40MHz, F1 split
 - [RAN-RHEL8-Cluster-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-RHEL8-Cluster-Image-Builder/)
   - cluster (`Asterix-OC-oaicicd-session` resource): RHEL 8 image build using the OpenShift Cluster
+- [RAN-SA-AW2S-CN5G](https://jenkins-oai.eurecom.fr/job/RAN-SA-AW2S-CN5G/)
+  - 5G-NR SA test setup: avra(RHEL9.1) + AW2S, amariue, OAI CN5G
+  - uses OpenShift cluster for CN deployment and container images for gNB deployment
+  - multi UE testing
 - [RAN-SA-B200-Module-SABOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-SA-B200-Module-SABOX-Container/)
   - ofqot + B200, idefix + Quectel, nepes w/ sabox
   - basic SA test (20 MHz TDD), F1, reestablishment, ...
-- [RAN-Ubuntu20-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
+- [RAN-Ubuntu18-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
   - obelix: Ubuntu 20 image build using docker (Note: builds U20 images while pipeline is named U18!)
-- [RAN-SA-AW2S-CN5G](https://jenkins-oai.eurecom.fr/job/RAN-SA-AW2S-CN5G/)
-  - 5G-NR SA test setup: Avra(RHEL9.1)/Manarola(U22PRO) + AW2S, Amarisoft UE x1, OAI CN5G
-  - uses OpenShift cluster for CN deployment and container images for gNB deployment
 
 ### RAN-CI-NSA-Trigger
 

doc/TESTING_5GSA_setup.md

@@ -1,230 +0,0 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI 5G SA tutorial</font></b>
-    </td>
-  </tr>
-</table>
-
-**Table of Contents**
-
-[[_TOC_]]
-
-In the following tutorial we describe how to deploy configure and test the two SA OAI setups:
-
- - SA setup with OAI gNB and COTS UE
- - SA setup with OAI gNB and OAI UE
- 
-The operating system and hardware requirements to support OAI 5G NR are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/5g-nr-development-and-setup). 
-
-# 1.  SA setup with COTS UE
-At the moment of writing this document interoperability with the following COTS UE devices is being tested:
-
- - [Quectel RM500Q-GL](https://www.quectel.com/product/5g-rm500q-gl/)
- - [Simcom SIMCOM8200EA](https://www.simcom.com/product/SIM8200EA_M2.html)
- - Huawei Mate 30 Pro
- - Oneplus 8
- - Google Pixel 5
-
- End-to-end control plane signaling to achieve a 5G SA connection, UE registration and PDU session establishment with the CN, as well as some basic user-plane traffic tests have been validated so far using SIMCOM/Quectel modules and Huawei Mate 30 pro. In terms of interoperability with different 5G Core Networks, so far this setup has been tested with:
- 
-
- - [OAI CN](https://openairinterface.org/oai-5g-core-network-project/)
- - Nokia SA Box
- - [Free CN](https://www.free5gc.org/)
-
- 
-## 1.1  gNB build and configuration
-To get the code and build the gNB executable:
-
-### Build gNB
-```bash
-    git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
-    git checkout develop
-    cd openairinterface5g/
-    source oaienv
-    cd cmake_targets/
-    ./build_oai -I -w USRP #For OAI first time installation only to install software dependencies
-    ./build_oai --gNB -w USRP
-```
-
-A reference configuration file for the **monolithic** gNB is provided  [here](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf).     
-
-
-In the following, we highlight the fields of the file that have to be configured according to the configuration and interfaces of the Core Network. First, the PLMN section has to be filled with the proper values that match the configuration of the AMF and the UE USIM.
-```bash
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
-```
-Then, the source and destination IP interfaces for the communication with
-the Core Network also need to be set as shown below.
-
-```bash
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    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_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-```
-In the first part (*amf_ip_address*) we specify the IP of the AMF and in the second part (*NETWORK_INTERFACES*) we specify the gNB local interface with AMF (N2 interface) and the UPF (N3 interface).
-
-**CAUTION:** the `192.168.70.132` AMF IF address is the OAI-CN5G `AMF` Container IP address. You certainly will need to do some networking manipulations for the `gNB` server to be able to see this AMF container.
-
-Please read [CN5G tutorial for more details](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
-
-### gNB configuration in F1 (CU/DU split mode)
-
-For the configuration of the gNB in CU and DU blocks, the following sample configuration files are provided for the [CU](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf) and the [DU](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf) entities respectively. These configuration files have to be updated with the IP addresses of the CU and the DU over the F1 interface. For example, in the following section from the DU configuration file, *local_n_address* corresponds to the DU address and *remote_n_address* corresponds to the CU address:
-
-```bash
-MACRLCs = (
-  {
-    num_cc           = 1;
-    tr_s_preference  = "local_L1";
-    tr_n_preference  = "f1";
-    local_n_if_name = "lo";
-    local_n_address = "127.0.0.3";
-    remote_n_address = "127.0.0.4";
-    local_n_portc   = 601;
-    local_n_portd   = 2152;
-    remote_n_portc  = 600;
-    remote_n_portd  = 2152;
-
-  }
-);
-```
-
-At the point of writing this document the control-plane exchanges between the CU and the DU over *F1-C* interface, as well as some IP traffic tests over *F1-U* have been validated using the OAI gNB/nrUE in RFSIMULATOR mode. 
-
-### gNB configuration with F1 and E1
-
-Please refer to [E1-design](E1-design) for more information.
-
-## 1.2  OAI 5G Core Network installation and configuration
-The instructions for the installation of OAI CN components (AMF, SMF, NRF, UPF) using `docker-compose` can be found [here](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
-
-## 1.3  Execution of SA scenario
-
-After having configured the gNB, we can start the individual components in the following sequence:
-
- - Launch 5G Core Network
- - Launch gNB
- - Launch COTS UE (disable airplane mode)
-
-The execution command to start the gNB (in monolithic mode) is the following:
-```bash
-cd cmake_targets/ran_build/build
-sudo ./nr-softmodem -E --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
-```
-
-# 2. SA Setup with OAI NR UE Softmodem
-The SA setup with OAI UE has been validated with **RFSIMULATOR**. Both control plane and user plane for the successful UE registration and PDU Session establishment has been verified with OAI and Nokia SA Box CNs.
-
-In the following, we provide the instructions on how to build, configure and execute this SA setup.
-
-As another option, if you do not want to build anything and instead deploy the OAI RAN (RFSIMULATOR) and Core Network components directly using docker images and docker-compose, please have a look at [this tutorial](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/ci-scripts/yaml_files/5g_rfsimulator/README.md).
-
-### NAS configuration for the OAI UE
-The NAS configuration parameters of the OAI UE can be set as input parameters, configuration file or can be hardcoded.  More specifically:
-- SUCI (*Subscription Concealed Identifier*)
-- USIM_API_K and OPc keys
-- NSSAI (*Network Slice Assistance Information*)
-- DNN (*Data Network Name*)
-
-Below is a sample configuration file that can be parsed through the execution command ([section 2.3](#23-execution-of-sa-scenario)).
-
-```bash
-uicc0 = {
-imsi = "208990000007487";
-key = "fec86ba6eb707ed08905757b1bb44b8f";
-opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
-nssai_sd=1;
-}
-```
-
-For interoperability with OAI or other CNs, it should be ensured that the configuration of the aforementioned parameters match the configuration of the corresponding subscribed user at the core network.
-
-
-## 2.1 Build and configuration
-To build the gNB and OAI UE executables:  
-
-```bash
-    cd cmake_targets
-    # Note: For OAI first time installation please install software dependencies as described in 1.1.
-    ./build_oai --gNB --nrUE -w SIMU
-```
-The gNB configuration can be performed according to what is described in [section 1.1](#11--gnb-build-and-configuration), using the same reference configuration file as with the RF scenario.
-
-## 2.2  OAI 5G Core Network installation and configuration
-The instructions for the installation of OAI CN components (AMF, SMF, NRF, UPF) using `docker-compose` can be found [here](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
-
-
-## 2.3 Execution of SA scenario
-
-The order of starting the different components should be the same as the one described in [section 1.3](#13--execution-of-sa-scenario).
-
-the gNB can be launched in 2 modes:
-
-- To launch the gNB in `monolithic` mode:
- ```bash
- sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
-     -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
- ```
-- To launch the gNB in `CU/DU split` mode:
-
-    1. Launch the CU component:
-    ```bash
-    sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
-        -O ../../../ci-scripts/conf_files/gNB_SA_CU.conf
-    ```
-    2. Launch the DU component:
-    ```bash
-    sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
-        -O ../../../ci-scripts/conf_files/gNB_SA_DU.conf
-    ```
-
-- To launch the OAI UE (valid in `monolithic` gNB and `CU/DU split` gNB):
- ```bash
-sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 \
-    --rfsim --sa -O <PATH_TO_UE_CONF_FILE>
-```
-
-If you get the following error:
-
-```bash
-Assertion (k2 >= ((5))) failed!
-In get_k2() /home/mir/workspace/openairinterface5g/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c:147
-Slot offset K2 (2) cannot be less than DURATION_RX_TO_TX (5). K2 set according to min_rxtxtime in config file.
-```
-
-Add the following parameter (i.e., min_rxtxtime) in the gNB configuration file, just after nr_cellid.
-
-```bash
-nr_cellid = 12345678L;
-min_rxtxtime=6;
-```
-or --gNBs.[0].min_rxtxtime 6 to the gNB command line
-
-
-The IP address at the execution command of the OAI UE corresponds to the target IP of the gNB host that the RFSIMULATOR at the UE will connect to. In the above example, we assume that the gNB and UE are running on the same host so the specified address (127.0.0.1) is the one of the loopback interface.  

doc/testbenches_doc_resources/5g-aw2s-bench.tex

@@ -23,9 +23,11 @@
   \node[below right=-0.7cm and 0.35cm of b78o.east] (anto2)
     {\includegraphics[width=0.3cm]{antenna}} edge (b78o);
 
-  \node[right=4cm of aw2s, label=above:Amarisoft UE] (amariue)
+  \node[right=3.5cm of aw2s, label=above:amariue] (amariue)
     {\includegraphics[width=0.7cm]{amariue}};
-  \node[right=3cm of aw2s] (anto3)
+  \node[right=0.8cm of anto1] (anto3)
+    {\includegraphics[width=0.3cm]{antenna}} edge (amariue);
+  \node[right=0.8cm of anto2] (anto4)
     {\includegraphics[width=0.3cm]{antenna}} edge (amariue);
 
 \end{tikzpicture}

docker/Dockerfile.base.rocky

@@ -0,0 +1,58 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM $BASE_IMAGE AS ran-base
+
+ENV TZ=Europe/Paris
+ENV BUILD_UHD_FROM_SOURCE=True
+ENV UHD_VERSION=4.4.0.0
+
+RUN dnf install 'dnf-command(config-manager)' -y && \
+    dnf config-manager --set-enabled powertools && \
+    dnf install epel-release -y && crb enable && \
+    dnf update -y && \
+    dnf install -y \
+       #gcc needed for build_oai
+       gcc gcc-c++ \ 
+       diffutils \
+       file \
+       psmisc \
+       git \
+       # python3-pip and pyyaml are used for conf template generation
+       python3-pip && \
+    pip3 install --ignore-installed pyyaml
+
+#create the WORKDIR
+WORKDIR /oai-ran
+COPY . .
+
+#run build_oai -I to get the builder image
+RUN /bin/sh oaienv && \ 
+    cd cmake_targets && \
+    mkdir -p log && \
+    ./build_oai -I --install-optional-packages -w USRP

docker/Dockerfile.build.rhel8.2

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function

docker/Dockerfile.build.rocky

@@ -0,0 +1,38 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+FROM ran-base:latest as ran-build
+
+RUN rm -Rf /oai-ran
+WORKDIR /oai-ran
+COPY . .
+
+#run build_oai to build the target image
+RUN /bin/sh oaienv && \ 
+    cd cmake_targets && \
+    mkdir -p log && \
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c

docker/Dockerfile.build.ubuntu20

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function

docker/Dockerfile.clang.rhel8.2

@@ -40,4 +40,4 @@ RUN /bin/sh oaienv && \
     mkdir -p log && \
     export CC=/usr/bin/clang && \
     export CXX=/usr/bin/clang++ && \
-    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function

docker/Dockerfile.eNB.rocky

@@ -0,0 +1,130 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS enb-base
+
+FROM ran-build:latest AS enb-build
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \
+    cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-enb
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        lksctp-tools \
+        tzdata \
+        procps-ng \
+        atlas \
+        gdb \
+        python3 \
+        python3-pip \
+        net-tools \
+        iputils \
+        iproute && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-enb/bin
+COPY --from=enb-build \
+    /oai-ran/cmake_targets/ran_build/build/lte-softmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+COPY --from=enb-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_enb.so \
+    /usr/local/lib/
+
+COPY --from=enb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=enb-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on lte-softmodem" && ldd /opt/oai-enb/bin/lte-softmodem && \
+    echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on liboai_iqplayer.so" && ldd /usr/local/lib/liboai_iqplayer.so && \
+    echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \
+    echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.so
+
+# Copy the relevant configuration files for eNB
+WORKDIR /opt/oai-enb/etc
+COPY --from=enb-build /oai-ran/docker/etc .
+
+WORKDIR /opt/oai-enb
+
+# 2152 --> S1U, GTP/UDP
+# 36412 --> S1C, SCTP/UDP
+# 36422 --> X2C, SCTP/UDP
+EXPOSE 2152/udp 36412/udp 36422/udp
+
+ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
+CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]

docker/Dockerfile.gNB.aw2s.rocky

@@ -0,0 +1,105 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS gnb-base
+
+FROM ran-build:latest AS gnb-build
+
+COPY ./libori.so /usr/local/lib
+
+# build AW2S fronthaul lib
+WORKDIR /oai-ran
+RUN /bin/sh oaienv && \
+    cd cmake_targets/ran_build/build && \
+    ninja aw2sori_transpro
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-gnb-aw2s
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        procps-ng \
+        libXpm \
+        libX11 \
+        atlas \
+        lksctp-tools \
+        tzdata \
+        net-tools \
+        iputils && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-gnb-aw2s/bin
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-softmodem \
+    ./
+COPY ./docker/scripts/gnb-aw2s_entrypoint.sh ./entrypoint.sh
+
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/libaw2sori_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /usr/local/lib/libori.so \
+    /usr/local/lib/
+
+COPY --from=gnb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libforms.so.2 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/
+
+RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \
+    ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \
+    ldconfig && \
+    echo "ldd on nr-softmodem" && ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on libaw2sori_transpro" && ldd /usr/local/lib/libaw2sori_transpro.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \
+    echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \
+    echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \
+    echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so
+
+WORKDIR /opt/oai-gnb-aw2s
+ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
+CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]

docker/Dockerfile.gNB.rocky

@@ -0,0 +1,138 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS gnb-base
+
+FROM ran-build:latest AS gnb-build
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \
+    cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-gnb
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        procps-ng \
+        libXpm \
+        libX11 \
+        atlas \
+        lksctp-tools \
+        tzdata \
+        gdb \
+        python3 \
+        python3-pip \
+        net-tools \
+        iputils && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-gnb/bin
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-softmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \
+    /usr/local/lib/
+
+COPY --from=gnb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libforms.so.2 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on nr-softmodem" && ldd /opt/oai-gnb/bin/nr-softmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \
+    echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \
+    echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \
+    echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so && \
+    echo "ldd on libtelnetsrv_ci" && ldd /usr/local/lib/libtelnetsrv_ci.so
+
+# Copy the relevant configuration files for gNB
+WORKDIR /opt/oai-gnb/etc
+COPY --from=gnb-build /oai-ran/docker/etc .
+
+WORKDIR /opt/oai-gnb
+#EXPOSE 2152/udp  # S1U, GTP/UDP
+#EXPOSE 22100/tcp # ?
+#EXPOSE 36412/udp # S1C, SCTP/UDP
+#EXPOSE 36422/udp # X2C, SCTP/UDP
+#EXPOSE 50000/udp # IF5 / ORI (control)
+#EXPOSE 50001/udp # IF5 / ECPRI (data)
+
+ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.lteUE.rocky

@@ -0,0 +1,123 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS lte-ue-base
+
+FROM ran-build:latest AS lte-ue-build
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
+    python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \
+    cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-lte-ue
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        lksctp-tools \
+        procps-ng \
+        tzdata \
+        atlas \
+        gdb \
+        python3 \
+        python3-pip \
+        iproute \
+        net-tools \
+        iputils && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-lte-ue/bin
+COPY --from=lte-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \
+    /oai-ran/cmake_targets/nas_sim_tools/build/nvram \
+    /oai-ran/cmake_targets/nas_sim_tools/build/usim \
+    ./
+
+COPY --from=lte-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /usr/local/lib/
+
+COPY --from=lte-ue-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on lte-uesoftmodem" && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so
+
+# Copy the relevant configuration files for UE
+WORKDIR /opt/oai-lte-ue/etc
+COPY --from=lte-ue-build /oai-ran/docker/etc .
+
+WORKDIR /opt/oai-lte-ue
+CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
+ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]

docker/Dockerfile.nr-cuup.rocky

@@ -0,0 +1,80 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS gnb-base
+
+FROM ran-build:latest AS gnb-build
+
+RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-nr-cuup
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        procps-ng \
+        lksctp-tools \
+        tzdata \
+        atlas \
+        net-tools \
+        iputils && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-gnb/bin
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-cuup \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /usr/local/lib/
+
+COPY --from=gnb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/
+
+RUN ldconfig && \
+    echo "ldd on nr-cuup" && ldd /opt/oai-gnb/bin/nr-cuup && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so
+
+WORKDIR /opt/oai-gnb/etc
+
+WORKDIR /opt/oai-gnb
+
+ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+CMD ["/opt/oai-gnb/bin/nr-cuup", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.nrUE.rocky

@@ -0,0 +1,138 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS nr-ue-base
+
+FROM ran-build:latest AS nr-ue-build 
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \
+    cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-nr-ue
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        lksctp-tools \
+        procps-ng \
+        tzdata \
+        net-tools \
+        iputils \
+        iproute \
+        atlas \
+        gdb \
+        python3 \
+        python3-pip \
+        libXpm \
+        libX11 && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-nr-ue/bin
+COPY --from=nr-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+WORKDIR /opt/oai-nr-ue/etc
+COPY --from=nr-ue-build \
+    /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \
+    /oai-ran/docker/etc/nr-ue.nfapi.conf \
+    ./
+
+COPY --from=nr-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \
+    /usr/local/lib/
+
+COPY --from=nr-ue-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libforms.so.2 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=nr-ue-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on nr-uesoftmodem" && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \
+    echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \
+    echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \
+    echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so && \
+    echo "ldd on libtelnetsrv_5Gue" && ldd /usr/local/lib/libtelnetsrv_5Gue.so
+
+# Copy the relevant configuration files for eNB
+WORKDIR /opt/oai-nr-ue/etc
+COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/ue.* .
+
+WORKDIR /opt/oai-nr-ue
+CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
+ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]

docker/Dockerfile.phySim.rhel8.2

@@ -38,7 +38,7 @@ RUN yum install -y libasan libubsan
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --phy_simulators --ninja --verbose-ci --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --phy_simulators --ninja --verbose-ci --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function
 
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi8/ubi:latest as oai-physim

docker/README.md

@@ -77,6 +77,7 @@ The currently-supported OS are:
 
 - `rhel8.2` for Red Hat Entreprise Linux (including images for an OpenShift cluster)
 - `ubuntu20` for Ubuntu 20.04 LTS
+- `rocky` for Rocky-Linux 8.7
 
 For more details regarding the build on an Openshift Cluster, see [OpenShift README](../openshift/README.md).
 
@@ -111,6 +112,8 @@ ran-base            latest              5c9c02a5b4a8        1 minute ago
 ...
 ```
 
+Note that the steps are identical for `rocky-linux`.
+
 ## 3.3. Building any target image ##
 
 For example, the eNB:
@@ -136,6 +139,8 @@ Do not forget to remove the temporary image:
 docker image prune --force
 ```
 
+Note that the steps are identical for `rocky-linux`.
+
 # 4. Building using `podman` under Red Hat Entreprise Linux 8.2 #
 
 Analogous to the above steps:

executables/nr-cuup.c

@@ -84,7 +84,7 @@ int nr_rlc_get_available_tx_space(const rnti_t rntiP, const logical_chan_id_t ch
   return 0;
 }
 
-void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *ue_context_pP, NR_CellGroupConfig_t *cell_groupConfig_from_DU)
+void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *ue_context_pP)
 {
   abort();
 }
@@ -111,7 +111,7 @@ f1ap_cudu_inst_t *getCxt(F1_t isCU, instance_t instanceP)
   return NULL;
 }
 
-void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *ue_context_pP)
+void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *ue_context_pP, uint8_t xid)
 {
   abort();
 }

executables/nr-gnb.c

@@ -52,6 +52,11 @@
 #include "PHY/MODULATION/nr_modulation.h"
 #include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
+#include "common/utils/thread_pool/task_manager.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/sysinfo.h>
 
 #undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
@@ -88,6 +93,7 @@
 #include <openair1/PHY/NR_TRANSPORT/nr_dlsch.h>
 #include <PHY/NR_ESTIMATION/nr_ul_estimation.h>
 
+
 //#define USRP_DEBUG 1
 // Fix per CC openair rf/if device update
 // extern openair0_device openair0;
@@ -110,7 +116,8 @@ time_stats_t softmodem_stats_rx_sf; // total rx time
 #define L1STATSSTRLEN 16384
 
 
-void tx_func(void *param) {
+void tx_func(void *param) 
+{
 
   processingData_L1tx_t *info = (processingData_L1tx_t *) param;
   int frame_tx = info->frame;
@@ -119,6 +126,7 @@ void tx_func(void *param) {
   int absslot_tx = info->timestamp_tx/info->gNB->frame_parms.get_samples_per_slot(slot_tx,&info->gNB->frame_parms);
   int absslot_rx = absslot_tx-info->gNB->RU_list[0]->sl_ahead;
   int rt_prof_idx = absslot_rx % RT_PROF_DEPTH;
+  start_meas(&info->gNB->phy_proc_tx);
 
   clock_gettime(CLOCK_MONOTONIC,&info->gNB->rt_L1_profiling.start_L1_TX[rt_prof_idx]);
   phy_procedures_gNB_TX(info,
@@ -127,10 +135,47 @@ void tx_func(void *param) {
                         1);
   clock_gettime(CLOCK_MONOTONIC,&info->gNB->rt_L1_profiling.return_L1_TX[rt_prof_idx]);
 
+  if (get_softmodem_params()->reorder_thread_disable) {
+    PHY_VARS_gNB *gNB = info->gNB;
+    processingData_RU_t syncMsgRU;
+    syncMsgRU.frame_tx = frame_tx;
+    syncMsgRU.slot_tx = slot_tx;
+    syncMsgRU.ru = gNB->RU_list[0];
+    syncMsgRU.timestamp_tx = info->timestamp_tx;
+    LOG_D(PHY,"gNB: %d.%d : calling RU TX function\n",syncMsgRU.frame_tx,syncMsgRU.slot_tx);
+    ru_tx_func((void*)&syncMsgRU);
+  }
   /* this thread is done with the sched_info, decrease the reference counter */
   deref_sched_response(info->sched_response_id);
+  stop_meas(&info->gNB->phy_proc_tx);
 }
 
+
+void *L1_rx_thread(void *arg) 
+{
+  PHY_VARS_gNB *gNB = (PHY_VARS_gNB*)arg;
+
+  while (oai_exit == 0) {
+     notifiedFIFO_elt_t *res = pullNotifiedFIFO(&gNB->resp_L1);
+     processingData_L1_t *info = (processingData_L1_t *)NotifiedFifoData(res);
+     rx_func(info);
+     delNotifiedFIFO_elt(res);
+  }
+  return NULL;
+}
+/* to be added for URLLC, requires MAC scheduling to be split from UL indication 
+void *L1_tx_thread(void *arg) {
+  PHY_VARS_gNB *gNB = (PHY_VARS_gNB*)arg;
+
+  while (oai_exit == 0) {
+     notifiedFIFO_elt_t *res = pullNotifiedFIFO(&gNB->L1_tx_out);
+     processingData_L1tx_t *info = (processingData_L1tx_t *)NotifiedFifoData(res);
+     tx_func(info);
+     delNotifiedFIFO_elt(res);
+  }
+  return NULL;
+}
+*/
 void rx_func(void *param)
 {
   processingData_L1_t *info = (processingData_L1_t *) param;
@@ -189,13 +234,16 @@ void rx_func(void *param)
     // Do PRACH RU processing
     L1_nr_prach_procedures(gNB,frame_rx,slot_rx);
 
-    //apply the rx signal rotation here
-    for (int aa = 0; aa < gNB->frame_parms.nb_antennas_rx; aa++) {
-      apply_nr_rotation_ul(&gNB->frame_parms,
-                           gNB->common_vars.rxdataF[aa],
-                           slot_rx,
-                           0,
-                           gNB->frame_parms.Ncp==EXTENDED?12:14);
+    //WA: comment rotation in tx/rx
+    if((gNB->num_RU == 1) && (gNB->RU_list[0]->if_south != REMOTE_IF4p5)) {
+      //apply the rx signal rotation here
+      for (int aa = 0; aa < gNB->frame_parms.nb_antennas_rx; aa++) {
+        apply_nr_rotation_ul(&gNB->frame_parms,
+            gNB->common_vars.rxdataF[aa],
+            slot_rx,
+            0,
+            gNB->frame_parms.Ncp==EXTENDED?12:14);
+      }
     }
     phy_procedures_gNB_uespec_RX(gNB, frame_rx, slot_rx);
   }
@@ -206,29 +254,37 @@ void rx_func(void *param)
 
   // Call the scheduler
   start_meas(&gNB->ul_indication_stats);
-  pthread_mutex_lock(&gNB->UL_INFO_mutex);
+//  pthread_mutex_lock(&gNB->UL_INFO_mutex);
   gNB->UL_INFO.frame     = frame_rx;
   gNB->UL_INFO.slot      = slot_rx;
   gNB->UL_INFO.module_id = gNB->Mod_id;
   gNB->UL_INFO.CC_id     = gNB->CC_id;
   gNB->if_inst->NR_UL_indication(&gNB->UL_INFO);
-  pthread_mutex_unlock(&gNB->UL_INFO_mutex);
+//  pthread_mutex_unlock(&gNB->UL_INFO_mutex);
   stop_meas(&gNB->ul_indication_stats);
 
-  int tx_slot_type = nr_slot_select(cfg,frame_rx,slot_tx);
+  int tx_slot_type = nr_slot_select(cfg,frame_tx,slot_tx);
   if ((tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT) && NFAPI_MODE != NFAPI_MODE_PNF) {
     notifiedFIFO_elt_t *res;
     processingData_L1tx_t *syncMsg;
     // Its a FIFO so it maitains the order in which the MAC fills the messages
     // so no need for checking for right slot
-    res = pullTpool(&gNB->L1_tx_filled, &gNB->threadPool);
-    if (res == NULL)
-      return; // Tpool has been stopped
-    syncMsg = (processingData_L1tx_t *)NotifiedFifoData(res);
-    syncMsg->gNB = gNB;
-    syncMsg->timestamp_tx = info->timestamp_tx;
-    res->key = slot_tx;
-    pushTpool(&gNB->threadPool, res);
+    if (get_softmodem_params()->reorder_thread_disable) {
+      // call the TX function directly from this thread
+      syncMsg = gNB->msgDataTx;
+      syncMsg->gNB = gNB; 
+      syncMsg->timestamp_tx = info->timestamp_tx;
+      tx_func(syncMsg);
+    } else {
+      res = pullTpool(&gNB->L1_tx_filled, &gNB->threadPool);
+      if (res == NULL)
+        return; // Tpool has been stopped
+      syncMsg = (processingData_L1tx_t *)NotifiedFifoData(res);
+      syncMsg->gNB = gNB;
+      syncMsg->timestamp_tx = info->timestamp_tx;
+      res->key = slot_tx;
+      pushTpool(&gNB->threadPool, res);
+    }
   } else if (get_softmodem_params()->continuous_tx) {
     notifiedFIFO_elt_t *res = pullTpool(&gNB->L1_tx_free, &gNB->threadPool);
     if (res == NULL)
@@ -287,6 +343,11 @@ static size_t dump_L1_meas_stats(PHY_VARS_gNB *gNB, RU_t *ru, char *output, size
   const char *end = output + outputlen;
   output += print_meas_log(&gNB->phy_proc_tx, "L1 Tx processing", NULL, NULL, output, end - output);
   output += print_meas_log(&gNB->dlsch_encoding_stats, "DLSCH encoding", NULL, NULL, output, end - output);
+  output += print_meas_log(&gNB->dlsch_scrambling_stats, "DLSCH scrambling", NULL, NULL, output, end-output);
+  output += print_meas_log(&gNB->dlsch_modulation_stats, "DLSCH modulation", NULL, NULL, output, end-output);
+  output += print_meas_log(&gNB->dlsch_layer_mapping_stats, "DLSCH layer mapping", NULL, NULL, output,end-output);
+  output += print_meas_log(&gNB->dlsch_resource_mapping_stats, "DLSCH resource mapping", NULL, NULL, output,end-output);
+  output += print_meas_log(&gNB->dlsch_precoding_stats, "DLSCH precoding", NULL, NULL, output,end-output);
   output += print_meas_log(&gNB->phy_proc_rx, "L1 Rx processing", NULL, NULL, output, end - output);
   output += print_meas_log(&gNB->ul_indication_stats, "UL Indication", NULL, NULL, output, end - output);
   output += print_meas_log(&gNB->rx_pusch_stats, "PUSCH inner-receiver", NULL, NULL, output, end - output);
@@ -331,7 +392,11 @@ void *nrL1_stats_thread(void *param) {
   reset_meas(&gNB->rx_pusch_stats);
   reset_meas(&gNB->ulsch_decoding_stats);
   reset_meas(&gNB->schedule_response_stats);
-
+  reset_meas(&gNB->dlsch_scrambling_stats);
+  reset_meas(&gNB->dlsch_modulation_stats);
+  reset_meas(&gNB->dlsch_layer_mapping_stats);
+  reset_meas(&gNB->dlsch_resource_mapping_stats);
+  reset_meas(&gNB->dlsch_precoding_stats);
   while (!oai_exit) {
     sleep(1);
     dump_nr_I0_stats(fd,gNB);
@@ -407,6 +472,13 @@ void init_gNB_Tpool(int inst) {
   gNB = RC.gNB[inst];
   gNB_L1_proc_t *proc = &gNB->proc;
 
+#ifdef TASK_MANAGER
+  int log_cores = get_nprocs_conf();
+  assert(log_cores > 0);
+  // Assuming: 2 x Physical cores = Logical cores
+  init_task_manager(&gNB->man, log_cores/2);
+#endif
+
   // ULSCH decoding threadpool
   initTpool(get_softmodem_params()->threadPoolConfig, &gNB->threadPool, cpumeas(CPUMEAS_GETSTATE));
   // ULSCH decoder result FIFO
@@ -414,31 +486,49 @@ void init_gNB_Tpool(int inst) {
 
   // L1 RX result FIFO 
   initNotifiedFIFO(&gNB->resp_L1);
-  notifiedFIFO_elt_t *msg = newNotifiedFIFO_elt(sizeof(processingData_L1_t), 0, &gNB->resp_L1, rx_func);
-  pushNotifiedFIFO(&gNB->resp_L1, msg); // to unblock the process in the beginning
-
+  if (!get_softmodem_params()->reorder_thread_disable) {
+    notifiedFIFO_elt_t *msg = newNotifiedFIFO_elt(sizeof(processingData_L1_t), 0, &gNB->resp_L1, rx_func);
+    pushNotifiedFIFO(&gNB->resp_L1, msg); // to unblock the process in the beginning
+  }
   // L1 TX result FIFO 
   initNotifiedFIFO(&gNB->L1_tx_free);
   initNotifiedFIFO(&gNB->L1_tx_filled);
   initNotifiedFIFO(&gNB->L1_tx_out);
-  
-  // we create 2 threads for L1 tx processing
-  for (int i=0; i < 2; i++) {
+ 
+  if (get_softmodem_params()->reorder_thread_disable) {
+    // create the RX thread responsible for triggering RX processing and then TX processing if a single thread is used	  
+    threadCreate(&gNB->L1_rx_thread, L1_rx_thread, (void *)gNB, "L1_rx_thread",
+                 gNB->L1_rx_thread_core, OAI_PRIORITY_RT_MAX);
+    // if separate threads are used for RX and TX, create the TX thread
+ // threadCreate(&gNB->L1_tx_thread, L1_tx_thread, (void *)gNB, "L1_tx_thread",
+ //              gNB->L1_tx_thread_core, OAI_PRIORITY_RT_MAX);
+
     notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t), 0, &gNB->L1_tx_out, tx_func);
     processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
     memset(msgDataTx, 0, sizeof(processingData_L1tx_t));
     init_DLSCH_struct(gNB, msgDataTx);
     memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
-    pushNotifiedFIFO(&gNB->L1_tx_free, msgL1Tx); // to unblock the process in the beginning
+    // this will be removed when the msgDataTx is not necessary anymore
+    gNB->msgDataTx = msgDataTx;
+  } else {
+    // we create 2 threads for L1 tx processing
+    for (int i=0; i < 2; i++) {
+      notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t), 0, &gNB->L1_tx_out, tx_func);
+      processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
+      memset(msgDataTx, 0, sizeof(processingData_L1tx_t));
+      init_DLSCH_struct(gNB, msgDataTx);
+      memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
+      pushNotifiedFIFO(&gNB->L1_tx_free, msgL1Tx); // to unblock the process in the beginning
+    }
+  
+    LOG_I(PHY,"Creating thread for TX reordering and dispatching to RU\n");
+    threadCreate(&proc->pthread_tx_reorder, tx_reorder_thread, (void *)gNB, "thread_tx_reorder",
+                  gNB->RU_list[0] ? gNB->RU_list[0]->tpcores[1] : -1, OAI_PRIORITY_RT_MAX);
   }
 
   if ((!get_softmodem_params()->emulate_l1) && (!IS_SOFTMODEM_NOSTATS_BIT) && (NFAPI_MODE!=NFAPI_MODE_VNF))
      threadCreate(&proc->L1_stats_thread,nrL1_stats_thread,(void*)gNB,"L1_stats",-1,OAI_PRIORITY_RT_LOW);
 
-  LOG_I(PHY,"Creating thread for TX reordering and dispatching to RU\n");
-  threadCreate(&proc->pthread_tx_reorder, tx_reorder_thread, (void *)gNB, "thread_tx_reorder", 
-		  gNB->RU_list[0] ? gNB->RU_list[0]->tpcores[1] : -1, OAI_PRIORITY_RT_MAX);
-
 }
 
 
@@ -507,6 +597,7 @@ void init_eNB_afterRU(void) {
 
     gNB = RC.gNB[inst];
     gNB->ldpc_offload_flag = ldpc_offload_flag;
+    gNB->reorder_thread_disable = get_softmodem_params()->reorder_thread_disable;
 
     phy_init_nr_gNB(gNB);
 
@@ -585,6 +676,7 @@ void init_gNB(int single_thread_flag,int wait_for_sync) {
     gNB->prach_energy_counter = 0;
     gNB->chest_time = get_softmodem_params()->chest_time;
     gNB->chest_freq = get_softmodem_params()->chest_freq;
+
   }
   
 

executables/nr-ru.c

@@ -60,6 +60,7 @@ unsigned short config_frames[4] = {2,9,11,13};
 #endif
 
 
+
 /* these variables have to be defined before including ENB_APP/enb_paramdef.h and GNB_APP/gnb_paramdef.h */
 static int DEFBANDS[] = {7};
 static int DEFENBS[] = {0};
@@ -83,6 +84,8 @@ static int DEFRUTPCORES[] = {-1,-1,-1,-1};
 
 extern int oai_exit;
 
+uint16_t sl_ahead;
+
 extern struct timespec timespec_sub(struct timespec lhs, struct timespec rhs);
 extern struct timespec timespec_add(struct timespec lhs, struct timespec rhs);
 extern void  nr_phy_free_RU(RU_t *);
@@ -1085,7 +1088,7 @@ void *ru_thread( void *param ) {
   ru_thread_status = 0;
   // set default return value
   sprintf(threadname,"ru_thread %u",ru->idx);
-  LOG_I(PHY,"Starting RU %d (%s,%s),\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing]);
+  LOG_I(PHY,"Starting RU %d (%s,%s) on cpu %d\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing],sched_getcpu());
   memcpy((void *)&ru->config,(void *)&RC.gNB[0]->gNB_config,sizeof(ru->config));
 
   if(emulate_rf) {
@@ -1281,9 +1284,13 @@ void *ru_thread( void *param ) {
     } // end if (slot_type == NR_UPLINK_SLOT || slot_type == NR_MIXED_SLOT) {
 
     // At this point, all information for subframe has been received on FH interface
-    res = pullTpool(&gNB->resp_L1, &gNB->threadPool);
-    if (res == NULL)
-      break; // Tpool has been stopped
+    if (!get_softmodem_params()->reorder_thread_disable) {
+      res = pullTpool(&gNB->resp_L1, &gNB->threadPool);
+      if (res == NULL)
+        break; // Tpool has been stopped
+    } else  {
+      res=newNotifiedFIFO_elt(sizeof(processingData_L1_t),0, &gNB->resp_L1,NULL);
+    }
     syncMsg = (processingData_L1_t *)NotifiedFifoData(res);
     syncMsg->gNB = gNB;
     syncMsg->frame_rx = proc->frame_rx;
@@ -1292,7 +1299,10 @@ void *ru_thread( void *param ) {
     syncMsg->slot_tx = proc->tti_tx;
     syncMsg->timestamp_tx = proc->timestamp_tx;
     res->key = proc->tti_rx;
-    pushTpool(&gNB->threadPool, res);
+    if (!get_softmodem_params()->reorder_thread_disable) 
+      pushTpool(&gNB->threadPool, res);
+    else 
+      pushNotifiedFIFO(&gNB->resp_L1, res);
   }
 
   printf( "Exiting ru_thread \n");
@@ -1307,7 +1317,8 @@ int start_streaming(RU_t *ru) {
 }
 
 int nr_start_if(struct RU_t_s *ru, struct PHY_VARS_gNB_s *gNB) {
-  for (int i=0;i<ru->nb_rx;i++) ru->openair0_cfg.rxbase[i] = ru->common.rxdata[i];
+  if (ru->if_south <= REMOTE_IF5)
+    for (int i=0;i<ru->nb_rx;i++) ru->openair0_cfg.rxbase[i] = ru->common.rxdata[i];
   ru->openair0_cfg.rxsize = ru->nr_frame_parms->samples_per_subframe*10;
   reset_meas(&ru->ifdevice.tx_fhaul);
   return(ru->ifdevice.trx_start_func(&ru->ifdevice));
@@ -1344,7 +1355,7 @@ void init_RU_proc(RU_t *ru) {
 
   pthread_mutex_init( &proc->mutex_emulateRF,NULL);
   pthread_cond_init( &proc->cond_emulateRF, NULL);
-  threadCreate( &proc->pthread_FH, ru_thread, (void *)ru, "ru_thread", ru->tpcores[0], OAI_PRIORITY_RT_MAX );
+  threadCreate( &proc->pthread_FH, ru_thread, (void *)ru, "ru_thread", ru->ru_thread_core, OAI_PRIORITY_RT_MAX );
 
   if(emulate_rf)
     threadCreate( &proc->pthread_emulateRF, emulatedRF_thread, (void *)proc, "emulateRF", -1, OAI_PRIORITY_RT );
@@ -1670,7 +1681,7 @@ void set_function_spec_param(RU_t *ru) {
     case REMOTE_IF4p5:
       ru->do_prach               = 0;
       ru->feprx                  = NULL;                // DFTs
-      ru->feptx_prec             = NULL;          // Precoding operation
+      ru->feptx_prec             = nr_feptx_prec;       // Precoding operation
       ru->feptx_ofdm             = NULL;                // no OFDM mod
       ru->fh_south_in            = fh_if4p5_south_in;   // synchronous IF4p5 reception
       ru->fh_south_out           = fh_if4p5_south_out;  // synchronous IF4p5 transmission
@@ -1782,23 +1793,25 @@ void init_NR_RU(char *rf_config_file) {
     set_function_spec_param(ru);
     LOG_I(PHY,"Starting ru_thread %d\n",ru_id);
     init_RU_proc(ru);
-    int threadCnt = ru->num_tpcores;
-    if (threadCnt < 2) LOG_E(PHY,"Number of threads for gNB should be more than 1. Allocated only %d\n",threadCnt);
-    else LOG_I(PHY,"RU Thread pool size %d\n",threadCnt);
-    char pool[80];
-    int s_offset = sprintf(pool,"%d",ru->tpcores[0]);
-    for (int icpu=1; icpu<threadCnt; icpu++) {
-       s_offset+=sprintf(pool+s_offset,",%d",ru->tpcores[icpu]);
+    if (ru->if_south != REMOTE_IF4p5) {
+      int threadCnt = ru->num_tpcores;
+      if (threadCnt < 2) LOG_E(PHY,"Number of threads for gNB should be more than 1. Allocated only %d\n",threadCnt);
+      else LOG_I(PHY,"RU Thread pool size %d\n",threadCnt);
+      char pool[80];
+      int s_offset = sprintf(pool,"%d",ru->tpcores[0]);
+      for (int icpu=1; icpu<threadCnt; icpu++) {
+         s_offset+=sprintf(pool+s_offset,",%d",ru->tpcores[icpu]);
+      }
+      LOG_I(PHY,"RU thread-pool core string %s\n",pool);
+      ru->threadPool = (tpool_t*)malloc(sizeof(tpool_t));
+      initTpool(pool, ru->threadPool, cpumeas(CPUMEAS_GETSTATE));
+      // FEP RX result FIFO
+      ru->respfeprx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+      initNotifiedFIFO(ru->respfeprx);
+      // FEP TX result FIFO
+      ru->respfeptx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+      initNotifiedFIFO(ru->respfeptx);
     }
-    LOG_I(PHY,"RU thread-pool core string %s\n",pool);
-    ru->threadPool = (tpool_t*)malloc(sizeof(tpool_t));
-    initTpool(pool, ru->threadPool, cpumeas(CPUMEAS_GETSTATE));
-    // FEP RX result FIFO
-    ru->respfeprx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-    initNotifiedFIFO(ru->respfeprx);
-    // FEP TX result FIFO
-    ru->respfeptx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-    initNotifiedFIFO(ru->respfeptx);
   } // for ru_id
 
   //  sleep(1);
@@ -1816,18 +1829,30 @@ void stop_RU(int nb_ru) {
 
 /* --------------------------------------------------------*/
 /* from here function to use configuration module          */
-static void NRRCconfig_RU(void) {
-  int i = 0, j = 0;
+static void NRRCconfig_RU(void)
+{
   paramdef_t RUParams[] = RUPARAMS_DESC;
   paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
-  config_getlist( &RUParamList, RUParams, sizeof(RUParams)/sizeof(paramdef_t), NULL);
+  config_getlist(&RUParamList, RUParams, sizeof(RUParams)/sizeof(paramdef_t), NULL);
 
-  if ( RUParamList.numelt > 0) {
+  paramdef_t GNBSParams[] = GNBSPARAMS_DESC;
+  paramdef_t GNBParams[] = GNBPARAMS_DESC;
+  paramlist_def_t GNBParamList = {GNB_CONFIG_STRING_GNB_LIST, NULL, 0};
+  config_get(GNBSParams, sizeof(GNBSParams) / sizeof(paramdef_t), NULL);
+  int num_gnbs = GNBSParams[GNB_ACTIVE_GNBS_IDX].numelt;
+  AssertFatal(num_gnbs > 0, "Failed to parse config file no gnbs %s \n", GNB_CONFIG_STRING_ACTIVE_GNBS);
+  config_getlist(&GNBParamList, GNBParams, sizeof(GNBParams) / sizeof(paramdef_t), NULL);
+  int N1 = *GNBParamList.paramarray[0][GNB_PDSCH_ANTENNAPORTS_N1_IDX].iptr;
+  int N2 = *GNBParamList.paramarray[0][GNB_PDSCH_ANTENNAPORTS_N2_IDX].iptr;
+  int XP = *GNBParamList.paramarray[0][GNB_PDSCH_ANTENNAPORTS_XP_IDX].iptr;
+  int num_logical_antennas = N1 * N2 * XP;
+
+  if (RUParamList.numelt > 0) {
     RC.ru = (RU_t **)malloc(RC.nb_RU*sizeof(RU_t *));
-    RC.ru_mask=(1<<NB_RU) - 1;
+    RC.ru_mask = (1 << NB_RU) - 1;
     printf("Set RU mask to %lx\n",RC.ru_mask);
 
-    for (j = 0; j < RC.nb_RU; j++) {
+    for (int j = 0; j < RC.nb_RU; j++) {
       RC.ru[j]                                      = (RU_t *)malloc(sizeof(RU_t));
       memset((void *)RC.ru[j],0,sizeof(RU_t));
       RC.ru[j]->idx                                 = j;
@@ -1836,12 +1861,13 @@ static void NRRCconfig_RU(void) {
       printf("Creating RC.ru[%d]:%p\n", j, RC.ru[j]);
       RC.ru[j]->if_timing                           = synch_to_ext_device;
 
-      if (RC.nb_nr_L1_inst >0)
+      if (RC.nb_nr_L1_inst > 0)
         RC.ru[j]->num_gNB                           = RUParamList.paramarray[j][RU_ENB_LIST_IDX].numelt;
       else
         RC.ru[j]->num_gNB                           = 0;
 
-      for (i=0; i<RC.ru[j]->num_gNB; i++) RC.ru[j]->gNB_list[i] = RC.gNB[RUParamList.paramarray[j][RU_ENB_LIST_IDX].iptr[i]];
+      for (int i = 0; i < RC.ru[j]->num_gNB; i++)
+        RC.ru[j]->gNB_list[i] = RC.gNB[RUParamList.paramarray[j][RU_ENB_LIST_IDX].iptr[i]];
 
       if (config_isparamset(RUParamList.paramarray[j], RU_SDR_ADDRS)) {
         RC.ru[j]->openair0_cfg.sdr_addrs = strdup(*(RUParamList.paramarray[j][RU_SDR_ADDRS].strptr));
@@ -1896,7 +1922,7 @@ static void NRRCconfig_RU(void) {
       RC.ru[j]->openair0_cfg.tune_offset = get_softmodem_params()->tune_offset;
 
       if (strcmp(*(RUParamList.paramarray[j][RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
-        if ( !(config_isparamset(RUParamList.paramarray[j],RU_LOCAL_IF_NAME_IDX)) ) {
+        if (!(config_isparamset(RUParamList.paramarray[j],RU_LOCAL_IF_NAME_IDX))) {
           RC.ru[j]->if_south                        = LOCAL_RF;
           RC.ru[j]->function                        = gNodeB_3GPP;
           printf("Setting function for RU %d to gNodeB_3GPP\n",j);
@@ -1970,6 +1996,8 @@ static void NRRCconfig_RU(void) {
       }  /* strcmp(local_rf, "yes") != 0 */
 
       RC.ru[j]->nb_tx                             = *(RUParamList.paramarray[j][RU_NB_TX_IDX].uptr);
+      AssertFatal(RC.ru[j]->nb_tx >= num_logical_antennas,
+      "Number of logical antenna ports (set in config file with pdsch_AntennaPorts) cannot be larger than physical antennas (nb_tx)\n");
       RC.ru[j]->nb_rx                             = *(RUParamList.paramarray[j][RU_NB_RX_IDX].uptr);
       RC.ru[j]->att_tx                            = *(RUParamList.paramarray[j][RU_ATT_TX_IDX].uptr);
       RC.ru[j]->att_rx                            = *(RUParamList.paramarray[j][RU_ATT_RX_IDX].uptr);
@@ -1978,7 +2006,8 @@ static void NRRCconfig_RU(void) {
       RC.ru[j]->do_precoding                      = *(RUParamList.paramarray[j][RU_DO_PRECODING].iptr);
       RC.ru[j]->sl_ahead                          = *(RUParamList.paramarray[j][RU_SL_AHEAD].iptr);
       RC.ru[j]->num_bands                         = RUParamList.paramarray[j][RU_BAND_LIST_IDX].numelt;
-      for (i=0; i<RC.ru[j]->num_bands; i++) RC.ru[j]->band[i] = RUParamList.paramarray[j][RU_BAND_LIST_IDX].iptr[i];
+      for (int i = 0; i < RC.ru[j]->num_bands; i++)
+        RC.ru[j]->band[i] = RUParamList.paramarray[j][RU_BAND_LIST_IDX].iptr[i];
       RC.ru[j]->openair0_cfg.nr_flag              = *(RUParamList.paramarray[j][RU_NR_FLAG].iptr);
       RC.ru[j]->openair0_cfg.nr_band              = RC.ru[j]->band[0];
       RC.ru[j]->openair0_cfg.nr_scs_for_raster    = *(RUParamList.paramarray[j][RU_NR_SCS_FOR_RASTER].iptr);
@@ -1987,16 +2016,18 @@ static void NRRCconfig_RU(void) {
       RC.ru[j]->openair0_cfg.txfh_cores[0]        = *(RUParamList.paramarray[j][RU_TXFH_CORE_ID].iptr);
       RC.ru[j]->num_tpcores                       = *(RUParamList.paramarray[j][RU_NUM_TP_CORES].iptr);
       RC.ru[j]->half_slot_parallelization         = *(RUParamList.paramarray[j][RU_HALF_SLOT_PARALLELIZATION].iptr);
+      RC.ru[j]->ru_thread_core                    = *(RUParamList.paramarray[j][RU_RU_THREAD_CORE].iptr);
       printf("[RU %d] Setting half-slot parallelization to %d\n",j,RC.ru[j]->half_slot_parallelization); 
       AssertFatal(RC.ru[j]->num_tpcores <= RUParamList.paramarray[j][RU_TP_CORES].numelt, "Number of TP cores should be <=16\n");
-      for (i=0; i<RC.ru[j]->num_tpcores; i++) RC.ru[j]->tpcores[i] = RUParamList.paramarray[j][RU_TP_CORES].iptr[i];
+      for (int i = 0; i < RC.ru[j]->num_tpcores; i++)
+        RC.ru[j]->tpcores[i] = RUParamList.paramarray[j][RU_TP_CORES].iptr[i];
       if (config_isparamset(RUParamList.paramarray[j], RU_BF_WEIGHTS_LIST_IDX)) {
         RC.ru[j]->nb_bfw = RUParamList.paramarray[j][RU_BF_WEIGHTS_LIST_IDX].numelt;
 
-        for (i=0; i<RC.ru[j]->num_gNB; i++)  {
+        for (int i = 0; i < RC.ru[j]->num_gNB; i++)  {
           RC.ru[j]->bw_list[i] = (int32_t *)malloc16_clear((RC.ru[j]->nb_bfw)*sizeof(int32_t));
-
-          for (int b=0; b<RC.ru[j]->nb_bfw; b++) RC.ru[j]->bw_list[i][b] = RUParamList.paramarray[j][RU_BF_WEIGHTS_LIST_IDX].iptr[b];
+          for (int b = 0; b < RC.ru[j]->nb_bfw; b++)
+            RC.ru[j]->bw_list[i][b] = RUParamList.paramarray[j][RU_BF_WEIGHTS_LIST_IDX].iptr[b];
         }
       }
     }// j=0..num_rus

executables/nr-ue.c

@@ -734,16 +734,6 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
     }
 }
 
-int computeSamplesShift(PHY_VARS_NR_UE *UE) {
-  int samples_shift = -(UE->rx_offset>>1);
-  if (samples_shift != 0) {
-    LOG_I(NR_PHY,"Adjusting frame in time by %i samples\n", samples_shift);
-    UE->rx_offset = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
-    UE->max_pos_fil += samples_shift << 15; // reset IIR filter when sample shift is applied
-  }
-  return samples_shift;
-}
-
 static inline int get_firstSymSamp(uint16_t slot, NR_DL_FRAME_PARMS *fp) {
   if (fp->numerology_index == 0)
     return fp->nb_prefix_samples0 + fp->ofdm_symbol_size;
@@ -904,14 +894,13 @@ void *UE_thread(void *arg) {
 
     int readBlockSize, writeBlockSize;
 
-    if (slot_nr<(nb_slot_frame - 1)) {
-      readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms);
-      writeBlockSize=UE->frame_parms.get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, &UE->frame_parms);
-    } else {
-      UE->rx_offset_diff = computeSamplesShift(UE);
-      readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms) -
-                    UE->rx_offset_diff;
-      writeBlockSize=UE->frame_parms.get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, &UE->frame_parms)- UE->rx_offset_diff;
+    readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms);
+    writeBlockSize=UE->frame_parms.get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, &UE->frame_parms);
+    if (UE->apply_timing_offset && (slot_nr == nb_slot_frame-1)) {
+      const int sampShift = -(UE->rx_offset>>1);
+      readBlockSize  -= sampShift;
+      writeBlockSize -= sampShift;
+      UE->apply_timing_offset = false;
     }
 
     AssertFatal(readBlockSize ==

executables/softmodem-common.c

@@ -46,6 +46,7 @@ static softmodem_params_t softmodem_params;
 char *parallel_config=NULL;
 char *worker_config=NULL;
 int usrp_tx_thread = 0;
+char *nfapi_str=NULL;
 int ldpc_offload_flag=0;
 uint8_t nfapi_mode=0;
 

executables/softmodem-common.h

@@ -44,6 +44,7 @@ extern "C"
   example: -1,3 launches two working threads one floating, the second set on core 3\n\
   default 8 floating threads\n\
   use N for no pool (runs in calling thread) recommended with rfsim.\n"
+#define CONFIG_HLP_REORDER       "Disable reorder thread\n"
 #define CONFIG_HLP_ULMAXE        "set the eNodeB max ULSCH erros\n"
 #define CONFIG_HLP_CALUER        "set UE RX calibration\n"
 #define CONFIG_HLP_CALUERM       ""
@@ -110,6 +111,7 @@ extern "C"
 /*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
 #define RF_CONFIG_FILE      softmodem_params.rf_config_file
 #define TP_CONFIG           softmodem_params.threadPoolConfig
+#define CONTINUOUS_TX       softmodem_params.continuous_tx
 #define PHY_TEST            softmodem_params.phy_test
 #define DO_RA               softmodem_params.do_ra
 #define SA                  softmodem_params.sa
@@ -132,7 +134,7 @@ extern "C"
 #define NON_STOP            softmodem_params.non_stop
 #define EMULATE_L1          softmodem_params.emulate_l1
 #define CONTINUOUS_TX       softmodem_params.continuous_tx
-
+#define REORDER_THREAD_DISABLE    softmodem_params.reorder_thread_disable
 #define DEFAULT_RFCONFIG_FILE    "/usr/local/etc/syriq/ue.band7.tm1.PRB100.NR40.dat";
 
 extern int usrp_tx_thread;
@@ -140,6 +142,7 @@ extern int usrp_tx_thread;
 #define CMDLINE_PARAMS_DESC {  \
   {"rf-config-file",        CONFIG_HLP_RFCFGF,        0,              .strptr=&RF_CONFIG_FILE,                .defstrval=NULL,          TYPE_STRING, 0},  \
   {"thread-pool",           CONFIG_HLP_TPOOL,         0,              .strptr=&TP_CONFIG,                     .defstrval="-1,-1,-1,-1,-1,-1,-1,-1",  TYPE_STRING, 0},     \
+  {"reorder-thread-disable",CONFIG_HLP_REORDER,     PARAMFLAG_BOOL,   .iptr=&REORDER_THREAD_DISABLE,          .defintval=0,                          TYPE_INT,    0},                     \
   {"phy-test",              CONFIG_HLP_PHYTST,        PARAMFLAG_BOOL, .iptr=&PHY_TEST,                        .defintval=0,             TYPE_INT,    0},  \
   {"do-ra",                 CONFIG_HLP_DORA,          PARAMFLAG_BOOL, .iptr=&DO_RA,                           .defintval=0,             TYPE_INT,    0},  \
   {"sa",                    CONFIG_HLP_SA,            PARAMFLAG_BOOL, .iptr=&SA,                              .defintval=0,             TYPE_INT,    0},  \
@@ -210,6 +213,7 @@ extern int usrp_tx_thread;
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
+    { .s5 = { NULL } },                     \
     { .s3a = { config_checkstr_assign_integer, \
                {"MONOLITHIC", "PNF", "VNF","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF"}, \
                {NFAPI_MONOLITHIC, NFAPI_MODE_PNF, NFAPI_MODE_VNF,NFAPI_UE_STUB_PNF,NFAPI_UE_STUB_OFFNET,NFAPI_MODE_STANDALONE_PNF}, \
@@ -300,6 +304,7 @@ typedef struct {
   //THREAD_STRUCT  thread_struct;
   char           *rf_config_file;
   char           *threadPoolConfig;
+  int            reorder_thread_disable;
   int            phy_test;
   int            do_ra;
   int            sa;

openair1/PHY/CODING/ccoding_byte_lte.c

@@ -28,10 +28,10 @@
 
 //#define DEBUG_CCODE 1
 
-unsigned short glte[] = { 0133, 0171, 0165 }; // {A,B}
-unsigned short glte_rev[] = { 0155, 0117, 0127 }; // {A,B}
-unsigned short gdab[] = { 0133, 0171, 0145 }; // {A,B}
-unsigned short gdab_rev[] = { 0155, 0117, 0123 }; // {A,B}
+static const unsigned short glte[] = {0133, 0171, 0165}; // {A,B}
+static const unsigned short glte_rev[] = {0155, 0117, 0127}; // {A,B}
+static const unsigned short gdab[] = {0133, 0171, 0145}; // {A,B}
+static const unsigned short gdab_rev[] = {0155, 0117, 0123}; // {A,B}
 unsigned char  ccodelte_table[128];      // for transmitter
 unsigned char  ccodelte_table_rev[128];  // for receiver
 

openair1/PHY/CODING/crc_byte.c

@@ -44,18 +44,20 @@
 /*ref 36-212 v8.6.0 , pp 8-9 */
 /* the highest degree is set by default */
 
-uint32_t poly24a = 0x864cfb00; // 1000 0110 0100 1100 1111 1011
-                               // D^24 + D^23 + D^18 + D^17 + D^14 + D^11 + D^10 + D^7 + D^6 + D^5 + D^4 + D^3 + D + 1
-uint32_t poly24b = 0x80006300; // 1000 0000 0000 0000 0110 0011
-                               // D^24 + D^23 + D^6 + D^5 + D + 1
-uint32_t poly24c = 0xb2b11700; // 1011 0010 1011 0001 0001 0111
-                               // D^24+D^23+D^21+D^20+D^17+D^15+D^13+D^12+D^8+D^4+D^2+D+1
 
-uint32_t poly16 = 0x10210000; // 0001 0000 0010 0001            D^16 + D^12 + D^5 + 1
-uint32_t poly12 = 0x80F00000; // 1000 0000 1111                 D^12 + D^11 + D^3 + D^2 + D + 1
-uint32_t poly8 = 0x9B000000; // 1001 1011                      D^8  + D^7  + D^4 + D^3 + D + 1
-uint32_t poly6 = 0x84000000; // 10000100000... -> D^6+D^5+1
-uint32_t poly11 = 0xc4200000; //11000100001000... -> D^11+D^10+D^9+D^5+1
+static const uint32_t poly24a =
+    0x864cfb00; // 1000 0110 0100 1100 1111 1011
+                // D^24 + D^23 + D^18 + D^17 + D^14 + D^11 + D^10 + D^7 + D^6 + D^5 + D^4 + D^3 + D + 1
+static const uint32_t poly24b = 0x80006300; // 1000 0000 0000 0000 0110 0011
+                                                // D^24 + D^23 + D^6 + D^5 + D + 1
+static const uint32_t poly24c = 0xb2b11700; // 1011 0010 1011 0001 0001 0111
+                                                // D^24+D^23+D^21+D^20+D^17+D^15+D^13+D^12+D^8+D^4+D^2+D+1
+
+static const uint32_t poly16 = 0x10210000; // 0001 0000 0010 0001            D^16 + D^12 + D^5 + 1
+static const uint32_t poly12 = 0x80F00000; // 1000 0000 1111                 D^12 + D^11 + D^3 + D^2 + D + 1
+static const uint32_t poly8 = 0x9B000000; // 1001 1011                      D^8  + D^7  + D^4 + D^3 + D + 1
+static const uint32_t poly6 = 0x84000000; // 10000100000... -> D^6+D^5+1
+static const uint32_t poly11 = 0xc4200000; // 11000100001000... -> D^11+D^10+D^9+D^5+1
 
 /*********************************************************
 
@@ -100,24 +102,20 @@ static uint32_t crc8Table[256];
 static uint32_t crc6Table[256];
 
 #if USE_INTEL_CRC
-static DECLARE_ALIGNED(struct crc_pclmulqdq_ctx lte_crc24a_pclmulqdq, 16) = {
-        0x64e4d700,     /**< k1 */
-        0x2c8c9d00,     /**< k2 */
-        0xd9fe8c00,     /**< k3 */
-        0xf845fe24,     /**< q */
-        0x864cfb00,     /**< p */
-        0ULL            /**< res */
+static const struct crc_pclmulqdq_ctx lte_crc24a_pclmulqdq __attribute__((aligned(16))) = {
+    0x64e4d700, /**< k1 */
+    0x2c8c9d00, /**< k2 */
+    0xd9fe8c00, /**< k3 */
+    0xf845fe24, /**< q */
+    0x864cfb00, /**< p */
+    0ULL /**< res */
 };
 __m128i crc_xmm_be_le_swap128;
 
-DECLARE_ALIGNED(const uint8_t crc_xmm_shift_tab[48], 16) = {
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
+const uint8_t crc_xmm_shift_tab[48]
+    __attribute__((aligned(16))) = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 #endif
 
@@ -176,13 +174,13 @@ uint32_t crc24a(unsigned char* inptr, int bitlen)
 }
 
 #if USE_INTEL_CRC
-static DECLARE_ALIGNED(struct crc_pclmulqdq_ctx lte_crc24b_pclmulqdq, 16) = {
-        0x80140500,     /**< k1 */
-        0x42000100,     /**< k2 */
-        0x90042100,     /**< k3 */
-        0xffff83ff,     /**< q */
-        0x80006300,     /**< p */
-        0ULL            /**< res */
+static const struct crc_pclmulqdq_ctx lte_crc24b_pclmulqdq __attribute__((aligned(16))) = {
+    0x80140500, /**< k1 */
+    0x42000100, /**< k2 */
+    0x90042100, /**< k3 */
+    0xffff83ff, /**< q */
+    0x80006300, /**< p */
+    0ULL /**< res */
 };
 #endif
 uint32_t crc24b(unsigned char* inptr, int bitlen)

openair1/PHY/CODING/lte_rate_matching.c

@@ -33,9 +33,12 @@
 
 //#define cmin(a,b) ((a)<(b) ? (a) : (b))
 
-static uint32_t bitrev[32]    = {0,16,8,24,4,20,12,28,2,18,10,26,6,22,14,30,1,17,9,25,5,21,13,29,3,19,11,27,7,23,15,31};
-static uint32_t bitrev_x3[32] = {0,48,24,72,12,60,36,84,6,54,30,78,18,66,42,90,3,51,27,75,15,63,39,87,9,57,33,81,21,69,45,93};
-static uint32_t bitrev_cc[32] = {1,17,9,25,5,21,13,29,3,19,11,27,7,23,15,31,0,16,8,24,4,20,12,28,2,18,10,26,6,22,14,30};
+static const uint32_t bitrev[32] = {0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26, 6, 22, 14, 30,
+                                    1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23, 15, 31};
+static const uint32_t bitrev_x3[32] = {0, 48, 24, 72, 12, 60, 36, 84, 6, 54, 30, 78, 18, 66, 42, 90,
+                                       3, 51, 27, 75, 15, 63, 39, 87, 9, 57, 33, 81, 21, 69, 45, 93};
+static const uint32_t bitrev_cc[32] = {1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23, 15, 31,
+                                       0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26, 6, 22, 14, 30};
 
 //#define RM_DEBUG_TX 1
 //#define RM_DEBUG 1

openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu

@@ -56,13 +56,13 @@ __device__ char dev_dt [46*68*384];
 __device__ char dev_llr[68*384];
 __device__ unsigned char dev_tmp[68*384];
 
-h_element h_compact1 [46*19] = {};
+h_element h_compact1 [46*23] = {};
 h_element h_compact2 [68*30] = {};
 
-__device__  h_element dev_h_compact1[46*19];  // used in kernel 1
+__device__  h_element dev_h_compact1[46*23];  // used in kernel 1
 __device__  h_element dev_h_compact2[68*30];  // used in kernel 2
 
-// __device__ __constant__ h_element dev_h_compact1[46*19];  // used in kernel 1
+// __device__ __constant__ h_element dev_h_compact1[46*23];  // used in kernel 1
 // __device__ __constant__ h_element dev_h_compact2[68*30];  // used in kernel 2
 
 // row and col element count

openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c

@@ -22,12 +22,12 @@
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
 // ----- Old implementation ----
-uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits){
-
-	uint8_t crcPolynomialPattern[25] = {1,1,0,1,1,0,0,1,0,1,0,1,1,0,0,0,1,0,0,0,1,0,1,1,1};
-	// 1011 0010 1011 0001 0001 0111 D^24 + D^23 + D^21 + D^20 + D^17 + D^15 + D^13 + D^12 + D^8 + D^4 + D^2 + D + 1
-	uint8_t crcPolynomialSize = 24;
-	uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
+const uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits)
+{
+  uint8_t crcPolynomialPattern[25] = {1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1};
+  // 1011 0010 1011 0001 0001 0111 D^24 + D^23 + D^21 + D^20 + D^17 + D^15 + D^13 + D^12 + D^8 + D^4 + D^2 + D + 1
+  uint8_t crcPolynomialSize = 24;
+  uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
 
 	uint8_t **crc_generator_matrix = malloc(payloadSizeBits*sizeof(uint8_t *) + payloadSizeBits*crcPolynomialSize*sizeof(uint8_t));
 	if (crc_generator_matrix)
@@ -52,74 +52,5 @@ uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits){
 				crc_generator_matrix[i][j]=0;
 		}
 	}
-	return crc_generator_matrix;
-}
-
-uint8_t **crc11_generator_matrix(uint16_t payloadSizeBits){
-
-	uint8_t crcPolynomialPattern[12] = {1,1,1,0,0,0,1,0,0,0,0,1};
-	// 1110 0010 0001 D^11 + D^10 + D^9 + D^5 + 1
-	uint8_t crcPolynomialSize = 11;
-	uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
-
-	uint8_t **crc_generator_matrix = malloc(payloadSizeBits * sizeof(uint8_t *));
-	if (crc_generator_matrix)
-	  for (int i = 0; i < payloadSizeBits; i++)
-		  crc_generator_matrix[i] = malloc(crcPolynomialSize * sizeof(uint8_t));
-
-	for (int i = 0; i < crcPolynomialSize; i++) crc_generator_matrix[payloadSizeBits-1][i]=crcPolynomialPattern[i+1];
-
-	for (int i = payloadSizeBits-2; i >= 0; i--){
-		for (int j = 0; j < crcPolynomialSize-1; j++)
-			temp1[j]=crc_generator_matrix[i+1][j+1];
-
-		temp1[crcPolynomialSize-1]=0;
-
-		for (int j = 0; j < crcPolynomialSize; j++)
-			temp2[j]=crc_generator_matrix[i+1][0]*crcPolynomialPattern[j+1];
-
-		for (int j = 0; j < crcPolynomialSize; j++){
-			if(temp1[j]+temp2[j] == 1)
-				crc_generator_matrix[i][j]=1;
-			else
-				crc_generator_matrix[i][j]=0;
-		}
-	}
-
-	return crc_generator_matrix;
-}
-
-uint8_t **crc6_generator_matrix(uint16_t payloadSizeBits){
-
-	uint8_t crcPolynomialPattern[7] = {1,1,0,0,0,0,1};
-	// 0110 0001 D^6 + D^5 + 1
-	uint8_t crcPolynomialSize = 6;
-	uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
-	uint8_t **crc_generator_matrix = malloc(payloadSizeBits * sizeof(uint8_t *));
-
-	if (crc_generator_matrix)
-	  for (int i = 0; i < payloadSizeBits; i++)
-		  crc_generator_matrix[i] = malloc(crcPolynomialSize * sizeof(uint8_t));
-
-	for (int i = 0; i < crcPolynomialSize; i++)
-		crc_generator_matrix[payloadSizeBits-1][i]=crcPolynomialPattern[i+1];
-
-	for (int i = payloadSizeBits-2; i >= 0; i--){
-		for (int j = 0; j < crcPolynomialSize-1; j++)
-			temp1[j]=crc_generator_matrix[i+1][j+1];
-
-		temp1[crcPolynomialSize-1]=0;
-
-		for (int j = 0; j < crcPolynomialSize; j++)
-			temp2[j]=crc_generator_matrix[i+1][0]*crcPolynomialPattern[j+1];
-
-		for (int j = 0; j < crcPolynomialSize; j++){
-			if(temp1[j]+temp2[j] == 1)
-				crc_generator_matrix[i][j]=1;
-			else
-				crc_generator_matrix[i][j]=0;
-		}
-	}
-
-	return crc_generator_matrix;
+  return (const uint8_t **)crc_generator_matrix;
 }

openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c

@@ -366,7 +366,7 @@ void applyGtoright(const t_nrPolar_params *pp,decoder_node_t *node) {
   }
 }
 
-int16_t all1[16] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static const int16_t all1[16] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
 
 void computeBeta(const t_nrPolar_params *pp,decoder_node_t *node) {
 

openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h

@@ -109,8 +109,8 @@ struct nrPolar_params {
   uint16_t *channel_interleaver_pattern;
   //uint32_t crc_polynomial;
 
-  uint8_t **crc_generator_matrix; //G_P
-  uint8_t **G_N;
+  const uint8_t **crc_generator_matrix; // G_P
+  const uint8_t **G_N;
   uint64_t **G_N_tab;
   int groupsize;
   int *rm_tab;
@@ -205,7 +205,7 @@ t_nrPolar_params *nr_polar_params (int8_t messageType,
 
 uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level);
 
-uint8_t **nr_polar_kronecker_power_matrices(uint8_t n);
+const uint8_t **nr_polar_kronecker_power_matrices(uint8_t n);
 
 const uint16_t *nr_polar_sequence_pattern(uint8_t n);
 
@@ -270,11 +270,7 @@ void nr_byte2bit_uint8_32(uint8_t *in,
                           uint16_t arraySize,
                           uint32_t *out);
 
-uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits);
-
-uint8_t **crc11_generator_matrix(uint16_t payloadSizeBits);
-
-uint8_t **crc6_generator_matrix(uint16_t payloadSizeBits);
+const uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits);
 
 void nr_polar_bit_insertion(uint8_t *input,
                             uint8_t *output,
@@ -284,11 +280,11 @@ void nr_polar_bit_insertion(uint8_t *input,
                             int16_t *Q_PC_N,
                             uint8_t n_PC);
 
-void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1,
-    uint8_t **matrix2,
-    uint8_t *output,
-    uint16_t row,
-    uint16_t col);
+void nr_matrix_multiplication_uint8_1D_uint8_2D(const uint8_t *matrix1,
+                                                const uint8_t **matrix2,
+                                                uint8_t *output,
+                                                uint16_t row,
+                                                uint16_t col);
 
 void nr_sort_asc_double_1D_array_ind(double *matrix,
                                      uint8_t *ind,

openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c

@@ -32,15 +32,18 @@
 
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
-void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1, uint8_t **matrix2,
-		uint8_t *output, uint16_t row, uint16_t col) {
-
-	for (uint16_t i = 0; i < col; i++) {
-		output[i] = 0;
-		for (uint16_t j = 0; j < row; j++) {
+void nr_matrix_multiplication_uint8_1D_uint8_2D(const uint8_t *matrix1,
+                                                const uint8_t **matrix2,
+                                                uint8_t *output,
+                                                uint16_t row,
+                                                uint16_t col)
+{
+  for (uint16_t i = 0; i < col; i++) {
+    output[i] = 0;
+    for (uint16_t j = 0; j < row; j++) {
 			output[i] += matrix1[j] * matrix2[j][i];
 		}
-	}
+  }
 }
 
 // Modified Bubble Sort.

openair1/PHY/INIT/lte_init.c

@@ -36,15 +36,10 @@
 #include <math.h>
 #include "nfapi/oai_integration/vendor_ext.h"
 #include <openair1/PHY/LTE_ESTIMATION/lte_estimation.h>
-extern uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn);
-extern int32_t get_uldl_offset(int eutra_bandP);
 
-extern uint16_t prach_root_sequence_map0_3[838];
-extern uint16_t prach_root_sequence_map4[138];
-uint8_t         dmrs1_tab[8] = { 0, 2, 3, 4, 6, 8, 9, 10 };
+const uint8_t dmrs1_tab[8] = {0, 2, 3, 4, 6, 8, 9, 10};
 
-
-int             N_RB_DL_array[6] = { 6, 15, 25, 50, 75, 100 };
+const int N_RB_DL_array[6] = {6, 15, 25, 50, 75, 100};
 
 #include "common/ran_context.h"
 extern RAN_CONTEXT_t RC;

openair1/PHY/INIT/lte_init_ue.c

@@ -35,6 +35,7 @@
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 #include "nfapi/oai_integration/vendor_ext.h"
+#include "PHY/phy_extern.h"
 void init_7_5KHz(void);
 
 uint8_t dmrs1_tab_ue[8] = {0,2,3,4,6,8,9,10};
@@ -360,8 +361,6 @@ void phy_config_harq_ue(module_id_t Mod_id,
   phy_vars_ue->ulsch[eNB_id]->Mlimit = max_harq_tx;
 }
 
-extern uint16_t beta_cqi[16];
-
 void phy_config_dedicated_ue(module_id_t Mod_id,int CC_id,uint8_t eNB_id,
                              struct LTE_PhysicalConfigDedicated *physicalConfigDedicated ) {
   static uint8_t first_dedicated_configuration = 0;

openair1/PHY/INIT/lte_parms.c

@@ -22,8 +22,8 @@
 #include "phy_init.h"
 #include "common/utils/LOG/log.h"
 
-uint16_t dl_S_table_normal[10]= {3,9,10,11,12,3,9,10,11,6};
-uint16_t dl_S_table_extended[10]= {3,8,9,10,3,8,9,5,0,0};
+static const uint16_t dl_S_table_normal[10] = {3, 9, 10, 11, 12, 3, 9, 10, 11, 6};
+static const uint16_t dl_S_table_extended[10] = {3, 8, 9, 10, 3, 8, 9, 5, 0, 0};
 
 void set_S_config(LTE_DL_FRAME_PARMS *fp) {
   int X = fp->srsX;

openair1/PHY/INIT/nr_init.c

@@ -554,7 +554,8 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB)
   AssertFatal(pdcch_dmrs!=NULL, "NR init: pdcch_dmrs malloc failed\n");
 
   gNB->bad_pucch = 0;
-
+  if (gNB->TX_AMP == 0)
+    gNB->TX_AMP = AMP;
   // ceil(((NB_RB<<1)*3)/32) // 3 RE *2(QPSK)
   int pdcch_dmrs_init_length =  (((fp->N_RB_DL<<1)*3)>>5)+1;
 

openair1/PHY/INIT/nr_init_ue.c

@@ -36,9 +36,6 @@
 #include "openair2/COMMON/prs_nr_paramdef.h"
 #include "SCHED_NR_UE/harq_nr.h"
 
-
-extern uint16_t beta_cqi[16];
-
 void RCconfig_nrUE_prs(void *cfg)
 {
   int j = 0, k = 0, gNB_id = 0;

openair1/PHY/INIT/nr_parms.c

@@ -24,61 +24,21 @@
 #include "common/utils/LOG/log.h"
 
 /// Subcarrier spacings in Hz indexed by numerology index
-uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
-uint16_t nr_slots_per_subframe[MAX_NUM_SUBCARRIER_SPACING] = {1, 2, 4, 8, 16};
+static const uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
+static const uint16_t nr_slots_per_subframe[MAX_NUM_SUBCARRIER_SPACING] = {1, 2, 4, 8, 16};
 
 // Table 5.4.3.3-1 38-101
-int nr_ssb_table[48][3] = {
-  {1, 15, nr_ssb_type_A},
-  {2, 15, nr_ssb_type_A},
-  {3, 15, nr_ssb_type_A},
-  {5, 15, nr_ssb_type_A},
-  {5, 30, nr_ssb_type_B},
-  {7, 15, nr_ssb_type_A},
-  {8, 15, nr_ssb_type_A},
-  {12, 15, nr_ssb_type_A},
-  {14, 15, nr_ssb_type_A},
-  {18, 15, nr_ssb_type_A},
-  {20, 15, nr_ssb_type_A},
-  {25, 15, nr_ssb_type_A},
-  {26, 15, nr_ssb_type_A},
-  {28, 15, nr_ssb_type_A},
-  {29, 15, nr_ssb_type_A},
-  {30, 15, nr_ssb_type_A},
-  {34, 15, nr_ssb_type_A},
-  {34, 30, nr_ssb_type_C},
-  {38, 15, nr_ssb_type_A},
-  {38, 30, nr_ssb_type_C},
-  {39, 15, nr_ssb_type_A},
-  {39, 30, nr_ssb_type_C},
-  {40, 30, nr_ssb_type_C},
-  {41, 15, nr_ssb_type_A},
-  {41, 30, nr_ssb_type_C},
-  {46, 30, nr_ssb_type_C},
-  {48, 30, nr_ssb_type_C},
-  {50, 30, nr_ssb_type_C},
-  {51, 15, nr_ssb_type_A},
-  {53, 15, nr_ssb_type_A},
-  {65, 15, nr_ssb_type_A},
-  {66, 15, nr_ssb_type_A},
-  {66, 30, nr_ssb_type_B},
-  {70, 15, nr_ssb_type_A},
-  {71, 15, nr_ssb_type_A},
-  {74, 15, nr_ssb_type_A},
-  {75, 15, nr_ssb_type_A},
-  {76, 15, nr_ssb_type_A},
-  {77, 30, nr_ssb_type_C},
-  {78, 30, nr_ssb_type_C},
-  {79, 30, nr_ssb_type_C},
-  {90, 15, nr_ssb_type_A},
-  {90, 30, nr_ssb_type_C},
-  {91, 15, nr_ssb_type_A},
-  {92, 15, nr_ssb_type_A},
-  {93, 15, nr_ssb_type_A},
-  {94, 15, nr_ssb_type_A},
-  {96, 30, nr_ssb_type_C}
-};
-
+static const int nr_ssb_table[48][3] = {
+    {1, 15, nr_ssb_type_A},  {2, 15, nr_ssb_type_A},  {3, 15, nr_ssb_type_A},  {5, 15, nr_ssb_type_A},  {5, 30, nr_ssb_type_B},
+    {7, 15, nr_ssb_type_A},  {8, 15, nr_ssb_type_A},  {12, 15, nr_ssb_type_A}, {14, 15, nr_ssb_type_A}, {18, 15, nr_ssb_type_A},
+    {20, 15, nr_ssb_type_A}, {25, 15, nr_ssb_type_A}, {26, 15, nr_ssb_type_A}, {28, 15, nr_ssb_type_A}, {29, 15, nr_ssb_type_A},
+    {30, 15, nr_ssb_type_A}, {34, 15, nr_ssb_type_A}, {34, 30, nr_ssb_type_C}, {38, 15, nr_ssb_type_A}, {38, 30, nr_ssb_type_C},
+    {39, 15, nr_ssb_type_A}, {39, 30, nr_ssb_type_C}, {40, 30, nr_ssb_type_C}, {41, 15, nr_ssb_type_A}, {41, 30, nr_ssb_type_C},
+    {46, 30, nr_ssb_type_C}, {48, 30, nr_ssb_type_C}, {50, 30, nr_ssb_type_C}, {51, 15, nr_ssb_type_A}, {53, 15, nr_ssb_type_A},
+    {65, 15, nr_ssb_type_A}, {66, 15, nr_ssb_type_A}, {66, 30, nr_ssb_type_B}, {70, 15, nr_ssb_type_A}, {71, 15, nr_ssb_type_A},
+    {74, 15, nr_ssb_type_A}, {75, 15, nr_ssb_type_A}, {76, 15, nr_ssb_type_A}, {77, 30, nr_ssb_type_C}, {78, 30, nr_ssb_type_C},
+    {79, 30, nr_ssb_type_C}, {90, 15, nr_ssb_type_A}, {90, 30, nr_ssb_type_C}, {91, 15, nr_ssb_type_A}, {92, 15, nr_ssb_type_A},
+    {93, 15, nr_ssb_type_A}, {94, 15, nr_ssb_type_A}, {96, 30, nr_ssb_type_C}};
 
 void set_Lmax(NR_DL_FRAME_PARMS *fp) {
   // definition of Lmax according to ts 38.213 section 4.1

openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c

@@ -29,9 +29,40 @@
 #include "openair1/PHY/LTE_TRANSPORT/transport_vars.h"
 
 // round(exp(sqrt(-1)*(pi/2)*[0:1:N-1]/N)*pow2(15))
-static int16_t ru_90[2*128] = {32767, 0,32766, 402,32758, 804,32746, 1206,32729, 1608,32706, 2009,32679, 2411,32647, 2811,32610, 3212,32568, 3612,32522, 4011,32470, 4410,32413, 4808,32352, 5205,32286, 5602,32214, 5998,32138, 6393,32058, 6787,31972, 7180,31881, 7571,31786, 7962,31686, 8351,31581, 8740,31471, 9127,31357, 9512,31238, 9896,31114, 10279,30986, 10660,30853, 11039,30715, 11417,30572, 11793,30425, 12167,30274, 12540,30118, 12910,29957, 13279,29792, 13646,29622, 14010,29448, 14373,29269, 14733,29086, 15091,28899, 15447,28707, 15800,28511, 16151,28311, 16500,28106, 16846,27897, 17190,27684, 17531,27467, 17869,27246, 18205,27020, 18538,26791, 18868,26557, 19195,26320, 19520,26078, 19841,25833, 20160,25583, 20475,25330, 20788,25073, 21097,24812, 21403,24548, 21706,24279, 22006,24008, 22302,23732, 22595,23453, 22884,23170, 23170,22884, 23453,22595, 23732,22302, 24008,22006, 24279,21706, 24548,21403, 24812,21097, 25073,20788, 25330,20475, 25583,20160, 25833,19841, 26078,19520, 26320,19195, 26557,18868, 26791,18538, 27020,18205, 27246,17869, 27467,17531, 27684,17190, 27897,16846, 28106,16500, 28311,16151, 28511,15800, 28707,15447, 28899,15091, 29086,14733, 29269,14373, 29448,14010, 29622,13646, 29792,13279, 29957,12910, 30118,12540, 30274,12167, 30425,11793, 30572,11417, 30715,11039, 30853,10660, 30986,10279, 31114,9896, 31238,9512, 31357,9127, 31471,8740, 31581,8351, 31686,7962, 31786,7571, 31881,7180, 31972,6787, 32058,6393, 32138,5998, 32214,5602, 32286,5205, 32352,4808, 32413,4410, 32470,4011, 32522,3612, 32568,3212, 32610,2811, 32647,2411, 32679,2009, 32706,1608, 32729,1206, 32746,804, 32758,402, 32766};
+static const int16_t ru_90[2 * 128] = {
+    32767, 0,     32766, 402,   32758, 804,   32746, 1206,  32729, 1608,  32706, 2009,  32679, 2411,  32647, 2811,  32610, 3212,
+    32568, 3612,  32522, 4011,  32470, 4410,  32413, 4808,  32352, 5205,  32286, 5602,  32214, 5998,  32138, 6393,  32058, 6787,
+    31972, 7180,  31881, 7571,  31786, 7962,  31686, 8351,  31581, 8740,  31471, 9127,  31357, 9512,  31238, 9896,  31114, 10279,
+    30986, 10660, 30853, 11039, 30715, 11417, 30572, 11793, 30425, 12167, 30274, 12540, 30118, 12910, 29957, 13279, 29792, 13646,
+    29622, 14010, 29448, 14373, 29269, 14733, 29086, 15091, 28899, 15447, 28707, 15800, 28511, 16151, 28311, 16500, 28106, 16846,
+    27897, 17190, 27684, 17531, 27467, 17869, 27246, 18205, 27020, 18538, 26791, 18868, 26557, 19195, 26320, 19520, 26078, 19841,
+    25833, 20160, 25583, 20475, 25330, 20788, 25073, 21097, 24812, 21403, 24548, 21706, 24279, 22006, 24008, 22302, 23732, 22595,
+    23453, 22884, 23170, 23170, 22884, 23453, 22595, 23732, 22302, 24008, 22006, 24279, 21706, 24548, 21403, 24812, 21097, 25073,
+    20788, 25330, 20475, 25583, 20160, 25833, 19841, 26078, 19520, 26320, 19195, 26557, 18868, 26791, 18538, 27020, 18205, 27246,
+    17869, 27467, 17531, 27684, 17190, 27897, 16846, 28106, 16500, 28311, 16151, 28511, 15800, 28707, 15447, 28899, 15091, 29086,
+    14733, 29269, 14373, 29448, 14010, 29622, 13646, 29792, 13279, 29957, 12910, 30118, 12540, 30274, 12167, 30425, 11793, 30572,
+    11417, 30715, 11039, 30853, 10660, 30986, 10279, 31114, 9896,  31238, 9512,  31357, 9127,  31471, 8740,  31581, 8351,  31686,
+    7962,  31786, 7571,  31881, 7180,  31972, 6787,  32058, 6393,  32138, 5998,  32214, 5602,  32286, 5205,  32352, 4808,  32413,
+    4410,  32470, 4011,  32522, 3612,  32568, 3212,  32610, 2811,  32647, 2411,  32679, 2009,  32706, 1608,  32729, 1206,  32746,
+    804,   32758, 402,   32766};
 
-static int16_t ru_90c[2*128] = {32767, 0,32766, -402,32758, -804,32746, -1206,32729, -1608,32706, -2009,32679, -2411,32647, -2811,32610, -3212,32568, -3612,32522, -4011,32470, -4410,32413, -4808,32352, -5205,32286, -5602,32214, -5998,32138, -6393,32058, -6787,31972, -7180,31881, -7571,31786, -7962,31686, -8351,31581, -8740,31471, -9127,31357, -9512,31238, -9896,31114, -10279,30986, -10660,30853, -11039,30715, -11417,30572, -11793,30425, -12167,30274, -12540,30118, -12910,29957, -13279,29792, -13646,29622, -14010,29448, -14373,29269, -14733,29086, -15091,28899, -15447,28707, -15800,28511, -16151,28311, -16500,28106, -16846,27897, -17190,27684, -17531,27467, -17869,27246, -18205,27020, -18538,26791, -18868,26557, -19195,26320, -19520,26078, -19841,25833, -20160,25583, -20475,25330, -20788,25073, -21097,24812, -21403,24548, -21706,24279, -22006,24008, -22302,23732, -22595,23453, -22884,23170, -23170,22884, -23453,22595, -23732,22302, -24008,22006, -24279,21706, -24548,21403, -24812,21097, -25073,20788, -25330,20475, -25583,20160, -25833,19841, -26078,19520, -26320,19195, -26557,18868, -26791,18538, -27020,18205, -27246,17869, -27467,17531, -27684,17190, -27897,16846, -28106,16500, -28311,16151, -28511,15800, -28707,15447, -28899,15091, -29086,14733, -29269,14373, -29448,14010, -29622,13646, -29792,13279, -29957,12910, -30118,12540, -30274,12167, -30425,11793, -30572,11417, -30715,11039, -30853,10660, -30986,10279, -31114,9896, -31238,9512, -31357,9127, -31471,8740, -31581,8351, -31686,7962, -31786,7571, -31881,7180, -31972,6787, -32058,6393, -32138,5998, -32214,5602, -32286,5205, -32352,4808, -32413,4410, -32470,4011, -32522,3612, -32568,3212, -32610,2811, -32647,2411, -32679,2009, -32706,1608, -32729,1206, -32746,804, -32758,402, -32766};
+static const int16_t ru_90c[2 * 128] = {
+    32767, 0,      32766, -402,   32758, -804,   32746, -1206,  32729, -1608,  32706, -2009,  32679, -2411,  32647, -2811,
+    32610, -3212,  32568, -3612,  32522, -4011,  32470, -4410,  32413, -4808,  32352, -5205,  32286, -5602,  32214, -5998,
+    32138, -6393,  32058, -6787,  31972, -7180,  31881, -7571,  31786, -7962,  31686, -8351,  31581, -8740,  31471, -9127,
+    31357, -9512,  31238, -9896,  31114, -10279, 30986, -10660, 30853, -11039, 30715, -11417, 30572, -11793, 30425, -12167,
+    30274, -12540, 30118, -12910, 29957, -13279, 29792, -13646, 29622, -14010, 29448, -14373, 29269, -14733, 29086, -15091,
+    28899, -15447, 28707, -15800, 28511, -16151, 28311, -16500, 28106, -16846, 27897, -17190, 27684, -17531, 27467, -17869,
+    27246, -18205, 27020, -18538, 26791, -18868, 26557, -19195, 26320, -19520, 26078, -19841, 25833, -20160, 25583, -20475,
+    25330, -20788, 25073, -21097, 24812, -21403, 24548, -21706, 24279, -22006, 24008, -22302, 23732, -22595, 23453, -22884,
+    23170, -23170, 22884, -23453, 22595, -23732, 22302, -24008, 22006, -24279, 21706, -24548, 21403, -24812, 21097, -25073,
+    20788, -25330, 20475, -25583, 20160, -25833, 19841, -26078, 19520, -26320, 19195, -26557, 18868, -26791, 18538, -27020,
+    18205, -27246, 17869, -27467, 17531, -27684, 17190, -27897, 16846, -28106, 16500, -28311, 16151, -28511, 15800, -28707,
+    15447, -28899, 15091, -29086, 14733, -29269, 14373, -29448, 14010, -29622, 13646, -29792, 13279, -29957, 12910, -30118,
+    12540, -30274, 12167, -30425, 11793, -30572, 11417, -30715, 11039, -30853, 10660, -30986, 10279, -31114, 9896,  -31238,
+    9512,  -31357, 9127,  -31471, 8740,  -31581, 8351,  -31686, 7962,  -31786, 7571,  -31881, 7180,  -31972, 6787,  -32058,
+    6393,  -32138, 5998,  -32214, 5602,  -32286, 5205,  -32352, 4808,  -32413, 4410,  -32470, 4011,  -32522, 3612,  -32568,
+    3212,  -32610, 2811,  -32647, 2411,  -32679, 2009,  -32706, 1608,  -32729, 1206,  -32746, 804,   -32758, 402,   -32766};
 
 #define SCALE 0x3FFF
 
@@ -51,8 +82,8 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
   uint8_t harq_pid; 
 
   int16_t delta_phase = 0;
-  int16_t *ru1 = ru_90;
-  int16_t *ru2 = ru_90;
+  const int16_t *ru1 = ru_90;
+  const int16_t *ru2 = ru_90;
   int16_t current_phase1,current_phase2;
   uint16_t aa,Msc_RS,Msc_RS_idx;
   uint16_t *Msc_idx_ptr;
@@ -67,8 +98,8 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
   uint32_t v=frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[Ns+(subframe<<1)];
   int symbol_offset,i;
   //debug_msg("lte_ul_channel_estimation: cyclic shift %d\n",cyclicShift);
-  int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
-  int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
+  const int16_t alpha_re[12] = {32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384, -1, 16383, 28377};
+  const int16_t alpha_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384};
 #if defined(__x86_64__) || defined(__i386__)
   __m128i *rxdataF128,*ul_ref128,*ul_ch128;
   __m128i mmtmpU0,mmtmpU1,mmtmpU2,mmtmpU3;
@@ -390,8 +421,8 @@ int32_t lte_ul_channel_estimation_RRU(LTE_DL_FRAME_PARMS *frame_parms,
                                       int interpolate,
                                       uint16_t rnti) {
   int16_t delta_phase = 0;
-  int16_t *ru1 = ru_90;
-  int16_t *ru2 = ru_90;
+  const int16_t *ru1 = ru_90;
+  const int16_t *ru2 = ru_90;
   int16_t current_phase1,current_phase2;
   uint16_t aa,Msc_RS,Msc_RS_idx;
   uint16_t *Msc_idx_ptr;
@@ -403,8 +434,8 @@ int32_t lte_ul_channel_estimation_RRU(LTE_DL_FRAME_PARMS *frame_parms,
   int32_t tmp_estimates[N_rb_alloc*12] __attribute__((aligned(16)));
   int symbol_offset,i;
   //debug_msg("lte_ul_channel_estimation_RRU: cyclic shift %d\n",cyclicShift);
-  int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
-  int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
+  const int16_t alpha_re[12] = {32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384, -1, 16383, 28377};
+  const int16_t alpha_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384};
 #if defined(__x86_64__) || defined(__i386__)
   __m128i *rxdataF128,*ul_ref128,*ul_ch128;
   __m128i mmtmpU0,mmtmpU1,mmtmpU2,mmtmpU3;

openair1/PHY/LTE_REFSIG/lte_ul_ref.c

@@ -28,18 +28,52 @@
 #include "PHY/defs_eNB.h"
 #include "openair1/PHY/LTE_TRANSPORT/transport_vars.h"
 
-const uint16_t ref_primes[34] = {11, 23, 31, 47, 59, 71, 89, 107, 113, 139, 179, 191, 211, 239, 283, 293, 317, 359, 383, 431, 479, 523, 571, 599, 647, 719, 761, 863, 887, 953, 971, 1069, 1151, 1193};
+static const uint16_t ref_primes[34] = {11,  23,  31,  47,  59,  71,  89,  107, 113, 139, 179, 191, 211, 239, 283,  293,  317,
+                                        359, 383, 431, 479, 523, 571, 599, 647, 719, 761, 863, 887, 953, 971, 1069, 1151, 1193};
 
 int16_t *ul_ref_sigs[30][2][34];
 int16_t *ul_ref_sigs_rx[30][2][34]; //these contain the sequences in repeated format and quantized to QPSK ifdef IFFT_FPGA
 
 /* 36.211 table 5.5.1.2-1 */
-char ref12[360] = {-1,1,3,-3,3,3,1,1,3,1,-3,3,1,1,3,3,3,-1,1,-3,-3,1,-3,3,1,1,-3,-3,-3,-1,-3,-3,1,-3,1,-1,-1,1,1,1,1,-1,-3,-3,1,-3,3,-1,-1,3,1,-1,1,-1,-3,-1,1,-1,1,3,1,-3,3,-1,-1,1,1,-1,-1,3,-3,1,-1,3,-3,-3,-3,3,1,-1,3,3,-3,1,-3,-1,-1,-1,1,-3,3,-1,1,-3,3,1,1,-3,3,1,-1,-1,-1,1,1,3,-1,1,1,-3,-1,3,3,-1,-3,1,1,1,1,1,-1,3,-1,1,1,-3,-3,-1,-3,-3,3,-1,3,1,-1,-1,3,3,-3,1,3,1,3,3,1,-3,1,1,-3,1,1,1,-3,-3,-3,1,3,3,-3,3,-3,1,1,3,-1,-3,3,3,-3,1,-1,-3,-1,3,1,3,3,3,-1,1,3,-1,1,-3,-1,-1,1,1,3,1,-1,-3,1,3,1,-1,1,3,3,3,-1,-1,3,-1,-3,1,1,3,-3,3,-3,-3,3,1,3,-1,-3,3,1,1,-3,1,-3,-3,-1,-1,1,-3,-1,3,1,3,1,-1,-1,3,-3,-1,-3,-1,-1,-3,1,1,1,1,3,1,-1,1,-3,-1,-1,3,-1,1,-3,-3,-3,-3,-3,1,-1,-3,1,1,-3,-3,-3,-3,-1,3,-3,1,-3,3,1,1,-1,-3,-1,-3,1,-1,1,3,-1,1,1,1,3,1,3,3,-1,1,-1,-3,-3,1,1,-3,3,3,1,3,3,1,-3,-1,-1,3,1,3,-3,-3,3,-3,1,-1,-1,3,-1,-3,-3,-1,-3,-1,-3,3,1,-1,1,3,-3,-3,-1,3,-3,3,-1,3,3,-3,3,3,-1,-1,3,-3,-3,-1,-1,-3,-1,3,-3,3,1,-1};
+static const char ref12[360] = {
+    -1, 1,  3,  -3, 3,  3,  1,  1,  3,  1,  -3, 3,  1,  1,  3,  3,  3,  -1, 1,  -3, -3, 1,  -3, 3,  1,  1,  -3, -3, -3, -1,
+    -3, -3, 1,  -3, 1,  -1, -1, 1,  1,  1,  1,  -1, -3, -3, 1,  -3, 3,  -1, -1, 3,  1,  -1, 1,  -1, -3, -1, 1,  -1, 1,  3,
+    1,  -3, 3,  -1, -1, 1,  1,  -1, -1, 3,  -3, 1,  -1, 3,  -3, -3, -3, 3,  1,  -1, 3,  3,  -3, 1,  -3, -1, -1, -1, 1,  -3,
+    3,  -1, 1,  -3, 3,  1,  1,  -3, 3,  1,  -1, -1, -1, 1,  1,  3,  -1, 1,  1,  -3, -1, 3,  3,  -1, -3, 1,  1,  1,  1,  1,
+    -1, 3,  -1, 1,  1,  -3, -3, -1, -3, -3, 3,  -1, 3,  1,  -1, -1, 3,  3,  -3, 1,  3,  1,  3,  3,  1,  -3, 1,  1,  -3, 1,
+    1,  1,  -3, -3, -3, 1,  3,  3,  -3, 3,  -3, 1,  1,  3,  -1, -3, 3,  3,  -3, 1,  -1, -3, -1, 3,  1,  3,  3,  3,  -1, 1,
+    3,  -1, 1,  -3, -1, -1, 1,  1,  3,  1,  -1, -3, 1,  3,  1,  -1, 1,  3,  3,  3,  -1, -1, 3,  -1, -3, 1,  1,  3,  -3, 3,
+    -3, -3, 3,  1,  3,  -1, -3, 3,  1,  1,  -3, 1,  -3, -3, -1, -1, 1,  -3, -1, 3,  1,  3,  1,  -1, -1, 3,  -3, -1, -3, -1,
+    -1, -3, 1,  1,  1,  1,  3,  1,  -1, 1,  -3, -1, -1, 3,  -1, 1,  -3, -3, -3, -3, -3, 1,  -1, -3, 1,  1,  -3, -3, -3, -3,
+    -1, 3,  -3, 1,  -3, 3,  1,  1,  -1, -3, -1, -3, 1,  -1, 1,  3,  -1, 1,  1,  1,  3,  1,  3,  3,  -1, 1,  -1, -3, -3, 1,
+    1,  -3, 3,  3,  1,  3,  3,  1,  -3, -1, -1, 3,  1,  3,  -3, -3, 3,  -3, 1,  -1, -1, 3,  -1, -3, -3, -1, -3, -1, -3, 3,
+    1,  -1, 1,  3,  -3, -3, -1, 3,  -3, 3,  -1, 3,  3,  -3, 3,  3,  -1, -1, 3,  -3, -3, -1, -1, -3, -1, 3,  -3, 3,  1,  -1};
 
 /* 36.211 table 5.5.1.2-2 */
-char ref24[720] = {
-  -1,3,1,-3,3,-1,1,3,-3,3,1,3,-3,3,1,1,-1,1,3,-3,3,-3,-1,-3,-3,3,-3,-3,-3,1,-3,-3,3,-1,1,1,1,3,1,-1,3,-3,-3,1,3,1,1,-3,3,-1,3,3,1,1,-3,3,3,3,3,1,-1,3,-1,1,1,-1,-3,-1,-1,1,3,3,-1,-3,1,1,3,-3,1,1,-3,-1,-1,1,3,1,3,1,-1,3,1,1,-3,-1,-3,-1,-1,-1,-1,-3,-3,-1,1,1,3,3,-1,3,-1,1,-1,-3,1,-1,-3,-3,1,-3,-1,-1,-3,1,1,3,-1,1,3,1,-3,1,-3,1,1,-1,-1,3,-1,-3,3,-3,-3,-3,1,1,1,1,-1,-1,3,-3,-3,3,-3,1,-1,-1,1,-1,1,1,-1,-3,-1,1,-1,3,-1,-3,-3,3,3,-1,-1,-3,-1,3,1,3,1,3,1,1,-1,3,1,-1,1,3,-3,-1,-1,1,-3,1,3,-3,1,-1,-3,3,-3,3,-1,-1,-1,-1,1,-3,-3,-3,1,-3,-3,-3,1,-3,1,1,-3,3,3,-1,-3,-1,3,-3,3,3,3,-1,1,1,-3,1,-1,1,1,-3,1,1,-1,1,-3,-3,3,-1,3,-1,-1,-3,-3,-3,-1,-3,-3,1,-1,1,3,3,-1,1,-1,3,1,3,3,-3,-3,1,3,1,-1,-3,-3,-3,3,3,-3,3,3,-1,-3,3,-1,1,-3,1,1,3,3,1,1,1,-1,-1,1,-3,3,-1,1,1,-3,3,3,-1,-3,3,-3,-1,-3,-1,3,-1,-1,-1,-1,-3,-1,3,3,1,-1,1,3,3,3,-1,1,1,-3,1,3,-1,-3,3,-3,-3,3,1,3,1,-3,3,1,3,1,1,3,3,-1,-1,-3,1,-3,-1,3,1,1,3,-1,-1,1,-3,1,3,-3,1,-1,-3,-1,3,1,3,1,-1,-3,-3,-1,-1,-3,-3,-3,-1,-1,-3,3,-1,-1,-1,-1,1,1,-3,3,1,3,3,1,-1,1,-3,1,-3,1,1,-3,-1,1,3,-1,3,3,-1,-3,1,-1,-3,3,3,3,-1,1,1,3,-1,-3,-1,3,-1,-1,-1,1,1,1,1,1,-1,3,-1,-3,1,1,3,-3,1,-3,-1,1,1,-3,-3,3,1,1,-3,1,3,3,1,-1,-3,3,-1,3,3,3,-3,1,-1,1,-1,-3,-1,1,3,-1,3,-3,-3,-1,-3,3,-3,-3,-3,-1,-1,-3,-1,-3,3,1,3,-3,-1,3,-1,1,-1,3,-3,1,-1,-3,-3,1,1,-1,1,-1,1,-1,3,1,-3,-1,1,-1,1,-1,-1,3,3,-3,-1,1,-3,-3,-1,-3,3,1,-1,-3,-1,-3,-3,3,-3,3,-3,-1,1,3,1,-3,1,3,3,-1,-3,-1,-1,-1,-1,3,3,3,1,3,3,-3,1,3,-1,3,-1,3,3,-3,3,1,-1,3,3,1,-1,3,3,-1,-3,3,-3,-1,-1,3,-1,3,-1,-1,1,1,1,1,-1,-1,-3,-1,3,1,-1,1,-1,3,-1,3,1,1,-1,-1,-3,1,1,-3,1,3,-3,1,1,-3,-3,-1,-1,-3,-1,1,3,1,1,-3,-1,-1,-3,3,-3,3,1,-3,3,-3,1,-1,1,-3,1,1,1,-1,-3,3,3,1,1,3,-1,-3,-1,-1,-1,3,1,-3,-3,-1,3,-3,-1,-3,-1,-3,-1,-1,-3,-1,-1,1,-3,-1,-1,1,-1,-3,1,1,-3,1,-3,-3,3,1,1,-1,3,-1,-1,1,1,-1,-1,-3,-1,3,-1,3,-1,1,3,1,-1,3,1,3,-3,-3,1,-1,-1,1,3
-};
+static const char ref24[720] = {
+    -1, 3,  1,  -3, 3,  -1, 1,  3,  -3, 3,  1,  3,  -3, 3,  1,  1,  -1, 1,  3,  -3, 3,  -3, -1, -3, -3, 3,  -3, -3, -3, 1,  -3, -3,
+    3,  -1, 1,  1,  1,  3,  1,  -1, 3,  -3, -3, 1,  3,  1,  1,  -3, 3,  -1, 3,  3,  1,  1,  -3, 3,  3,  3,  3,  1,  -1, 3,  -1, 1,
+    1,  -1, -3, -1, -1, 1,  3,  3,  -1, -3, 1,  1,  3,  -3, 1,  1,  -3, -1, -1, 1,  3,  1,  3,  1,  -1, 3,  1,  1,  -3, -1, -3, -1,
+    -1, -1, -1, -3, -3, -1, 1,  1,  3,  3,  -1, 3,  -1, 1,  -1, -3, 1,  -1, -3, -3, 1,  -3, -1, -1, -3, 1,  1,  3,  -1, 1,  3,  1,
+    -3, 1,  -3, 1,  1,  -1, -1, 3,  -1, -3, 3,  -3, -3, -3, 1,  1,  1,  1,  -1, -1, 3,  -3, -3, 3,  -3, 1,  -1, -1, 1,  -1, 1,  1,
+    -1, -3, -1, 1,  -1, 3,  -1, -3, -3, 3,  3,  -1, -1, -3, -1, 3,  1,  3,  1,  3,  1,  1,  -1, 3,  1,  -1, 1,  3,  -3, -1, -1, 1,
+    -3, 1,  3,  -3, 1,  -1, -3, 3,  -3, 3,  -1, -1, -1, -1, 1,  -3, -3, -3, 1,  -3, -3, -3, 1,  -3, 1,  1,  -3, 3,  3,  -1, -3, -1,
+    3,  -3, 3,  3,  3,  -1, 1,  1,  -3, 1,  -1, 1,  1,  -3, 1,  1,  -1, 1,  -3, -3, 3,  -1, 3,  -1, -1, -3, -3, -3, -1, -3, -3, 1,
+    -1, 1,  3,  3,  -1, 1,  -1, 3,  1,  3,  3,  -3, -3, 1,  3,  1,  -1, -3, -3, -3, 3,  3,  -3, 3,  3,  -1, -3, 3,  -1, 1,  -3, 1,
+    1,  3,  3,  1,  1,  1,  -1, -1, 1,  -3, 3,  -1, 1,  1,  -3, 3,  3,  -1, -3, 3,  -3, -1, -3, -1, 3,  -1, -1, -1, -1, -3, -1, 3,
+    3,  1,  -1, 1,  3,  3,  3,  -1, 1,  1,  -3, 1,  3,  -1, -3, 3,  -3, -3, 3,  1,  3,  1,  -3, 3,  1,  3,  1,  1,  3,  3,  -1, -1,
+    -3, 1,  -3, -1, 3,  1,  1,  3,  -1, -1, 1,  -3, 1,  3,  -3, 1,  -1, -3, -1, 3,  1,  3,  1,  -1, -3, -3, -1, -1, -3, -3, -3, -1,
+    -1, -3, 3,  -1, -1, -1, -1, 1,  1,  -3, 3,  1,  3,  3,  1,  -1, 1,  -3, 1,  -3, 1,  1,  -3, -1, 1,  3,  -1, 3,  3,  -1, -3, 1,
+    -1, -3, 3,  3,  3,  -1, 1,  1,  3,  -1, -3, -1, 3,  -1, -1, -1, 1,  1,  1,  1,  1,  -1, 3,  -1, -3, 1,  1,  3,  -3, 1,  -3, -1,
+    1,  1,  -3, -3, 3,  1,  1,  -3, 1,  3,  3,  1,  -1, -3, 3,  -1, 3,  3,  3,  -3, 1,  -1, 1,  -1, -3, -1, 1,  3,  -1, 3,  -3, -3,
+    -1, -3, 3,  -3, -3, -3, -1, -1, -3, -1, -3, 3,  1,  3,  -3, -1, 3,  -1, 1,  -1, 3,  -3, 1,  -1, -3, -3, 1,  1,  -1, 1,  -1, 1,
+    -1, 3,  1,  -3, -1, 1,  -1, 1,  -1, -1, 3,  3,  -3, -1, 1,  -3, -3, -1, -3, 3,  1,  -1, -3, -1, -3, -3, 3,  -3, 3,  -3, -1, 1,
+    3,  1,  -3, 1,  3,  3,  -1, -3, -1, -1, -1, -1, 3,  3,  3,  1,  3,  3,  -3, 1,  3,  -1, 3,  -1, 3,  3,  -3, 3,  1,  -1, 3,  3,
+    1,  -1, 3,  3,  -1, -3, 3,  -3, -1, -1, 3,  -1, 3,  -1, -1, 1,  1,  1,  1,  -1, -1, -3, -1, 3,  1,  -1, 1,  -1, 3,  -1, 3,  1,
+    1,  -1, -1, -3, 1,  1,  -3, 1,  3,  -3, 1,  1,  -3, -3, -1, -1, -3, -1, 1,  3,  1,  1,  -3, -1, -1, -3, 3,  -3, 3,  1,  -3, 3,
+    -3, 1,  -1, 1,  -3, 1,  1,  1,  -1, -3, 3,  3,  1,  1,  3,  -1, -3, -1, -1, -1, 3,  1,  -3, -3, -1, 3,  -3, -1, -3, -1, -3, -1,
+    -1, -3, -1, -1, 1,  -3, -1, -1, 1,  -1, -3, 1,  1,  -3, 1,  -3, -3, 3,  1,  1,  -1, 3,  -1, -1, 1,  1,  -1, -1, -3, -1, 3,  -1,
+    3,  -1, 1,  3,  1,  -1, 3,  1,  3,  -3, -3, 1,  -1, -1, 1,  3};
 
 void generate_ul_ref_sigs(void) {
   double qbar,phase;

openair1/PHY/LTE_TRANSPORT/dci_tools_common.c

@@ -40,8 +40,7 @@
 #include "transport_common_proto.h"
 #include "SCHED/sched_common.h"
 //#define DEBUG_HARQ
-
-
+#include "openair1/PHY/LTE_TRANSPORT/dci_tools_common_extern.h"
 
 //#define DEBUG_DCI
 
@@ -98,69 +97,7 @@ uint16_t RIV2nb_rb_LUT100[6000];
 uint16_t RIV2first_rb_LUT100[6000];
 uint16_t RIV_max100=0;
 
-
-extern uint32_t current_dlsch_cqi;
-
-// Table 8.6.3-3 36.213
-uint16_t beta_cqi[16] = {0,   //reserved
-                         0,   //reserved
-                         9,   //1.125
-                         10,  //1.250
-                         11,  //1.375
-                         13,  //1.625
-                         14,  //1.750
-                         16,  //2.000
-                         18,  //2.250
-                         20,  //2.500
-                         23,  //2.875
-                         25,  //3.125
-                         28,  //3.500
-                         32,  //4.000
-                         40,  //5.000
-                         50
-                        }; //6.250
-
-// Table 8.6.3-2 36.213
-uint16_t beta_ri[16] = {10,   //1.250
-                        13,   //1.625
-                        16,   //2.000
-                        20,   //2.500
-                        25,   //3.125
-                        32,   //4.000
-                        40,   //5.000
-                        50,   //6.250
-                        64,   //8.000
-                        80,   //10.000
-                        101,  //12.625
-                        127,  //15.875
-                        160,  //20.000
-                        0,    //reserved
-                        0,    //reserved
-                        0
-                       };   //reserved
-
-// Table 8.6.3-2 36.213
-uint16_t beta_ack[16] = {16,  //2.000
-                         20,  //2.500
-                         25,  //3.125
-                         32,  //4.000
-                         40,  //5.000
-                         50,  //6.250
-                         64,  //8.000
-                         80,  //10.000
-                         101, //12.625
-                         127, //15.875
-                         160, //20.000
-                         248, //31.000
-                         400, //50.000
-                         640, //80.000
-                         808
-                        };//126.00
-
-int8_t delta_PUSCH_abs[4] = {-4,-1,1,4};
-int8_t delta_PUSCH_acc[4] = {-1,0,1,3};
-
-int8_t *delta_PUCCH_lut = delta_PUSCH_acc;
+const int8_t *delta_PUCCH_lut = delta_PUSCH_acc;
 
 uint32_t check_phich_reg(LTE_DL_FRAME_PARMS *frame_parms,uint32_t kprime,uint8_t lprime,uint8_t mi)
 {

openair1/PHY/LTE_TRANSPORT/dci_tools_common_extern.h

@@ -84,6 +84,6 @@ extern uint16_t RIV2nb_rb_LUT100[6000];
 extern uint16_t RIV2first_rb_LUT100[6000];
 extern uint16_t RIV_max100;
 
-extern int8_t *delta_PUCCH_lut;
-extern int8_t delta_PUSCH_acc[4];
-extern int8_t delta_PUSCH_abs[4];
+extern const int8_t *delta_PUCCH_lut;
+extern const int8_t delta_PUSCH_acc[4];
+extern const int8_t delta_PUSCH_abs[4];

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -131,8 +131,8 @@ void layer1prec2A(int32_t *antenna0_sample, int32_t *antenna1_sample, uint8_t pr
       ((int16_t *)antenna1_sample)[1] = (int16_t)((((int16_t *)antenna1_sample)[1]*ONE_OVER_SQRT2_Q15)>>15);  */
 }
 
-uint32_t FOUR[2]={0,4};
-uint32_t TWO[2]={0,2};
+static const uint32_t FOUR[2] = {0, 4};
+static const uint32_t TWO[2] = {0, 2};
 
 int allocate_REs_in_RB_no_pilots_QPSK_siso(PHY_VARS_eNB* phy_vars_eNB,
                                            int **txdataF,

openair1/PHY/LTE_TRANSPORT/phich.c

@@ -44,11 +44,6 @@
 
 //unsigned short phich_reg[MAX_NUM_PHICH_GROUPS][3];
 
-
-
-int32_t alam_bpsk_perm1[4] = {2,1,4,3}; // -conj(x) 1 (-1-j) -> 2 (1-j), 2->1, 3 (-1+j) -> (4) 1+j, 4->3
-int32_t alam_bpsk_perm2[4] = {3,4,2,1}; // conj(x) 1 (-1-j) -> 3 (-1+j), 3->1, 2 (1-j) -> 4 (1+j), 4->2
-
 // This routine generates the PHICH
 
 void generate_phich(LTE_DL_FRAME_PARMS *frame_parms,

openair1/PHY/LTE_TRANSPORT/power_control.c

@@ -28,10 +28,10 @@ double ratioPB[2][4]={{ 1.0,4.0/5.0,3.0/5.0,2.0/5.0},
           { 5.0/4.0,1.0,3.0/4.0,1.0/2.0}};
 */
 
-double ratioPB[2][4]={{ 0.00000,  -0.96910,  -2.21849,  -3.97940}, //in db
-                      { 0.96910,   0.00000,  -1.24939,  -3.01030}};
+static const double ratioPB[2][4] = {{0.00000, -0.96910, -2.21849, -3.97940}, // in db
+                                     {0.96910, 0.00000, -1.24939, -3.01030}};
 
-double pa_values[8]={-6.0,-4.77,-3.0,-1.77,0.0,1.0,2.0,3.0}; //reported by higher layers
+static const double pa_values[8] = {-6.0, -4.77, -3.0, -1.77, 0.0, 1.0, 2.0, 3.0}; // reported by higher layers
 
 double get_pa_dB(uint8_t pa)
 {

openair1/PHY/LTE_TRANSPORT/prach_common.c

@@ -36,9 +36,9 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "common/utils/lte/prach_utils.h"
 
-uint16_t NCS_unrestricted[16] = {0,13,15,18,22,26,32,38,46,59,76,93,119,167,279,419};
-uint16_t NCS_restricted[15]   = {15,18,22,26,32,38,46,55,68,82,100,128,158,202,237}; // high-speed case
-uint16_t NCS_4[7]             = {2,4,6,8,10,12,15};
+const uint16_t NCS_unrestricted[16] = {0, 13, 15, 18, 22, 26, 32, 38, 46, 59, 76, 93, 119, 167, 279, 419};
+const uint16_t NCS_restricted[15] = {15, 18, 22, 26, 32, 38, 46, 55, 68, 82, 100, 128, 158, 202, 237}; // high-speed case
+const uint16_t NCS_4[7] = {2, 4, 6, 8, 10, 12, 15};
 
 int16_t ru[2*839]; // quantized roots of unity
 uint32_t ZC_inv[839]; // multiplicative inverse for roots u
@@ -259,66 +259,41 @@ PRACH_TDD_PREAMBLE_MAP tdd_preamble_map[64][7] = {
 
 */
 
-uint16_t prach_root_sequence_map0_3[838] = { 129, 710, 140, 699, 120, 719, 210, 629, 168, 671, 84, 755, 105, 734, 93, 746, 70, 769, 60, 779,
-                                             2, 837, 1, 838,
-                                             56, 783, 112, 727, 148, 691,
-                                             80, 759, 42, 797, 40, 799,
-                                             35, 804, 73, 766, 146, 693,
-                                             31, 808, 28, 811, 30, 809, 27, 812, 29, 810,
-                                             24, 815, 48, 791, 68, 771, 74, 765, 178, 661, 136, 703,
-                                             86, 753, 78, 761, 43, 796, 39, 800, 20, 819, 21, 818,
-                                             95, 744, 202, 637, 190, 649, 181, 658, 137, 702, 125, 714, 151, 688,
-                                             217, 622, 128, 711, 142, 697, 122, 717, 203, 636, 118, 721, 110, 729, 89, 750, 103, 736, 61,
-                                             778, 55, 784, 15, 824, 14, 825,
-                                             12, 827, 23, 816, 34, 805, 37, 802, 46, 793, 207, 632, 179, 660, 145, 694, 130, 709, 223, 616,
-                                             228, 611, 227, 612, 132, 707, 133, 706, 143, 696, 135, 704, 161, 678, 201, 638, 173, 666, 106,
-                                             733, 83, 756, 91, 748, 66, 773, 53, 786, 10, 829, 9, 830,
-                                             7, 832, 8, 831, 16, 823, 47, 792, 64, 775, 57, 782, 104, 735, 101, 738, 108, 731, 208, 631, 184,
-                                             655, 197, 642, 191, 648, 121, 718, 141, 698, 149, 690, 216, 623, 218, 621,
-                                             152, 687, 144, 695, 134, 705, 138, 701, 199, 640, 162, 677, 176, 663, 119, 720, 158, 681, 164,
-                                             675, 174, 665, 171, 668, 170, 669, 87, 752, 169, 670, 88, 751, 107, 732, 81, 758, 82, 757, 100,
-                                             739, 98, 741, 71, 768, 59, 780, 65, 774, 50, 789, 49, 790, 26, 813, 17, 822, 13, 826, 6, 833,
-                                             5, 834, 33, 806, 51, 788, 75, 764, 99, 740, 96, 743, 97, 742, 166, 673, 172, 667, 175, 664, 187,
-                                             652, 163, 676, 185, 654, 200, 639, 114, 725, 189, 650, 115, 724, 194, 645, 195, 644, 192, 647,
-                                             182, 657, 157, 682, 156, 683, 211, 628, 154, 685, 123, 716, 139, 700, 212, 627, 153, 686, 213,
-                                             626, 215, 624, 150, 689,
-                                             225, 614, 224, 615, 221, 618, 220, 619, 127, 712, 147, 692, 124, 715, 193, 646, 205, 634, 206,
-                                             633, 116, 723, 160, 679, 186, 653, 167, 672, 79, 760, 85, 754, 77, 762, 92, 747, 58, 781, 62,
-                                             777, 69, 770, 54, 785, 36, 803, 32, 807, 25, 814, 18, 821, 11, 828, 4, 835,
-                                             3, 836, 19, 820, 22, 817, 41, 798, 38, 801, 44, 795, 52, 787, 45, 794, 63, 776, 67, 772, 72,
-                                             767, 76, 763, 94, 745, 102, 737, 90, 749, 109, 730, 165, 674, 111, 728, 209, 630, 204, 635, 117,
-                                             722, 188, 651, 159, 680, 198, 641, 113, 726, 183, 656, 180, 659, 177, 662, 196, 643, 155, 684,
-                                             214, 625, 126, 713, 131, 708, 219, 620, 222, 617, 226, 613,
-                                             230, 609, 232, 607, 262, 577, 252, 587, 418, 421, 416, 423, 413, 426, 411, 428, 376, 463, 395,
-                                             444, 283, 556, 285, 554, 379, 460, 390, 449, 363, 476, 384, 455, 388, 451, 386, 453, 361, 478,
-                                             387, 452, 360, 479, 310, 529, 354, 485, 328, 511, 315, 524, 337, 502, 349, 490, 335, 504, 324,
-                                             515,
-                                             323, 516, 320, 519, 334, 505, 359, 480, 295, 544, 385, 454, 292, 547, 291, 548, 381, 458, 399,
-                                             440, 380, 459, 397, 442, 369, 470, 377, 462, 410, 429, 407, 432, 281, 558, 414, 425, 247, 592,
-                                             277, 562, 271, 568, 272, 567, 264, 575, 259, 580,
-                                             237, 602, 239, 600, 244, 595, 243, 596, 275, 564, 278, 561, 250, 589, 246, 593, 417, 422, 248,
-                                             591, 394, 445, 393, 446, 370, 469, 365, 474, 300, 539, 299, 540, 364, 475, 362, 477, 298, 541,
-                                             312, 527, 313, 526, 314, 525, 353, 486, 352, 487, 343, 496, 327, 512, 350, 489, 326, 513, 319,
-                                             520, 332, 507, 333, 506, 348, 491, 347, 492, 322, 517,
-                                             330, 509, 338, 501, 341, 498, 340, 499, 342, 497, 301, 538, 366, 473, 401, 438, 371, 468, 408,
-                                             431, 375, 464, 249, 590, 269, 570, 238, 601, 234, 605,
-                                             257, 582, 273, 566, 255, 584, 254, 585, 245, 594, 251, 588, 412, 427, 372, 467, 282, 557, 403,
-                                             436, 396, 443, 392, 447, 391, 448, 382, 457, 389, 450, 294, 545, 297, 542, 311, 528, 344, 495,
-                                             345, 494, 318, 521, 331, 508, 325, 514, 321, 518,
-                                             346, 493, 339, 500, 351, 488, 306, 533, 289, 550, 400, 439, 378, 461, 374, 465, 415, 424, 270,
-                                             569, 241, 598,
-                                             231, 608, 260, 579, 268, 571, 276, 563, 409, 430, 398, 441, 290, 549, 304, 535, 308, 531, 358,
-                                             481, 316, 523,
-                                             293, 546, 288, 551, 284, 555, 368, 471, 253, 586, 256, 583, 263, 576,
-                                             242, 597, 274, 565, 402, 437, 383, 456, 357, 482, 329, 510,
-                                             317, 522, 307, 532, 286, 553, 287, 552, 266, 573, 261, 578,
-                                             236, 603, 303, 536, 356, 483,
-                                             355, 484, 405, 434, 404, 435, 406, 433,
-                                             235, 604, 267, 572, 302, 537,
-                                             309, 530, 265, 574, 233, 606,
-                                             367, 472, 296, 543,
-                                             336, 503, 305, 534, 373, 466, 280, 559, 279, 560, 419, 420, 240, 599, 258, 581, 229, 610
-                                           };
+const uint16_t prach_root_sequence_map0_3[838] = {
+    129, 710, 140, 699, 120, 719, 210, 629, 168, 671, 84,  755, 105, 734, 93,  746, 70,  769, 60,  779, 2,   837, 1,   838, 56,
+    783, 112, 727, 148, 691, 80,  759, 42,  797, 40,  799, 35,  804, 73,  766, 146, 693, 31,  808, 28,  811, 30,  809, 27,  812,
+    29,  810, 24,  815, 48,  791, 68,  771, 74,  765, 178, 661, 136, 703, 86,  753, 78,  761, 43,  796, 39,  800, 20,  819, 21,
+    818, 95,  744, 202, 637, 190, 649, 181, 658, 137, 702, 125, 714, 151, 688, 217, 622, 128, 711, 142, 697, 122, 717, 203, 636,
+    118, 721, 110, 729, 89,  750, 103, 736, 61,  778, 55,  784, 15,  824, 14,  825, 12,  827, 23,  816, 34,  805, 37,  802, 46,
+    793, 207, 632, 179, 660, 145, 694, 130, 709, 223, 616, 228, 611, 227, 612, 132, 707, 133, 706, 143, 696, 135, 704, 161, 678,
+    201, 638, 173, 666, 106, 733, 83,  756, 91,  748, 66,  773, 53,  786, 10,  829, 9,   830, 7,   832, 8,   831, 16,  823, 47,
+    792, 64,  775, 57,  782, 104, 735, 101, 738, 108, 731, 208, 631, 184, 655, 197, 642, 191, 648, 121, 718, 141, 698, 149, 690,
+    216, 623, 218, 621, 152, 687, 144, 695, 134, 705, 138, 701, 199, 640, 162, 677, 176, 663, 119, 720, 158, 681, 164, 675, 174,
+    665, 171, 668, 170, 669, 87,  752, 169, 670, 88,  751, 107, 732, 81,  758, 82,  757, 100, 739, 98,  741, 71,  768, 59,  780,
+    65,  774, 50,  789, 49,  790, 26,  813, 17,  822, 13,  826, 6,   833, 5,   834, 33,  806, 51,  788, 75,  764, 99,  740, 96,
+    743, 97,  742, 166, 673, 172, 667, 175, 664, 187, 652, 163, 676, 185, 654, 200, 639, 114, 725, 189, 650, 115, 724, 194, 645,
+    195, 644, 192, 647, 182, 657, 157, 682, 156, 683, 211, 628, 154, 685, 123, 716, 139, 700, 212, 627, 153, 686, 213, 626, 215,
+    624, 150, 689, 225, 614, 224, 615, 221, 618, 220, 619, 127, 712, 147, 692, 124, 715, 193, 646, 205, 634, 206, 633, 116, 723,
+    160, 679, 186, 653, 167, 672, 79,  760, 85,  754, 77,  762, 92,  747, 58,  781, 62,  777, 69,  770, 54,  785, 36,  803, 32,
+    807, 25,  814, 18,  821, 11,  828, 4,   835, 3,   836, 19,  820, 22,  817, 41,  798, 38,  801, 44,  795, 52,  787, 45,  794,
+    63,  776, 67,  772, 72,  767, 76,  763, 94,  745, 102, 737, 90,  749, 109, 730, 165, 674, 111, 728, 209, 630, 204, 635, 117,
+    722, 188, 651, 159, 680, 198, 641, 113, 726, 183, 656, 180, 659, 177, 662, 196, 643, 155, 684, 214, 625, 126, 713, 131, 708,
+    219, 620, 222, 617, 226, 613, 230, 609, 232, 607, 262, 577, 252, 587, 418, 421, 416, 423, 413, 426, 411, 428, 376, 463, 395,
+    444, 283, 556, 285, 554, 379, 460, 390, 449, 363, 476, 384, 455, 388, 451, 386, 453, 361, 478, 387, 452, 360, 479, 310, 529,
+    354, 485, 328, 511, 315, 524, 337, 502, 349, 490, 335, 504, 324, 515, 323, 516, 320, 519, 334, 505, 359, 480, 295, 544, 385,
+    454, 292, 547, 291, 548, 381, 458, 399, 440, 380, 459, 397, 442, 369, 470, 377, 462, 410, 429, 407, 432, 281, 558, 414, 425,
+    247, 592, 277, 562, 271, 568, 272, 567, 264, 575, 259, 580, 237, 602, 239, 600, 244, 595, 243, 596, 275, 564, 278, 561, 250,
+    589, 246, 593, 417, 422, 248, 591, 394, 445, 393, 446, 370, 469, 365, 474, 300, 539, 299, 540, 364, 475, 362, 477, 298, 541,
+    312, 527, 313, 526, 314, 525, 353, 486, 352, 487, 343, 496, 327, 512, 350, 489, 326, 513, 319, 520, 332, 507, 333, 506, 348,
+    491, 347, 492, 322, 517, 330, 509, 338, 501, 341, 498, 340, 499, 342, 497, 301, 538, 366, 473, 401, 438, 371, 468, 408, 431,
+    375, 464, 249, 590, 269, 570, 238, 601, 234, 605, 257, 582, 273, 566, 255, 584, 254, 585, 245, 594, 251, 588, 412, 427, 372,
+    467, 282, 557, 403, 436, 396, 443, 392, 447, 391, 448, 382, 457, 389, 450, 294, 545, 297, 542, 311, 528, 344, 495, 345, 494,
+    318, 521, 331, 508, 325, 514, 321, 518, 346, 493, 339, 500, 351, 488, 306, 533, 289, 550, 400, 439, 378, 461, 374, 465, 415,
+    424, 270, 569, 241, 598, 231, 608, 260, 579, 268, 571, 276, 563, 409, 430, 398, 441, 290, 549, 304, 535, 308, 531, 358, 481,
+    316, 523, 293, 546, 288, 551, 284, 555, 368, 471, 253, 586, 256, 583, 263, 576, 242, 597, 274, 565, 402, 437, 383, 456, 357,
+    482, 329, 510, 317, 522, 307, 532, 286, 553, 287, 552, 266, 573, 261, 578, 236, 603, 303, 536, 356, 483, 355, 484, 405, 434,
+    404, 435, 406, 433, 235, 604, 267, 572, 302, 537, 309, 530, 265, 574, 233, 606, 367, 472, 296, 543, 336, 503, 305, 534, 373,
+    466, 280, 559, 279, 560, 419, 420, 240, 599, 258, 581, 229, 610};
 
 uint16_t prach_root_sequence_map4[138] = {  1,138,2,137,3,136,4,135,5,134,6,133,7,132,8,131,9,130,10,129,
                                             11,128,12,127,13,126,14,125,15,124,16,123,17,122,18,121,19,120,20,119,
@@ -350,7 +325,7 @@ void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe) {
 void fill_du(uint8_t prach_fmt) {
   uint16_t iu,u,p;
   uint16_t N_ZC;
-  uint16_t *prach_root_sequence_map;
+  const uint16_t *prach_root_sequence_map;
 
   if (prach_fmt<4) {
     N_ZC = 839;
@@ -405,7 +380,7 @@ void compute_prach_seq(uint16_t rootSequenceIndex,
   unsigned int k,inv_u,i,NCS=0,num_preambles;
   int N_ZC;
   uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
-  uint16_t *prach_root_sequence_map;
+  const uint16_t *prach_root_sequence_map;
   uint16_t u, preamble_offset;
   uint16_t n_shift_ra,n_shift_ra_bar, d_start,numshift;
   uint8_t not_found;

openair1/PHY/LTE_TRANSPORT/prach_extern.h

@@ -40,9 +40,9 @@
 //#define PRACH_DEBUG 1
 //#define PRACH_WRITE_OUTPUT_DEBUG 1
 
-extern uint16_t NCS_unrestricted[16];
-extern uint16_t NCS_restricted[15];
-extern uint16_t NCS_4[7];
+extern const uint16_t NCS_unrestricted[16];
+extern const uint16_t NCS_restricted[15];
+extern const uint16_t NCS_4[7];
 
 extern int16_t ru[2*839]; // quantized roots of unity
 extern uint32_t ZC_inv[839]; // multiplicative inverse for roots u

openair1/PHY/LTE_TRANSPORT/pucch.c

@@ -44,26 +44,20 @@
 
 #include "pucch_extern.h"
 
-int16_t cfo_pucch_np[24*7] = {20787,-25330,27244,-18205,31356,-9512,32767,0,31356,9511,27244,18204,20787,25329,
-                              27244,-18205,30272,-12540,32137,-6393,32767,0,32137,6392,30272,12539,27244,18204,
-                              31356,-9512,32137,-6393,32609,-3212,32767,0,32609,3211,32137,6392,31356,9511,
-                              32767,0,32767,0,32767,0,32767,0,32767,0,32767,0,32767,0,
-                              31356,9511,32137,6392,32609,3211,32767,0,32609,-3212,32137,-6393,31356,-9512,
-                              27244,18204,30272,12539,32137,6392,32767,0,32137,-6393,30272,-12540,27244,-18205,
-                              20787,25329,27244,18204,31356,9511,32767,0,31356,-9512,27244,-18205,20787,-25330
-                             };
-
-int16_t cfo_pucch_ep[24*6] = {24278,-22005,29621,-14010,32412,-4808,32412,4807,29621,14009,24278,22004,
-                              28897,-15447,31356,-9512,32609,-3212,32609,3211,31356,9511,28897,15446,
-                              31785,-7962,32412,-4808,32727,-1608,32727,1607,32412,4807,31785,7961,
-                              32767,0,32767,0,32767,0,32767,0,32767,0,32767,0,
-                              31785,7961,32412,4807,32727,1607,32727,-1608,32412,-4808,31785,-7962,
-                              28897,15446,31356,9511,32609,3211,32609,-3212,31356,-9512,28897,-15447,
-                              24278,22004,29621,14009,32412,4807,32412,-4808,29621,-14010,24278,-22005
-                             };
-
-
+static const int16_t cfo_pucch_np[24 * 7] = {
+    20787,  -25330, 27244, -18205, 31356, -9512, 32767, 0,     31356, 9511,  27244,  18204, 20787, 25329,  27244, -18205, 30272,
+    -12540, 32137,  -6393, 32767,  0,     32137, 6392,  30272, 12539, 27244, 18204,  31356, -9512, 32137,  -6393, 32609,  -3212,
+    32767,  0,      32609, 3211,   32137, 6392,  31356, 9511,  32767, 0,     32767,  0,     32767, 0,      32767, 0,      32767,
+    0,      32767,  0,     32767,  0,     31356, 9511,  32137, 6392,  32609, 3211,   32767, 0,     32609,  -3212, 32137,  -6393,
+    31356,  -9512,  27244, 18204,  30272, 12539, 32137, 6392,  32767, 0,     32137,  -6393, 30272, -12540, 27244, -18205, 20787,
+    25329,  27244,  18204, 31356,  9511,  32767, 0,     31356, -9512, 27244, -18205, 20787, -25330};
 
+static const int16_t cfo_pucch_ep[24 * 6] = {
+    24278, -22005, 29621, -14010, 32412, -4808, 32412, 4807,  29621, 14009, 24278, 22004, 28897, -15447, 31356, -9512, 32609,
+    -3212, 32609,  3211,  31356,  9511,  28897, 15446, 31785, -7962, 32412, -4808, 32727, -1608, 32727,  1607,  32412, 4807,
+    31785, 7961,   32767, 0,      32767, 0,     32767, 0,     32767, 0,     32767, 0,     32767, 0,      31785, 7961,  32412,
+    4807,  32727,  1607,  32727,  -1608, 32412, -4808, 31785, -7962, 28897, 15446, 31356, 9511,  32609,  3211,  32609, -3212,
+    31356, -9512,  28897, -15447, 24278, 22004, 29621, 14009, 32412, 4807,  32412, -4808, 29621, -14010, 24278, -22005};
 
 void dump_uci_stats(FILE *fd,PHY_VARS_eNB *eNB,int frame) {
 
@@ -194,10 +188,10 @@ uint16_t pucchfmt3_Baseseq_csh_remove( int16_t SubCarrierDeMapData[4][14][12][2]
 }
 
 #define MAXROW_TBL_SF5_OS_IDX    (5)    // Orthogonal sequence index
-const int16_t TBL_3_SF5_GEN_N_DASH_NS[MAXROW_TBL_SF5_OS_IDX] = {0,3,6,8,10};
+static const int16_t TBL_3_SF5_GEN_N_DASH_NS[MAXROW_TBL_SF5_OS_IDX] = {0, 3, 6, 8, 10};
 
 #define MAXROW_TBL_SF4_OS_IDX    (4)    // Orthogonal sequence index
-const int16_t TBL_3_SF4_GEN_N_DASH_NS[MAXROW_TBL_SF4_OS_IDX] = {0,3,6,9};
+static const int16_t TBL_3_SF4_GEN_N_DASH_NS[MAXROW_TBL_SF4_OS_IDX] = {0, 3, 6, 9};
 
 /* Channel estimation */
 uint16_t pucchfmt3_ChannelEstimation( int16_t SubCarrierDeMapData[4][14][12][2],
@@ -532,12 +526,10 @@ const int16_t TBL_3_SF5[MAXROW_TBL_SF5][MAXCLM_TBL_SF5][2] = {
 
 #define  MAXROW_TBL_SF4_fmt3 4
 #define  MAXCLM_TBL_SF4      4
-const int16_t TBL_3_SF4[MAXROW_TBL_SF4_fmt3][MAXCLM_TBL_SF4][2] = {
-  { {32767,0}, {32767,0}, {32767,0}, {32767,0}},
-  { {32767,0}, {-32767,0}, {32767,0}, {-32767,0}},
-  { {32767,0}, {32767,0}, {-32767,0}, {-32767,0}},
-  { {32767,0}, {-32767,0}, {-32767,0}, {32767,0}}
-};
+static const int16_t TBL_3_SF4[MAXROW_TBL_SF4_fmt3][MAXCLM_TBL_SF4][2] = {{{32767, 0}, {32767, 0}, {32767, 0}, {32767, 0}},
+                                                                          {{32767, 0}, {-32767, 0}, {32767, 0}, {-32767, 0}},
+                                                                          {{32767, 0}, {32767, 0}, {-32767, 0}, {-32767, 0}},
+                                                                          {{32767, 0}, {-32767, 0}, {-32767, 0}, {32767, 0}}};
 
 /* orthogonal sequence remove */
 uint16_t pucchfmt3_OrthSeqRemove( int16_t RemoveFrqDev_fmt3[4][2][5][12][2],
@@ -918,7 +910,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
   int16_t tmp_re,tmp_im,W_re=0,W_im=0;
   int16_t *rxptr;
   uint32_t symbol_offset;
-  int16_t stat0_ref_re[4],stat0_ref_im[4],stat1_ref_re[4],stat1_ref_im[4],*cfo;
+  int16_t stat0_ref_re[4], stat0_ref_im[4], stat1_ref_re[4], stat1_ref_im[4];
   int16_t chest0_re[4][12],chest0_im[4][12];
   int16_t chest1_re[4][12],chest1_im[4][12];
   int32_t chest_mag;
@@ -1214,7 +1206,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
 	    stat1_re[aa]=0;
 	    stat1_im[aa]=0;
             off=re<<1;
-            cfo =  (frame_parms->Ncp==0) ? &cfo_pucch_np[14*phase] : &cfo_pucch_ep[12*phase];
+            const int16_t *cfo = (frame_parms->Ncp == 0) ? &cfo_pucch_np[14 * phase] : &cfo_pucch_ep[12 * phase];
 
             for (l=0; l<(nsymb>>1); l++) {
               stat0_re[aa] += (((rxcomp[aa][off]*(int32_t)cfo[l<<1])>>15)     - ((rxcomp[aa][1+off]*(int32_t)cfo[1+(l<<1)])>>15))/nsymb;
@@ -1318,7 +1310,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
             stat0_ref_re[aa]=0;
             stat0_ref_im[aa]=0;
             off=re<<1;
-            cfo =  (frame_parms->Ncp==0) ? &cfo_pucch_np[14*phase] : &cfo_pucch_ep[12*phase];
+            const int16_t *cfo = (frame_parms->Ncp == 0) ? &cfo_pucch_np[14 * phase] : &cfo_pucch_ep[12 * phase];
 
             for (l=0; l<(nsymb>>1); l++) {
               if ((l<2)||(l>(nsymb>>1) - 3)) {  //data symbols
@@ -1398,7 +1390,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
       if (sigma2_dB<(dB_fixed(stat_max) - (IS_SOFTMODEM_IQPLAYER?0:pucch1_thres)) ) {//
         chL = (nsymb>>1)-4;
         chest_mag=0;
-        cfo =  (frame_parms->Ncp==0) ? &cfo_pucch_np[14*phase_max] : &cfo_pucch_ep[12*phase_max];
+        const int16_t *cfo = (frame_parms->Ncp == 0) ? &cfo_pucch_np[14 * phase_max] : &cfo_pucch_ep[12 * phase_max];
 
         for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
           for (re=0; re<12; re++) {