Merge branch 'develop_integration_2019_w13' into 'develop'

Develop Integration Branch 2019 week 13

The following MRs have been integrated:

* MR 524 : Feature 127 -- Protocol Split F1 -- CU/DU
* MR 539 : Documentation on the new build/simulation system
* MR 542 : TDD fixes
* MR 545 : Initial framework testing for OAI UE testing over-the-air
* MR 546 : Fix in FlexRan code
* MR 548 : new Thread Pool feature

.gitignore

@@ -0,0 +1,8 @@
+# vim swp
+*.swp
+
+# log and exec file
+log/
+lte_build_oai/
+targets/bin/
+cmake_targets/nas_sim_tools/build/

README.txt

@@ -17,7 +17,7 @@ openairinterface5g
 ├── maketags : Script to generate emacs tags
 ├── nfapi : Contains the NFAPI code. A local Readme file provides more details.
 ├── openair1 : 3GPP LTE Rel-10/12 PHY layer + PHY RF simulation. A local Readme file provides more details.
-├── openair2 : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation. 
+├── openair2 : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation.
     ├── COMMON
     ├── DOCS
     ├── ENB_APP

ci-scripts/Jenkinsfile-gitlab

@@ -133,6 +133,7 @@ pipeline {
                     script {
                         def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
                         addGitLabMRComment comment: message
+                        currentBuild.result = 'FAILURE'
                     }
                 }
             }
@@ -283,6 +284,11 @@ pipeline {
                 }
             }
             post {
+                failure {
+                    script {
+                        currentBuild.result = 'FAILURE'
+                    }
+                }
                 always {
                     script {
                         dir ('archives') {
@@ -392,7 +398,7 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test FDD - Band 7 - B210") {
+                stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
                     steps {
                         script {
                             if ("MERGE".equals(env.gitlabActionType)) {
@@ -443,7 +449,7 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test TDD - Band 40 - B210") {
+                stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
                     steps {
                         script {
                             if ("MERGE".equals(env.gitlabActionType)) {
@@ -647,6 +653,57 @@ pipeline {
                         }
                     }
                 }
+                stage ("Test OAI UE Sniffing - FDD - Band 20 - B200") {
+                    steps {
+                        script {
+                            if ("MERGE".equals(env.gitlabActionType)) {
+                                //gitlabCommitStatus(name: "Test-OAI-UE-FDD-Band20") {
+                                    build job: 'UE-CI-FDD-Band20-B200',
+                                       parameters: [
+                                           string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+                                           string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
+                                           string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+                                           booleanParam(name: 'eNB_mergeRequest', value: true),
+                                           string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+                                       ]
+                                //}
+                            } else {
+                                //gitlabCommitStatus(name: "Test-OAI-UE-FDD-Band20") {
+                                    build job: 'UE-CI-FDD-Band20-B200',
+                                       parameters: [
+                                           string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+                                           string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
+                                           string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
+                                           booleanParam(name: 'eNB_mergeRequest', value: false)
+                                       ]
+                                //}
+                            }
+                        }
+                    }
+                    post {
+                        // In case of any non-success, we are retrieving the HTML report of the last completed
+                        // slave job.
+                        // The only drop-back is that we may retrieve the HTML report of a previous build
+                        always {
+                            script {
+                                if (!fileExists('test_results-UE-CI-FDD-Band20-B200.html')) {
+                                    copyArtifacts(projectName: 'UE-CI-FDD-Band20-B200',
+                                                  filter: 'test_results*.html',
+                                                  selector: lastCompleted())
+                                    if (fileExists('test_results-UE-CI-FDD-Band20-B200.html')) {
+                                        sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-UE-CI-FDD-Band20-B200.html"
+                                        archiveArtifacts artifacts: 'test_results-UE-CI-FDD-Band20-B200.html'
+                                    }
+                                }
+                            }
+                        }
+                        failure {
+                            script {
+                                currentBuild.result = 'FAILURE'
+                            }
+                        }
+                    }
+                }
             }
             post {
                 always {

ci-scripts/Jenkinsfile-tmp-ue

@@ -0,0 +1,300 @@
+#!/bin/groovy
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
+
+// Location of the python executor node shall be in the same subnet as the others servers
+def pythonExecutor = params.pythonExecutor
+
+// Location of the test XML file to be run
+def testXMLFile = params.pythonTestXmlFile
+def mainPythonAllXmlFiles = ""
+def buildStageStatus = true
+
+// Name of the test stage
+def testStageName = params.pipelineTestStageName
+
+// Name of the phone resource
+def ciSmartPhoneResource = params.smartphonesResource
+
+// Terminate Status
+def termUE = 0
+def termENB = 1
+def termSPGW = 2
+def termMME = 3
+def termHSS = 4
+def termStatusArray = new Boolean[termHSS + 1]
+termStatusArray[termUE] = false
+termStatusArray[termENB] = false
+termStatusArray[termSPGW] = false
+termStatusArray[termMME] = false
+termStatusArray[termHSS] = false
+
+// Global Parameters. Normally they should be populated when the master job
+// triggers the slave job with parameters
+def eNB_Repository
+def eNB_Branch
+def eNB_CommitID
+def eNB_AllowMergeRequestProcess = false
+def eNB_TargetBranch
+
+pipeline {
+    agent {
+        label pythonExecutor
+    }
+    options {
+        disableConcurrentBuilds()
+        ansiColor('xterm')
+        lock (ciSmartPhoneResource)
+    }
+    // the following parameter options are commented out so it shows the ones
+    // that you SHALL have to run the job.
+    // You can use them as template
+    /*
+    parameters {
+        //node-test parameters
+        string(name: 'pythonExecutor', defaultValue: 'nodea', description: 'Node where the pipeline - python scripts will be executed')
+        string(name: 'pythonTestXmlFile', defaultValue: 'enb_usrpB210_band7_50PRB.xml', description: 'Location of the Test XML to be run')
+        string(name: 'pipelineTestStageName', defaultValue: 'Test COTS-UE - OAI eNB - LTEBOX EPC', description: 'Naming of the Test Stage')
+        booleanParam(name: 'pipelineZipsConsoleLog', defaultValue: 'True', description: 'If true, the pipeline script retrieves the job console log, zips it and archives it as artifact')
+        string(name: 'smartphonesResource', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
+
+        //eNB parameters
+        string(name: 'eNB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of eNB')
+        credentials(name: 'eNB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for eNB')
+        string(name: 'eNB_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of eNB source code')
+
+        //EPC parameters
+        string(name: 'EPC_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of EPC')
+        string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
+        credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
+        string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
+
+        //ADB server parameters
+        string(name: 'ADB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of ADB server')
+        credentials(name: 'ADB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for ADB')
+    }
+    */
+
+    stages {
+        stage ("Verify Parameters") {
+            steps {
+                script {
+                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
+                    def allParametersPresent = true
+
+                    // It is already to late to check it
+                    if (params.pythonExecutor != null) {
+                        echo "eNB CI executor node  :   ${pythonExecutor}"
+                    }
+                    // If not present picking a default XML file
+                    if (params.pythonTestXmlFile == null) {
+                        // picking default
+                        testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
+                        echo "Test XML file(default):   ${testXMLFile}"
+                        mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
+                    } else {
+                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                        for (xmlFile in myXmlTestSuite) {
+                            if (fileExists("ci-scripts/" + xmlFile)) {
+                                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                                echo "Test XML file         :   ${xmlFile}"
+                            }
+                        }
+                    }
+                    // If not present picking a default Stage Name
+                    if (params.pipelineTestStageName == null) {
+                        // picking default
+                        testStageName = 'Template Test Stage'
+                    }
+
+                    if (params.smartphonesResource == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.UE_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.UE_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.UE_Credentials == null) {
+                        allParametersPresent = false
+                    }
+                    // the following 4 parameters should be pushed by the master trigger
+                    // if not present, take the job GIT variables (used for developing)
+                    if (params.eNB_Repository == null) {
+                        eNB_Repository = env.GIT_URL
+                    } else {
+                        eNB_Repository = params.eNB_Repository
+                    }
+                    echo "eNB_Repository        :   ${eNB_Repository}"
+                    if (params.eNB_Branch == null) {
+                        eNB_Branch = env.GIT_BRANCH
+                    } else {
+                        eNB_Branch = params.eNB_Branch
+                    }
+                    echo "eNB_Branch            :   ${eNB_Branch}"
+                    if (params.eNB_CommitID == null) {
+                        eNB_CommitID = env.GIT_COMMIT
+                    } else {
+                        eNB_CommitID = params.eNB_CommitID
+                    }
+                    echo "eNB_CommitID          :   ${eNB_CommitID}"
+                    if (params.eNB_mergeRequest != null) {
+                        eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
+                        if (eNB_AllowMergeRequestProcess) {
+                            if (params.eNB_TargetBranch != null) {
+                                eNB_TargetBranch = params.eNB_TargetBranch
+                            } else {
+                                eNB_TargetBranch = 'develop'
+                            }
+                            echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
+                        }
+                    }
+/*
+                    if (params.EPC_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Type == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_SourceCodePath == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.EPC_Credentials == null) {
+                        allParametersPresent = false
+                    }
+*/
+                    if (params.ADB_IPAddress == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.ADB_Credentials == null) {
+                        allParametersPresent = false
+                    }
+
+                    if (allParametersPresent) {
+                        echo "All parameters are present"
+                        if (eNB_AllowMergeRequestProcess) {
+                            sh "git fetch"
+                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
+                        } else {
+                            sh "git fetch"
+                            sh "git checkout -f ${eNB_CommitID}"
+                        }
+                    } else {
+                        echo "Some parameters are missing"
+                        sh "./ci-scripts/fail.sh"
+                    }
+                }
+            }
+        }
+        stage ("Build and Test") {
+            steps {
+                script {
+                    dir ('ci-scripts') {
+                        echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
+                        ]) {
+                            sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                            for (xmlFile in myXmlTestSuite) {
+                            if (fileExists(xmlFile)) {
+                                try {
+                                    sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                                } catch (Exception e) {
+                                    currentBuild.result = 'FAILURE'
+                                    buildStageStatus = false
+                                }
+                            }
+                            }
+                            sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
+                        }
+                    }
+                }
+            }
+        }
+        stage('Log Collection') {
+            parallel {
+                stage('Log Collection (OAI UE - Build)') {
+                    steps {
+                        echo '\u2705 \u001B[32mLog Collection (OAI UE - Build)\u001B[0m'
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (UE - Build)\u001B[0m'
+                            sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"
+                            }
+                        }
+                    }
+                }
+                stage('Log Collection (OAI UE - Run)') {
+                    steps {
+                        echo '\u2705 \u001B[32mLog Collection (OAI UE - Run)\u001B[0m'
+                        withCredentials([
+                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
+
+                            echo '\u2705 \u001B[32mLog Transfer (UE - Run)\u001B[0m'
+                            sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
+                        }
+                        script {
+                            if(fileExists("ue.log.${env.BUILD_ID}.zip")) {
+                                archiveArtifacts "ue.log.${env.BUILD_ID}.zip"
+                            }
+                            if(fileExists("ci-scripts/test_results.html")) {
+                                sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
+                                sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
+                                archiveArtifacts "test_results-${JOB_NAME}.html"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        always {
+            script {
+                if (params.pipelineZipsConsoleLog != null) {
+                    if (params.pipelineZipsConsoleLog) {
+                        echo "Archiving Jenkins console log"
+                        sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
+                        sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
+                        if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
+                            archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

ci-scripts/buildOnVM.sh

@@ -111,7 +111,7 @@ function build_on_vm {
     fi
 
     echo "############################################################"
-    echo "Copying GIT repo into VM ($VM_NAME)" 
+    echo "Copying GIT repo into VM ($VM_NAME)"
     echo "############################################################"
     if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
     then

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

@@ -49,22 +49,22 @@ eNBs =
       prach_freq_offset                         = 1;
       pucch_delta_shift                         = 1;
       pucch_nRB_CQI                             = 0;
-      pucch_nCS_AN                              = 0;    
+      pucch_nCS_AN                              = 0;
       pucch_n1_AN                               = 0;
       pdsch_referenceSignalPower                = -24;
       pdsch_p_b                                 = 0;
       pusch_n_SB                                = 1;
       pusch_enable64QAM                         = "DISABLE";
       pusch_hoppingMode                         = "interSubFrame";
-      pusch_hoppingOffset                       = 0; 
+      pusch_hoppingOffset                       = 0;
       pusch_groupHoppingEnabled                 = "ENABLE";
       pusch_groupAssignment                     = 0;
       pusch_sequenceHoppingEnabled              = "DISABLE";
       pusch_nDMRS1                              = 1;
       phich_duration                            = "NORMAL";
       phich_resource                            = "ONESIXTH";
-      srs_enable                                = "DISABLE"; 
-      /*  srs_BandwidthConfig                   =; 
+      srs_enable                                = "DISABLE";
+      /*  srs_BandwidthConfig                   =;
       srs_SubframeConfig                        =;
       srs_ackNackST                             =;
       srs_MaxUpPts                              =;*/
@@ -73,14 +73,14 @@ eNBs =
       pusch_alpha                               = "AL1";
       pucch_p0_Nominal                          = -104;
       msg3_delta_Preamble                       = 6;
-      pucch_deltaF_Format1                      = "deltaF2";             
-      pucch_deltaF_Format1b                     = "deltaF3";            
-      pucch_deltaF_Format2                      = "deltaF0";            
-      pucch_deltaF_Format2a                     = "deltaF0";            
-      pucch_deltaF_Format2b                     = "deltaF0";            
+      pucch_deltaF_Format1                      = "deltaF2";
+      pucch_deltaF_Format1b                     = "deltaF3";
+      pucch_deltaF_Format2                      = "deltaF0";
+      pucch_deltaF_Format2a                     = "deltaF0";
+      pucch_deltaF_Format2b                     = "deltaF0";
 
-      rach_numberOfRA_Preambles                 = "n64"; #64 
-      rach_preamblesGroupAConfig                = "DISABLE"; 
+      rach_numberOfRA_Preambles                 = "n64"; #64
+      rach_preamblesGroupAConfig                = "DISABLE";
       /*
       rach_sizeOfRA_PreamblesGroupA             = ;
       rach_messageSizeGroupA                    = ;
@@ -105,7 +105,7 @@ eNBs =
       ue_TransmissionMode                       = "tm1";
 
       # eMTC Parameters
-      emtc_parameters : 
+      emtc_parameters :
       {
           eMTC_configured                       = 1;
           #hyperSFN_r13                               = 0;
@@ -115,7 +115,7 @@ eNBs =
           #SIB1
           schedulingInfoSIB1_BR_r13                   = 4;
 
-          #system_info_value_tag_SI = 
+          #system_info_value_tag_SI =
           #(
           #    {
           #        systemInfoValueTagSi_r13 = 0;
@@ -124,7 +124,7 @@ eNBs =
 
           cellSelectionInfoCE_r13                     = "ENABLE";
           q_RxLevMinCE_r13                            = -70;
-          bandwidthReducedAccessRelatedInfo_r13       = "ENABLE"   
+          bandwidthReducedAccessRelatedInfo_r13       = "ENABLE"
           si_WindowLength_BR_r13                      = "ms20";    #0
           si_RepetitionPattern_r13                    = "everyRF"; #0
 
@@ -136,7 +136,7 @@ eNBs =
               }
          );
 
-          fdd_DownlinkOrTddSubframeBitmapBR_r13     = "subframePattern40-r13"; 
+          fdd_DownlinkOrTddSubframeBitmapBR_r13     = "subframePattern40-r13";
           fdd_DownlinkOrTddSubframeBitmapBR_val_r13 = 0xFFFFFFFFFF;
           startSymbolBR_r13                           = 2;
           si_HoppingConfigCommon_r13                  = "off"; #1; # Note: 1==OFF !
@@ -157,14 +157,14 @@ eNBs =
 
           rach_numberOfRA_Preambles                 = 60; #14
           rach_powerRampingStep                     = 4;
-          rach_preambleInitialReceivedTargetPower   = -110;           
+          rach_preambleInitialReceivedTargetPower   = -110;
           rach_preambleTransMax                     = 10;
           rach_raResponseWindowSize                 = 10;
           rach_macContentionResolutionTimer         = 64;
           rach_maxHARQ_Msg3Tx                       = 4;
 
           # max size for this array is 4
-          rach_CE_LevelInfoList_r13 = 
+          rach_CE_LevelInfoList_r13 =
           (
               {
                   firstPreamble_r13                 = 60;
@@ -175,7 +175,7 @@ eNBs =
               }
           );
 
-          # BCCH CONFIG          
+          # BCCH CONFIG
           bcch_modificationPeriodCoeff              = 2;
 
           #PCCH Config
@@ -189,7 +189,7 @@ eNBs =
           prach_zero_correlation                    = 1;
           prach_freq_offset                         = 1;
 
-          #PDSCH Config Common          
+          #PDSCH Config Common
           pdsch_referenceSignalPower                = -24
           pdsch_p_b                                 = 0;
 
@@ -213,22 +213,22 @@ eNBs =
           pusch_p0_Nominal                          = -96;
           pusch_alpha                               = "AL1";
           pucch_p0_Nominal                          = -104;
-          pucch_deltaF_Format1                      = "deltaF0"; 
-          pucch_deltaF_Format1b                     = "deltaF3";            
-          pucch_deltaF_Format2                      = "deltaF0";           
-          pucch_deltaF_Format2a                     = "deltaF0";            
+          pucch_deltaF_Format1                      = "deltaF0";
+          pucch_deltaF_Format1b                     = "deltaF3";
+          pucch_deltaF_Format2                      = "deltaF0";
+          pucch_deltaF_Format2a                     = "deltaF0";
           pucch_deltaF_Format2b                     = "deltaF0";
 
           msg3_delta_Preamble                       = 6;
 
 
           prach_ConfigCommon_v1310                  = "ENABLE";
- 
+
           mpdcch_startSF_CSS_RA_r13                 = "fdd-r13";
           mpdcch_startSF_CSS_RA_r13_val             = "v1"; #0
           prach_HoppingOffset_r13                   = 0;
 
-         
+
           pdsch_maxNumRepetitionCEmodeA_r13         = "r16"; #0
           #pdsch_maxNumRepetitionCEmodeB_r13         = "r384"; # NULL - 2
 
@@ -245,7 +245,7 @@ eNBs =
           );
 
           # max size for this array is 4
-          prach_parameters_ce_r13 = 
+          prach_parameters_ce_r13 =
           (
               {
                   prach_config_index_br                     = 3;
@@ -255,17 +255,17 @@ eNBs =
                   numRepetitionPerPreambleAttempt_r13       = 1;  #0
                   mpdcch_NumRepetition_RA_r13               = 1;  #0
                   prach_HoppingConfig_r13                   = 0;  #1
-                  max_available_narrow_band                 = [3]; 
+                  max_available_narrow_band                 = [3];
              }
           );
 
-          n1PUCCH_AN_InfoList_r13 = 
+          n1PUCCH_AN_InfoList_r13 =
           (
               {
                   pucch_info_value = 33;
               }
           );
-          
+
 
           ue_TimersAndConstants_t300                = "ms1000";
           ue_TimersAndConstants_t301                = "ms400";
@@ -283,21 +283,21 @@ eNBs =
           }
 
 
-          pucch_NumRepetitionCE_Msg4_Level0_r13      = "n1";  #0 
+          pucch_NumRepetitionCE_Msg4_Level0_r13      = "n1";  #0
           #pucch_NumRepetitionCE_Msg4_Level1_r13     = "n2";  #1
           #pucch_NumRepetitionCE_Msg4_Level2_r13     = "n16"; #2
           #pucch_NumRepetitionCE_Msg4_Level3_r13     = "n32"; #3
 
-          sib2_freq_hoppingParameters_r13 : 
+          sib2_freq_hoppingParameters_r13 :
           {
              #sib2_mpdcch_pdsch_hoppingNB_r13                   = "nb2"; #0
              #sib2_interval_DLHoppingConfigCommonModeA_r13      = "FDD"; # choice -> (0, FDD) (1, TDD)
-             #sib2_interval_DLHoppingConfigCommonModeA_r13_val  = "int1";          
+             #sib2_interval_DLHoppingConfigCommonModeA_r13_val  = "int1";
              #sib2_interval_DLHoppingConfigCommonModeB_r13      = "FDD"; # choice -> (0, FDD) (1, TDD)
-             #sib2_interval_DLHoppingConfigCommonModeB_r13_val  = "int2";        
+             #sib2_interval_DLHoppingConfigCommonModeB_r13_val  = "int2";
 
              sib2_interval_ULHoppingConfigCommonModeA_r13      = "FDD";  # choice -> (0, FDD) (1, TDD)
-             sib2_interval_ULHoppingConfigCommonModeA_r13_val  = "int4"; #2          
+             sib2_interval_ULHoppingConfigCommonModeA_r13_val  = "int4"; #2
 #            sib2_interval_ULHoppingConfigCommonModeB_r13      = "FDD";  # choice -> (0, FDD) (1, TDD)
 #            sib2_interval_ULHoppingConfigCommonModeB_r13_val  = "int2"; #0
 
@@ -305,11 +305,11 @@ eNBs =
           }
 
           rach_preamblesGroupAConfig                = "DISABLE";
-          
+
           phich_duration                            = "NORMAL";
           phich_resource                            = "ONESIXTH";
           srs_enable                                = "DISABLE";
-          
+
       }
 
 
@@ -397,14 +397,14 @@ eNBs =
 );
 
 MACRLCs = (
-        {	
+        {
         num_cc	 = 1;
         tr_s_preference = "local_L1";
         tr_n_preference = "local_RRC";
 	phy_test_mode = 0;
         puSch10xSnr     =  200;
         puCch10xSnr     =  200;
-        }  
+        }
 );
 
 L1s = (
@@ -412,11 +412,11 @@ L1s = (
       num_cc = 1;
       tr_n_preference = "local_mac";
       prach_dtx_threshold = 200;
-      }  
+      }
 );
 
 RUs = (
-    {     
+    {
         local_rf       = "yes"
         nb_tx          = 1
         nb_rx          = 1
@@ -427,7 +427,7 @@ RUs = (
         max_rxgain                    = 110;
         eNB_instances  = [0];
     }
-);  
+);
 
 THREAD_STRUCT = (
   {
@@ -465,4 +465,3 @@ log_config :
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-

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

@@ -207,18 +207,18 @@ MACRLCs = (
     phy_test_mode   = 0;
     puSch10xSnr     = 200;
     puCch10xSnr     = 200;
-    }  
+    }
 );
 
 L1s = (
     {
     num_cc = 1;
     tr_n_preference = "local_mac";
-    }  
+    }
 );
 
 RUs = (
-    {          
+    {
     local_rf                      = "yes"
     nb_tx                         = 2
     nb_rx                         = 2
@@ -229,7 +229,7 @@ RUs = (
     max_rxgain                    = 115;
     eNB_instances                 = [0];
     }
-);  
+);
 
 THREAD_STRUCT = (
   {
@@ -267,4 +267,3 @@ log_config :
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-

ci-scripts/conf_files/lte-fdd-basic-sim.conf

@@ -205,18 +205,18 @@ MACRLCs = (
 	phy_test_mode = 0;
         puSch10xSnr     =  200;
         puCch10xSnr     =  200;
-        }  
+        }
 );
 
 L1s = (
-    	{
+      {
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-        }  
+      }
 );
 
 RUs = (
-    {		  
+    {
        local_rf       = "yes"
          nb_tx          = 1
          nb_rx          = 1
@@ -228,7 +228,7 @@ RUs = (
          eNB_instances  = [0];
 
     }
-);  
+);
 
 THREAD_STRUCT = (
   {
@@ -266,4 +266,3 @@ NETWORK_CONTROLLER :
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-

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

@@ -7,7 +7,7 @@ eNBs =
  {
     # real_time choice in {hard, rt-preempt, no}
     real_time       =  "no";
- 
+
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
 
@@ -207,18 +207,18 @@ MACRLCs = (
 	phy_test_mode = 0;
         puSch10xSnr     =  160;
         puCch10xSnr     =  160;
-        }  
+        }
 );
 
 L1s = (
-    	{
+      {
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-        }  
+      }
 );
 
 RUs = (
-    {		  
+    {
         local_if_name  = "lo";
         remote_address = "127.0.0.2";
         local_address  = "127.0.0.1";
@@ -234,7 +234,7 @@ RUs = (
         att_rx         = 0;
         eNB_instances  = [0];
     }
-);  
+);
 
 THREAD_STRUCT = (
   {
@@ -272,4 +272,3 @@ NETWORK_CONTROLLER :
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-

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

@@ -7,7 +7,7 @@ eNBs =
  {
     # real_time choice in {hard, rt-preempt, no}
     real_time       =  "no";
- 
+
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
 
@@ -207,18 +207,18 @@ MACRLCs = (
 	phy_test_mode = 0;
         puSch10xSnr     =  160;
         puCch10xSnr     =  160;
-        }  
+        }
 );
 
 L1s = (
-    	{
+      {
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-        }  
+      }
 );
 
 RUs = (
-    {		  
+    {
         local_if_name  = "lo";
         remote_address = "127.0.0.2";
         local_address  = "127.0.0.1";
@@ -234,7 +234,7 @@ RUs = (
         att_rx         = 0;
         eNB_instances  = [0];
     }
-);  
+);
 
 THREAD_STRUCT = (
   {
@@ -272,4 +272,3 @@ NETWORK_CONTROLLER :
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-

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

@@ -7,7 +7,7 @@ eNBs =
  {
     # real_time choice in {hard, rt-preempt, no}
     real_time       =  "no";
- 
+
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
 
@@ -207,18 +207,18 @@ MACRLCs = (
 	phy_test_mode = 0;
         puSch10xSnr     =  160;
         puCch10xSnr     =  160;
-        }  
+        }
 );
 
 L1s = (
-    	{
+      {
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-        }  
+      }
 );
 
 RUs = (
-    {		  
+    {
         local_if_name  = "lo";
         remote_address = "127.0.0.2";
         local_address  = "127.0.0.1";
@@ -234,7 +234,7 @@ RUs = (
         att_rx         = 0;
         eNB_instances  = [0];
     }
-);  
+);
 
 THREAD_STRUCT = (
   {
@@ -272,4 +272,3 @@ NETWORK_CONTROLLER :
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-

ci-scripts/conf_files/rru.fdd.band7.conf

@@ -42,4 +42,3 @@ log_config = {
       rrc_log_level                         ="error";
       rrc_log_verbosity                     ="medium";
 };
-

ci-scripts/conf_files/rru.tdd.band40.conf

@@ -42,4 +42,3 @@ log_config = {
       rrc_log_level                         ="error";
       rrc_log_verbosity                     ="medium";
 };
-

ci-scripts/conf_files/ue.nfapi.conf

@@ -17,21 +17,21 @@ log_config = {
 
 
 L1s = (
-    	{
+        {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
-    	local_n_if_name  = "lo";
-      	remote_n_address = "127.0.0.2";
-    	local_n_address  = "127.0.0.1";
-    	local_n_portc    = 50000;
-    	remote_n_portc   = 50001;
-    	local_n_portd    = 50010;
-    	remote_n_portd   = 50011;
-        }  
+        local_n_if_name  = "lo";
+        remote_n_address = "127.0.0.2";
+        local_n_address  = "127.0.0.1";
+        local_n_portc    = 50000;
+        remote_n_portc   = 50001;
+        local_n_portd    = 50010;
+        remote_n_portd   = 50011;
+        }
 );
 
 RUs = (
-    {		  
+    {
        local_rf       = "yes"
        nb_tx          = 1
        nb_rx          = 1
@@ -40,5 +40,5 @@ RUs = (
        bands          = [7,38,42,43];
        max_pdschReferenceSignalPower = -27;
        max_rxgain                    = 125;
-    }		      
+    }
 );

ci-scripts/cppcheck_suppressions.list

@@ -24,26 +24,26 @@
 // section for "valid" memory leaks: the related functions are allocators and
 // the caller is responsible of freeing the memory. cppcheck has a mechanism
 // to check more accuretaly this, by defining callers responsible of freeing
-// but tools like valgring might be more suitable 
+// but tools like valgring might be more suitable
 //
 //-----------------------------------------------------------------------------
-//    suppress error about keysP memory leak, free must be done by calling func 
+//    suppress error about keysP memory leak, free must be done by calling func
 memleak:common/utils/hashtable/obj_hashtable.c
 //-----------------------------------------------------------------------------
-//    suppress error about keys memory leak, free must be done by calling func 
+//    suppress error about keys memory leak, free must be done by calling func
 memleak:openair2/UTIL/OMG/omg_hashtable.c
 //-----------------------------------------------------------------------------
-//     suppress error about data memory leak. This is the buffer where 
+//     suppress error about data memory leak. This is the buffer where
 //    _emm_as_encode function creates the encoded buffer
 //
 memleak:openair3/NAS/UE/EMM/SAP/emm_as.c
 //-----------------------------------------------------------------------------
 //*****************************************************************************
-// section for files not used in oai exec's included in CI. 
+// section for files not used in oai exec's included in CI.
 // Possibly candidates for removal otherwise should be documented and updated
 // for project rules enforcement
 // ----------------------------------------------------------------------------
-// likely sources for test programs, maintained? 
+// likely sources for test programs, maintained?
 invalidPrintfArgType_sint:openair1/PHY/CODING/TESTBENCH/ltetest.c
 memleak:openair1/PHY/CODING/TESTBENCH/ltetest.c
 invalidPrintfArgType_sint:openair1/PHY/CODING/TESTBENCH/pdcch_test.c
@@ -72,14 +72,14 @@ uninitvar:openair2/UTIL/OTG/otg_rx_socket.c
 // iteration of the loop.
 nullPointer:common/utils/T/local_tracer.c:243
 //-----------------------------------------------------------------------------
-// once again cppcheck is not to understand that fds is initialized in the
+// once again cppcheck does not understand that fds is initialized in the
 // first iteration of the loop
 nullPointer:common/utils/T/tracer/multi.c:264
 nullPointer:common/utils/T/tracer/multi.c:265
 //
 //*****************************************************************************
-// 
-// True problems we don't know how to fix, Suppression is commented out, 
+//
+// True problems we don't know how to fix, Suppression is commented out,
 // as these kind of problem need either to be fixed or can be suppressed
 // when fully uderstood
 //-----------------------------------------------------------------------------
@@ -89,13 +89,13 @@ nullPointer:common/utils/T/tracer/multi.c:265
 // memleak:nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
 // memleak:nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
 //-----------------------------------------------------------------------------
-// may be security_data->kenb.value is released from calling functions. But even 
-// when, for test, freeing it before returning from emm_proc_security_mode_command 
+// may be security_data->kenb.value is released from calling functions. But even
+// when, for test, freeing it before returning from emm_proc_security_mode_command
 // which does the allocation, cppcheck complains. So something might be wrong...
 // memleak:openair3/NAS/UE/EMM/SecurityModeControl.c
 //-----------------------------------------------------------------------------
 // when used, nobody but the original developer can guess if sn_data_cnf is set or not
-// cppcheck found that in some cases it is not, code needs cleanup before fixing that...  
+// cppcheck found that in some cases it is not, code needs cleanup before fixing that...
 // uninitvar:openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
 //*****************************************************************************
 // *INDENT-ON*

ci-scripts/main.py

@@ -1,4 +1,3 @@
-#/*
 # * 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.
@@ -43,6 +42,9 @@ ENB_PROCESS_SEG_FAULT = -11
 ENB_PROCESS_ASSERTION = -12
 ENB_PROCESS_REALTIME_ISSUE = -13
 ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
+UE_PROCESS_NOLOGFILE_TO_ANALYZE = -20
+UE_PROCESS_COULD_NOT_SYNC = -21
+UE_PROCESS_ASSERTION = -22
 HSS_PROCESS_FAILED = -2
 HSS_PROCESS_OK = +2
 MME_PROCESS_FAILED = -3
@@ -122,13 +124,21 @@ class SSHConnection():
 		self.htmlTabNames = []
 		self.htmlTabIcons = []
 		self.finalStatus = False
+		self.OsVersion = ''
+		self.KernelVersion = ''
+		self.UhdVersion = ''
+		self.UsrpBoard = ''
+		self.CpuNb = ''
+		self.CpuModel = ''
+		self.CpuMHz = ''
+		self.UEIPAddress = ''
+		self.UEUserName = ''
+		self.UEPassword = ''
+		self.UE_instance = ''
+		self.UESourceCodePath = ''
+		self.Build_OAI_UE_args = ''
+		self.Initialize_OAI_UE_args = ''
 		self.eNBOsVersion = ''
-		self.eNBKernelVersion = ''
-		self.eNBUhdVersion = ''
-		self.eNBUsrpBoard = ''
-		self.eNBCpuNb = ''
-		self.eNBCpuModel = ''
-		self.eNBCpuMHz = ''
 
 	def open(self, ipaddress, username, password):
 		count = 0
@@ -324,11 +334,46 @@ class SSHConnection():
 		self.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
 		self.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
 		self.command('mv compile_oai_enb.log ' + 'build_log_' + self.testCase_id, '\$', 5)
-		# Workaround to run with develop-nr
-		self.command('if [ -e ran_build ]; then cp -rf ran_build lte_build_oai; fi', '\$', 30)
 		self.close()
 		self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
 
+	def BuildOAIUE(self):
+		if self.UEIPAddress == '' or self.eNBRepository == '' or self.eNBBranch == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
+			Usage()
+			sys.exit('Insufficient Parameter')
+		self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+		self.command('mkdir -p ' + self.UESourceCodePath, '\$', 5)
+		self.command('cd ' + self.UESourceCodePath, '\$', 5)
+		self.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + self.eNBRepository + ' .; else stdbuf -o0 git fetch; fi', '\$', 600)
+		# here add a check if git clone or git fetch went smoothly
+		self.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		self.command('git config user.name "OAI Jenkins"', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		# if the commit ID is provided use it to point to it
+		if self.eNBCommitID != '':
+			self.command('git checkout -f ' + self.eNBCommitID, '\$', 5)
+		# if the branch is not develop, then it is a merge request and we need to do 
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		if (self.eNB_AllowMerge):
+			if self.eNBTargetBranch == '':
+				if (self.eNBBranch != 'develop') and (self.eNBBranch != 'origin/develop'):
+					self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+			else:
+				logging.debug('Merging with the target branch: ' + self.eNBTargetBranch)
+				self.command('git merge --ff origin/' + self.eNBTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+		self.command('source oaienv', '\$', 5)
+		self.command('cd cmake_targets', '\$', 5)
+		self.command('mkdir -p log', '\$', 5)
+		self.command('chmod 777 log', '\$', 5)
+		# no need to remove in log (git clean did the trick)
+		self.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee -a compile_oai_ue.log', 'Bypassing the Tests', 600)
+		self.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		self.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		self.command('mv compile_oai_ue.log ' + 'build_log_' + self.testCase_id, '\$', 5)
+		self.close()
+		self.CreateHtmlTestRow(self.Build_OAI_UE_args, 'OK', ALL_PROCESSES_OK, 'OAI UE')
+
+
 	def InitializeHSS(self):
 		if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '':
 			Usage()
@@ -452,8 +497,8 @@ class SSHConnection():
 		# Launch eNB with the modified config file
 		self.command('source oaienv', '\$', 5)
 		self.command('cd cmake_targets', '\$', 5)
-		self.command('echo "ulimit -c unlimited && ./lte_build_oai/build/lte-softmodem -O ' + self.eNBSourceCodePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh ', '\$', 5)
-		self.command('chmod 775 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh ', '\$', 5)
+		self.command('echo "ulimit -c unlimited && ./lte_build_oai/build/lte-softmodem -O ' + self.eNBSourceCodePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+		self.command('chmod 775 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		self.command('echo ' + self.eNBPassword + ' | sudo -S rm -Rf enb_' + self.testCase_id + '.log', '\$', 5)
 		self.command('echo ' + self.eNBPassword + ' | sudo -S -E daemon --inherit --unsafe --name=enb' + str(self.eNB_instance) + '_daemon --chdir=' + self.eNBSourceCodePath + '/cmake_targets -o ' + self.eNBSourceCodePath + '/cmake_targets/enb_' + self.testCase_id + '.log ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		if not rruCheck:
@@ -535,6 +580,99 @@ class SSHConnection():
 			job.join()
 		self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
 
+	def InitializeOAIUE(self):
+		if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
+			Usage()
+			sys.exit('Insufficient Parameter')
+		#initialize_OAI_UE_flag = True
+		#pStatus = self.CheckOAIUEProcessExist(initialize_OAI_UE_flag)
+		#if (pStatus < 0):
+		#	self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', pStatus)
+		#	self.CreateHtmlTabFooter(False)
+		#	sys.exit(1)
+		self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+		# b2xx_fx3_utils reset procedure
+		self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 5)
+		result = re.search('type: b200', str(self.ssh.before))
+		if result is not None:
+			logging.debug('Found a B2xx device --> resetting it')
+			self.command('echo ' + self.UEPassword + ' | sudo -S sudo b2xx_fx3_utils --reset-device', '\$', 5)
+			# Reloading FGPA bin firmware
+			self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 5)
+		else:
+			logging.debug('Did not find any B2xx device')
+		self.command('cd ' + self.UESourceCodePath, '\$', 5)
+		# Initialize_OAI_UE_args usually start with -C and followed by the location in repository
+		#full_config_file = self.Initialize_OAI_UE_args.replace('-O ','')
+		#extIdx = full_config_file.find('.conf')
+		#if (extIdx > 0):
+		#	extra_options = full_config_file[extIdx + 5:]
+		#	# if tracer options is on, compiling and running T Tracer
+		#	result = re.search('T_stdout', str(extra_options))
+		##	if result is not None:
+		#		logging.debug('\u001B[1m Compiling and launching T Tracer\u001B[0m')
+		#		self.command('cd common/utils/T/tracer', '\$', 5)
+		#		self.command('make', '\$', 10)
+		#		self.command('echo $USER; nohup ./record -d ../T_messages.txt -o ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '_record.raw -ON -off VCD -off HEAVY -off LEGACY_GROUP_TRACE -off LEGACY_GROUP_DEBUG > ' + self.UESourceCodePath + '/cmake_targets/enb_' + self.testCase_id + '_record.log 2>&1 &', self.UEUserName, 5)
+		#		self.command('cd ' + self.UESourceCodePath, '\$', 5)
+		#	full_config_file = full_config_file[:extIdx + 5]
+		#	config_path, config_file = os.path.split(full_config_file)
+		#ci_full_config_file = config_path + '/ci-' + config_file
+		#rruCheck = False
+		#result = re.search('rru', str(config_file))
+		#if result is not None:
+		#	rruCheck = True
+		## Make a copy and adapt to EPC / UE IP addresses
+		#self.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
+		#self.command('sed -i -e \'s/CI_UE_IP_ADDR/' + self.UEIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
+		# Launch UE with the modified config file
+		self.command('source oaienv', '\$', 5)
+		self.command('cd cmake_targets/lte_build_oai/build', '\$', 5)
+		self.command('echo "ulimit -c unlimited && ./lte-uesoftmodem ' + self.Initialize_OAI_UE_args + '" > ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		self.command('chmod 775 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S -E daemon --inherit --unsafe --name=ue' + str(self.UE_instance) + '_daemon --chdir=' + self.UESourceCodePath + '/cmake_targets/lte_build_oai/build -o ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		self.UELogFile = 'ue_' + self.testCase_id + '.log'
+		time.sleep(6)
+		self.command('cd ../..', '\$', 5)
+		doLoop = True
+		loopCounter = 10
+		while (doLoop):
+			loopCounter = loopCounter - 1
+			if (loopCounter == 0):
+				# In case of T tracer recording, we may need to kill it
+				#result = re.search('T_stdout', str(self.Initialize_OAI_UE_args))
+				#if result is not None:
+				#	self.command('killall --signal SIGKILL record', '\$', 5)
+				self.close()
+				doLoop = False
+				logging.error('\u001B[1;37;41m UE logging system did not show got sync! \u001B[0m')
+				self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', ALL_PROCESSES_OK, 'OAI UE')
+				self.CreateHtmlTabFooter(False)
+				## In case of T tracer recording, we need to kill tshark on EPC side
+				#result = re.search('T_stdout', str(self.Initialize_OAI_UE_args))
+				#if result is not None:
+				#	self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
+				#	logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+				#	self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
+				#	self.close()
+				#	time.sleep(1)
+				#	pcap_log_file = 'enb_' + self.testCase_id + '_s1log.pcap'
+				#	copyin_res = self.copyin(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, '/tmp/' + pcap_log_file, '.')
+				#	if (copyin_res == 0):
+				#		self.copyout(self.UEIPAddress, self.UEUserName, self.UEPassword, pcap_log_file, self.UESourceCodePath + '/cmake_targets/.')
+				sys.exit(1)
+			else:
+				self.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
+				result = re.search('got sync', str(self.ssh.before))
+				if result is None:
+					time.sleep(6)
+				else:
+					doLoop = False
+					self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'OK', ALL_PROCESSES_OK, 'OAI UE')
+					logging.debug('\u001B[1m Initialize OAI UE Completed\u001B[0m')
+		self.close()
+
 	def checkDevTTYisUnlocked(self):
 		self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 		count = 0
@@ -1674,6 +1812,48 @@ class SSHConnection():
 						result = logStatus
 			return result
 
+	def CheckOAIUEProcessExist(self, initialize_OAI_UE_flag):
+		multi_jobs = []
+		status_queue = SimpleQueue()
+		if initialize_OAI_UE_flag == False:
+			p = Process(target = SSH.CheckOAIUEProcess, args = (status_queue,))
+			p.daemon = True
+			p.start()
+			multi_jobs.append(p)
+		for job in multi_jobs:
+			job.join()
+
+		if (status_queue.empty()):
+			return -15
+		else:
+			result = 0
+			while (not status_queue.empty()):
+				status = status_queue.get()
+				if (status < 0):
+					result = status
+			if result == OAI_UE_PROCESS_FAILED:
+				fileCheck = re.search('enb_', str(self.UELogFile))
+				if fileCheck is not None:
+					self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
+					logStatus = self.AnalyzeLogFile_UE(self.UELogFile)
+					if logStatus < 0:
+						result = logStatus
+			return result
+
+	def CheckOAIUEProcess(self, status_queue):
+		try:
+			self.open(self.OAIUEIPAddress, self.OAIUEUserName, self.OAIUEPassword)
+			self.command('stdbuf -o0 ps -aux | grep -v grep | grep --color=never lte-uesoftmodem', '\$', 5)
+			result = re.search('lte-uesoftmodem', str(self.ssh.before))
+			if result is None:
+				logging.debug('\u001B[1;37;41m OAI UE Process Not Found! \u001B[0m')
+				status_queue.put(OAI_UE_PROCESS_FAILED)
+			else:
+				status_queue.put(OAI_UE_PROCESS_OK)
+			self.close()
+		except:
+			os.kill(os.getppid(),signal.SIGUSR1)
+
 	def CheckeNBProcess(self, status_queue):
 		try:
 			self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
@@ -1891,6 +2071,156 @@ class SSHConnection():
 			return ENB_PROCESS_REALTIME_ISSUE
 		return 0
 
+	def AnalyzeLogFile_UE(self, UElogFile):
+		if (not os.path.isfile('./' + UElogFile)):
+			return -1
+		ue_log_file = open('./' + UElogFile, 'r')
+		foundAssertion = False
+		msgAssertion = ''
+		msgLine = 0
+		foundSegFault = False
+		foundRealTimeIssue = False
+		rlcDiscardBuffer = 0
+		rachCanceledProcedure = 0
+		uciStatMsgCount = 0
+		pdcpFailure = 0
+		ulschFailure = 0
+		no_cell_sync_found = False
+		mib_found = False
+		frequency_found = False
+		self.htmlUEFailureMsg = ''
+		for line in ue_log_file.readlines():
+			result = re.search('[Ss]egmentation [Ff]ault', str(line))
+			if result is not None:
+				foundSegFault = True
+			result = re.search('[Cc]ore [dD]ump', str(line))
+			if result is not None:
+				foundSegFault = True
+			result = re.search('[Aa]ssertion', str(line))
+			if result is not None:
+				foundAssertion = True
+			result = re.search('LLL', str(line))
+			if result is not None:
+				foundRealTimeIssue = True
+			if foundAssertion and (msgLine < 3):
+				msgLine += 1
+				msgAssertion += str(line)
+			result = re.search('uci->stat', str(line))
+			if result is not None:
+				uciStatMsgCount += 1
+			# No cell synchronization found, abandoning
+			result = re.search('No cell synchronization found, abandoning', str(line))
+			if result is not None:
+				no_cell_sync_found = True
+			result = re.search("MIB Information => ([a-zA-Z]{1,10}), ([a-zA-Z]{1,10}), NidCell (?P<nidcell>\d{1,3}), N_RB_DL (?P<n_rb_dl>\d{1,3}), PHICH DURATION (?P<phich_duration>\d), PHICH RESOURCE (?P<phich_resource>.{1,4}), TX_ANT (?P<tx_ant>\d)", str(line))
+			if result is not None and (not mib_found):
+				try:
+					mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
+					self.htmlUEFailureMsg += mibMsg + '\n'
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					mibMsg = "    nidcell = " + result.group('nidcell')
+					self.htmlUEFailureMsg += mibMsg
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					mibMsg = "    n_rb_dl = " + result.group('n_rb_dl')
+					self.htmlUEFailureMsg += mibMsg + '\n'
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					mibMsg = "    phich_duration = " + result.group('phich_duration')
+					self.htmlUEFailureMsg += mibMsg
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					mibMsg = "    phich_resource = " + result.group('phich_resource')
+					self.htmlUEFailureMsg += mibMsg + '\n'
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					mibMsg = "    tx_ant = " + result.group('tx_ant')
+					self.htmlUEFailureMsg += mibMsg + '\n'
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					mib_found = True
+				except Exception as e:
+					logging.error('\033[91m' + "MIB marker was not found" + '\033[0m')
+			result = re.search("Measured Carrier Frequency (?P<measured_carrier_frequency>\d{1,15}) Hz", str(line))
+			if result is not None and (not frequency_found):
+				try:
+					mibMsg = "Measured Carrier Frequency = " + result.group('measured_carrier_frequency') + ' Hz'
+					self.htmlUEFailureMsg += mibMsg + '\n'
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+					frequency_found = True
+				except Exception as e:
+					logging.error('\033[91m' + "Measured Carrier Frequency not found" + '\033[0m')
+			result = re.search("Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
+			if result is not None:
+				try:
+					mibMsg = "The operator is: " + result.group('operator')
+					self.htmlUEFailureMsg += mibMsg + '\n'
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+				except Exception as e:
+					logging.error('\033[91m' + "Operator name not found" + '\033[0m')
+			result = re.search("SIB5 InterFreqCarrierFreq element (.{1,4})/(.{1,4})", str(line))
+			if result is not None:
+				try:
+					mibMsg = "SIB5 InterFreqCarrierFreq element " + result.group(1) + '/' + result.group(2)
+					self.htmlUEFailureMsg += mibMsg + ' -> '
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
+				except Exception as e:
+					logging.error('\033[91m' + "SIB5 InterFreqCarrierFreq element not found" + '\033[0m')
+			result = re.search("DL Carrier Frequency/ARFCN : (?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
+			if result is not None:
+				try:
+					freq = result.group('carrier_frequency')
+					new_freq = re.sub('/[0-9]+','',freq)
+					float_freq = float(new_freq) / 1000000
+					self.htmlUEFailureMsg += 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
+					logging.debug('\033[94m' + "    DL Carrier Frequency is: " + freq + '\033[0m')
+				except Exception as e:
+					logging.error('\033[91m' + "    DL Carrier Frequency not found" + '\033[0m')
+			result = re.search("AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
+			if result is not None:
+				try:
+					prb = result.group('allowed_bandwidth')
+					self.htmlUEFailureMsg += ' -- PRB: ' + prb + '\n'
+					logging.debug('\033[94m' + "    AllowedMeasBandwidth: " + prb + '\033[0m')
+				except Exception as e:
+					logging.error('\033[91m' + "    AllowedMeasBandwidth not found" + '\033[0m')
+		ue_log_file.close()
+		if uciStatMsgCount > 0:
+			statMsg = 'UE showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			self.htmlUEFailureMsg += statMsg + '\n'
+		if pdcpFailure > 0:
+			statMsg = 'UE showed ' + str(pdcpFailure) + ' "PDCP Out of Resources" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			self.htmlUEFailureMsg += statMsg + '\n'
+		if ulschFailure > 0:
+			statMsg = 'UE showed ' + str(ulschFailure) + ' "ULSCH in error in round" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+			self.htmlUEFailureMsg += statMsg + '\n'
+		if rachCanceledProcedure > 0:
+			rachMsg = 'UE cancelled ' + str(rachCanceledProcedure) + ' RA procedure(s)'
+			logging.debug('\u001B[1;30;43m ' + rachMsg + ' \u001B[0m')
+			self.htmlUEFailureMsg += rachMsg + '\n'
+		if foundSegFault:
+			logging.debug('\u001B[1;37;41m UE ended with a Segmentation Fault! \u001B[0m')
+			return ENB_PROCESS_SEG_FAULT
+		if foundAssertion:
+			logging.debug('\u001B[1;37;43m UE ended with an assertion! \u001B[0m')
+			# removed for esthetics
+			#self.htmlUEFailureMsg += msgAssertion
+			self.htmlUEFailureMsg += 'UE ended with an assertion!\n'
+			if not mib_found or not frequency_found:
+				return UE_PROCESS_ASSERTION
+		if foundRealTimeIssue:
+			logging.debug('\u001B[1;37;41m UE faced real time issues! \u001B[0m')
+			self.htmlUEFailureMsg += 'UE faced real time issues!\n'
+			#return ENB_PROCESS_REALTIME_ISSUE
+		if no_cell_sync_found and not mib_found:
+			logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
+			self.htmlUEFailureMsg += 'UE could not synchronize!\n'
+			return UE_PROCESS_COULD_NOT_SYNC
+		if rlcDiscardBuffer > 0:
+			rlcMsg = 'UE RLC discarded ' + str(rlcDiscardBuffer) + ' buffer(s)'
+			logging.debug('\u001B[1;37;41m ' + rlcMsg + ' \u001B[0m')
+			self.htmlUEFailureMsg += rlcMsg + '\n'
+			return ENB_PROCESS_REALTIME_ISSUE
+		return 0
+
 	def TerminateeNB(self):
 		self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
 		self.command('cd ' + self.eNBSourceCodePath + '/cmake_targets', '\$', 5)
@@ -2031,6 +2361,75 @@ class SSHConnection():
 			job.join()
 		self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
 
+	def TerminateOAIUE(self):
+		self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+		self.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S daemon --name=ue' + str(self.UE_instance) + '_daemon --stop', '\$', 5)
+		self.command('rm -f my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT lte-uesoftmodem || true', '\$', 5)
+		time.sleep(5)
+		self.command('stdbuf -o0  ps -aux | grep -v grep | grep lte-uesoftmodem', '\$', 5)
+		result = re.search('lte-uesoftmodem', str(self.ssh.before))
+		if result is not None:
+			self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL lte-uesoftmodem || true', '\$', 5)
+			time.sleep(5)
+		self.close()
+		# If tracer options is on, stopping tshark on EPC side
+		result = re.search('T_stdout', str(self.Initialize_OAI_UE_args))
+		if result is not None:
+			self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+			logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+			self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
+			time.sleep(1)
+			pcap_log_file = self.UELogFile.replace('.log', '_s1log.pcap')
+			self.command('echo ' + self.UEPassword + ' | sudo -S chmod 666 /tmp/' + pcap_log_file, '\$', 5)
+			self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, '/tmp/' + pcap_log_file, '.')
+			self.copyout(self.UEIPAddress, self.UEUserName, self.UEPassword, pcap_log_file, self.UESourceCodePath + '/cmake_targets/.')
+			self.close()
+			logging.debug('\u001B[1m Replaying RAW record file\u001B[0m')
+			self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+			self.command('cd ' + self.UESourceCodePath + '/common/utils/T/tracer/', '\$', 5)
+			raw_record_file = self.UELogFile.replace('.log', '_record.raw')
+			replay_log_file = self.UELogFile.replace('.log', '_replay.log')
+			extracted_txt_file = self.UELogFile.replace('.log', '_extracted_messages.txt')
+			extracted_log_file = self.UELogFile.replace('.log', '_extracted_messages.log')
+			self.command('./extract_config -i ' + self.UESourceCodePath + '/cmake_targets/' + raw_record_file + ' > ' + self.UESourceCodePath + '/cmake_targets/' + extracted_txt_file, '\$', 5)
+			self.command('echo $USER; nohup ./replay -i ' + self.UESourceCodePath + '/cmake_targets/' + raw_record_file + ' > ' + self.UESourceCodePath + '/cmake_targets/' + replay_log_file + ' 2>&1 &', self.UEUserName, 5)
+			self.command('./textlog -d ' +  self.UESourceCodePath + '/cmake_targets/' + extracted_txt_file + ' -no-gui -ON -full > ' + self.UESourceCodePath + '/cmake_targets/' + extracted_log_file, '\$', 5)
+			self.close()
+			self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + extracted_log_file, '.')
+			logging.debug('\u001B[1m Analyzing UE replay logfile \u001B[0m')
+			logStatus = self.AnalyzeLogFile_UE(extracted_log_file)
+			self.CreateHtmlTestRow(html_queue, 'OK', ALL_PROCESSES_OK)
+			self.UELogFile = ''
+		else:
+			result = re.search('ue_', str(self.UELogFile))
+			if result is not None:
+				copyin_res = self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
+				if (copyin_res == -1):
+					logging.debug('\u001B[1;37;41m Could not copy UE logfile to analyze it! \u001B[0m')
+					optionsMsg = '<pre style="background-color:white">Could not copy UE logfile to analyze it!</pre>'
+					self.CreateHtmlTestRow(optionsMsg, 'KO', UE_PROCESS_NOLOGFILE_TO_ANALYZE, 'UE')
+					self.UELogFile = ''
+					return
+				logging.debug('\u001B[1m Analyzing UE logfile \u001B[0m')
+				logStatus = self.AnalyzeLogFile_UE(self.UELogFile)
+				if (logStatus < 0):
+					optionsMsg = '<pre style="background-color:white"><b>Sniffing Unsuccessful</b>\n'
+					optionsMsg += self.htmlUEFailureMsg
+					optionsMsg += '</pre>'
+					self.CreateHtmlTestRow(optionsMsg, 'KO', logStatus, 'UE')
+					self.CreateHtmlTabFooter(False)
+					sys.exit(1)
+				else:
+					optionsMsg = '<pre style="background-color:white"><b>Sniffing Successful</b>\n'
+					optionsMsg += self.htmlUEFailureMsg
+					optionsMsg += '</pre>'
+					self.CreateHtmlTestRow(optionsMsg, 'OK', ALL_PROCESSES_OK)
+				self.UELogFile = ''
+			else:
+				self.CreateHtmlTestRow('<pre style="background-color:white">No Log File to analyze</pre>', 'OK', ALL_PROCESSES_OK)
+
 	def AutoTerminateUEandeNB(self):
 		self.testCase_id = 'AUTO-KILL-UE'
 		self.desc = 'Automatic Termination of UE'
@@ -2047,12 +2446,24 @@ class SSHConnection():
 		self.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', ALL_PROCESSES_OK)
 
 	def LogCollectBuild(self):
-		self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
-		self.command('cd ' + self.eNBSourceCodePath, '\$', 5)
+		if (self.eNBIPAddress != '' and self.eNBUserName != '' and self.eNBPassword != ''):
+			IPAddress = self.eNBIPAddress
+			UserName = self.eNBUserName
+			Password = self.eNBPassword
+			SourceCodePath = self.eNBSourceCodePath
+		elif (self.UEIPAddress != '' and self.UEUserName != '' and self.UEPassword != ''):
+			IPAddress = self.UEIPAddress
+			UserName = self.UEUserName
+			Password = self.UEPassword
+			SourceCodePath = self.UESourceCodePath
+		else:
+			sys.exit('Insufficient Parameter')
+		self.open(IPAddress, UserName, Password)
+		self.command('cd ' + SourceCodePath, '\$', 5)
 		self.command('cd cmake_targets', '\$', 5)
 		self.command('rm -f build.log.zip', '\$', 5)
 		self.command('zip build.log.zip build_log_*/*', '\$', 60)
-		self.command('echo ' + self.eNBPassword + ' | sudo -S rm -rf build_log_*', '\$', 5)
+		self.command('echo ' + Password + ' | sudo -S rm -rf build_log_*', '\$', 5)
 		self.close()
 
 	def LogCollecteNB(self):
@@ -2121,49 +2532,69 @@ class SSHConnection():
 			self.command('zip spgw.log.zip xGwLog.0', '\$', 60)
 		self.close()
 
+	def LogCollectOAIUE(self):
+		self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+		self.command('cd ' + self.UESourceCodePath, '\$', 5)
+		self.command('cd cmake_targets', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S rm -f ue.log.zip', '\$', 5)
+		self.command('echo ' + self.UEPassword + ' | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
+		self.command('echo ' + self.UEPassword + ' | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
+		self.close()
+
 	def RetrieveSystemVersion(self):
 		if self.eNBIPAddress == 'none':
-			self.eNBOsVersion = 'Ubuntu 16.04.5 LTS'
-			self.eNBKernelVersion = '4.15.0-45-generic'
-			self.eNBUhdVersion = '3.13.0.1-0'
-			self.eNBUsrpBoard = 'B210'
-			self.eNBCpuNb = '4'
-			self.eNBCpuModel = 'Intel(R) Core(TM) i5-6200U'
-			self.eNBCpuMHz = '2399.996 MHz'
+			self.OsVersion = 'Ubuntu 16.04.5 LTS'
+			self.KernelVersion = '4.15.0-45-generic'
+			self.UhdVersion = '3.13.0.1-0'
+			self.UsrpBoard = 'B210'
+			self.CpuNb = '4'
+			self.CpuModel = 'Intel(R) Core(TM) i5-6200U'
+			self.CpuMHz = '2399.996 MHz'
 			return
-		if self.eNBIPAddress == '' or self.eNBUserName == '' or self.eNBPassword == '':
+		machine = None
+		if self.eNBIPAddress != '' and self.eNBUserName != '' and self.eNBPassword != '':
+			machine = 'eNB'
+			IPAddress = self.eNBIPAddress
+			UserName = self.eNBUserName
+			Password = self.eNBPassword
+		elif self.UEIPAddress != '' and self.UEUserName != '' and self.UEPassword != '':
+			machine = 'UE'
+			IPAddress = self.UEIPAddress
+			UserName = self.UEUserName
+			Password = self.UEPassword
+		if machine is None:
 			Usage()
 			sys.exit('Insufficient Parameter')
-		self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
+		self.open(IPAddress, UserName, Password)
 		self.command('lsb_release -a', '\$', 5)
 		result = re.search('Description:\\\\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', str(self.ssh.before))
 		if result is not None:
-			self.eNBOsVersion = result.group('os_type')
-			logging.debug('OS is: ' + self.eNBOsVersion)
+			self.OsVersion = result.group('os_type')
+			logging.debug('OS is: ' + self.OsVersion)
 		self.command('uname -r', '\$', 5)
 		result = re.search('uname -r\\\\r\\\\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', str(self.ssh.before))
 		if result is not None:
-			self.eNBKernelVersion = result.group('kernel_version')
-			logging.debug('Kernel Version is: ' + self.eNBKernelVersion)
+			self.KernelVersion = result.group('kernel_version')
+			logging.debug('Kernel Version is: ' + self.KernelVersion)
 		self.command('dpkg --list | egrep --color=never libuhd003', '\$', 5)
 		result = re.search('libuhd003:amd64 *(?P<uhd_version>[0-9\.]+)', str(self.ssh.before))
 		if result is not None:
-			self.eNBUhdVersion = result.group('uhd_version')
-			logging.debug('UHD Version is: ' + self.eNBUhdVersion)
-		self.command('echo ' + self.eNBPassword + ' | sudo -S uhd_find_devices', '\$', 5)
+			self.UhdVersion = result.group('uhd_version')
+			logging.debug('UHD Version is: ' + self.UhdVersion)
+		self.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 5)
 		result = re.search('product: (?P<usrp_board>[0-9A-Za-z]+)\\\\r\\\\n', str(self.ssh.before))
 		if result is not None:
-			self.eNBUsrpBoard = result.group('usrp_board')
-			logging.debug('USRP Board  is: ' + self.eNBUsrpBoard)
+			self.UsrpBoard = result.group('usrp_board')
+			logging.debug('USRP Board  is: ' + self.UsrpBoard)
 		self.command('lscpu', '\$', 5)
 		result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+).*Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+).*CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', str(self.ssh.before))
 		if result is not None:
-			self.eNBCpuNb = result.group('nb_cpus')
-			logging.debug('nb_cpus: ' + self.eNBCpuNb)
-			self.eNBCpuModel = result.group('model')
-			logging.debug('model: ' + self.eNBCpuModel)
-			self.eNBCpuMHz = result.group('cpu_mhz') + ' MHz'
-			logging.debug('cpu_mhz: ' + self.eNBCpuMHz)
+			self.CpuNb = result.group('nb_cpus')
+			logging.debug('nb_cpus: ' + self.CpuNb)
+			self.CpuModel = result.group('model')
+			logging.debug('model: ' + self.CpuModel)
+			self.CpuMHz = result.group('cpu_mhz') + ' MHz'
+			logging.debug('cpu_mhz: ' + self.CpuMHz)
 		self.close()
 
 #-----------------------------------------------------------
@@ -2171,6 +2602,9 @@ class SSHConnection():
 #-----------------------------------------------------------
 	def CreateHtmlHeader(self):
 		if (not self.htmlHeaderCreated):
+			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+			logging.debug('\u001B[1m  Creating HTML header \u001B[0m')
+			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
 			self.htmlFile = open('test_results.html', 'w')
 			self.htmlFile.write('<!DOCTYPE html>\n')
 			self.htmlFile.write('<html class="no-js" lang="en-US">\n')
@@ -2248,18 +2682,13 @@ class SSHConnection():
 				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')
 
-			terminate_ue_flag = True
 			if (self.ADBIPAddress != 'none'):
+				terminate_ue_flag = True
 				self.GetAllUEDevices(terminate_ue_flag)
 				self.GetAllCatMDevices(terminate_ue_flag)
-			else:
-				self.UEDevices.append('doughq9rehg')
-				self.UEDevices.append('dnsgiuahgia')
-				self.UEDevices.append('uehgieng9')
-			self.htmlUEConnected = len(self.UEDevices)
-
-			self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.UEDevices)) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
-			self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.CatMDevices)) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
+				self.htmlUEConnected = len(self.UEDevices)
+				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.UEDevices)) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
+				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.CatMDevices)) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
 			self.htmlFile.write('  <br>\n')
 			self.htmlFile.write('  <ul class="nav nav-pills">\n')
 			count = 0
@@ -2298,10 +2727,6 @@ class SSHConnection():
 				if (self.ADBIPAddress != 'none'):
 					self.GetAllUEDevices(terminate_ue_flag)
 					self.GetAllCatMDevices(terminate_ue_flag)
-				else:
-					self.UEDevices.append('doughq9rehg')
-					self.UEDevices.append('dnsgiuahgia')
-					self.UEDevices.append('uehgieng9')
 				self.htmlUEConnected = len(self.UEDevices)
 
 			i = 0
@@ -2326,6 +2751,9 @@ class SSHConnection():
 
 	def CreateHtmlFooter(self, passStatus):
 		if (os.path.isfile('test_results.html')):
+			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+			logging.debug('\u001B[1m  Creating HTML footer \u001B[0m')
+			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
 			self.RetrieveSystemVersion()
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('</div>\n')
@@ -2336,21 +2764,21 @@ class SSHConnection():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td>OS Version</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBOsVersion + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.OsVersion + '</span></td>\n')
 			self.htmlFile.write('        <td>Kernel Version</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBKernelVersion + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.KernelVersion + '</span></td>\n')
 			self.htmlFile.write('        <td>UHD Version</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBUhdVersion + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.UhdVersion + '</span></td>\n')
 			self.htmlFile.write('        <td>USRP Board</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBUsrpBoard + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.UsrpBoard + '</span></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td>Nb CPUs</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBCpuNb + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.CpuNb + '</span></td>\n')
 			self.htmlFile.write('        <td>CPU Model Name</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBCpuModel + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.CpuModel + '</span></td>\n')
 			self.htmlFile.write('        <td>CPU Frequency</td>\n')
-			self.htmlFile.write('        <td><span class="label label-default">' + self.eNBCpuMHz + '</span></td>\n')
+			self.htmlFile.write('        <td><span class="label label-default">' + self.CpuMHz + '</span></td>\n')
 			self.htmlFile.write('        <td></td>\n')
 			self.htmlFile.write('        <td></td>\n')
 			self.htmlFile.write('      </tr>\n')
@@ -2368,7 +2796,7 @@ class SSHConnection():
 			self.htmlFile.write('</html>\n')
 			self.htmlFile.close()
 
-	def CreateHtmlTestRow(self, options, status, processesStatus):
+	def CreateHtmlTestRow(self, options, status, processesStatus, machine='eNB'):
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
@@ -2380,15 +2808,17 @@ class SSHConnection():
 				if (processesStatus == 0):
 					self.htmlFile.write('        <td bgcolor = "lightcoral" >' + str(status)  + '</td>\n')
 				elif (processesStatus == ENB_PROCESS_FAILED):
-					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - eNB process not found</td>\n')
+					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process not found</td>\n')
 				elif (processesStatus == ENB_PROCESS_SEG_FAULT):
-					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - eNB process ended in Segmentation Fault</td>\n')
-				elif (processesStatus == ENB_PROCESS_ASSERTION):
-					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - eNB process ended in Assertion</td>\n')
+					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Segmentation Fault</td>\n')
+				elif (processesStatus == ENB_PROCESS_ASSERTION) or (processesStatus == UE_PROCESS_ASSERTION):
+					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Assertion</td>\n')
 				elif (processesStatus == ENB_PROCESS_REALTIME_ISSUE):
-					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - eNB process faced Real Time issue(s)</td>\n')
-				elif (processesStatus == ENB_PROCESS_NOLOGFILE_TO_ANALYZE):
-					self.htmlFile.write('        <td bgcolor = "orange" >OK</td>\n')
+					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process faced Real Time issue(s)</td>\n')
+				elif (processesStatus == ENB_PROCESS_NOLOGFILE_TO_ANALYZE) or (processesStatus == UE_PROCESS_NOLOGFILE_TO_ANALYZE):
+					self.htmlFile.write('        <td bgcolor = "orange" >OK?</td>\n')
+				elif (processesStatus == UE_PROCESS_COULD_NOT_SYNC):
+					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - UE could not sync</td>\n')
 				elif (processesStatus == HSS_PROCESS_FAILED):
 					self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - HSS process not found</td>\n')
 				elif (processesStatus == MME_PROCESS_FAILED):
@@ -2493,7 +2923,7 @@ def Usage():
 	print('------------------------------------------------------------')
 
 def CheckClassValidity(action,id):
-	if action != 'Build_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and action != 'Terminate_SPGW'  and action != 'Initialize_CatM_module' and action != 'Terminate_CatM_module' and action != 'Attach_CatM_module' and action != 'Detach_CatM_module' and action != 'Ping_CatM_module' and action != 'IdleSleep':
+	if action != 'Build_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Build_OAI_UE' and action != 'Initialize_OAI_UE' and action != 'Terminate_OAI_UE' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and action != 'Terminate_SPGW'  and action != 'Initialize_CatM_module' and action != 'Terminate_CatM_module' and action != 'Attach_CatM_module' and action != 'Detach_CatM_module' and action != 'Ping_CatM_module' and action != 'IdleSleep':
 		logging.debug('ERROR: test-case ' + id + ' has wrong class ' + action)
 		return False
 	return True
@@ -2520,6 +2950,20 @@ def GetParametersFromXML(action):
 		else:
 			SSH.nbMaxUEtoAttach = int(nbMaxUEtoAttach)
 
+	if action == 'Build_OAI_UE':
+		SSH.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
+
+	if action == 'Initialize_OAI_UE':
+		SSH.Initialize_OAI_UE_args = test.findtext('Initialize_OAI_UE_args')
+		SSH.UE_instance = test.findtext('UE_instance')
+		if (SSH.UE_instance is None):
+			SSH.UE_instance = '0'
+
+	if action == 'Terminate_OAI_UE':
+		SSH.eNB_instance = test.findtext('UE_instance')
+		if (SSH.UE_instance is None):
+			SSH.UE_instance = '0'
+
 	if action == 'Ping' or action == 'Ping_CatM_module':
 		SSH.ping_args = test.findtext('ping_args')
 		SSH.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
@@ -2562,6 +3006,7 @@ SSH = SSHConnection()
 
 argvs = sys.argv
 argc = len(argvs)
+cwd = os.getcwd()
 
 while len(argvs) > 1:
 	myArgv = argvs.pop(1)	# 0th is this file's name
@@ -2634,6 +3079,18 @@ while len(argvs) > 1:
 		matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
 		SSH.testXMLfiles.append(matchReg.group(1))
 		SSH.nbTestXMLfiles += 1
+	elif re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE):
+		matchReg = re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
+		SSH.UEIPAddress = matchReg.group(1)
+	elif re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
+		matchReg = re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
+		SSH.UEUserName = matchReg.group(1)
+	elif re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
+		matchReg = re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
+		SSH.UEPassword = matchReg.group(1)
+	elif re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+		matchReg = re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
+		SSH.UESourceCodePath = matchReg.group(1)
 	elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
 		matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
 		finalStatus = matchReg.group(1)
@@ -2649,7 +3106,13 @@ if re.match('^TerminateeNB$', mode, re.IGNORECASE):
 		sys.exit('Insufficient Parameter')
 	SSH.TerminateeNB()
 elif re.match('^TerminateUE$', mode, re.IGNORECASE):
-	if SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
+	if (SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == ''):
+		Usage()
+		sys.exit('Insufficient Parameter')
+	signal.signal(signal.SIGUSR1, receive_signal)
+	SSH.TerminateUE()
+elif re.match('^TerminateOAIUE$', mode, re.IGNORECASE):
+	if SSH.UEIPAddress == '' or SSH.UEUserName == '' or SSH.UEPassword == '':
 		Usage()
 		sys.exit('Insufficient Parameter')
 	signal.signal(signal.SIGUSR1, receive_signal)
@@ -2670,7 +3133,7 @@ elif re.match('^TerminateSPGW$', mode, re.IGNORECASE):
 		sys.exit('Insufficient Parameter')
 	SSH.TerminateSPGW()
 elif re.match('^LogCollectBuild$', mode, re.IGNORECASE):
-	if SSH.eNBIPAddress == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '':
+	if (SSH.eNBIPAddress == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '') and (SSH.UEIPAddress == '' or SSH.UEUserName == '' or SSH.UEPassword == '' or SSH.UESourceCodePath == ''):
 		Usage()
 		sys.exit('Insufficient Parameter')
 	SSH.LogCollectBuild()
@@ -2704,36 +3167,53 @@ elif re.match('^LogCollectIperf$', mode, re.IGNORECASE):
 		Usage()
 		sys.exit('Insufficient Parameter')
 	SSH.LogCollectIperf()
+elif re.match('^LogCollectOAIUE$', mode, re.IGNORECASE):
+        if SSH.UEIPAddress == '' or SSH.UEUserName == '' or SSH.UEPassword == '' or SSH.UESourceCodePath == '':
+                Usage()
+                sys.exit('Insufficient Parameter')
+        SSH.LogCollectOAIUE()
 elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
-	if SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
+	if (SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == ''):
 		Usage()
 		sys.exit('Insufficient Parameter')
 	count = 0
+	foundCount = 0
 	while (count < SSH.nbTestXMLfiles):
+		xml_test_file = cwd + "/" + SSH.testXMLfiles[count]
 		xml_test_file = sys.path[0] + "/" + SSH.testXMLfiles[count]
-		xmlTree = ET.parse(xml_test_file)
-		xmlRoot = xmlTree.getroot()
-		SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count)))
-		SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-' + str(count)))
-		SSH.htmlTabIcons.append(xmlRoot.findtext('htmlTabIcon',default='info-sign'))
+		if (os.path.isfile(xml_test_file)):
+			xmlTree = ET.parse(xml_test_file)
+			xmlRoot = xmlTree.getroot()
+			SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count)))
+			SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-' + str(count)))
+			SSH.htmlTabIcons.append(xmlRoot.findtext('htmlTabIcon',default='info-sign'))
+			foundCount += 1
 		count += 1
+	if foundCount != SSH.nbTestXMLfiles:
+		SSH.nbTestXMLfiles = foundCount
 	SSH.CreateHtmlHeader()
 elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
 	SSH.CreateHtmlFooter(SSH.finalStatus)
-elif re.match('^TesteNB$', mode, re.IGNORECASE):
-	if SSH.eNBIPAddress == '' or SSH.eNBRepository == '' or SSH.eNBBranch == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '' or SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '' or SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
-		Usage()
-		sys.exit('Insufficient Parameter')
+elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re.IGNORECASE):
+	if re.match('^TesteNB$', mode, re.IGNORECASE):
+		if SSH.eNBIPAddress == '' or SSH.eNBRepository == '' or SSH.eNBBranch == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '' or SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '' or SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
+			Usage()
+			sys.exit('Insufficient Parameter')
+
+		if (SSH.EPCIPAddress != ''):
+			SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, cwd + "/tcp_iperf_stats.awk", "/tmp")
+			SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, cwd + "/active_net_interfaces.awk", "/tmp")
+	else:
+		if SSH.UEIPAddress == '' or SSH.eNBRepository == '' or SSH.eNBBranch == '' or SSH.UEUserName == '' or SSH.UEPassword == '' or SSH.UESourceCodePath == '':
+			Usage()
+			sys.exit('UE: Insufficient Parameter')
 
-	if (SSH.EPCIPAddress != 'none'):
-		SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, sys.path[0] + "/tcp_iperf_stats.awk", "/tmp")
-		SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, sys.path[0] + "/active_net_interfaces.awk", "/tmp")
 	#read test_case_list.xml file
         # if no parameters for XML file, use default value
 	if (SSH.nbTestXMLfiles != 1):
-		xml_test_file = sys.path[0] + "/test_case_list.xml"
+		xml_test_file = cwd + "/test_case_list.xml"
 	else:
-		xml_test_file = sys.path[0] + "/" + SSH.testXMLfiles[0]
+		xml_test_file = cwd + "/" + SSH.testXMLfiles[0]
 
 	xmlTree = ET.parse(xml_test_file)
 	xmlRoot = xmlTree.getroot()
@@ -2810,6 +3290,12 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE):
 				SSH.AttachUE()
 			elif action == 'Detach_UE':
 				SSH.DetachUE()
+			elif action == 'Build_OAI_UE':
+				SSH.BuildOAIUE()
+			elif action == 'Initialize_OAI_UE':
+				SSH.InitializeOAIUE()
+			elif action == 'Terminate_OAI_UE':
+				SSH.TerminateOAIUE()
 			elif action == 'Initialize_CatM_module':
 				SSH.InitializeCatM()
 			elif action == 'Terminate_CatM_module':

ci-scripts/oai-ci-vm-tool

@@ -264,7 +264,7 @@ case $key in
     ARCHIVES_LOC=cppcheck
     LOG_PATTERN=cppcheck.xml
     NB_PATTERN_FILES=1
-    BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list"
+    BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -j4"
     NBARGS=$[$NBARGS+256]
     shift
     ;;
@@ -344,7 +344,7 @@ case $key in
         ARCHIVES_LOC=cppcheck
         LOG_PATTERN=cppcheck.xml
         NB_PATTERN_FILES=1
-        BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list"
+        BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -j4"
         NBARGS=$[$NBARGS+256]
         ;;
         enb-ethernet)

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml

@@ -65,7 +65,7 @@
                 <class>Ping</class>
                 <desc>ping (5MHz - 20 sec)</desc>
                 <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>50</ping_packetloss_threshold>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="040601">
@@ -112,7 +112,7 @@
 		<class>Iperf</class>
 		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
 		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>80</iperf_packetloss_threshold>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>unbalanced</iperf_profile>
 	</testCase>
 

ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml

@@ -81,7 +81,7 @@
                 <class>Ping</class>
                 <desc>ping (5MHz - 20 sec)</desc>
                 <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>50</ping_packetloss_threshold>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="040602">

ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml

@@ -37,7 +37,7 @@
 		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 	</testCase>
-	
+
 	<testCase id="030125">
 		<class>Initialize_eNB</class>
 		<desc>Initialize RCC (TDD/Band40/20MHz/info)</desc>

ci-scripts/xml_files/ue_band20_build.xml

@@ -0,0 +1,38 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>build-tab</htmlTabRef>
+	<htmlTabName>Build</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+090101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="090101">
+		<class>Build_OAI_UE</class>
+		<desc>Build OAI UE</desc>
+		<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml

@@ -0,0 +1,49 @@
+<!--
+
+ 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-10mhz-orange</htmlTabRef>
+        <htmlTabName>Test-10Mhz-Orange</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>	
+	<TestCaseRequestedList>
+090102 000001 090109
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="090102">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE -- sniffing Orange frequency</desc>
+		<Initialize_OAI_UE_args>-C 816000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml

@@ -0,0 +1,49 @@
+<!--
+
+ 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-10mHz-sfr</htmlTabRef>
+        <htmlTabName>Test-10MHz-SFR</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+090104 000001 090109
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="090104">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE -- sniffing SFR frequency</desc>
+		<Initialize_OAI_UE_args>-C 806000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+</testCaseList>

cmake_targets/CMakeLists.txt

@@ -176,7 +176,6 @@ set(CMAKE_C_FLAGS
 set(CMAKE_CXX_FLAGS
 	"${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR} -std=c++11 -D${MKVER}"
 )
-add_definitions("-DASN_DISABLE_OER_SUPPORT")
 
 
 #########################
@@ -228,7 +227,6 @@ add_definitions("-DPACKAGE_VERSION=\"Branch: ${GIT_BRANCH} Abrev. Hash: ${GIT_CO
 add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")
 
 
-
 # Debug related options
 #########################################
 add_boolean_option(ASN_DEBUG           False "ASN1 coder/decoder Debug")
@@ -383,7 +381,7 @@ file(GLOB S1AP_source ${S1AP_C_DIR}/*.c)
 add_custom_target (
   s1ap_flag ALL
   ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${S1AP_C_DIR}" "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "S1AP_" -fno-include-deps
-  DEPENDS  "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" 
+  DEPENDS  "${S1AP_ASN_DIR}/${S1AP_ASN_FILES}"
 )
 
 add_library(S1AP_LIB
@@ -475,6 +473,50 @@ add_library(X2AP_ENB
  )
 add_dependencies(X2AP_ENB rrc_flag x2_flag)
 
+# F1AP
+##############
+add_list1_option(F1AP_RELEASE R15 "F1AP ASN.1 grammar version" R15)
+set(F1AP_DIR ${OPENAIR2_DIR}/F1AP)
+if (${F1AP_RELEASE} STREQUAL "R15")
+  make_version(F1AP_VERSION 15 2 1)
+  set (ASN1RELDIR R15.2.1)
+endif(${F1AP_RELEASE} STREQUAL "R15")
+add_definitions(-DF1AP_VERSION=${F1AP_VERSION})
+set(F1AP_ASN_DIR ${F1AP_DIR}/MESSAGES/ASN1/${ASN1RELDIR})
+set(F1AP_ASN_FILES
+  ${F1AP_ASN_DIR}/F1AP-CommonDataTypes.asn
+  ${F1AP_ASN_DIR}/F1AP-Constants.asn
+  ${F1AP_ASN_DIR}/F1AP-PDU-Descriptions.asn
+  ${F1AP_ASN_DIR}/F1AP-PDU-Contents.asn
+  ${F1AP_ASN_DIR}/F1AP-IEs.asn
+  ${F1AP_ASN_DIR}/F1AP-Containers.asn
+  )
+
+set(F1AP_ASN_GENERATED_C_DIR ${asn1_generated_dir}/F1AP_${ASN1RELDIR})
+message("calling ASN1C_PREFIX=F1AP_ asn1c -gen-PER -fcompound-names -no-gen-example -findirect-choice -fno-include-deps -D ${F1AP_ASN_GENERATED_C_DIR} ${F1AP_ASN_FILES}")
+execute_process(COMMAND mkdir -p ${F1AP_ASN_GENERATED_C_DIR}
+                COMMAND env "ASN1C_PREFIX=F1AP_" asn1c -gen-PER -fcompound-names -no-gen-example -findirect-choice -fno-include-deps -D ${F1AP_ASN_GENERATED_C_DIR} ${F1AP_ASN_FILES}
+                RESULT_VARIABLE ret
+                OUTPUT_QUIET
+                ERROR_QUIET)
+
+if (NOT ${ret} STREQUAL 0)
+  message(FATAL_ERROR "asn1c: error")
+endif (NOT ${ret} STREQUAL 0)
+
+file(GLOB F1AP_ASN_GENERATED_C_FILES ${F1AP_ASN_GENERATED_C_DIR}/*.c)
+add_library(F1AP_LIB
+  ${F1AP_ASN_GENERATED_C_FILES}
+)
+
+include_directories ("${F1AP_ASN_GENERATED_C_DIR}")
+include_directories ("${F1AP_DIR}")
+
+file(GLOB F1AP_C_FILES ${F1AP_DIR}/*.c)
+add_library(F1AP
+  ${F1AP_C_FILES}
+)
+
 # Hardware dependant options
 ###################################
 add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4")
@@ -622,7 +664,12 @@ add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION w
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
 
-########################
+#############################################################################
+# Flag for UE compilation to avoid issues in common eNB/UE PDCP/RLC functions
+#############################################################################
+
+add_boolean_option(UETARGET                 False         "set UE as target for compiler")
+
 # Include order
 ##########################
 add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
@@ -748,6 +795,8 @@ include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")
 include_directories("${OPENAIR1_DIR}")
 include_directories("${OPENAIR2_DIR}")
+include_directories("${OPENAIR3_DIR}/NAS/TOOLS")
+include_directories("${OPENAIR2_DIR}/ENB_APP")
 include_directories("${OPENAIR2_DIR}/LAYER2/RLC")
 include_directories("${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0")
 include_directories("${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0")
@@ -770,19 +819,21 @@ include_directories("${OPENAIR3_DIR}/SECU")
 include_directories("${OPENAIR3_DIR}/SCTP")
 include_directories("${OPENAIR3_DIR}/S1AP")
 include_directories("${OPENAIR2_DIR}/X2AP")
+include_directories("${OPENAIR2_DIR}/F1AP")
 include_directories("${OPENAIR3_DIR}/UDP")
 include_directories("${OPENAIR3_DIR}/GTPV1-U")
 include_directories("${OPENAIR_DIR}/targets/COMMON")
 include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON")
 include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/USERSPACE/LIB/")
 include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/DEFS")
-include_directories("${OPENAIR2_DIR}/ENB_APP")
+include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PHY")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/RRC")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PDCP")
 include_directories("${OPENAIR2_DIR}/UTIL/OSA")
 include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds6.1.1/liblfds611/inc")
 include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds7.0.0/liblfds700/inc")
+include_directories("${OPENAIR2_DIR}/LAYER2/PROTO_AGENT")
 include_directories("${OPENAIR2_DIR}/UTIL/MEM")
 include_directories("${OPENAIR2_DIR}/UTIL/LISTS")
 include_directories("${OPENAIR2_DIR}/UTIL/FIFO")
@@ -824,7 +875,7 @@ set(FLPT_MSG_FILES
   ${FLPT_MSG_DIR}/control_delegation.proto
   )
 
-set(FLPT_C_DIR ${protobuf_generated_dir}/${FLPTDIR})
+set(FLPT_C_DIR ${protobuf_generated_dir}/FLPT_${FLPTDIR})
 #message("calling protoc_call=${protoc_call} FLPT_C_DIR=${FLPT_C_DIR} FLPT_MSG_FILES=${FLPT_MSG_FILES}")
 execute_process(COMMAND ${protoc_call} ${FLPT_C_DIR} ${FLPT_MSG_DIR} ${FLPT_MSG_FILES})
 file(GLOB FLPT_source ${FLPT_C_DIR}/*.c)
@@ -867,6 +918,7 @@ add_library(FLEXRAN_AGENT
   ${OPENAIR2_DIR}/ENB_APP/flexran_agent_ran_api.c
   ${OPENAIR2_DIR}/ENB_APP/flexran_agent_timer.c
   ${OPENAIR2_DIR}/ENB_APP/flexran_agent_common_internal.c
+  ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PHY/flexran_agent_phy.c
   ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
   ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
   ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c
@@ -892,6 +944,63 @@ MARK_AS_ADVANCED(LIBYAML_INCLUDE_DIR LIBYAML_LIBRARIES)
 
 #set(PROTOBUF_LIB "protobuf") #for Cpp
 
+# set the version of protobuf messages, V3 not supported yet
+add_list1_option(FSPT_VERSION V2 "FSPT MSG  protobuf  grammar version" V2 V3)
+
+if (${FSPT_VERSION} STREQUAL "V2")
+  set (FSPTDIR V2)
+elseif (${FSPT_VERSION} STREQUAL "V3")
+  set (FSPTDIR V3)
+endif(${FSPT_VERSION} STREQUAL "V2")
+
+set(FSPT_MSG_DIR ${OPENAIR_DIR}/targets/COMMON/MESSAGES/${FSPTDIR} )
+set(FSPT_MSG_FILES
+  ${FSPT_MSG_DIR}/flexsplit.proto
+  )
+
+set(FSPT_C_DIR ${protobuf_generated_dir}/FSPT_${FSPTDIR})
+message("calling protoc_call=${protoc_call} FSPT_C_DIR=${FSPT_C_DIR} FSPT_MSG_DIR=${FSPT_MSG_DIR} FSPT_MSG_FILES=${FSPT_MSG_FILES}")
+execute_process(COMMAND ${protoc_call} ${FSPT_C_DIR} ${FSPT_MSG_DIR} ${FSPT_MSG_FILES})
+file(GLOB FSPT_source ${FSPT_C_DIR}/*.c)
+set(FSPT_OAI_generated
+  ${FSPT_C_DIR}/flexsplit.pb-c.c
+  )
+
+file(GLOB fspt_h ${FSPT_C_DIR}/*.h)
+set(fspt_h ${fspt_h} )
+
+add_library(FSPT_MSG
+  ${FSPT_OAI_generated}
+  ${FSPT_source}
+  )
+set(FSPT_MSG_LIB FSPT_MSG)
+message("fspt c dir is : ${FSPT_C_DIR}")
+include_directories (${FSPT_C_DIR})
+
+#  add_library(ASYNC_IF
+#    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/socket_link.c
+#    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/link_manager.c
+#    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/message_queue.c
+#    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/ringbuffer_queue.c
+#    )
+#  set(ASYNC_IF_LIB ASYNC_IF)
+#  include_directories(${OPENAIR2_DIR}/UTIL/ASYNC_IF)
+
+add_library(PROTO_AGENT
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_common.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_async.c
+  )
+set(PROTO_AGENT_LIB PROTO_AGENT)
+include_directories(${OPENAIR2_DIR}/LAYER2/PROTO_AGENT)
+
+
+
+set(PROTOBUF_LIB "protobuf-c")
+
+#set(PROTOBUF_LIB "protobuf") #for Cpp
 
 add_library(HASHTABLE
   ${OPENAIR_DIR}/common/utils/hashtable/hashtable.c
@@ -914,7 +1023,7 @@ set(UTIL_SRC
   ${OPENAIR_DIR}/common/utils/LOG/log.c
 #  ${OPENAIR2_DIR}/UTIL/LOG/vcd_signal_dumper.c
   ${OPENAIR2_DIR}/UTIL/MATH/oml.c
-  ${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
+  #${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
 #  ${OPENAIR2_DIR}/UTIL/OCG/OCG.c
 #  ${OPENAIR2_DIR}/UTIL/OCG/OCG_create_dir.c
 #  ${OPENAIR2_DIR}/UTIL/OCG/OCG_detect_file.c
@@ -1974,11 +2083,39 @@ add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag)
 
 target_link_libraries (lte-softmodem
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2
-  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2
+  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB} LFDS7
   NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   -Wl,--end-group z dl)
 
+add_executable(cu_test
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/cu_test.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_common.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_async.c
+  ${T_SOURCE}
+)
+target_link_libraries(cu_test
+  ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FSPT_MSG_LIB} ${PROTOBUF_LIB}
+  ${PROTO_AGENT_LIB} pthread UTIL ${T_LIB} dl ${ITTI_LIB}
+)
+
+add_executable(du_test
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/du_test.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_common.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
+  ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_async.c
+  ${T_SOURCE}
+)
+target_link_libraries(du_test
+  ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FSPT_MSG_LIB} ${PROTOBUF_LIB}
+  ${PROTO_AGENT_LIB} pthread UTIL ${T_LIB} dl ${ITTI_LIB}
+)
+
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
 target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
@@ -2015,14 +2152,14 @@ add_dependencies(lte-softmodem-nos1 rrc_flag s1ap_flag x2_flag)
 
 target_link_libraries (lte-softmodem-nos1
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2
-  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  RRC_LIB F1AP F1AP_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2
+  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB} LFDS7
   NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   -Wl,--end-group z dl)
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 ${LIB_LMS_LIBRARIES})
+target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 # lte-uesoftmodem is  UE implementation
 #######################################
@@ -2055,7 +2192,7 @@ add_executable(lte-uesoftmodem
 add_dependencies(lte-uesoftmodem rrc_flag s1ap_flag x2_flag)
 target_link_libraries (lte-uesoftmodem
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
+  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB F1AP F1AP_LIB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES}
   NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   -Wl,--end-group z dl)
@@ -2096,14 +2233,14 @@ add_dependencies(lte-uesoftmodem-nos1 rrc_flag s1ap_flag x2_flag)
 
 target_link_libraries (lte-uesoftmodem-nos1
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
+  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB F1AP F1AP_LIB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES}
   NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   -Wl,--end-group z dl)
 
 target_link_libraries (lte-uesoftmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-uesoftmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
-target_link_libraries (lte-uesoftmodem-nos1 ${LIB_LMS_LIBRARIES})
+target_link_libraries (lte-uesoftmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
+target_link_libraries (lte-uesoftmodem-nos1  ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-uesoftmodem-nos1 ${T_LIB})
 # USIM process
 #################
@@ -2159,7 +2296,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
   target_link_libraries (${myExe}
 
     -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY PHY_UE PHY_RU LFDS ${ITTI_LIB} LFDS7 -Wl,--end-group
-    pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB} dl 
+    pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB} dl
     )
 endforeach(myExe)
 
@@ -2172,7 +2309,7 @@ add_executable(test_epc_generate_scenario
   ${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
   )
 target_link_libraries (test_epc_generate_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB F1AP_LIB F1AP GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${ITTI_LIB} ${MSC_LIB} L2 -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
   )
 
 add_executable(test_epc_play_scenario
@@ -2191,7 +2328,7 @@ add_executable(test_epc_play_scenario
   )
 target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
 target_link_libraries (test_epc_play_scenario
-  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB X2AP_ENB GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY_COMMON PHY PHY_UE LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
+  -Wl,--start-group RRC_LIB S1AP_LIB X2AP_LIB X2AP_ENB F1AP_LIB F1AP GTPV1U LIB_NAS_UE SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY_COMMON PHY PHY_UE LFDS ${ITTI_LIB} ${MSC_LIB} -Wl,--end-group pthread m rt crypt sctp ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} ${CONFIG_LIBRARIES}
   )
 
 
@@ -2225,15 +2362,15 @@ if (${T_TRACER})
         #all "add_executable" definitions (except tests, rb_tool, updatefw)
         lte-softmodem lte-softmodem-nos1 lte-uesoftmodem lte-uesoftmodem-nos1
         dlsim_tm4 dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
-        pdcchsim pucchsim prachsim syncsim ulsim
+        pdcchsim pucchsim prachsim syncsim ulsim cu_test du_test
         #all "add_library" definitions
-        ITTI RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB
+        ITTI RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB F1AP_LIB F1AP
         oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif
         oai_eth_transpro
         FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO SECU_OSA
-        SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL CN_UTILS
-        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU OPENAIR0_LIB PHY_MEX
-        coding)
+        SECU_CN SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY L2 default_sched
+        remote_sched RAL CN_UTILS GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS
+        LFDS7 SIMU OPENAIR0_LIB PHY_MEX coding)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()

cmake_targets/autotests/test_case_list.xml

@@ -990,11 +990,11 @@
       <pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
       <pre_exec_args></pre_exec_args>
       <main_exec> $OPENAIR_DIR/targets/bin/ulsim.Rel14</main_exec>
-      <main_exec_args> -BnbRBs=25 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
-                       -BnbRBs=25 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
-                        -BnbRBs=50 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70  
-                       -BnbRBs=50 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
-                        -BnbRBs=100 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
+      <main_exec_args> -BnbRBs=25 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70
+                       -BnbRBs=25 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70
+                        -BnbRBs=50 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70
+                       -BnbRBs=50 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70
+                        -BnbRBs=100 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70
                        -BnbRBs=100 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 </main_exec_args>
      <tags>ulsim.test1 ulsim.test2 ulsim.test3 ulsim.test4 ulsim.test5 ulsim.test6</tags>
       <search_expr_true>"passed"</search_expr_true>

cmake_targets/build_oai

@@ -70,6 +70,7 @@ DISABLE_LOG_X="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
 UE_NAS_USE_TUN="False"
+UETARGET="False"
 BASIC_SIMULATOR=0
 trap handle_ctrl_c INT
 
@@ -103,6 +104,8 @@ Options
    Specify conf_nvram_path (default \"$conf_nvram_path\")
 --UE-gen-nvram [output path]
    Specify gen_nvram_path (default \"$gen_nvram_path\")
+-a | --agent
+   Enables agent for software-defined control of the eNB
 -r | --3gpp-release
    default is Rel14,
    Rel8 limits the implementation to 3GPP Release 8 version
@@ -216,6 +219,7 @@ function main() {
 	    shift;;
        --UE)
             UE=1
+            UETARGET="True"
             echo_info "Will compile UE"
             shift;;
        --mu)
@@ -237,7 +241,7 @@ function main() {
             echo_info "Setting release to: $REL"
             shift 2;;
        -w | --hardware)
-                # Use OAI_USRP  as the key word USRP is used inside UHD driver
+            # Use OAI_USRP  as the key word USRP is used inside UHD driver           
                 case "$2" in
                     "EXMIMO")
                         HW="EXMIMO"
@@ -251,7 +255,7 @@ function main() {
                     *)
                         echo_fatal "Unknown HW type $HW: exit..."
                 esac
-	echo_info "Setting hardware to: $HW"
+		echo_info "Setting hardware to: $HW"
             shift 2;;
 	-t | --transport_protocol)
             TP="$2" #"${i#*=}"
@@ -389,35 +393,35 @@ function main() {
   
   CMAKE_CMD="$CMAKE_CMD .."
   echo_info "CMAKE_CMD=$CMAKE_CMD"
-    #########################################################
-    # check validity of HW and TP parameters for eNB
-    #########################################################
-    # to be discussed
-    
-    if [ "$eNB" = "1" ] ; then
-	if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
-            echo_fatal "Define a local radio head (e.g. -w EXMIMO) or a transport protocol (e.g. -t ETHERNET) to communicate with a remote radio head!"
-	fi
-	if [ "$HW" = "None" ] ; then 
-            echo_info "No radio head has been selected (HW set to $HW)"   
-	fi
-	if [ "$TP" = "None" ] ; then
-            echo_info "No transport protocol has been selected (TP set to $TP)"   
-	fi
-    fi
-    
-    echo_info "RF HW set to $HW" 
+  #########################################################
+  # check validity of HW and TP parameters for eNB
+  #########################################################
+  # to be discussed
+  
+  if [ "$eNB" = "1" ] ; then
+      if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
+	  echo_fatal "Define a local radio head (e.g. -w EXMIMO) or a transport protocol (e.g. -t ETHERNET) to communicate with a remote radio head!"
+      fi
+      if [ "$HW" = "None" ] ; then 
+	  echo_info "No radio head has been selected (HW set to $HW)"	
+      fi
+      if [ "$TP" = "None" ] ; then
+	  echo_info "No transport protocol has been selected (TP set to $TP)"	
+      fi
+  fi
+  
+  echo_info "RF HW set to $HW" 
     # If the user doesn't specify the Linux scheduler to use, we set a value
     if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
       case "$HW" in
  	  "EXMIMO")
-               DEADLINE_SCHEDULER_FLAG_USER="True"
+        DEADLINE_SCHEDULER_FLAG_USER="True"
               ;;
  	  *)
-              DEADLINE_SCHEDULER_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
               ;;
       esac
-    fi
+  fi
   #Disable CPU Affinity for deadline scheduler
   if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then 
      CPU_AFFINITY_FLAG_USER="False"
@@ -497,18 +501,18 @@ function main() {
   
   echo_info "3. building the compilation directives ..."
 
-    DIR=$OPENAIR_DIR/cmake_targets
+  DIR=$OPENAIR_DIR/cmake_targets
     
     if [ "$T_TRACER" =  "False" ] ; then
         noLOGDirsuffix="_noLOG"
-    fi
+      fi
     if [ "$NOS1" =  "1" ] ; then
         noS1Dir="_noS1"
         bin_suffix="-nos1"
-    else
-        lte_build_dir=lte_build_oai
+  else
+      lte_build_dir=lte_build_oai
         bin_suffix=""
-    fi
+  fi
 
     lte_build_dir="lte${noS1Dir}_build_oai${noLOGDirsuffix}"
 # configuration module libraries, one currently available, using libconfig 
@@ -545,6 +549,9 @@ function main() {
     echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
     echo "set (DISABLE_LOG_X $DISABLE_LOG_X)"        >>  $cmake_file
     echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"        >>  $cmake_file
+    if [ "$UE" = 1 ] ; then
+       echo "set (UETARGET $UETARGET )"                   >> $cmake_file
+    fi
     if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
      echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
      echo "set (LINUX True )"              >>  $cmake_file
@@ -707,81 +714,81 @@ function main() {
     cp $OPENAIR_DIR/cmake_targets/tools/init_exmimo2 $dbin
   fi
 
-    # Telnet server compilation
-    #####################
-    if [ "$BUILD_TELNETSRV" = "1" ] ; then
-        compilations \
+  # Telnet server compilation
+  #####################
+  if [ "$BUILD_TELNETSRV" = "1" ] ; then
+              compilations \
             $lte_build_dir telnetsrv \
-            libtelnetsrv.so $dbin/libtelnetsrv.so
-        
-    fi
+                  libtelnetsrv.so $dbin/libtelnetsrv.so
+
+  fi 
     # msc library compilation
-    #####################
-    if [ "$MSC_GEN" = "1" ] ; then
-        compilations \
+  #####################
+  if [ "$MSC_GEN" = "1" ] ; then
+              compilations \
             $lte_build_dir msc \
-            libmsc.so $dbin/libmsc.so
-        
-    fi
-    # build RF device and transport protocol libraries
-    #####################################
-    if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
-        
-        # build RF device libraries
-        if [ "$HW" != "None" ] ; then
-            rm -f liboai_device.so
-            rm -f $dbin/liboai_device.so
-            
-            # link liboai_device.so with the selected RF device library
-            if [ "$HW" == "EXMIMO" ] ; then
-                compilations \
+                  libmsc.so $dbin/libmsc.so
+
+  fi  
+  # build RF device and transport protocol libraries
+  #####################################
+  if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
+
+      # build RF device libraries
+      if [ "$HW" != "None" ] ; then
+	  rm -f liboai_device.so
+	  rm -f $dbin/liboai_device.so
+
+	  # link liboai_device.so with the selected RF device library
+	  if [ "$HW" == "EXMIMO" ] ; then
+	      compilations \
                     $lte_build_dir oai_exmimodevif \
-                    liboai_exmimodevif.so $dbin/liboai_exmimodevif.so.$REL
-                
-                ln -sf liboai_exmimodevif.so liboai_device.so
-                ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
-                echo_info "liboai_device.so is linked to EXMIMO device library"
-            elif [ "$HW" == "OAI_USRP" ] ; then
-                compilations \
+		  liboai_exmimodevif.so $dbin/liboai_exmimodevif.so.$REL
+
+	      ln -sf liboai_exmimodevif.so liboai_device.so
+	      ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to EXMIMO device library"       
+	  elif [ "$HW" == "OAI_USRP" ] ; then
+              compilations \
                     $lte_build_dir oai_usrpdevif \
-                    liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
-                
-                ln -sf liboai_usrpdevif.so liboai_device.so
-                ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
-                echo_info "liboai_device.so is linked to USRP device library"
-            elif [ "$HW" == "OAI_BLADERF" ] ; then
-                if [ -f "/usr/include/libbladeRF.h" ] ; then
-                    compilations \
+                  liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
+
+	      ln -sf liboai_usrpdevif.so liboai_device.so
+	      ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to USRP device library"        
+	  elif [ "$HW" == "OAI_BLADERF" ] ; then
+	      if [ -f "/usr/include/libbladeRF.h" ] ; then
+		  compilations \
                         $lte_build_dir oai_bladerfdevif \
-                        liboai_bladerfdevif.so $dbin/liboai_bladerfdevif.so.$REL
-                fi
-                
-                ln -sf liboai_bladerfdevif.so liboai_device.so
-                ln -sf $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
-                echo_info "liboai_device.so is linked to BLADERF device library"
-            elif [ "$HW" == "OAI_LMSSDR" ] ; then
+		      liboai_bladerfdevif.so $dbin/liboai_bladerfdevif.so.$REL
+	      fi
+
+	      ln -sf liboai_bladerfdevif.so liboai_device.so
+	      ln -sf $dbin/liboai_bladerfdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to BLADERF device library"	 
+	  elif [ "$HW" == "OAI_LMSSDR" ] ; then
                 #       if [ -f "/usr/include/libbladeRF.h" ] ; then
-                compilations \
+		  compilations \
                     $lte_build_dir oai_lmssdrdevif \
-                    liboai_lmssdrdevif.so $dbin/liboai_lmssdrdevif.so.$REL
+		      liboai_lmssdrdevif.so $dbin/liboai_lmssdrdevif.so.$REL
                 #       fi
-                
-                ln -sf liboai_lmssdrdevif.so liboai_device.so
-                ln -sf $dbin/liboai_lmssdrdevif.so.$REL $dbin/liboai_device.so
-                echo_info "liboai_device.so is linked to LMSSDR device library"
-            elif [ "$HW" == "OAI_IRIS" ] ; then
-                compilations \
+
+	      ln -sf liboai_lmssdrdevif.so liboai_device.so
+	      ln -sf $dbin/liboai_lmssdrdevif.so.$REL $dbin/liboai_device.so
+	      echo_info "liboai_device.so is linked to LMSSDR device library"	 
+          elif [ "$HW" == "OAI_IRIS" ] ; then
+                  compilations \
                     $lte_build_dir oai_irisdevif \
-                    liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
-                
-                ln -s liboai_irisdevif.so liboai_device.so
-                ln -s $dbin/liboai_irisdevif.so.$REL $dbin/liboai_device.so
-                echo_info "liboai_device.so is linked to IRIS device library"
-            else
-                echo_info "liboai_device.so is not linked to any device library"
-            fi
-        fi
-        
+                      liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
+
+              ln -s liboai_irisdevif.so liboai_device.so
+              ln -s $dbin/liboai_irisdevif.so.$REL $dbin/liboai_device.so
+              echo_info "liboai_device.so is linked to IRIS device library"
+	  else 
+	      echo_info "liboai_device.so is not linked to any device library"	    
+	  fi
+      fi
+      
         # build simulators devices
         echo_info "Compiling rfsimulator"
         compilations \
@@ -793,16 +800,16 @@ function main() {
             libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
         # build transport protocol libraries (currently only ETHERNET is available)
 
-        rm -f liboai_transpro.so
-        rm -f $dbin/liboai_transpro.so
-        compilations \
+	  rm -f liboai_transpro.so
+	  rm -f $dbin/liboai_transpro.so
+	      compilations \
             $lte_build_dir oai_eth_transpro \
-            liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
-        ln -sf liboai_eth_transpro.so liboai_transpro.so
-        ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
+		  liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
+	      ln -sf liboai_eth_transpro.so liboai_transpro.so
+	      ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
         echo_info "liboai_transpro.so is linked to ETHERNET transport"
-    fi
-    
+      fi
+
     if [ "$RFSIMULATOR" == "true" -o "$HW" == "OAI_SIMU" ] ; then
         echo_info "Compiling rfsimulator"
         compilations \
@@ -938,6 +945,7 @@ function main() {
     echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"         >>  $cmake_file
     echo "set (LINUX True )"                          >>  $cmake_file
     echo "set (PDCP_USE_NETLINK True )"               >>  $cmake_file
+    echo "set (UETARGET True )"                       >>  $cmake_file
     echo "set (BASIC_SIMULATOR \"True\" )"            >>  $cmake_file
 #    echo "set (UE_NAS_USE_TUN \"True\" )"             >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)' >> $cmake_file

cmake_targets/tools/build_helper

@@ -102,7 +102,7 @@ check_supported_distribution() {
         "ubuntu14.04") return 0 ;;
         "fedora24")    return 0 ;;
         "rhel7")       return 0 ;;
-	"rhel7.6")     return 0 ;; 
+	"rhel7.6")     return 0 ;;
         "centos7")     return 0 ;;
     esac
     return 1
@@ -639,8 +639,6 @@ check_install_oai_software() {
 	libidn2-0-dev  \
 	libidn11-dev \
 	libmysqlclient-dev  \
-	liboctave-dev \
-	libpgm-dev \
 	libpython2.7-dev \
 	libsctp1  \
 	libsctp-dev  \
@@ -651,7 +649,6 @@ check_install_oai_software() {
 	libxml2-dev  \
 	libxslt1-dev \
 	mscgen  \
-	octave \
 	octave-signal \
 	openssh-client \
 	openssh-server \
@@ -663,7 +660,8 @@ check_install_oai_software() {
 	pydb \
 	libyaml-dev \
 	wget \
-	libxpm-dev
+	libxpm-dev \
+        libboost-all-dev
 
     $SUDO update-alternatives --set "$LAPACK_LIBNAME" "$LAPACK_TARGET"
 
@@ -711,8 +709,6 @@ check_install_oai_software() {
       libidn2-devel  \
       libidn-devel \
       mariadb-devel \
-      octave-devel \
-      openpgm-devel \
       lksctp-tools \
       lksctp-tools-devel \
       openssl-devel \
@@ -722,8 +718,6 @@ check_install_oai_software() {
       libxml2 \
       libxml2-devel \
       libxslt-devel \
-      octave \
-      octave-signal \
       openssh-clients \
       openssh-server \
       openssl \
@@ -746,7 +740,7 @@ check_install_oai_software() {
       libyaml-devel
   fi
 
-    install_asn1c_from_source
+    install_asn1c_from_source $1
     $SUDO rm -fr /opt/ssh
     $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
 }

cmake_targets/tools/fix_asn1

@@ -23,7 +23,7 @@ reset_color="$(tput sgr0)"
 function error()
 {
   echo -e "$red_color"ERROR: "$@""$reset_color"
-  exit 1
+#  exit 1
 }
 
 function check_sha1()
@@ -56,11 +56,11 @@ function patch_file()
 
   echo -e "$green_color""patch file $file with $OPENAIR_DIR/cmake_targets/tools/$patch""$reset_color"
 
-  patch "$file" "$OPENAIR_DIR/cmake_targets/tools/$patch"
-  if [ $? -ne 0 ]
-  then
-    error "patching of $file with $OPENAIR_DIR/cmake_targets/tools/$patch failed"
-  fi
+#  patch "$file" "$OPENAIR_DIR/cmake_targets/tools/$patch"
+#  if [ $? -ne 0 ]
+#  then
+#    error "patching of $file with $OPENAIR_DIR/cmake_targets/tools/$patch failed"
+#  fi
 }
 
 function apply_patches()
@@ -140,6 +140,22 @@ function patch_s1ap()
   esac
 }
 
+function patch_f1ap()
+{
+  local directory="$1"
+  local version="$2"
+
+  case "$version" in
+    R15 )
+      #nothing to do anymore (fixes went to asn1c)
+      ;;
+    * )
+      error unknwon/unhandled F1AP version \'"$version"\'
+      ;;
+  esac
+}
+
+
 function main()
 {
   if [ $# -ne 3 ]
@@ -167,6 +183,9 @@ function main()
     S1AP )
       patch_s1ap "$directory" "$version"
       ;;
+    F1AP )
+      patch_f1ap "$directory" "$version"
+      ;;
     * )
       error unknown module "$module"
       ;;

cmake_targets/tools/generate_asn1

@@ -2,23 +2,29 @@
 
 function main()
 {
-mkdir -p $1
-cd $1
+PROTOCOL_DIR=$1
+mkdir -p ${PROTOCOL_DIR}
+cd ${PROTOCOL_DIR}
+
+# Because use $* also include directory, so we need shift
 shift
 
-#if this script is called with only 2 arguments (so 1 here after the shift), it's for RRC
-#(there may be a better way...)
-if [ $# -eq 1 ]; then
+# There are three types parameter for asn1c
+# One is for RRC
+# and one is for F1AP
+# another is for other protocols
 
-#asn1c does not work well with extension groups, we need the following fix:
-# replace [[ by '<name> SEQUENCE {'
-#     and ]] by '} OPTIONAL'
-#<name> is ext<N> with N starting from 1 and incremented at each new [[ ]] just
-#following another [[ ]]
-#
-#this is what the following C program does
+if echo ${PROTOCOL_DIR} | grep -q "RRC"; then
 
-echo generate asnfix.c
+    #asn1c does not work well with extension groups, we need the following fix:
+    # replace [[ by '<name> SEQUENCE {'
+    #     and ]] by '} OPTIONAL'
+    #<name> is ext<N> with N starting from 1 and incremented at each new [[ ]] just
+    #following another [[ ]]
+    #
+    #this is what the following C program does
+
+    echo generate asnfix.c
 
 cat << EOF > asnfix.c
 /* transforms:
@@ -85,30 +91,34 @@ int main(void)
 }
 EOF
 
-echo compile asnfix.c
+    echo compile asnfix.c
 
-gcc -Wall -o asnfix asnfix.c
+    gcc -Wall -o asnfix asnfix.c
 
-echo run asnfix on $1
+    echo run asnfix on $1
 
-./asnfix < $1 > fixed_grammar.asn
+    ./asnfix < $1 > fixed_grammar.asn
 
-rm -f asnfix asnfix.c
+    rm -f asnfix asnfix.c
 
-echo done with asnfix
+    echo done with asnfix
 
-echo running asn1c
+    echo running asn1c
 
-asn1c -gen-PER -fcompound-names fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
+    asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
 
-rm -f fixed_grammar.asn
+    rm -f fixed_grammar.asn
 
-echo asn1c done
+    echo asn1c done
 
+elif echo ${PROTOCOL_DIR} | grep -q "F1AP"; then
+    
+    asn1c -gen-PER -fcompound-names -no-gen-example -findirect-choice -fno-include-deps $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
+    
 else
-
-asn1c -gen-PER -fcompound-names $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
-
+    
+    asn1c -gen-PER -fcompound-names -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
+    
 fi
 
 awk ' 

cmake_targets/tools/make_asn1c_includes.sh

@@ -3,11 +3,11 @@ GENERATED_FULL_DIR=$1
 shift
 ASN1_SOURCE_DIR=$1
 shift
-export ASN1C_PREFIX=$1 
+export ASN1C_PREFIX=$1
 shift
 options=$*
 done_flag="$GENERATED_FULL_DIR"/done
-if [ "$done_flag" -ot $ASN1_SOURCE_DIR ] ; then 
+if [ "$done_flag" -ot $ASN1_SOURCE_DIR ] ; then
    rm -f "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.c "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.h
    mkdir -p "$GENERATED_FULL_DIR"
    asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $options -D $GENERATED_FULL_DIR $ASN1_SOURCE_DIR |& egrep -v "^Copied|^Compiled" | sort -u

common/config/DOC/config/arch.md

@@ -1,7 +1,7 @@
 # config module source files
-![configmodule_srcdir](/uploads/fdc3e96011fd5592440900dfa05b4701/configmodule_srcdir.png)  
+![configmodule_srcdir](/uploads/fdc3e96011fd5592440900dfa05b4701/configmodule_srcdir.png)
 # config module components
 ![configmodule_components](/uploads/54f8a3953d5ee53717cd9a3b71f85c68/configmodule_components.png)
 
 
-[Configuration module home](../config.md)
+[Configuration module home](../config.md)

common/config/DOC/config/devusage.md

@@ -1,17 +1,17 @@
-The configuration module objectives are 
+The configuration module objectives are
 1. Allow easy parameters management in oai, helping the development of a flexible, modularized and fully configurable softmodem.
 1. Use a common configuration API in all oai modules
-1. Allow development of alternative configuration sources without modifying the oai code. Today the only delivered configuration source is the libconfig format configuration file.  
+1. Allow development of alternative configuration sources without modifying the oai code. Today the only delivered configuration source is the libconfig format configuration file.
 
 As a developer you may need to look at these sections:
 
 * [add parameters in an existing section](devusage/addaparam.md)
 * [add a parameter set, in a new section](devusage/addparamset.md)
-* [configuration module API](devusage/api.md) 
-* [configuration module public structures](devusage/struct.md)  
+* [configuration module API](devusage/api.md)
+* [configuration module public structures](devusage/struct.md)
 
-Whatever your need is, configuration module usage examples can be found in oai sources:  
-*  complex example, using all the configuration module functionalities, including parameter checking: 
+Whatever your need is, configuration module usage examples can be found in oai sources:
+*  complex example, using all the configuration module functionalities, including parameter checking:
 [NB-IoT configuration code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair2/ENB_APP/NB_IoT_config.c) and [NB-IoT configuration include file](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair2/ENB_APP/NB_IoT_paramdef.h)
 *  very simple example, just reading a parameter set corresponding to a dedicated section:  the telnetsrv_autoinit function in [common/utils/telnetsrv/telnetsrv.c, around line 726](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/telnetsrv/telnetsrv.c#L726)
 *  an example with run-time definition of parameters, in the logging sub-system: the log_getconfig function at the top of [openair2/UTIL/LOG/log.c](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair2/UTIL/LOG/log.c)

common/config/DOC/config/devusage/addaparam.md

@@ -1,6 +1,6 @@
-To add a new parameter in an existing section you  insert an item in a `paramdef_t` array, which describes the parameters to be read in the existing `config_get` call. You also need to increment the numparams argument.  
+To add a new parameter in an existing section you  insert an item in a `paramdef_t` array, which describes the parameters to be read in the existing `config_get` call. You also need to increment the numparams argument.
 
-existing code:  
+existing code:
 ```c
 unsigned int varopt1;
 paramdef_t someoptions[] = {
@@ -11,10 +11,10 @@ paramdef_t someoptions[] = {
    {"opt1",  "<help opt1>",   0,      uptr:&varopt1, defuintval:0, TYPE_UINT,  0 },
 };
 
-config_get( someoptions,sizeof(someoptions)/sizeof(paramdef_t),"somesection"); 
+config_get( someoptions,sizeof(someoptions)/sizeof(paramdef_t),"somesection");
 
 ```
-new code:  
+new code:
 ```c
 unsigned int varopt1;
 
@@ -31,7 +31,7 @@ paramdef_t someoptions[] = {
    {"opt2",  "<help opt2>",   0,      strptr:&varopt2,defstrval:"",TYPE_STRING,0   },
 };
 
-config_get( someoptions,sizeof(someoptions)/sizeof(paramdef_t),"somesection"); 
+config_get( someoptions,sizeof(someoptions)/sizeof(paramdef_t),"somesection");
 
 ```
 
@@ -57,10 +57,10 @@ The configuration module provides a mechanism to check the parameter value read
  A `checkedparam_t` structure array provides the parameter verification procedures:
 
 ```c
-/* 
+/*
    definition of the verification to be done on param opt1 and opt2.
    opt1 is an integer option we must be set to 0,2,3,4 or 7 in the
-   config source.  
+   config source.
    if opt1 is set to 0 in the config file, it will be set to 1, etc
    opt2 is C string option with the authorize values "zero","oneThird","twoThird","one"
  */
@@ -82,5 +82,5 @@ for(int i=0 ; i < sizeof(someoptions)/sizeof(paramdesc_t) ; i ++) {
 ```
 When you need a specific verification algorithm, you can provide your own verification function and use it in place of the available ones, in the `checkedparam_t` union. If no existing structure definition match your need, you can enhance the configuration module. You then have to add a new verification function in https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/config/config_userapi.c and add a new structure definition in the `checkedparam_t` type defined in https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/config/config_paramdesc.h
 
-[Configuration module developer main page](../../config/devusage.md)  
+[Configuration module developer main page](../../config/devusage.md)
 [Configuration module home](../../config.md)

common/config/DOC/config/devusage/addparamset.md

@@ -1,7 +1,7 @@
 The configuration module maps a configuration file section to a `paramdef_t` structure array. One `config_get` call can be used to return the values of all the parameters described in the `paramdef_t` array.
 Retrieving a single occurence of a parameter set ( a group in the libconfig terminology) is just a two steps task:
 1.  describe the parameters in a `paramdef_t` array
-1.  call the `config_get` function  
+1.  call the `config_get` function
 
 
 [config_get example](../../config/devusage/addaparam.md)
@@ -30,19 +30,19 @@ NB-IoT_MACRLCs =
 );
 
 ```
-The configuration module provides the `config_getlist` call to support lists of group of parameters. Below is a commented code example, using the config_getlist call.  
+The configuration module provides the `config_getlist` call to support lists of group of parameters. Below is a commented code example, using the config_getlist call.
 
 ```c
 /* name of section containing the list */
 #define NBIOT_MACRLCLIST_CONFIG_STRING      "NB-IoT_MACRLCs"
 
-/* 
+/*
 The following macro define the parameters names, as used in the
 configuration file
-*/   
-#define CONFIG_STRING_MACRLC_CC             "num_cc" 
+*/
+#define CONFIG_STRING_MACRLC_CC             "num_cc"
 .....
-#define CONFIG_MACRLC_S_PORTD               "remote_s_portd" 
+#define CONFIG_MACRLC_S_PORTD               "remote_s_portd"
 
 /*
    now define a macro which will be used to initialize the NbIoT_MacRLC_Params
@@ -51,16 +51,16 @@ configuration file
    module allocate the memory for the parameters values.
 */
 /*------------------------------------------------------------------------------------------------------------*/
-/*   optname               helpstr   paramflags    XXXptr              defXXXval                  type           numelt     */ 
+/*   optname               helpstr   paramflags    XXXptr              defXXXval                  type           numelt     */
 /*------------------------------------------------------------------------------------------------------------*/
 
 #define MACRLCPARAMS_DESC { \
 {CONFIG_STRING_MACRLC_CC, NULL,     0,          uptr:NULL,           defintval:1,           TYPE_UINT,     0}, \
 .............  \
 {CONFIG_MACRLC_S_PORTD,   NULL,     0,          uptr:NULL,           defintval:50021,           TYPE_UINT,     0}, \
-}  
+}
 
-/* 
+/*
 the following macros define the indexes used to access the NbIoT_MacRLC_Params array
 items. They must be maintained consistent with the previous  MACRLCPARAMS_DESC macro
 which is used to initialize the NbIoT_MacRLC_Params variable
@@ -72,60 +72,60 @@ which is used to initialize the NbIoT_MacRLC_Params variable
 
 
 void RCconfig_NbIoTmacrlc(void) {
- 
+
 
 /*
    define and initialize the array of paramdef_t structures describing the groups of
-   parameters we want to read. It will be passed as the second argument of the 
+   parameters we want to read. It will be passed as the second argument of the
    config_getlist call, which will use it as an input only argument.
 */
   paramdef_t NbIoT_MacRLC_Params[] = MACRLCPARAMS_DESC;
 
-/* 
+/*
       now define and initialize a paramlist_def_t structure which will be passed
    to the config_getlist call. The first field is the only one to be initialized
-   it contains the name of the section to be read. 
+   it contains the name of the section to be read.
    that section contains the list of group of parameters.
       The two other fields are output parameters used to return respectively
-   a pointer to a two dimensional array of paramdef_t structures pointers, and the 
+   a pointer to a two dimensional array of paramdef_t structures pointers, and the
    number  of items in the list of groups (size of first dimension, the second one
    being the number of parameters in each group.
-*/ 
+*/
   paramlist_def_t NbIoT_MacRLC_ParamList = {NBIOT_MACRLCLIST_CONFIG_STRING,NULL,0};
 
 
- /* 
-   the config_getlist will allocate the second field of the paramlist_def_t structure, a 
-two dimensional array of paramdef_t pointers. In each param_def item it will allocate 
+ /*
+   the config_getlist will allocate the second field of the paramlist_def_t structure, a
+two dimensional array of paramdef_t pointers. In each param_def item it will allocate
 the value pointer and set the value to what it will get from the config source. The
 numelt field of the paramlist_def_t structure will be set to the number of groups of
 parameters in the list.
     in this example the last argument of config_getlist is unused, it may contain a
 character string, used as a prefix for the section name. It has to be specified when the
 list to be read is under another section.
-*/  
+*/
   config_getlist( &NbIoT_MacRLC_ParamList,NbIoT_MacRLC_Params,
-                  sizeof(NbIoT_MacRLC_Params)/sizeof(paramdef_t), 
+                  sizeof(NbIoT_MacRLC_Params)/sizeof(paramdef_t),
                   NULL);
-  
-/* 
+
+/*
   start a loop in the nuber of groups in the list, the numelt field of the
   paramlist_def_t structure has been set in the config_getlist call
 */
   for (j=0 ; j<NbIoT_MacRLC_ParamList.numelt ; j++) {
 
 ..........
- 
+
 /* access the MACRLC_REMOTE_S_PORTD parameter in the j ieme group of the list */
-	RC.nb_iot_mac[j]->eth_params_s.remote_portd = 
+	RC.nb_iot_mac[j]->eth_params_s.remote_portd =
                *(NbIoT_MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_S_PORTD_IDX].iptr);
 ............
-	
+
   } // MacRLC_ParamList.numelt > 0
 }
 
 
-```  
+```
 
-[Configuration module developer main page](../../config/devusage.md)  
+[Configuration module developer main page](../../config/devusage.md)
 [Configuration module home](../../config.md)

common/config/DOC/config/devusage/api.md

@@ -25,14 +25,14 @@ int config_get(paramdef_t *params,int numparams, char *prefix)
  - `PARAMFLAG_DISABLECMDLINE`: parameter cannot be modified via the command line
  - `PARAMFLAG_DONOTREAD`: ignore the parameter, can be used at run-time, to alter a pre-defined `paramdef_t` array which is used in several `config_get` or/and `config_getlist` calls.
  - `PARAMFLAG_NOFREE`: do not free the memory possibly allocated by the config module to store the value of the parameter. Default behavior is for the config module to free the memory it has allocated when the `config_end` function is called.
- - `PARAMFLAG_BOOL`: Only relevant for integer types. tell the config module that when processing the command line, the corresponding option can be specified without any arggument and that in this case it must set the value to 1.  
+ - `PARAMFLAG_BOOL`: Only relevant for integer types. tell the config module that when processing the command line, the corresponding option can be specified without any arggument and that in this case it must set the value to 1.
 
 * `params` is also used as an output parameter, `< XXX >ptr >` field  is used by the config module to store the value it has read. The following bits can possibly be set in the `paramflags` mask after the call:
   - `PARAMFLAG_MALLOCINCONFIG`: memory has been allocated for the ` < XXX >ptr > ` field
   - `PARAMFLAG_PARAMSET`: parameter has been found in the config source, it is not set to default value.
   - `PARAMFLAG_PARAMSET`: parameter has been set to its default value
 * `numparams` is the number of entries in the params array
-* `prefix` is a character string to be appended to the parameters name, it defines the parameters position in the configuration file hierarchy (the section name in libconfig terminology). 
+* `prefix` is a character string to be appended to the parameters name, it defines the parameters position in the configuration file hierarchy (the section name in libconfig terminology).
 * The returned value is the number of parameters which have been assigned a value or -1 if a severe error occured
 
 ```c
@@ -42,8 +42,8 @@ int config_libconfig_getlist(paramlist_def_t *ParamList, paramdef_t *params, int
 * Calls the `config_<config source>_get` function for each list occurrence
 * `params` points to an array of `paramdef_t` structures which describes the parameters in each occurrence of the list
 * `ParamList`  points to a structure, where `paramarray` field points to an array of `paramdef_t` structure, allocated by the function. It is used to return the values of the parameters.
-* The returned value is the number of occurrences in the list or -1 in case of severe error  
+* The returned value is the number of occurrences in the list or -1 in case of severe error
 
 
-[Configuration module developer main page](../../config/devusage.md)  
+[Configuration module developer main page](../../config/devusage.md)
 [Configuration module home](../../config.md)

common/config/DOC/config/devusage/struct.md

@@ -10,11 +10,11 @@ It is defined in include file [ common/config/config_paramdesc.h ](https://gitla
 | `type` | Supported parameter types are defined as integer macros. Supported simple types are `TYPE_STRING`, parameter value is returned in `strptr` field,  `TYPE_INT8` `TYPE_UINT8` `TYPE_INT16` `TYPE_UINT16` `TYPE_INT32` `TYPE_UINT32` `TYPE_INT64` `TYPE_UINT64`, parameter value is returned in the corresponding uXptr or iXptr, `TYPE_MASK`, value is returned in `u32ptr`, `TYPE_DOUBLE` value is returned in `dblptr`, `TYPE_IPV4ADDR` value is returned in binary, network bytes order in `u32ptr` field. `TYPE_STRINGLIST`, `TYPE_INTARRAY` and `TYPE_UINTARRAY` are multiple values types. Multiple values are returned in respectively, `strlistptr`, `iptr` and `uptr` fields which then point to arrays. The  `numelt` field gives the number of item in the array. | I |
 | `numelt` | For `TYPE_STRING` where `strptr` points to a preallocated string, this field must contain the size in bytes of the available memory. For all multiple values types, this field contains the number of values in the value field.| I/O |
 | `chkPptr` | possible pointer to the structure containing the info used to check parameter values | I |
-| `processedvalue` | When `chkPptr` is not `ǸULL`, is used to return a value, computed from the original parameter, as read from the configuration source. | O |  
-  
+| `processedvalue` | When `chkPptr` is not `ǸULL`, is used to return a value, computed from the original parameter, as read from the configuration source. | O |
+
 # `paramlist_def_t`structure
-It is defined in include file [ common/config/config_paramdesc.h ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/config/config_paramdesc.h#L160). 
-It is used as an argument to `config_getlist` calls, to get values of multiple occurrences of group of parameters.  
+It is defined in include file [ common/config/config_paramdesc.h ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/config/config_paramdesc.h#L160).
+It is used as an argument to `config_getlist` calls, to get values of multiple occurrences of group of parameters.
 
 | Fields     | Description                                                       | I/O |
 |:-----------|:------------------------------------------------------------------|----:|
@@ -23,11 +23,11 @@ It is used as an argument to `config_getlist` calls, to get values of multiple o
 | `numelt` | Number of items in the `paramarray` field | O |
 
 # `checkedparam_t` union
-It is defined in include file [ common/config/config_paramdesc.h ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/config/config_paramdesc.h#L62). 
+It is defined in include file [ common/config/config_paramdesc.h ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/config/config_paramdesc.h#L62).
 This union of structures is used to provide a parameter checking mechanism. Each `paramdef_t` instance may include a pointer to a `checkedparam_t`structure which is then used by the configuration module to check the value it got from the config source.
 Each structure in the union provides one parameter verification method, which returns `-1` when the verification fails. Currently the following structures  are defined in the `checkedparam_t` union:
 
-| structure name    | Description                                                     | 
+| structure name    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|----:|
 | `s1` | check an integer against a list of authorized values |
 | `s1a` | check an integer against a list of authorized values and set the parameter value to another integer depending on the read value|
@@ -40,14 +40,14 @@ each of these structures provide the required fields to perform the specified pa
 The configuration module provides an implementation of the functions to be used to check parameters, qs described below.
 
 ## `s1` structure
-| field    | Description                                                     | 
+| field    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|
 | `f1` | pointer to the checking function. Initialize to `config_check_intval` to use the config module implementation |
 | `okintval` | array of `CONFIG_MAX_NUMCHECKVAL` integers containing the authorized values |
 | `num_okintval` | number of used values in `okintval` |
 
 ## `s1a` structure
-| field    | Description                                                     | 
+| field    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|
 | `f1a` | pointer to the checking function. Initialize to `config_check_modify_integer` to use the config module implementation |
 | `okintval` | array of `CONFIG_MAX_NUMCHECKVAL` integers containing the authorized values |
@@ -55,13 +55,13 @@ The configuration module provides an implementation of the functions to be used
 | `num_okintval` | number of used values in `okintval` and `setintval` |
 
 ## `s2` structure
-| field    | Description                                                     | 
+| field    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|
 | `f2` | pointer to the checking function. Initialize to `config_check_intrange` to use the config module implementation |
 | `okintrange` | array of 2 integers containing the min and max values for the parameter |
 
 ## `s3` structure
-| field    | Description                                                     | 
+| field    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|
 | `f3` | pointer to the checking function. Initialize to `config_check_strval` to use the config module implementation |
 | `okstrval` | array of `CONFIG_MAX_NUMCHECKVAL` C string pointers containing the authorized values |
@@ -69,7 +69,7 @@ The configuration module provides an implementation of the functions to be used
 
 
 ## `s3a` structure
-| field    | Description                                                     | 
+| field    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|
 | `f3a` | pointer to the checking function. Initialize to `config_checkstr_assign_integer` to use the config module implementation |
 | `okstrval` | array of `CONFIG_MAX_NUMCHECKVAL` C string pointers containing the authorized values |
@@ -77,9 +77,9 @@ The configuration module provides an implementation of the functions to be used
 | `num_okstrval` | number of used values in `okintval` and `setintval` |
 
 ## `s4` and `s5` structures
-| field    | Description                                                     | 
+| field    | Description                                                     |
 |:-----------|:------------------------------------------------------------------|
 | `f4`  or `f5` | pointer to the checking function. they are generic structures to be used  when no existing structure provides the required parameter verification. `f4` takes one argument, the `paramdef_t` structure corresponding to the parameter to be checked (`int  (*f4)(paramdef_t *param)`), `f5` taxes no argument (`void (*checkfunc)(void)`) |
 
-[Configuration module developer main page](../../config/devusage.md)  
+[Configuration module developer main page](../../config/devusage.md)
 [Configuration module home](../../config.md)

common/config/DOC/config/rtusage.md

@@ -1,34 +1,34 @@
- 
-   -O  is the only mandatory command line option to start the eNodeb softmodem (lte-softmodem executable), it is used to specify the configuration source with the associated parameters:  
+
+   -O  is the only mandatory command line option to start the eNodeb softmodem (lte-softmodem executable), it is used to specify the configuration source with the associated parameters:
 ```bash
 $ ./lte-softmodem -O <configsource>:<parameter1>:<parameter2>:...
 ```
-  The configuration module can also be used without a configuration source, ie to only parse the command line. In this case the -O switch is optional. This mode is used in the ue-softmodem executable and by the phy_simulators executables (ulsim, dlsim)  
+  The configuration module can also be used without a configuration source, ie to only parse the command line. In this case the -O switch is optional. This mode is used in the ue-softmodem executable and by the phy_simulators executables (ulsim, dlsim)
 
 Currently the available config sources are:
 
-- **libconfig**: libconfig file. [libconfig file format](http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files) Parameter1 is the file path and parameter 2 can be used to specify the level of console messages printed by the configuration module.  
+- **libconfig**: libconfig file. [libconfig file format](http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files) Parameter1 is the file path and parameter 2 can be used to specify the level of console messages printed by the configuration module.
 ```bash
 $ ./lte-softmodem -O libconfig:<config>:dbgl<debuglevel>
 ```
 - **cmdlineonly**: command line only, the default mode for lte-uesoftmodem and the phy simiulators. In this case -O may be used to specify the config module debug level.
 
-The debug level is a mask:  
-*  bit 1: print parameters values 
+The debug level is a mask:
+*  bit 1: print parameters values
 *  bit 2: print memory allocation/free performed by the config module
 *  bit 3: print command line processing messages
 *  bit 4: disable execution abort when parameters checking fails
 
-As a oai user, you may have to use bit 1 (dbgl1) , to check your configuration and get the full name of a parameter you would like to modify on the command line. Other bits are for developers usage, (dbgl7 will print all debug messages).  
+As a oai user, you may have to use bit 1 (dbgl1) , to check your configuration and get the full name of a parameter you would like to modify on the command line. Other bits are for developers usage, (dbgl7 will print all debug messages).
 
 ```bash
-$ ./lte-softmodem -O libconfig:<config>:dbgl1  
+$ ./lte-softmodem -O libconfig:<config>:dbgl1
 ```
 ```bash
 $ ./lte-uesoftmodem -O cmdlineonly:dbgl1
 ```
 To get help on supported parameters you can use specific options:
-*  ---help: print help for command line only parameters and for parameters not defined in a specific section 
+*  ---help: print help for command line only parameters and for parameters not defined in a specific section
 	*  ---help_< prefix > : print help for parameters defined under the section < prefix >
 
 ```
@@ -49,23 +49,23 @@ To get help on supported parameters you can use specific options:
     -C: Set the downlink frequency for all component carriers
     -a: Channel id offset
     -d: Enable soft scope and L1 and L2 stats (Xforms)
-    -q: Enable processing timing measurement of lte softmodem on per subframe basis 
-    -S: Skip the missed slots/subframes 
+    -q: Enable processing timing measurement of lte softmodem on per subframe basis
+    -S: Skip the missed slots/subframes
     --numerology: adding numerology for 5G
     --parallel-config: three config for level of parallelism 'PARALLEL_SINGLE_THREAD', 'PARALLEL_RU_L1_SPLIT', or 'PARALLEL_RU_L1_TRX_SPLIT'
     --worker-config: two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'
     --nbiot-disable: disable nb-iot, even if defined in config
     --noS1: Disable s1 interface
-    --nokrnmod: (noS1 only): Use tun instead of namesh module 
+    --nokrnmod: (noS1 only): Use tun instead of namesh module
 --------------------------------------------------------------------
 
 [LIBCONFIG] (root): 4/4 parameters successfully set, (4 to default value)
 
 -----Help for section (root section)            : 004 entries------
-    -R: Enable online log 
+    -R: Enable online log
     -g: Set the global log level, valide options: (4:trace, 3:debug, 2:info, 1:warn, (0:error))
-    --telnetsrv: Start embedded telnet server 
-    --msc: Enable the MSC tracing utility 
+    --telnetsrv: Start embedded telnet server
+    --msc: Enable the MSC tracing utility
 --------------------------------------------------------------------
 
 [LIBCONFIG] loader: 2/2 parameters successfully set, (2 to default value)
@@ -84,13 +84,13 @@ Getting ENBSParams
 
 ```
 
-For the lte-softmodem (the eNodeB) The config source parameter defaults to libconfig, preserving the initial -O option format. In this case you cannot specify the debug level.  
+For the lte-softmodem (the eNodeB) The config source parameter defaults to libconfig, preserving the initial -O option format. In this case you cannot specify the debug level.
 
 ```bash
 $ ./lte-softmodem -O <config>
 ```
 
-Configuration file parameters, except for the configuration file path,  can be specified in a **config** section in the configuration file:  
+Configuration file parameters, except for the configuration file path,  can be specified in a **config** section in the configuration file:
 
 ```
 config:
@@ -102,8 +102,8 @@ Configuration files examples can be found in the targets/PROJECTS/GENERIC-LTE-EP
 
 ```bash
 $ ./lte-softmodem -O <config> --eNBs.[0].component_carriers.[0].N_RB_DL 100
-```  
+```
 
 As specified earlier, use the dbgl1 debug level to get the full name of a parameter you would like to modify on the command line.
 
-[Configuration module home](../config.md)
+[Configuration module home](../config.md)

common/ngran_types.h

@@ -0,0 +1,51 @@
+/*
+ * 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
+ */
+
+/*! \file common/ngran_types.h
+* \brief Definitions for NGRAN node types
+* \author R. Knopp
+* \date 2018
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+
+#ifndef __NGRAN_TYPES_H__
+#define __NGRAN_TYPES_H__
+
+typedef enum {
+  ngran_eNB       = 0,
+  ngran_ng_eNB    = 1,
+  ngran_gNB       = 2,
+  ngran_eNB_CU    = 3,
+  ngran_ng_eNB_CU = 4,
+  ngran_gNB_CU    = 5,
+  ngran_eNB_DU    = 6,
+  ngran_gNB_DU    = 7
+} ngran_node_t;
+
+#define NODE_IS_MONOLITHIC(nOdE_TyPe) ((nOdE_TyPe) == ngran_eNB    || (nOdE_TyPe) == ngran_ng_eNB    || (nOdE_TyPe) == ngran_gNB)
+#define NODE_IS_CU(nOdE_TyPe)         ((nOdE_TyPe) == ngran_eNB_CU || (nOdE_TyPe) == ngran_ng_eNB_CU || (nOdE_TyPe) == ngran_gNB_CU)
+#define NODE_IS_DU(nOdE_TyPe)         ((nOdE_TyPe) == ngran_eNB_DU || (nOdE_TyPe) == ngran_gNB_DU)
+
+#endif

common/ran_context.h

@@ -39,6 +39,8 @@
 #include "PHY/types.h"
 #include "PHY/impl_defs_top.h"
 #include "PHY/impl_defs_lte.h"
+
+#include "ENB_APP/enb_config.h"
 #include "RRC/LTE/rrc_defs.h"
 #include "flexran_agent_defs.h"
 
@@ -49,7 +51,11 @@
 #include "gtpv1u_eNB_defs.h"
 
 #include "PHY/defs_L1_NB_IoT.h"
+
 #include "RRC/LTE/defs_NB_IoT.h"
+
+
+
 typedef struct {
   /// RAN context config file name
   char *config_file_name;

common/utils/DOC/loader/arch.md

@@ -2,6 +2,6 @@
 
 The oai shared library loader is implemented in two source files, located in [common/utils](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils)
 1. [load_module_shlib.c](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/load_module_shlib.c) contains the loader implementation
-1.  [load_module_shlib.h](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/load_module_shlib.h) is the loader include file containing both private and public data type definitions. It also contain API prototypes.  
+1.  [load_module_shlib.h](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/load_module_shlib.h) is the loader include file containing both private and public data type definitions. It also contain API prototypes.
 
-[loader home page](../loader.md)
+[loader home page](../loader.md)

common/utils/DOC/loader/devusage.md

@@ -1,16 +1,16 @@
-The loader objectives are 
+The loader objectives are
 1. provides a common mechanism to prevent an executable to include code that is only used under specific configurations, without rebuilding the code
 1. Provide a common mechanism to allow to choose between different implementations of a given set of functions, without rebuilding the code
 
 As a developer you may need to look at these sections:
 
 * [loading a shared library](devusage/loading.md)
-* [loader API](devusage/api.md) 
-* [loader public structures](devusage/struct.md)  
+* [loader API](devusage/api.md)
+* [loader public structures](devusage/struct.md)
 
-Loader usage examples can be found in oai sources:  
+Loader usage examples can be found in oai sources:
 
-*  device and transport initialization code: [function `load_lib` in *targets/ARCH/COMMON/__common_lib.c__* ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/targets/ARCH/COMMON/common_lib.c#L91) 
+*  device and transport initialization code: [function `load_lib` in *targets/ARCH/COMMON/__common_lib.c__* ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/targets/ARCH/COMMON/common_lib.c#L91)
 *  turbo encoder and decoder initialization: [function `load_codinglib`in *openair1/PHY/CODING/__coding_load.c__*](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/CODING/coding_load.c#L113)
 
 [loader home page](../loader.md)

common/utils/DOC/loader/devusage/api.md

@@ -1,12 +1,12 @@
- Loader API is defined in the [common/utils/load_module_shlib.h](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/load_module_shlib.h) include file. 
+ Loader API is defined in the [common/utils/load_module_shlib.h](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/load_module_shlib.h) include file.
 ```c
 int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
 ```
-* possibly initializes the loader, if it has not been already initialized 
-* Formats the full shared library path, using the `modname` argument and the loader `shlibpath` and `shlibversion`configuration parameters. 
+* possibly initializes the loader, if it has not been already initialized
+* Formats the full shared library path, using the `modname` argument and the loader `shlibpath` and `shlibversion`configuration parameters.
 * loads the shared library, using the dlopen system call
 * looks for `< modname >_autoinit` symbol, using the `dlsym` system call and possibly call the corresponding function.
-* looks for `< modname >_checkbuildver` symbol, using the `dlsym` system call and possibly calls the corresponding function. If the return value of this call is `-1`, program execution is stopped. It is the responsibility of the shared library developer to implement or not a `< modname >_checkbuildver` function and to decide if a version mismatch is a fatal condition. The `< modname >_checkbuildver` function must match the `checkverfunc_t` function type. The first argument is the main executable version, as set  in the `PACKAGE_VERSION` macro defined in the [oai CMakeLists](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/cmake_targets/CMakeLists.txt#L218), around line 218. The second argument points to the shared library version which should be set  by the `< modname >_checkbuildver` function. 
+* looks for `< modname >_checkbuildver` symbol, using the `dlsym` system call and possibly calls the corresponding function. If the return value of this call is `-1`, program execution is stopped. It is the responsibility of the shared library developer to implement or not a `< modname >_checkbuildver` function and to decide if a version mismatch is a fatal condition. The `< modname >_checkbuildver` function must match the `checkverfunc_t` function type. The first argument is the main executable version, as set  in the `PACKAGE_VERSION` macro defined in the [oai CMakeLists](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/cmake_targets/CMakeLists.txt#L218), around line 218. The second argument points to the shared library version which should be set  by the `< modname >_checkbuildver` function.
 * If the farray pointer is null,  looks for `< modname >_getfarray` symbol, calls the corresponding function when the symbol is found. `< modname >_getfarray` takes one argument, a pointer to a  `loader_shlibfunc_t` array, and returns the number of items in this array, as defined by the `getfarrayfunc_t` type. The `loader_shlibfunc_t` array returned by the shared library must be fully filled (both `fname` and `fptr` fields).
 * looks for the `numf` function symbols listed in the `farray[i].fname` arguments and set the corresponding `farray[i].fptr`function pointers
 
@@ -14,7 +14,7 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
 ```c
 void * get_shlibmodule_fptr(char *modname, char *fname)
 ```
-Returns a pointer to the symbol `fname`, defined in module `modname`, or `NULL` if the symbol is not found. 
+Returns a pointer to the symbol `fname`, defined in module `modname`, or `NULL` if the symbol is not found.
 
-[loader home page](../../loader.md)  
-[loader developer home page](../devusage.md)
+[loader home page](../../loader.md)
+[loader developer home page](../devusage.md)

common/utils/DOC/loader/devusage/loading.md

@@ -10,16 +10,16 @@ Typical loader usage looks like:
 /* shared library loader include file */
 #include "common/utils/load_module_shlib.h"
 .............
-/* 
-  define and initialize the array, describing the list of functions 
+/*
+  define and initialize the array, describing the list of functions
   implemented in "mymodule"
 */
   loader_shlibfunc_t mymodule_fdesc[2];
-  mymodule_fdesc[0].fname="mymodule_f1"; 
-  mymodule_fdesc[1].fname="mymodule_f2"; 
+  mymodule_fdesc[0].fname="mymodule_f1";
+  mymodule_fdesc[1].fname="mymodule_f2";
 
 /*
- load the library, it's name must be libmymod.so. Configuration can be 
+ load the library, it's name must be libmymod.so. Configuration can be
  used to specify a specific path to look for libmymod.so. Configuration
  can also specify a version, for example "V1", in this case the loader
  will look for libmymodV1.so
@@ -28,13 +28,13 @@ Typical loader usage looks like:
   if (ret < 0) {
        fprintf(stderr,"Library couldn't be loaded\n");
   } else {
-/* 
+/*
 library has been loaded, we probably want to call some functions...
 */
   ret=((funcf1_t)mymodule_fdesc[0].fptr)();
 
 ..................
-/* 
+/*
 later and/or somewhere else in the code you may want to call function "mymodule_f2"
 You can use the loader get_shlibmodule_fptr(char *modname, char *fname) function
 to retrieve the pointer to that function
@@ -50,7 +50,7 @@ if (f2 != NULL) {
 }
 ...............
 ```
-When loading a shared library the loader looks for a symbol named `< module name > _autoinit` and, if it finds it, calls it. The `autoinit` function is called without any argument and the returned value, if any, is not tested. 
+When loading a shared library the loader looks for a symbol named `< module name > _autoinit` and, if it finds it, calls it. The `autoinit` function is called without any argument and the returned value, if any, is not tested.
 
-[loader home page](../loader.md)  
-[loader developer home page](../../loader/devusage.md)
+[loader home page](../loader.md)
+[loader developer home page](../../loader/devusage.md)

common/utils/DOC/loader/devusage/struct.md

@@ -6,5 +6,5 @@ It is defined in include file [ common/util/load_module_shlib.h ](https://gitlab
 | `fname`    | symbol name, is passed to the [`dlsym`](http://man7.org/linux/man-pages/man3/dlsym.3.html) system call performed by the loader to get a pointer to the symbol | I |
 | `fptr`     | pointer to the symbol name, set by the loader. `fptr` is defined as a `int (*fptr)(void)` function type | O |
 
-[loader home page](../../loader.md)  
-[loader developer home page](../devusage.md)
+[loader home page](../../loader.md)
+[loader developer home page](../devusage.md)

common/utils/DOC/loader/rtusage.md

@@ -6,7 +6,7 @@ Shared library full names are built by the loader using the format:
 1.  the < *module version* > and < *path* > optional  parameters, are defined at run-time, depending on the configuration.
 
 ## loader parameters
-The loader is using the [configuration module](../../../config/DOC/config.md), and defines global and per library parameters. Global parameters must be specified under the **loader** section and library specific parameters under a **loader.<*module name*>** section. Module specific parameters override the global parameters. 
+The loader is using the [configuration module](../../../config/DOC/config.md), and defines global and per library parameters. Global parameters must be specified under the **loader** section and library specific parameters under a **loader.<*module name*>** section. Module specific parameters override the global parameters.
 ### Global loader parameters
 | name | type | default | description |
 |:---:|:---:|:---:|:----|
@@ -39,7 +39,7 @@ If you want to load a device called *liboai_device_USRP.so* without writting a s
 
 With this latest example, nn the softmodem logs, you can check that the right device library has been loaded:
 ```bash
-[LIBCONFIG] loader.oai_device.shlibpath not found in /usr/local/oai/develop-nb-iot-merge/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.nbiot.band7.tm1.50PRB.usrpb210.conf 
+[LIBCONFIG] loader.oai_device.shlibpath not found in /usr/local/oai/develop-nb-iot-merge/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.nbiot.band7.tm1.50PRB.usrpb210.conf
 [LIBCONFIG] loader.oai_device.shlibversion set to default value ""
 [LIBCONFIG] loader.oai_device: 1/2 parameters successfully set, (1 to default value)
 [CONFIG] shlibversion set to  _USRP from command line
@@ -47,4 +47,4 @@ With this latest example, nn the softmodem logs, you can check that the right de
 
 ```
 
-[loader home page](../loader.md)
+[loader home page](../loader.md)

common/utils/LOG/DOC/addconsoletrace.md

@@ -12,11 +12,11 @@ these macros are used in place of the printf C function. The additionnal ***comp
 
 | macro | level letter | level value | level name |
 |:---------|:---------------|:---------------|----------------:|
-| LOG_E |  E | 0 | error | 
+| LOG_E |  E | 0 | error |
 | LOG_W | W | 1 | warning |
 | LOG_I | I | 2 | informational |
 | LOG_D | D | 3 | debug |
-| LOG_T | T | 4 | trace |  
+| LOG_T | T | 4 | trace |
 
 component list is defined as an `enum` in  [log.h](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.h). A new component can be defined by adding an item in this type, it must also be defined in the T tracer [T_messages.txt ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/T/T_messages.txt).
 
@@ -27,18 +27,18 @@ Most oai sources are including LOG macros.
 ```C
 LOG_DEBUGFLAG(<flag>)
 ```
-this macro is to be used in if statements. The condition is true if the flag has been set, as described in the [run time usage page](rtusage.md) 
+this macro is to be used in if statements. The condition is true if the flag has been set, as described in the [run time usage page](rtusage.md)
 ```C
 if ( LOG_DEBUGFLAG(<flag>) {
-/* 
+/*
    the code below is only executed if the corresponding
    <flag>_debug option is set.
- */ 
+ */
 ......................
 ......................
 }
 ```
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c#L396) 
+[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c#L396)
 
 #### memory dump macros
 ```C
@@ -47,16 +47,16 @@ LOG_DUMPFLAG(<flag>)
 this macro is to be used in if statements. The condition is true if the flag has been set, as described in the [run time usage page](rtusage.md). It is mainly provided to surround LOG_M macros or direct calls to `log_dump`which otherwise would be unconditionals.
 ```C
 if ( LOG_DUMPFLAG(<flag>) {
-/* 
+/*
    the code below is only executed if the corresponding
    <flag>_dump option is set.
- */ 
+ */
 LOG_M(.............
 LOG_M(.............
 log_dump(...
 }
 
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/prach.c#L205) 
+[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/prach.c#L205)
 #### matlab format dump
 ```C
 LOG_M(file, vector, data, len, dec, format)
@@ -71,13 +71,13 @@ LOG_M(file, vector, data, len, dec, format)
 |format| int | defines the type of data to be dumped|
 
 This macro can be used to dump a buffer in a format that can be used for analyze via tools like matlab or octave. **It must be surrounded by LOG_DEBUGFLAG or LOG_DUMPFLAG macros, to prevent the dump to be built unconditionally.** The LOG_M macro points to the `write_file_matlab` function implemented in  [log.c](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.c). **This function should be revisited for more understandable implementation and ease of use (format parameter ???)**
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/prach.c#L205) 
+[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/LTE_TRANSPORT/prach.c#L205)
 
 #### hexadecimal format dump
 ```C
 LOG_DUMPMSG(c, f, b, s, x...)
 ```
-dumps a memory region if the corresponding debug flag `f` is set as explained here [run time usage page](rtusage.md) 
+dumps a memory region if the corresponding debug flag `f` is set as explained here [run time usage page](rtusage.md)
 
 |argument| type| description |
 |:-----------|:-------|-----------------:|
@@ -88,12 +88,12 @@ dumps a memory region if the corresponding debug flag `f` is set as explained he
 | x...| printf format and arguments| text string to be printed at the top of the dump|
 
 This macro can be used to conditionaly dump a buffer, bytes by bytes, giving the integer value of each byte in hexadecimal form.
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair2/RRC/LTE/rrc_eNB.c#L1181) 
+[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair2/RRC/LTE/rrc_eNB.c#L1181)
 
 This macro points to the `log_dump` function, implemented in  [log.c](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/LOG/log.c). This function can also dump buffers containing `double` data via the LOG_UDUMPMSG macro
 
 ```C
-LOG_UDUMPMSG(c, b, s, f, x...) 
+LOG_UDUMPMSG(c, b, s, f, x...)
 ```
 |argument| type| description |
 |:-----------|:-------|-----------------:|
@@ -103,8 +103,8 @@ LOG_UDUMPMSG(c, b, s, f, x...)
 |f|  int | format of dumped data LOG_DUMP_CHAR or  LOG_DUMP_DOUBLE|
 | x...| printf format and arguments| text string to be printed at the top of the dump|
 
-[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/SIMULATION/LTE_PHY/dlsim.c#L1974) 
+[example in oai code](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/SIMULATION/LTE_PHY/dlsim.c#L1974)
 
-[logging facility developer main page](devusage.md)  
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+[logging facility developer main page](devusage.md)
+[logging facility  main page](log.md)
+[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/arch.md

@@ -2,11 +2,11 @@
 
 The oai logging facility is implemented in two source files, located in [common/utils/LOG](LOG)
 1. [log.c](../log.c) contains logging implementation
-1.  [log.h](../log.h) is the logging facility include file containing both private and public data type definitions. It also contain API prototypes.  
+1.  [log.h](../log.h) is the logging facility include file containing both private and public data type definitions. It also contain API prototypes.
 
 The logging facility doesn't create any thread, all api's are executed in the context of the caller. The tracing macro's `LOG_<X>` are all using the logRecord_mt function to output the messages. To keep this function thread safe it must perform a single system call to the output stream. The buffer used to build the message must be specific to the calling thread, which is today enforced by using a variable in the logRecord_mt stack.
 
 Data used by the logging utility are defined by the `log_t` structure which is allocated at init time, when calling the `logInit` function.
 
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+[logging facility  main page](log.md)
+[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/configurelog.md

@@ -4,7 +4,7 @@
 ```C
 int  logInit (void);
 ```
-Allocate the internal data used by the logging utility, set the configuration, using the [configuration  module](../../../config/DOC/config.md) 
+Allocate the internal data used by the logging utility, set the configuration, using the [configuration  module](../../../config/DOC/config.md)
 
 ```C
 void logClean (void)
@@ -30,9 +30,9 @@ void close_component_filelog(int comp)
 Redirect or reset to stdout the output stream used by the logging facility. When the output stream is redirected to a file, it is created under /tmp with a hard-coded filename including the componemt name.
 
 ```C
-SET_LOG_DEBUG(flag) 
+SET_LOG_DEBUG(flag)
 CLEAR_LOG_DEBUG(flag)
-SET_LOG_DUMP(flag) 
+SET_LOG_DUMP(flag)
 CLEAR_LOG_DUMP(flag)
 ```
  These macros are used to set or clear the corresponding bit flag, trigerring the activation or un-activation of conditional code or memory dumps generation.
@@ -42,8 +42,8 @@ Example of using the logging utility APIs can be found, for initialization and c
 #### components and debug flags definitions
 
 Adding a new component is just adding an item in the `comp_name_t` enum defined in [log.h](../log.h) . You must also declare it in the T Tracer facility [message fefinitions](../../T/T_messages.txt).
-To add a flag than can then be used for adding conditional code or memory dumps you have to add the flag definition in the `LOG_MASKMAP_INIT` macro, in [log.h](../log.h). 
+To add a flag than can then be used for adding conditional code or memory dumps you have to add the flag definition in the `LOG_MASKMAP_INIT` macro, in [log.h](../log.h).
 
-[logging facility developer main page](devusage.md)  
-[logging facility  main page](log.md)  
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+[logging facility developer main page](devusage.md)
+[logging facility  main page](log.md)
+[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/devusage.md

@@ -1,14 +1,14 @@
 ### logging facility developer usage
-The logging facility objectives are 
-1. provide a common console tracing mechanism 
+The logging facility objectives are
+1. provide a common console tracing mechanism
 1. Allow a flexible activation of console traces, by configuration or dynamically at any time while code is running.
 
-Most developpers will only use the log macros to add console messages to the code. The logging facility also provides an api that is used for initialization and configuration. 
+Most developpers will only use the log macros to add console messages to the code. The logging facility also provides an api that is used for initialization and configuration.
 
-[Adding console traces in oaicode](addconsoletrace.md) 
+[Adding console traces in oaicode](addconsoletrace.md)
 
-[Configuring the logging facility](configurelog.md) 
+[Configuring the logging facility](configurelog.md)
 
 
-[logging facility  main page](log.md)  
+[logging facility  main page](log.md)
 [oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/log.md

@@ -1,6 +1,6 @@
 # OAI console logging facility
 
-oai includes a console logging facility that any component should use when writting informational or debugging messages to the softmodem or uesoftmodem stdout stream. 
+oai includes a console logging facility that any component should use when writting informational or debugging messages to the softmodem or uesoftmodem stdout stream.
 By default, this facility is included at build-time and activated at run-time. The T Tracer and the Logging facility share common options for activation:
 
 -   To disable the logging facility (and T Tracer) at build-time use the *--disable-T-Tracer* switch:

common/utils/LOG/DOC/rtusage.md

@@ -1,5 +1,5 @@
 ## configuring the logging facility
-The logging facility is fully configurable and it uses the [config module](../../../config/config.md) to get its parameters at init time. The [telnet server](../../telnetsrv/DOC/telnetsrv.md) includes a set of commands which can be used to dynamically modify the logging facility behavior 
+The logging facility is fully configurable and it uses the [config module](../../../config/config.md) to get its parameters at init time. The [telnet server](../../telnetsrv/DOC/telnetsrv.md) includes a set of commands which can be used to dynamically modify the logging facility behavior
 
 All logging facility parameters are defined in the log_config section. Some parameters are global to the logging facility, they modify the way messages are printed to stdout. Conversely, some parameters are specific to a component and  only modify the behavior for messages issued by a given component. A third type of parameters can be used to activate conditional debug code or dump messages or buffers.
 
@@ -14,7 +14,7 @@ All logging facility parameters are defined in the log_config section. Some para
 ### Component specific parameters
 | name | type | default | description |
 |:---:|:---:|:---:|:----|
-| `<component>_log_level` | `boolean` | global log level, as defined by the  `global_log_level ` parameter) | 
+| `<component>_log_level` | `boolean` | global log level, as defined by the  `global_log_level ` parameter) |
 | `<component>_log_infile` | `boolean` | 0 = false| Triggers the redirection of log messages printed by the specified component in a file. The file path and name is /tmp/<componemt>.[extension] the extension is optional and component dependant, it can be `log `,  `dat `,  `txt `|
 
 The list of components defined within oai can be retrieved from the  [config module](../../../config/config.md) traces, when asking for config module debugging info on the command line:
@@ -215,7 +215,7 @@ The list of components defined within oai can be retrieved from the  [config mod
 log init done
 
 ```
-It can also be retrieved when using the telnet server, as explained  [below](### Using the telnet server to configure the logging facility) 
+It can also be retrieved when using the telnet server, as explained  [below](### Using the telnet server to configure the logging facility)
 
 ### parameters to activate conditional code
 | name | type | default | description |
@@ -238,15 +238,15 @@ The following example sets all components log level to info, exept for hw,phy,ma
    };
 ```
 ### Using the command line to configure the logging facility
-Command line parameter values supersedes values specified in the configuration file. 
+Command line parameter values supersedes values specified in the configuration file.
 ```bash
-./lte-softmodem -O --log_config.global_log_options nocolor,level,thread  --log_config.prach_log_level debug --log_config.PRACH_debug 
+./lte-softmodem -O --log_config.global_log_options nocolor,level,thread  --log_config.prach_log_level debug --log_config.PRACH_debug
 ```
 In this example to get all the debug PRACH messages it is necessary to also set the PRACH_debug flag. This is a choice from the developper.
 The log messages will be printed whithout color and the header will include the lmessage evel and the thread name:
 ```bash
-[PHY]I ru thread Time in secs now: 104652566 
-[PHY]I ru thread Time in secs last pps: 91827117 
+[PHY]I ru thread Time in secs now: 104652566
+[PHY]I ru thread Time in secs last pps: 91827117
 [PHY]I ru thread RU 0 rf device ready
 [PHY]I ru thread RU 0 no asynch_south interface
 [MAC]E rxtx processing SCHED_MODE=0
@@ -256,10 +256,10 @@ The log messages will be printed whithout color and the header will include the
 [PHY]I lte-softmodem PRACH (eNB) : running rx_prach for subframe 1, prach_FreqOffset 2, prach_ConfigIndex 0 , rootSequenceIndex 0
 [PHY]I lte-softmodem PRACH (eNB) : running rx_prach for subframe 1, prach_FreqOffset 2, prach_ConfigIndex 0 , rootSequenceIndex 0
 ```
- 
+
 ### Using the telnet server to configure the logging facility
 The telnet server includes a `log` command which can be used to dymically modify the logging facility configuration parameters.
-[telnet server ***softmodem log*** commands](../../telnetsrv/DOC/telnetlog.md) 
+[telnet server ***softmodem log*** commands](../../telnetsrv/DOC/telnetlog.md)
 
-[logging facility  main page](log.md)  
+[logging facility  main page](log.md)
 [oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/log.c

@@ -393,15 +393,18 @@ int logInit (void) {
   register_log_component("mRAL","",RAL_UE);
   register_log_component("ENB_APP","log",ENB_APP);
   register_log_component("FLEXRAN_AGENT","log",FLEXRAN_AGENT);
+  register_log_component("PROTO_AGENT","log",PROTO_AGENT);
   register_log_component("TMR","",TMR);
   register_log_component("USIM","txt",USIM);
   register_log_component("SIM","txt",SIM);
   /* following log component are used for the localization*/
+  /* following log component are used for the localization*/
   register_log_component("LOCALIZE","log",LOCALIZE);
   register_log_component("NAS","log",NAS);
   register_log_component("UDP","",UDP_);
   register_log_component("GTPV1U","",GTPU);
   register_log_component("S1AP","",S1AP);
+  register_log_component("F1AP","",F1AP);
   register_log_component("X2AP","",X2AP);
   register_log_component("SCTP","",SCTP);
   register_log_component("X2AP","",X2AP);

common/utils/LOG/log.h

@@ -204,6 +204,7 @@ typedef enum {
   GTPU,
   SPGW,
   S1AP,
+  F1AP,
   SCTP,
   HW,
   OSA,
@@ -214,6 +215,8 @@ typedef enum {
   TMR,
   USIM,
   LOCALIZE,
+  PROTO_AGENT,
+  F1U,
   X2AP,
   LOADER,
   ASN,

common/utils/T/T_messages.txt

@@ -629,7 +629,7 @@ ID = LEGACY_OCM_DEBUG
     FORMAT = string,log
 ID = LEGACY_OCM_TRACE
     DESC = OCM legacy logs - trace level
-    GROUP = ALL:LEGACY_OCM:LEGACY_GROUP_TRACE:LEGACY
+    OGROUP = ALL:LEGACY_OCM:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
 ID = LEGACY_OIP_INFO
@@ -888,6 +888,62 @@ ID = LEGACY_componentP_TRACE
 
 
 
+ID = LEGACY_PROTO_AGENT_DEBUG
+    DESC = PROTO AGENT DEBUG LEVEL
+    GROUP = ALL:LEGACY_PROTO:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_PROTO_AGENT_INFO
+    DESC = PROTO AGENT INFO LEVEL
+    GROUP = ALL:LEGACY_PROTO:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_PROTO_AGENT_WARNING
+    DESC = PROTO AGENT WARNING LEVEL
+    GROUP = ALL:LEGACY_PROTO:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_PROTO_AGENT_ERROR
+    DESC = PROTO AGENT ERROR LEVEL
+    GROUP = ALL:LEGACY_PROTO:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_F1U_DEBUG
+    DESC = F1U DEBUG LEVEL
+    GROUP = ALL:LEGACY_F1U:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_F1U_INFO
+    DESC = F1U INFO LEVEL
+    GROUP = ALL:LEGACY_F1U:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_F1U_ERROR
+    DESC = F1U ERROR LEVEL
+    GROUP = ALL:LEGACY_F1U:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_F1AP_TRACE
+    DESC = F1AP TRACE LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
+ID = LEGACY_F1AP_DEBUG
+    DESC = F1AP DEBUG LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+ID = LEGACY_F1AP_INFO
+    DESC = F1AP INFO LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+ID = LEGACY_F1AP_WARNING
+    DESC = F1AP WARNING LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+ID = LEGACY_F1AP_ERROR
+    DESC = F1AP ERROR LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+
 #################
 #### UE LOGS ####
 #################

common/utils/assertions.h

@@ -35,13 +35,11 @@
 
 void output_log_mem(void);
 #define _Assert_Exit_                           \
-{                                               \
     fprintf(stderr, "\nExiting execution\n");   \
     display_backtrace();                        \
     fflush(stdout);                             \
     fflush(stderr);                             \
     exit(EXIT_FAILURE);                         \
-}
 
 #define _Assert_(cOND, aCTION, fORMAT, aRGS...)             \
 do {                                                        \

common/utils/msc/msc.c

@@ -150,7 +150,7 @@ int msc_init(const msc_env_t envP, const int max_threadsP)
     pointer_p = malloc(MSC_MAX_MESSAGE_LENGTH);
     AssertFatal (pointer_p, "malloc failed!\n");
     rv = lfds611_stack_guaranteed_push( g_msc_memory_stack_p, pointer_p );
-    AssertFatal (rv, "lfds611_stack_guaranteed_push failed for item %u\n", i);
+    AssertFatal (rv, "lfds611_stack_guaranteed_push failed for item %d\n", i);
   }
 
   for (i = MIN_MSC_PROTOS; i < MAX_MSC_PROTOS; i++) {
@@ -476,7 +476,20 @@ int msc_init(const msc_env_t envP, const int max_threadsP)
         }
 
         break;
-
+      case MSC_F1AP_CU:
+        rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "F1AP_CU");
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
+        //if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW)  || (envP == MSC_MME)) {
+          msc_log_declare_proto(i);
+        //}
+        break;
+      case MSC_F1AP_DU:
+        rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "F1AP_DU");
+        if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;}
+        //if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW)  || (envP == MSC_MME)) {
+          msc_log_declare_proto(i);
+        //}
+        break;
       default:
         rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "UNKNOWN");
 

common/utils/msc/msc.h

@@ -62,6 +62,8 @@ typedef enum {
   MSC_S11_MME,
   MSC_S6A_MME,
   MSC_HSS,
+  MSC_F1AP_CU,
+  MSC_F1AP_DU,
   MSC_X2AP_SRC_ENB,
   MSC_X2AP_TARGET_ENB,
   MAX_MSC_PROTOS,

common/utils/ocp_itti/all_msg.h

@@ -13,3 +13,4 @@
 #include "openair2/COMMON/udp_messages_def.h"
 #include "openair2/COMMON/gtpv1_u_messages_def.h"
 #include "openair2/COMMON/flexran_messages_def.h"
+#include "openair2/COMMON/f1ap_messages_def.h"

common/utils/ocp_itti/intertask_interface.cpp

@@ -1,6 +1,6 @@
 /*
   Author: Laurent THOMAS, Open Cells
-  copyleft: OpenAirInterface Software Alliance and it's licence 
+  copyleft: OpenAirInterface Software Alliance and it's licence
 */
 #include <vector>
 #include <map>
@@ -122,7 +122,7 @@ extern "C" {
       pthread_mutex_unlock (&t->queue_cond_lock);
       t->admin.func(NULL);
       pthread_mutex_lock (&t->queue_cond_lock);
-    } 
+    }
     pthread_mutex_unlock (&t->queue_cond_lock);
     return ret;
   }
@@ -290,12 +290,12 @@ extern "C" {
       struct sched_param sparam;
       memset(&sparam, 0, sizeof(sparam));
       sparam.sched_priority = sched_get_priority_max(SCHED_FIFO)-10;
-      policy = SCHED_FIFO ; 
+      policy = SCHED_FIFO ;
       if (pthread_setschedparam(t->thread, policy, &sparam) != 0) {
 	LOG_E(TMR,"task %s : Failed to set pthread priority\n",  itti_get_task_name(task_id) );
       }
     }
-#endif    
+#endif
     return 0;
   }
 

common/utils/ocp_itti/intertask_interface.h

@@ -1,6 +1,6 @@
 /*
   Author: Laurent THOMAS, Open Cells
-  Copyleft: OpenAirInterface software alliance and it's licence 
+  Copyleft: OpenAirInterface software alliance and it's licence
 */
 #ifndef INTERTASK_INTERFACE_H_
 #define INTERTASK_INTERFACE_H_
@@ -300,6 +300,8 @@ typedef struct {
   TASK_DEF(TASK_MSC,      TASK_PRIORITY_MED,  200, NULL, NULL)\
   TASK_DEF(TASK_GTPV1_U,  TASK_PRIORITY_MED,  1000,NULL, NULL)\
   TASK_DEF(TASK_UDP,      TASK_PRIORITY_MED,  1000, NULL, NULL)\
+  TASK_DEF(TASK_CU_F1,    TASK_PRIORITY_MED,  200, NULL, NULL) \
+  TASK_DEF(TASK_DU_F1,    TASK_PRIORITY_MED,  200, NULL, NULL) \
   TASK_DEF(TASK_MAX,      TASK_PRIORITY_MED,  200, NULL, NULL)
 
 #define TASK_DEF(TaskID, pRIO, qUEUEsIZE, FuNc, ThreadFunc)          { pRIO, qUEUEsIZE, #TaskID, FuNc, ThreadFunc },

common/utils/telnetsrv/DOC/telnetaddcmd.md

@@ -3,15 +3,15 @@
 The following example is extracted from [the oai `openair1/PHY/CODING/coding_load.c` file](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/CODING/coding_load.c).
 
 ```c
-/* 
+/*
 include the telnet server data structures and API definitions
 */
-#include "common/utils/telnetsrv/telnetsrv.h" 
+#include "common/utils/telnetsrv/telnetsrv.h"
 
 
 /*
 define the null terminated array of telnetshell_cmddef_t structures
-which map each sub-command string to a function implementing it. 
+which map each sub-command string to a function implementing it.
 you may also provide a help string which will be printed when
 the global help command is used. The prototype for the function
 implementing sub commands must match the `cmdfunc_t` type defined
@@ -25,7 +25,7 @@ static telnetshell_cmddef_t coding_cmdarray[] = {
 
 /*
 define the null terminated list of telnetshell_vardef_t structures defining the
-variables that can be set and get using the pre-defined get and set command 
+variables that can be set and get using the pre-defined get and set command
 of the telnet server
 */
 telnetshell_vardef_t coding_vardef[] = {
@@ -34,7 +34,7 @@ telnetshell_vardef_t coding_vardef[] = {
 };
 .................
 /*
- look for telnet server, if it is loaded, add the coding commands to it 
+ look for telnet server, if it is loaded, add the coding commands to it
  we use the shared library loader API to check the telnet server availibility
 The telnet server TELNET_ADDCMD_FNAME function takes three arguments:
 1.  The name of the telnet command to be added, here "coding"
@@ -43,9 +43,9 @@ The telnet server TELNET_ADDCMD_FNAME function takes three arguments:
 */
      add_telnetcmd_func_t addcmd = (add_telnetcmd_func_t)get_shlibmodule_fptr("telnetsrv", TELNET_ADDCMD_FNAME);
      if (addcmd != NULL) {
-         addcmd("coding",coding_vardef,coding_cmdarray); 
+         addcmd("coding",coding_vardef,coding_cmdarray);
 .......
-/* 
+/*
   functions implementing the "coding mode" sub command, as defined in
   the `coding_cmdarray` passed earlier to the TELNET_ADDCMD_FNAME function.
   This function will be called by the telnet server, when the `coding_cmdarray`
@@ -53,15 +53,15 @@ The telnet server TELNET_ADDCMD_FNAME function takes three arguments:
 */
 int coding_setmod_cmd(char *buff, int debug, telnet_printfunc_t prnt)
 {
-  /* 
+  /*
   1. buff argument is an input argument, pointer to the string received
   from the telnet client, the command and sub-command parts are removed
   In this case it points after "coding setmod" and is of no use as
-  we don't have second level sub-commands.  
+  we don't have second level sub-commands.
   1. debug argument is an input argument set by the telnet server
-  1. prnt arguments is also an input argument, a function pointer, to be used 
+  1. prnt arguments is also an input argument, a function pointer, to be used
   in place of printf to print messages on the telnet client interface. As this function
-  is called by the telnet server stdout points to the main executable console,  
+  is called by the telnet server stdout points to the main executable console,
   */
    if (debug > 0)
        prnt( "coding_setmod_cmd received %s\n",buff);
@@ -89,28 +89,28 @@ int coding_setmod_cmd(char *buff, int debug, telnet_printfunc_t prnt)
 ```c
 int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmddef_t *cmd)
 ```
-Add a command and the `cmd` list of sub-commands to the telnet server. After a successful call to `add_telnetcmd` function, the telnet server calls the function defined for each sub-commands in the null terminated `cmd` array, when the character string received from the telnet client matches the command and sub-command strings.  
-Also adds the list of variables described in the `var` array to the list of variable which can be set and read.  
-The function returns -1 if one argument is NULL.  
-The telnet server is dynamically loaded, to use  the `add_telnetcmd` function, the shared library loader API should be used to check the availability of the telnet server and retrieve it's address, as shown in [the example at the top of this page](telnetaddcmd.md#code-example-of-adding-a-command-to-the-telnet-server).  
+Add a command and the `cmd` list of sub-commands to the telnet server. After a successful call to `add_telnetcmd` function, the telnet server calls the function defined for each sub-commands in the null terminated `cmd` array, when the character string received from the telnet client matches the command and sub-command strings.
+Also adds the list of variables described in the `var` array to the list of variable which can be set and read.
+The function returns -1 if one argument is NULL.
+The telnet server is dynamically loaded, to use  the `add_telnetcmd` function, the shared library loader API should be used to check the availability of the telnet server and retrieve it's address, as shown in [the example at the top of this page](telnetaddcmd.md#code-example-of-adding-a-command-to-the-telnet-server).
 
 # telnet server public data types
-## `telnetshell_vardef_t`structure  
+## `telnetshell_vardef_t`structure
  This structure is used by developers to describe the variables that can be set or read using the get,set and getall sub-commands.
 
-| Fields     | type |Description                                                       | 
+| Fields     | type |Description                                                       |
 |:-----------|:------:|:-----------------------|
 | `varname`    | `char[TELNET_CMD_MAXSIZE]`  | variable name, as specified when using the get and set commands. |
 | `vartype`     | `char` |  Defines the type of the variable pointed by the `varvalptr`field. Supported values: TELNET_VARTYPE_INT32  TELNET_VARTYPE_INT16 TELNET_VARTYPE_INT64  TELNET_VARTYPE_STRING   TELNET_VARTYPE_DOUBLE |
 | `varvalptr`     | `void*` |  Defines the type of the variable pointed by the `varvalptr`field |
 
-## `telnetshell_cmddef_t`structure  
+## `telnetshell_cmddef_t`structure
  This structure is used by developers to describe the first level sub-commands to be added to the telnet server.
 
-| Fields     | type |Description                                                       | 
+| Fields     | type |Description                                                       |
 |:-----------|:------:|:-----------------------|
 | `cmdname`    | `char[TELNET_CMD_MAXSIZE]`  | command name, as tested by the telnet server to check it should call the `cmdfunc` function  |
 | `helpstr`     | `char[TELNET_HELPSTR_SIZE]` |  character string to print when the elp`command is received from the telnet client |
 | `cmdfunc`     | `cmdfunc_t` |  pointer to the function implementing the `cmdname` sub command. |
 
-[oai telnet server home](telnetsrv.md)
+[oai telnet server home](telnetsrv.md)

common/utils/telnetsrv/DOC/telnetarch.md

@@ -4,18 +4,18 @@ The oai telnet server is implemented in a shared library to be loaded by the [oa
 
 Currently the telnet server only supports one user connection. The same dedicated thread is used to wait for a user connection and process the input received from this connection.
 
-The telnet server provides an API which can be used by any oai component to add new CLI commands to the server. A pre-defined  command can be used to get or set a list of variables. 
+The telnet server provides an API which can be used by any oai component to add new CLI commands to the server. A pre-defined  command can be used to get or set a list of variables.
+
 
 
- 
 # telnet server source files
 
 telnet server source files are located in [common/utils/telnetsrv](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv)
 
-1. [telnetsrv.c](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv/telnetsrv.c) contains the telnet server implementation, including the implementation of the telnet CLI command. 
+1. [telnetsrv.c](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv/telnetsrv.c) contains the telnet server implementation, including the implementation of the telnet CLI command.
 1.  [telnetsrv.h](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv/telnetsrv.h) is the telnet server include file containing both private and public data type definitions. It also contains API prototypes for functions that are used to register a new command in the server.
 1.  `telnetsrv\_\<XXX\>.c`: implementation of \<XXX\> CLI command which are delivered with the telnet server.
 1.  `telnetsrv\_\<XXX\>.h`: include file for the implementation of XXX CLI command. Usually included only in the corresponding `.c`file
 1.  [telnetsrv_CMakeLists.txt](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/telnetsrv/telnetsrv_CMakeLists.txt): CMakelists file containing the cmake instructions to build the telnet server. this file is included in the [global oai CMakelists](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/cmake_targets/CMakeLists.txt).
 
-[oai telnet server home](telnetsrv.md)
+[oai telnet server home](telnetsrv.md)

common/utils/telnetsrv/DOC/telnetgetset.md

@@ -10,12 +10,12 @@ telnet, phypb = 65000
 telnet, hsize = 50
 telnet, hfile = "oaitelnet.history"
 softmodem> telnet set loopc 100
-telnet, loopc set to 
+telnet, loopc set to
 100
 softmodem> telnet get loopc
 telnet, loopc = 100
-softmodem> 
+softmodem>
 
 ```
-[oai telnetserver home](telnetsrv.md)  
-[oai telnetserver usage home](telnetusage.md)
+[oai telnetserver home](telnetsrv.md)
+[oai telnetserver usage home](telnetusage.md)

common/utils/telnetsrv/DOC/telnethelp.md

@@ -22,7 +22,7 @@ softmodem> help
       softmodem show loglvl|thread|config
       softmodem log (enter help for details)
       softmodem thread (enter help for details)
-      softmodem exit 
+      softmodem exit
    module 2 = phy:
       phy disp [phycnt,uedump,uestat UE<x>]
    module 3 = loader:
@@ -34,24 +34,24 @@ softmodem> help
    module 4 = coding:
       coding [get set] maxiter <value>
       coding mode [sse,avx2,stdc,none]
-softmodem> 
-```  
+softmodem>
+```
 
-# oai telnet server, specific commands help  
+# oai telnet server, specific commands help
 
 ``` bash
 softmodem> softmodem log help
- log sub commands: 
- show:  		     display current log configuration 
- online, noonline:	     enable or disable console logs 
- enable, disable id1-id2:    enable or disable logs for components index id1 to id2 
- level_<level> id1-id2:      set log level to <level> for components index id1 to id2 
- level_<verbosity> id1-id2:  set log verbosity to <verbosity> for components index id1 to id2 
-use the show command to get the values for <level>, <verbosity> and the list of component indexes that can be used for id1 and id2 
+ log sub commands:
+ show:  		     display current log configuration
+ online, noonline:	     enable or disable console logs
+ enable, disable id1-id2:    enable or disable logs for components index id1 to id2
+ level_<level> id1-id2:      set log level to <level> for components index id1 to id2
+ level_<verbosity> id1-id2:  set log verbosity to <verbosity> for components index id1 to id2
+use the show command to get the values for <level>, <verbosity> and the list of component indexes that can be used for id1 and id2
 softmodem>
 
 
 ```
 
-[oai telnetserver home](telnetsrv.md)  
-[oai telnetserver usage home](telnetusage.md)
+[oai telnetserver home](telnetsrv.md)
+[oai telnetserver usage home](telnetusage.md)

common/utils/telnetsrv/DOC/telnethist.md

@@ -40,5 +40,5 @@ softmodem>
 
 ```
 
-[oai telnetserver home](telnetsrv.md)  
-[oai telnetserver usage home](telnetusage.md)
+[oai telnetserver home](telnetsrv.md)
+[oai telnetserver usage home](telnetusage.md)

common/utils/telnetsrv/DOC/telnetloader.md

@@ -43,5 +43,5 @@ softmodem> loader show modules
 softmodem>
 ```
 
-[oai telnetserver home](telnetsrv.md)  
-[oai telnetserver usage home](telnetusage.md)
+[oai telnetserver home](telnetsrv.md)
+[oai telnetserver usage home](telnetusage.md)

common/utils/telnetsrv/DOC/telnetlog.md

@@ -38,10 +38,10 @@ log level/verbosity  comp 33 USIM set to info / medium (disabled)
 log level/verbosity  comp 34 LOCALIZE set to info / medium (disabled)
 log level/verbosity  comp 35 RRH set to info / medium (disabled)
 softmodem> softmodem log show
-Available log levels: 
-   emerg alert crit error warn notice info debug file trace 
-Available verbosity: 
-   none low medium high full 
+Available log levels:
+   emerg alert crit error warn notice info debug file trace
+Available verbosity:
+   none low medium high full
 component                 verbosity  level  enabled
 00               PHY:    medium      info  N
 01               MAC:    medium      info  N
@@ -89,8 +89,8 @@ log level/verbosity  comp 3 OCG set to error / medium (enabled)
 log level/verbosity  comp 4 OMG set to error / medium (enabled)
 softmodem> exit
 Connection closed by foreign host.
-```  
+```
 
-[oai telnetserver home](telnetsrv.md)  
+[oai telnetserver home](telnetsrv.md)
 [oai telnetserver usage home](telnetusage.md)
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/telnetsrv/DOC/telnetloop.md

@@ -1,4 +1,4 @@
-The telnet server includes a **_loop_** command that can be used to iterate a given command. The number of iterations and the delay, in ms between two iterations can be modified, as shown in the following example:  
+The telnet server includes a **_loop_** command that can be used to iterate a given command. The number of iterations and the delay, in ms between two iterations can be modified, as shown in the following example:
 
 ```bash
 softmodem> telnet get loopc
@@ -6,35 +6,35 @@ telnet, loopc = 10
 softmodem> telnet get loopd
 telnet, loopd = 2000
 softmodem> telnet set loopd 1000
-telnet, loopd set to 
+telnet, loopd set to
 1000
 softmodem> loop softmodem show thread
                   2018-03-27 17:58:49.000 2/10
-  id          name            state   USRmod    KRNmod  prio nice   vsize   proc pol 
+  id          name            state   USRmod    KRNmod  prio nice   vsize   proc pol
 
-     3946        lte-softmodem   S       20005      9440  20   0 236560384   2    0 other 
+     3946        lte-softmodem   S       20005      9440  20   0 236560384   2    0 other
 
-     3946        lte-softmodem   S           7        95  20   0 236560384   2    0 other 
-     3948               telnet   R           0         0  20   0 236560384   2    0 other 
-     3949        ITTI acceptor   S           2         9  20   0 236560384   2    0 other 
-     3951              ITTI 12   S           2         2  20   0 236560384   7    0 other 
-     3952              ITTI 11   S           0         0  20   0 236560384   0    0 other 
-     3953               ITTI 9   S           0         0  20   0 236560384   1    0 other 
-     3954               ITTI 7   S           0         0  20   0 236560384   7    0 other 
-     3955               ITTI 8   S           0         0  20   0 236560384   7    0 other 
-     3956               ITTI 4   S          35         0  20   0 236560384   2    0 other 
-     3957            ru_thread   S       15366      3072 -10   0 236560384   0    2 rt: rr 
-     3958      ru_thread_prach   S           0         0 -10   0 236560384   7    1 rt: fifo 
-     3959           fep_thread   S        1874       123 -10   0 236560384   5    1 rt: fifo 
-     3960         feptx_thread   S        1554       101 -10   0 236560384   7    1 rt: fifo 
-     3969            ru_thread   S           0         0 -10   0 236560384   0    2 rt: rr 
-     3970            ru_thread   S        1313      5522 -10   0 236560384   5    2 rt: rr 
-     3971            ru_thread   S           4         6 -10   0 236560384   1    2 rt: rr 
-     3972        lte-softmodem   S         318         9 -10   0 236560384   7    1 rt: fifo 
-     3973        lte-softmodem   S           6        13 -10   0 236560384   4    1 rt: fifo 
+     3946        lte-softmodem   S           7        95  20   0 236560384   2    0 other
+     3948               telnet   R           0         0  20   0 236560384   2    0 other
+     3949        ITTI acceptor   S           2         9  20   0 236560384   2    0 other
+     3951              ITTI 12   S           2         2  20   0 236560384   7    0 other
+     3952              ITTI 11   S           0         0  20   0 236560384   0    0 other
+     3953               ITTI 9   S           0         0  20   0 236560384   1    0 other
+     3954               ITTI 7   S           0         0  20   0 236560384   7    0 other
+     3955               ITTI 8   S           0         0  20   0 236560384   7    0 other
+     3956               ITTI 4   S          35         0  20   0 236560384   2    0 other
+     3957            ru_thread   S       15366      3072 -10   0 236560384   0    2 rt: rr
+     3958      ru_thread_prach   S           0         0 -10   0 236560384   7    1 rt: fifo
+     3959           fep_thread   S        1874       123 -10   0 236560384   5    1 rt: fifo
+     3960         feptx_thread   S        1554       101 -10   0 236560384   7    1 rt: fifo
+     3969            ru_thread   S           0         0 -10   0 236560384   0    2 rt: rr
+     3970            ru_thread   S        1313      5522 -10   0 236560384   5    2 rt: rr
+     3971            ru_thread   S           4         6 -10   0 236560384   1    2 rt: rr
+     3972        lte-softmodem   S         318         9 -10   0 236560384   7    1 rt: fifo
+     3973        lte-softmodem   S           6        13 -10   0 236560384   4    1 rt: fifo
 
-```  
-A **_loop_** command can be interrupted by pressing the  **_enter_** key till getting the  prompt. 
+```
+A **_loop_** command can be interrupted by pressing the  **_enter_** key till getting the  prompt.
 
-[oai telnetserver home](telnetsrv.md)  
-[oai telnetserver usage home](telnetusage.md)
+[oai telnetserver home](telnetsrv.md)
+[oai telnetserver usage home](telnetusage.md)

common/utils/telnetsrv/DOC/telnetsrv.md

@@ -3,5 +3,5 @@ The oai embedded telnet server is an optional monitoring and debugging tool. It
 * [Using the telnet server](telnetusage.md)
 * [Adding commands to the oai telnet server](telnetaddcmd.md)
 * [telnet server architecture ](telnetarch.md)
- 
-[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/telnetsrv/DOC/telnetusage.md

@@ -1,28 +1,28 @@
-# starting the softmodem with the telnet server  
+# starting the softmodem with the telnet server
 By default the embedded telnet server, which is implemented in a shared library, is not built. It can be built after compiling the softmodem executable using the `build_oai` script:
 
 ```bash
- cd \<oai repository\>/openairinterface5g  
- source oaienv  
- cd cmake_targets  
- ./build_oai  --build-telnetsrv  
+ cd \<oai repository\>/openairinterface5g
+ source oaienv
+ cd cmake_targets
+ ./build_oai  --build-telnetsrv
 ```
 
 This will create the `libtelnetsrv.so` file in the `targets/bin` and `cmake_targets/lte_build_oai/build` sub directories of the oai repository.
 
 When starting the softmodem, you must specify the **_\-\-telnetsrv_** option to load and start the telnet server. The telnet server is loaded via the [oai shared library loader](loader).
 
-# using the Command Line Interface  
-By default the telnet server listen on all the ip addresses configured on the system and on port 9090.  This behavior can be changed using the `listenaddr` and `listenport` parameters. 
+# using the Command Line Interface
+By default the telnet server listen on all the ip addresses configured on the system and on port 9090.  This behavior can be changed using the `listenaddr` and `listenport` parameters.
 The telnet server includes a basic help, listing available commands and some commands also provide a specific detailed help sub-command.
-Below are  examples of telnet sessions:  
+Below are  examples of telnet sessions:
 
 *  [getting help](telnethelp.md)
 *  [using the history](telnethist.md)
 *  [using the get and set commands](telnetgetset.md)
 *  [using the loop command](telnetloop.md)
 *  [loader command](telnetloader.md)
-*  [log command](telnetlog.md)  
+*  [log command](telnetlog.md)
 
 # telnet server parameters
 The telnet server is using the [oai configuration module](Config/Rtusage). Telnet parameters must be specified in the `telnetsrv` section. Some parameters can be modified via the telnet telnet server command, as specified in the last column of the following table.
@@ -36,4 +36,4 @@ The telnet server is using the [oai configuration module](Config/Rtusage). Telne
 | `histfile` | `character string` | "oaitelnet.history" | file used for command history persistency | Y |
 | `histfsize` | `integer` | 50 | maximum number of commands saved in the history | Y |
 
-[oai telnet server home](telnetsrv.md)
+[oai telnet server home](telnetsrv.md)

common/utils/telnetsrv/telnetsrv_cpumeasur_def.h

@@ -22,7 +22,7 @@
 /*! \file common/utils/telnetsrv/telnetsrv_cpumeasur_def.h
  * \brief: definitions of macro used to initialize the telnet_ltemeasurdef_t
  * \        strucures arrays which are then used by the display functions
- * \        in telnetsrv_measurements.c. 
+ * \        in telnetsrv_measurements.c.
  * \author Francois TABURET
  * \date 2019
  * \version 0.1

common/utils/threadPool/Makefile

@@ -0,0 +1,8 @@
+all: measurement_display thread-pool-test
+
+measurement_display: measurement_display.c thread-pool.h
+	gcc measurement_display.c -I /data/openairinterface5g.nr/common/utils/  -I. /data/openairinterface5g.nr/common/utils/backtrace.c -lpthread -D TEST_THREAD_POOL -I../LOG -I../../utils/T -o measurement_display
+
+thread-pool-test: thread-pool.c thread-pool.h
+	gcc -g thread-pool.c -I /data/openairinterface5g.nr/common/utils/  -I. /data/openairinterface5g.nr/common/utils/backtrace.c -lpthread -D TEST_THREAD_POOL -I../LOG -I../../utils/T -o thread-pool-test
+

common/utils/threadPool/measurement_display.c

@@ -0,0 +1,61 @@
+/*
+  Author: Laurent THOMAS, Open Cells
+  copyleft: OpenAirInterface Software Alliance and it's licence
+*/
+
+#define __USE_GNU
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <pthread.h>
+#include <sched.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include "thread-pool.h"
+
+#define SEP "\t"
+
+uint64_t cpuCyclesMicroSec;
+
+int main(int argc, char *argv[]) {
+  if(argc != 2) {
+    printf("Need one paramter: the trace Linux pipe (fifo)");
+    exit(1);
+  }
+
+  mkfifo(argv[1],0666);
+  int fd=open(argv[1], O_RDONLY);
+
+  if ( fd == -1 ) {
+    perror("open read mode trace file:");
+    exit(1);
+  }
+
+  uint64_t deb=rdtsc();
+  usleep(100000);
+  cpuCyclesMicroSec=(rdtsc()-deb)/100000;
+  printf("Cycles per µs: %lu\n",cpuCyclesMicroSec);
+  printf("Key" SEP "delay to process" SEP "processing time" SEP "delay to be read answer\n");
+  notifiedFIFO_elt_t doneRequest;
+
+  while ( 1 ) {
+    if ( read(fd,&doneRequest, sizeof(doneRequest)) ==  sizeof(doneRequest)) {
+      printf("%lu" SEP "%lu" SEP "%lu" SEP "%lu" "\n",
+             doneRequest.key,
+             (doneRequest.startProcessingTime-doneRequest.creationTime)/cpuCyclesMicroSec,
+             (doneRequest.endProcessingTime-doneRequest.startProcessingTime)/cpuCyclesMicroSec,
+             (doneRequest.returnTime-doneRequest.endProcessingTime)/cpuCyclesMicroSec
+            );
+    } else {
+      printf("no measurements\n");
+      sleep(1);
+    }
+  }
+}

common/utils/threadPool/thread-pool.c

@@ -0,0 +1,230 @@
+/*
+  Author: Laurent THOMAS, Open Cells
+  copyleft: OpenAirInterface Software Alliance and it's licence
+*/
+
+#define _GNU_SOURCE
+#include <sched.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/sysinfo.h>
+#include <threadPool/thread-pool.h>
+
+void displayList(notifiedFIFO_t *nf) {
+  int n=0;
+  notifiedFIFO_elt_t *ptr=nf->outF;
+
+  while(ptr) {
+    printf("element: %d, key: %lu\n",++n,ptr->key);
+    ptr=ptr->next;
+  }
+
+  printf("End of list: %d elements\n",n);
+}
+
+static inline  notifiedFIFO_elt_t *pullNotifiedFifoRemember( notifiedFIFO_t *nf, struct one_thread *thr) {
+  mutexlock(nf->lockF);
+
+  while(!nf->outF)
+    condwait(nf->notifF, nf->lockF);
+
+  notifiedFIFO_elt_t *ret=nf->outF;
+  nf->outF=nf->outF->next;
+
+  if (nf->outF==NULL)
+    nf->inF=NULL;
+
+  // For abort feature
+  thr->runningOnKey=ret->key;
+  thr->abortFlag=false;
+  mutexunlock(nf->lockF);
+  return ret;
+}
+
+void *one_thread(void *arg) {
+  struct  one_thread *myThread=(struct  one_thread *) arg;
+  struct  thread_pool *tp=myThread->pool;
+
+  // configure the thread core assignment
+  // TBD: reserve the core for us exclusively
+  if ( myThread->coreID >= 0 &&  myThread->coreID < get_nprocs_conf()) {
+    cpu_set_t cpuset;
+    CPU_ZERO(&cpuset);
+    CPU_SET(myThread->coreID, &cpuset);
+    pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
+  }
+
+  //Configure the thread scheduler policy for Linux
+  struct sched_param sparam= {0};
+  sparam.sched_priority = sched_get_priority_max(SCHED_RR);
+  pthread_setschedparam(pthread_self(), SCHED_RR, &sparam);
+  // set the thread name for debugging
+  sprintf(myThread->name,"Tpool_%d",myThread->coreID);
+  pthread_setname_np(pthread_self(), myThread->name );
+
+  // Infinite loop to process requests
+  do {
+    notifiedFIFO_elt_t *elt=pullNotifiedFifoRemember(&tp->incomingFifo, myThread);
+
+    if (tp->measurePerf) elt->startProcessingTime=rdtsc();
+
+    elt->processingFunc(NotifiedFifoData(elt));
+
+    if (tp->measurePerf) elt->endProcessingTime=rdtsc();
+
+    if (elt->reponseFifo) {
+      // Check if the job is still alive, else it has been aborted
+      mutexlock(tp->incomingFifo.lockF);
+
+      if (myThread->abortFlag)
+        delNotifiedFIFO_elt(elt);
+      else
+        pushNotifiedFIFO(elt->reponseFifo, elt);
+
+      mutexunlock(tp->incomingFifo.lockF);
+    }
+  } while (true);
+}
+
+void initTpool(char *params,tpool_t *pool, bool performanceMeas) {
+  memset(pool,0,sizeof(*pool));
+  char *measr=getenv("threadPoolMeasurements");
+  pool->measurePerf=performanceMeas;
+  // force measurement if the output is defined
+  pool->measurePerf=measr!=NULL;
+
+  if (measr) {
+    mkfifo(measr,0666);
+    AssertFatal(-1 != (pool->dummyTraceFd=
+                         open(measr, O_RDONLY| O_NONBLOCK)),"");
+    AssertFatal(-1 != (pool->traceFd=
+                         open(measr, O_WRONLY|O_APPEND|O_NOATIME|O_NONBLOCK)),"");
+  } else
+    pool->traceFd=-1;
+
+  //Configure the thread scheduler policy for Linux
+  struct sched_param sparam= {0};
+  sparam.sched_priority = sched_get_priority_max(SCHED_RR)-1;
+  pthread_setschedparam(pthread_self(), SCHED_RR, &sparam);
+  pool->activated=true;
+  initNotifiedFIFO(&pool->incomingFifo);
+  char *saveptr, * curptr;
+  pool->nbThreads=0;
+  pool->restrictRNTI=false;
+  curptr=strtok_r(params,",",&saveptr);
+
+  while ( curptr!=NULL ) {
+    int c=toupper(curptr[0]);
+
+    switch (c) {
+      case 'U':
+        pool->restrictRNTI=true;
+        break;
+
+      case 'N':
+        pool->activated=false;
+        break;
+
+      default:
+        pool->allthreads=(struct one_thread *)malloc(sizeof(struct one_thread));
+        pool->allthreads->next=pool->allthreads;
+        printf("create a thread for core %d\n", atoi(curptr));
+        pool->allthreads->coreID=atoi(curptr);
+        pool->allthreads->id=pool->nbThreads;
+        pool->allthreads->pool=pool;
+        pthread_create(&pool->allthreads->threadID, NULL, one_thread, (void *)pool->allthreads);
+        pool->nbThreads++;
+    }
+
+    curptr=strtok_r(NULL,",",&saveptr);
+  }
+
+  if (pool->activated && pool->nbThreads==0) {
+    printf("No servers created in the thread pool, exit\n");
+    exit(1);
+  }
+}
+
+#ifdef TEST_THREAD_POOL
+
+struct testData {
+  int id;
+  char txt[30];
+};
+
+void processing(void *arg) {
+  struct testData *in=(struct testData *)arg;
+  printf("doing: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
+  sprintf(in->txt,"Done by %ld, job %d", pthread_self(), in->id);
+  usleep(rand()%100);
+  printf("done: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
+}
+
+int main() {
+  notifiedFIFO_t myFifo;
+  initNotifiedFIFO(&myFifo);
+  pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 1234,NULL,NULL));
+
+  for(int i=10; i>1; i--) {
+    pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 1000+i,NULL,NULL));
+  }
+
+  displayList(&myFifo);
+  notifiedFIFO_elt_t *tmp=pullNotifiedFIFO(&myFifo);
+  printf("pulled: %lu\n", tmp->key);
+  displayList(&myFifo);
+  tmp=pullNotifiedFIFO(&myFifo);
+  printf("pulled: %lu\n", tmp->key);
+  displayList(&myFifo);
+  abortNotifiedFIFO(&myFifo,1005);
+  printf("aborted 1005\n");
+  displayList(&myFifo);
+  pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 12345678, NULL, NULL));
+  displayList(&myFifo);
+  abortNotifiedFIFO(&myFifo,12345678);
+  printf("aborted 12345678\n");
+  displayList(&myFifo);
+
+  do {
+    tmp=pollNotifiedFIFO(&myFifo);
+
+    if (tmp) {
+      printf("pulled: %lu\n", tmp->key);
+      displayList(&myFifo);
+    } else
+      printf("Empty list \n");
+  } while(tmp);
+
+  tpool_t  pool;
+  char params[]="1,2,3,u";
+  initTpool(params,&pool, true);
+  notifiedFIFO_t worker_back;
+  initNotifiedFIFO(&worker_back);
+
+  for (int i=0; i <1000 ; i++) {
+    notifiedFIFO_elt_t *work=newNotifiedFIFO_elt(sizeof(struct testData), i, &worker_back, processing);
+    struct testData *x=(struct testData *)NotifiedFifoData(work);
+    x->id=i;
+    pushTpool(&pool, work);
+  }
+
+  do {
+    tmp=pullTpool(&worker_back,&pool);
+
+    if (tmp) {
+      struct testData *dd=NotifiedFifoData(tmp);
+      printf("Result: %s\n",dd->txt);
+      delNotifiedFIFO_elt(tmp);
+    } else
+      printf("Empty list \n");
+
+    abortTpool(&pool,510);
+  } while(tmp);
+
+  return 0;
+}
+#endif

common/utils/threadPool/thread-pool.h

@@ -0,0 +1,244 @@
+/*
+  Author: Laurent THOMAS, Open Cells
+  copyleft: OpenAirInterface Software Alliance and it's licence
+*/
+
+#ifndef THREAD_POOL_H
+#define THREAD_POOL_H
+#include <stdbool.h>
+#include <stdint.h>
+#include <pthread.h>
+#include <sys/syscall.h>
+#include <assertions.h>
+#include <LOG/log.h>
+
+#ifdef DEBUG
+  #define THREADINIT   PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+#else
+  #define THREADINIT   PTHREAD_MUTEX_INITIALIZER
+#endif
+#define mutexinit(mutex)   AssertFatal(pthread_mutex_init(&mutex,NULL)==0,"");
+#define condinit(signal)   AssertFatal(pthread_cond_init(&signal,NULL)==0,"");
+#define mutexlock(mutex)   AssertFatal(pthread_mutex_lock(&mutex)==0,"");
+#define mutextrylock(mutex)   pthread_mutex_trylock(&mutex)
+#define mutexunlock(mutex) AssertFatal(pthread_mutex_unlock(&mutex)==0,"");
+#define condwait(condition, mutex) AssertFatal(pthread_cond_wait(&condition, &mutex)==0,"");
+#define condbroadcast(signal) AssertFatal(pthread_cond_broadcast(&signal)==0,"");
+#define condsignal(signal)    AssertFatal(pthread_cond_broadcast(&signal)==0,"");
+
+typedef struct notifiedFIFO_elt_s {
+  struct notifiedFIFO_elt_s *next;
+  uint64_t key; //To filter out elements
+  struct notifiedFIFO_s *reponseFifo;
+  void (*processingFunc)(void *);
+  bool malloced;
+  uint64_t creationTime;
+  uint64_t startProcessingTime;
+  uint64_t endProcessingTime;
+  uint64_t returnTime;
+  void *msgData;
+}  notifiedFIFO_elt_t;
+
+typedef struct notifiedFIFO_s {
+  notifiedFIFO_elt_t *outF;
+  notifiedFIFO_elt_t *inF;
+  pthread_mutex_t lockF;
+  pthread_cond_t  notifF;
+} notifiedFIFO_t;
+
+// You can use this allocator or use any piece of memory
+static inline notifiedFIFO_elt_t *newNotifiedFIFO_elt(int size,
+    uint64_t key,
+    notifiedFIFO_t *reponseFifo,
+    void (*processingFunc)(void *)) {
+  notifiedFIFO_elt_t *ret;
+  AssertFatal( NULL != (ret=(notifiedFIFO_elt_t *) malloc(sizeof(notifiedFIFO_elt_t)+size+32)), "");
+  ret->next=NULL;
+  ret->key=key;
+  ret->reponseFifo=reponseFifo;
+  ret->processingFunc=processingFunc;
+  // We set user data piece aligend 32 bytes to be able to process it with SIMD
+  ret->msgData=(void *)ret+(sizeof(notifiedFIFO_elt_t)/32+1)*32;
+  ret->malloced=true;
+  return ret;
+}
+
+static inline void *NotifiedFifoData(notifiedFIFO_elt_t *elt) {
+  return elt->msgData;
+}
+
+static inline void delNotifiedFIFO_elt(notifiedFIFO_elt_t *elt) {
+  if (elt->malloced) {
+    elt->malloced=false;
+    free(elt);
+  } else
+    printf("delNotifiedFIFO on something not allocated by newNotifiedFIFO\n");
+
+  //LOG_W(UTIL,"delNotifiedFIFO on something not allocated by newNotifiedFIFO\n");
+}
+
+static inline void initNotifiedFIFO(notifiedFIFO_t *nf) {
+  mutexinit(nf->lockF);
+  condinit (nf->notifF);
+  nf->inF=NULL;
+  nf->outF=NULL;
+  // No delete function: the creator has only to free the memory
+}
+
+static inline void pushNotifiedFIFO(notifiedFIFO_t *nf, notifiedFIFO_elt_t *msg) {
+  mutexlock(nf->lockF);
+  msg->next=NULL;
+
+  if (nf->outF == NULL)
+    nf->outF = msg;
+
+  if (nf->inF)
+    nf->inF->next = msg;
+
+  nf->inF = msg;
+  condbroadcast(nf->notifF);
+  mutexunlock(nf->lockF);
+}
+
+static inline  notifiedFIFO_elt_t *pullNotifiedFIFO(notifiedFIFO_t *nf) {
+  mutexlock(nf->lockF);
+
+  while(!nf->outF)
+    condwait(nf->notifF, nf->lockF);
+
+  notifiedFIFO_elt_t *ret=nf->outF;
+  nf->outF=nf->outF->next;
+
+  if (nf->outF==NULL)
+    nf->inF=NULL;
+
+  mutexunlock(nf->lockF);
+  return ret;
+}
+
+static inline  notifiedFIFO_elt_t *pollNotifiedFIFO(notifiedFIFO_t *nf) {
+  int tmp=mutextrylock(nf->lockF);
+
+  if (tmp != 0 )
+    return NULL;
+
+  notifiedFIFO_elt_t *ret=nf->outF;
+
+  if (ret!=NULL)
+    nf->outF=nf->outF->next;
+
+  if (nf->outF==NULL)
+    nf->inF=NULL;
+
+  mutexunlock(nf->lockF);
+  return ret;
+}
+
+// This function aborts all messages matching the key
+// If the queue is used in thread pools, it doesn't cancels already running processing
+// because the message has already been picked
+static inline void abortNotifiedFIFO(notifiedFIFO_t *nf, uint64_t key) {
+  mutexlock(nf->lockF);
+  notifiedFIFO_elt_t **start=&nf->outF;
+
+  while(*start!=NULL) {
+    if ( (*start)->key == key ) {
+      notifiedFIFO_elt_t *request=*start;
+      *start=(*start)->next;
+      delNotifiedFIFO_elt(request);
+    }
+
+    if (*start != NULL)
+      start=&(*start)->next;
+  }
+
+  mutexunlock(nf->lockF);
+}
+
+struct one_thread {
+  pthread_t  threadID;
+  int id;
+  int coreID;
+  char name[256];
+  uint64_t runningOnKey;
+  bool abortFlag;
+  struct thread_pool *pool;
+  struct one_thread *next;
+};
+
+typedef struct thread_pool {
+  int activated;
+  bool measurePerf;
+  int traceFd;
+  int dummyTraceFd;
+  uint64_t cpuCyclesMicroSec;
+  uint64_t startProcessingUE;
+  int nbThreads;
+  bool restrictRNTI;
+  notifiedFIFO_t incomingFifo;
+  struct one_thread *allthreads;
+} tpool_t;
+
+static inline void pushTpool(tpool_t *t, notifiedFIFO_elt_t *msg) {
+  if (t->measurePerf) msg->creationTime=rdtsc();
+
+  pushNotifiedFIFO(&t->incomingFifo, msg);
+}
+
+static inline notifiedFIFO_elt_t *pullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
+  notifiedFIFO_elt_t *msg= pullNotifiedFIFO(responseFifo);
+
+  if (t->measurePerf)
+    msg->returnTime=rdtsc();
+
+  if (t->traceFd)
+    if(write(t->traceFd, msg, sizeof(*msg)));
+
+  return msg;
+}
+
+static inline notifiedFIFO_elt_t *tryPullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
+  notifiedFIFO_elt_t *msg= pollNotifiedFIFO(responseFifo);
+
+  if (msg == NULL)
+    return NULL;
+
+  if (t->measurePerf)
+    msg->returnTime=rdtsc();
+
+  if (t->traceFd)
+    if(write(t->traceFd, msg, sizeof(*msg)));
+
+  return msg;
+}
+
+static inline void abortTpool(tpool_t *t, uint64_t key) {
+  notifiedFIFO_t *nf=&t->incomingFifo;
+  mutexlock(nf->lockF);
+  notifiedFIFO_elt_t **start=&nf->outF;
+
+  while(*start!=NULL) {
+    if ( (*start)->key == key ) {
+      notifiedFIFO_elt_t *request=*start;
+      *start=(*start)->next;
+      delNotifiedFIFO_elt(request);
+    }
+
+    if (*start != NULL)
+      start=&(*start)->next;
+  }
+
+  struct one_thread *ptr=t->allthreads;
+
+  while(ptr!=NULL) {
+    if (ptr->runningOnKey==key)
+      ptr->abortFlag=true;
+
+    ptr=ptr->next;
+  }
+
+  mutexunlock(nf->lockF);
+}
+void initTpool(char *params,tpool_t *pool, bool performanceMeas);
+
+#endif

common/utils/threadPool/thread-pool.md

@@ -0,0 +1,71 @@
+# Thread pool
+
+The thread pool is a working server, made of a set of worker threads that can be mapped on CPU cores.
+
+Each worker loop on pick from the same input queue jobs to do.
+When a job is done, the worker sends a return if a return is defined.
+
+A selective abort allows to cancel parallel jobs (usage: a client pushed jobs, but from a response of one job, the other linked jobs becomes useless).
+
+All the thread pool functions are thread safe, nevertheless the working functions are implemented by the thread pool client, so the client has to tackle the parallel execution of his functions called "processingFunc" hereafter.
+
+## license
+Author: Laurent Thomas, Open cells project 
+The owner share this piece code to Openairsoftware alliance as per OSA license terms
+
+# jobs
+
+A job is a message (notifiedFIFO_elt_t):
+next: internal FIFO chain, do not set it
+key:  a long int that the client can use to identify a message or a group of messages
+responseFifo: if the client defines a response FIFO, the message will be posted back after processing
+processingFunc: any funtion (type void processingFunc(void *)) that the worker will launch
+msgData: the data passed to processingFunc. It can be added automatically, or you can set it to a buffer you are managing
+malloced: a boolean that enable internal free in these cases: no return Fifo or Abort feature
+
+The job messages can be created with newNotifiedFIFO_elt() and delNotifiedFIFO_elt() or managed by the client.
+
+# Queues of jobs
+
+Queues are type of: notifiedFIFO_t that must be initialized by init_notifiedFIFO()
+No delete function is required, the creator has only to free the data of type notifiedFIFO_t
+
+push_notifiedFIFO() add a job in the queue
+pull_notifiedFIFO() is blocking, poll_notifiedFIFO() is non blocking
+
+abort_notifiedFIFO() allows the customer to delete all waiting jobs that match with the key (see key in jobs definition)
+
+# Thread pools
+
+## initialization
+The clients can create one or more thread pools with init_tpool()
+the params string structure: describes a list of cores, separated by "," that run a worker thread
+
+If the core exists on the CPU, the thread pool initialization sets the affinity between this thread and the related code (use negative values is allowed, so the thread will never be mapped on a specific core).
+
+The threads are all Linux real time scheduler, their name is set automatically is "Tpool_<core id>"
+
+## adding jobs
+The client create their jobs messages as a notifiedFIFO_elt_t, then they push it with pushTpool() (that internally calls push_notifiedFIFO())
+
+If they need a return, they have to create response queues with init_notifiedFIFO() and set this FIFO pointer in the notifiedFIFO_elt_t before pushing the job.
+
+## abort
+
+A abort service abortTpool() allows to abort all jobs that match a key (see jobs "key"). When the abort returns, it garanties no job (matching the key) response will be posted on response queues.
+
+Nevertheless, jobs already performed before the return of abortTpool() are pushed in the response Fifo queue.
+
+## Performance measurements
+
+A performance measurement is integrated: the pool will automacillay fill timestamps:
+
+* creationTime: time the request is push to the pool;
+* startProcessingTime: time a worker start to run on the job
+* endProcessingTime: time the worker finished the job
+* returnTime: time the client reads the result
+
+if you set the environement variable: thread-pool-measurements to a valid file name
+These measurements will be wrote to this Linux pipe.
+
+A tool to read the linux fifo and display it in ascii is provided: see the local directory Makefile for this tool and to compile the thread pool unitary tests.

doc/BUILD.md

@@ -0,0 +1,121 @@
+# OAI build procedures
+
+## soft modem Build script
+
+oai EPC is developed in a distinct project with it's own [documentation](https://github.com/OPENAIRINTERFACE/openair-cn/wiki) , it is not described here. OAI UE and eNodeB sources can be downloaded from the Eurecom [gitlab repository](./GET_SOURCES.md). Sources  come with a build script [build_oai](../cmake_targets/build_oai) located at the root of the `openairinterface5g/cmake_targets` directory. This script is developed to build the oai binaries (executables,shared libraries) for different hardware platforms, and use cases. 
+
+the main oai binaries, which are tested by the Continuous Integration process are:
+
+- The LTE UE: `lte-uesoftmodem`
+-  The LTE eNodeB: `lte-softmodem`
+- The PHY simulators: `dlsim` and `ulsim`
+
+The build system for OAI uses [cmake](https://cmake.org/) which is a  tool to generate makefiles. The `build_oai` script is a wrapper using cmake, make and standard linux shell commands to ease the oai build and use . The file describing how to build the executables from source files is the [CMakeLists.txt](../cmake_targets/CMakeLists.txt), it is used as input by cmake to generate the makefiles.
+
+The oai softmodem supports many use cases, and new ones are regularly added. Most of them are accessible using the configuration file or the command line options and continuous effort is done to avoid introducing build options as it makes tests and usage more complicated than run-time options. The following functionalities, originally requiring a specific build are now accessible by configuration or command line options:
+
+- s1, noS1
+
+- all simulators, with exception of PHY simulators, which are distinct executables.
+
+
+Calling the `build_oai` script with the -h option gives the list of all available options, but a process to simplify and check the requirements of all these options is on-going. Check the 
+
+[table]: BUILD.md	"`build_oai` options"
+
+ at the end of this page to know the status of `buid_oai` options which are not described hereafter.
+
+
+
+## building PHY simulators
+
+detailed information about these simulators can be found  [in this dedicated page](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/OpenAirLTEPhySimul
+
+## building UE and eNodeB executables
+
+After downloading the source files, a single build command can be used to get the binaries supporting all the oai softmodem use cases (UE and eNodeB):
+
+```
+cd <your oai installation directory>/openairinterface5g/
+source oaienv
+cd ../cmake_targets/
+./build_oai -I -w USRP --eNB --UE
+```
+
+- The -I option is to install pre-requisites, you only need it the first time you build the softmodem or when some oai dependencies have changed. 
+- The -w option is to select the radio head support you want to include in your build. Radio head support is provided via a shared library, which is called the "oai device" The build script creates a soft link from `liboai_device.so` to the true device which will be used at run-time (here the USRP one,`liboai_usrpdevif.so` . USRP is the only hardware tested today in the Continuous Integration process.
+- --eNB is to build the `lte-softmodem` executable and all required shared libraries
+- --UE is to build the `lte-uesoftmodem` executable and all required shared libraries
+
+You can build the eNodeB and the UE separately, you may not need both of them depending on your oai usage.
+
+After completing the build, the binaries are available in the `cmake_targets/lte_build_oai/build` directory. A copy is also available in the `target/bin` directory, with all binaries suffixed by the 3GPP release number, today .Rel14 by default. It must be noticed that the option for building for a specific 3GPP release number is not tested by the CI and may be removed in the future. 
+
+## building optional binaries
+
+### Telnet server
+
+​	The telnet server can be built  with the --build-telnet option, after building the softmodem or while building it.
+
+`./build_oai -I -w USRP --eNB --UE --build-telnetsrv`
+
+​	or
+
+`./build_oai  --build-telnetsrv`
+
+### USRP record player
+
+​	The USRP record player today needs a specific build. Work to make it available as a run time option is under consideration
+
+
+
+## `build_oai` options
+
+| Option                                                      | Status                                      | Description                                                  |
+| ----------------------------------------------------------- | ------------------------------------------- | :----------------------------------------------------------- |
+| -h                                                          | maintained                                  | get help                                                     |
+| -c                                                          | maintained                                  | erase all previously built files for this target before starting the new build. |
+| -C                                                          | maintained, needs improvement               | erase all previously built files for any target before starting the new build. |
+| --verbose-compile                                           | maintained                                  |                                                              |
+| --cflags_processor                                          | maintained                                  | used to pass options to the compiler                         |
+| --clean-kernel                                              | unknown                                     | no code in the script corresponding to this option           |
+| --install-system-files                                      | maintained                                  | install oai built binaries in linux system files repositories |
+| -w                                                          | maintained and tested in CI for USRP device | build corresponding oai device and create the soft link to enforce this device usage at run-time |
+| -t                                                          | maintained                                  | build the specified transport library, which is used in some simulators and in non monolithic eNodeB deployments. Now of little interest as transport library build is enforced when building the eNodeB. |
+| --phy_simulators                                            | maintained, tested in CI                    | build all PHY simulators, a set of executables allowing unitary tests of LTE channel implementation within oai. |
+| --core_simulators                                           |                                             |                                                              |
+| -s                                                          |                                             |                                                              |
+| --run-group                                                 |                                             |                                                              |
+| -I                                                          | maintained, tested in CI                    | install external dependencies before starting the build      |
+| --install-optional-packages                                 | maintained                                  | install optional packages, useful for developing and testing. look at the |
+|                                                             |                                             | check_install_additional_tools function in cmake_targets/tools/build_helper script to get the list |
+| -g                                                          | maintained                                  | build binaries with gdb support.                             |
+| --eNB                                                       | maintained and tested in CI                 | build `lte-softmodem` the LTE eNodeB                         |
+| --UE                                                        | maintained and tested in CI                 | build `lte-uesoftmodem` the LTE UE                           |
+| --usrp-recplay                                              | maintained                                  | build with support for the record player. Implementation will be soon reviewed to switch to a run-time option. |
+| --build-telnet                                              | maintained                                  | build the telnet server shared library, which can then be loaded at run time via the --telnetsrv command line option. |
+| --build-msc                                                 | unknown                                     | build the msc shared library, which can then be loaded at run time via the --msc command line option. msc is a tracing utility which status is unknown. |
+| --UE-conf-nvram                                             |                                             |                                                              |
+| --UE-gen-nvram                                              |                                             |                                                              |
+| -r                                                          | unknown, to be removed                      | specifies which 3GPP release to build for. Only the default (today rel14) is tested in CI and it is likely that future oai release will remove this option |
+| -V                                                          | deprecated                                  | Used to build with support for synchronization diagram utility. This is now available via the T-Tracer and is included if T-Tracer is not disabled. |
+| -x                                                          | deprecated                                  | Used to build with support for embedded signal analyzer. This is now available via the T-Tracer and is included if T-Tracer is not disabled. |
+| --noS1                                                      | deprecated, to be removed                   | build noS1 version of oai softmodem binaries. noS1 allows running oai eNodeB and UE without an LTE core network (EPC). This functionality is now available via a run-time option. |
+| --build-doxygen                                             | unknown                                     | build doxygen documentation, many oai source files do not include doxygen comments |
+| --disable-deadline --enable-deadline --disable-cpu-affinity | deprecated                                  | These options were used to activate or de-activate specific code depending on the choice of a specific linux scheduling  mode. This has not been tested for a while and should be implemented as configuration options |
+| --disable-T-Tracer                                          | maintained, to be tested                    | Remove T_Tracer and console LOG messages except error messages. |
+| --disable-hardware-dependency                               |                                             |                                                              |
+| --ue-autotest-trace --ue-timing --ue-trace                  | deprecated                                  | Were used to enable conditional code implementing debugging messages or debugging statistics. These functionalities are now either available from run-time options or not maintained. |
+| --disable-log                                               | deprecated, to be removed                   | Was used to disable LOG messages, replaced by `--disable-T-Tracer` build option to remove tracing code from the build or `--T-stdout 0` run time option to redirect LOG messages to T-Tracer client interface. |
+| --ue-nas-use-tun                                            | deprecated to be removed                    | Usage of tun  in place of specific kernel modules is now a run time option. `--nokrnmod 0` option disable the default behavior which is to use tun to send or receive ip packets to/from the linux ip stack. |
+| --build-eclipse                                             | unknown                                     |                                                              |
+| --basic-simulator                                           | deprecated tested in CI                     | builds the basic simulator device. Now of little interest as this device build is enforced when building the eNodeB and it can be used at run time with the `--basicsim` option. More over the rf simulator is an enhanced basic simulator. |
+| --rfsimulator                                               | maintained                                  | builds the rf simulator device. Now of little interest as this device build is enforced when building the eNodeB and it can be used at run time with the `--rfsim` option. |
+|                                                             |                                             |                                                              |
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[running the oai softmodem ](RUNMODEM.md)
+

doc/FEATURE_SET.md

@@ -195,3 +195,10 @@ The NAS layer is based on **3GPP 24.301** and implements the following functions
 
 - EMM attach/detach, authentication, tracking area update, and more
 - ESM default/dedicated bearer, PDN connectivity, and more
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem build procedure](BUILD.md)
+
+[running the oai softmodem ](RUNMODEM.md)
+

doc/GET_SOURCES.md

@@ -0,0 +1,103 @@
+# The OpenAirInterface repository
+
+The OpenAirInterface software can be obtained from our gitLab
+server. You will need a git client to get the sources. The repository
+is currently used for main developments.
+
+## Prerequisite
+
+You need to install the subversion/git using the following commands:
+
+```shell
+sudo apt-get update
+sudo apt-get install subversion git
+```
+
+## Using EURECOM Gitlab
+
+The [openairinterface5g repository](https://gitlab.eurecom.fr/oai/openairinterface5g.git)
+holds the source code for (eNB RAN + UE RAN).
+
+For legal issues (licenses), the core network (EPC) source code is now moved away from
+the above openairinterface5g git repository. This EPC code is now splitted into two git
+projects ([openair-cn](https://gitlab.eurecom.fr/oai/openair-cn.git) with apache license
+and [xtables-addons-oai](https://gitlab.eurecom.fr/oai/xtables-addons-oai.git) with GPL license).
+
+Configure git with your name/email address (only important if you are developer and want to checkin code to Git):
+
+```shell
+git config --global user.name "Your Name"
+git config --global user.email "Your email address"
+```
+
+- Add a certificate from gitlab.eurecom.fr to your Ubuntu 14.04 installation:
+
+```shell
+echo -n | openssl s_client -showcerts -connect gitlab.eurecom.fr:443 2>/dev/null | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
+```
+
+- Disable certificate check completely if you do not have root access to /etc/ssl directory
+
+```shell
+git config --global http.sslverify false
+```
+
+### In order to checkout the Git repository (for OAI Users without login to gitlab server)
+
+Checkout RAN repository (eNB RAN + UE RAN):
+
+```shell
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
+```
+
+Checkout EPC (Core Network) repository:
+
+```shell
+git clone https://gitlab.eurecom.fr/oai/openair-cn.git
+```
+
+Optionally (openair-cn build script can install it for you):
+
+```shell
+git clone https://gitlab.eurecom.fr/oai/xtables-addons-oai.git
+```
+
+### In order to checkout the Git repository (for OAI Developers/admins with login to gitlab server)
+
+Please send email to {openair_tech (AT) eurecom (DOT) fr} to be added to the repository
+as a developer (only important for users who want to commit code to the repository). If
+you do not have account on gitlab.eurecom.fr, please register yourself to gitlab.eurecom.fr.
+
+* Checkout with using ssh keys:
+   * You will need to put your ssh keys in https://gitlab.eurecom.fr/profile/keys
+     to access to the git repo. Once that is done, checkout the git repository using:
+   * `git clone git@gitlab.eurecom.fr:oai/openairinterface5g.git`
+* Checkout with user name/password prompt:
+   * `git clone https://YOUR_USERNAME@gitlab.eurecom.fr/oai/openairinterface5g.git`
+   * `git clone https://YOUR_USERNAME@gitlab.eurecom.fr/oai/openair-cn.git`
+   * `git clone https://YOUR_USERNAME@gitlab.eurecom.fr/oai/xtables-addons-oai.git` (optional, openair-cn build script can do it for you)
+
+## Which branch to checkout?
+
+On the RAN side:
+
+* **master**: This branch is targeted for the user community. Since January 2019, it is also subject to a Continuous Integration process. The update frequency is about once every 2-3 months. We are also performing bug fixes on this branch.
+* **develop**: This branch contains recent commits that are tested on our CI test bench. The update frequency is about once a week.
+
+Please see the work flow and policies page :
+
+https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home
+
+you can find the latest stable tag release here :
+
+https://gitlab.eurecom.fr/oai/openairinterface5g/tags
+
+The tag naming conventions are :
+
+- On `master` branch: **v1.`x`.`y`** where
+  * `x` is the minor release number, incremented every 2-3 months when we are merging `develop` into `master` branch.
+  * `y` is the maintenance number, starting at 0 when we do a minor release and being incremented when a bug fix is incorporated into `master` branch.
+- On `develop` branch **`yyyy`.w`xx`**
+  * `yyyy` is the calendar year
+  * `xx` the week number within the year
+

doc/L1SIM.md

@@ -0,0 +1,99 @@
+<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">Open Air LTE Emulation</font></b>
+    </td>
+  </tr>
+</table>
+
+This page is valid for the develop branch
+
+# Table of Contents: #
+
+* [How to build the eNB and the UE](#build)
+* [How to run an eNB built with the noS1 option](#run-noS1-eNB)
+* [How to run a UE built with the noS1 option](#run-noS1-UE)
+* [Continuous Integration notes](#CInote)
+* [How to ping an eNB from a UE and vice versa (with the noS1 option)](#noS1-pinging)
+
+The old oaisim is dead! Long live oaisim! :)
+
+If you are looking for a description of the old oaisim (which is still available in some branches/tags), please see [here](OpenAirLTEEmulation) and [here](how-to-run-oaisim-with-multiple-ue).
+
+oaisim has been scraped and replaced by the same programs that are used for the real-time operation, `lte-softmodem` and `lte-uesoftmodem`. The latter also now includes an optional channel model, just like oaisim did. 
+
+# <a name="build">[How to build the eNB and the UE](BUILD.md)</a>
+
+The following paragraph explains how to run the L1 simulator in noS1 mode and using the oai kernel modules. 
+
+# <a name="run-noS1-eNB">How to run an eNB with the noS1 option</a>
+
+Modify the configuration file for IF4p5 fronthaul, `/openairinterface5g/ci-scripts/conf_files/rcc.band7.nos1.simulator.conf`, and replace the loopback interface with a physical ethernet interface and the IP addresses to work on your network. Copy your modifications to a new file, let's call YYY.conf the resulting configuration file.
+
+Run lte-softmodem as usual with this configuration. 
+
+```bash
+$ source oaienv
+$ cd cmake_targets/tools
+$ sudo -E ./init_nas_nos1 eNB
+$ cd ../lte_build_oai/build
+$ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0
+```
+
+# <a name="run-noS1-UE">How to run a UE with the noS1 option</a>
+
+Similarly modify the example configuration file in `/openairinterface5g/ci-scripts/conf_files/rru.band7.nos1.simulator.conf` and replace loopback interface and IP addresses. Copy your modifications to a new file, let's call XXX.conf the resulting configuration file.
+
+Run it like:
+
+```bash
+$ source oaienv
+$ cd cmake_targets/tools
+$ sudo -E ./init_nas_nos1 UE
+$ cd ../lte_build_oai/build
+$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0
+```
+
+That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. 
+
+# <a name="CInote">Continuous Integration notes</a>
+The CI currently tests the noS1 build option with one eNB and one UE in the following scenarios:
+* pinging one UE from one eNB
+* pinging one eNB from one UE
+* iperf download between one eNB and one UE
+* iperf upload between one eNB and one UE
+* all the above tests are done in FDD 5Mhz mode.
+
+# <a name="noS1-pinging">How to ping an eNB from a UE and vice versa (with the noS1 option)</a>
+
+Once your eNB and UE (built with the noS1 option) are running and synchronised, you can ping the eNB from the UE with the following command:
+
+```bash
+ping -I oai0 -c 20 $eNB_ip_addr
+```
+where $eNB_ip_addr is the IP address of your eNB.
+
+Similarly, you can ping the UE from the eNB.
+
+The IP adresses of the eNB and the UE are set up by the init_nas_nos1 program and should have the following values:
+* eNB_ip_addr set to 20 10.0.1.1
+* ue_ip_addr set to 20 10.0.1.2
+
+
+
+
+
+
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[oai softmodem build procedure](BUILD.md)
+

doc/L2NFAPI.md

@@ -0,0 +1,36 @@
+<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">L2 nFAPI Simulator Usage</font></b>
+    </td>
+  </tr>
+</table>
+
+This simulator allows to test L2 and above Layers using the nFAPI interface.
+
+**This simulator is available starting the `v1.0.0` release on the `master` branch.**
+
+Currently the only validated deployment by CI and developers is *with S1 interface and eNB / UEs are on the same machine*.
+
+Others deployments will be supported later after bug fixes and validation in the CI process.
+
+1. [With S1 -- eNB and UE on same machine](L2NFAPI_S1.md)
+
+
+
+
+
+
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[oai softmodem build procedure](BUILD.md)
+

doc/L2NFAPI_S1.md

@@ -0,0 +1,304 @@
+<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">L2 nFAPI Simulator (with S1 / same machine deployment)</font></b>
+    </td>
+  </tr>
+</table>
+
+## Table of Contents ##
+
+1.   [Environment](#1-environment)
+2.   [Prepare the EPC](#2-prepare-the-epc)
+3.   [Retrieve the OAI eNB-UE source code](#3-retrieve-the-oai-enb-ue-source-code)
+4.   [Setup of the USIM information in UE folder](#4-setup-of-the-usim-information-in-ue-folder)
+5.   [Setup of the Configuration files](#5-setup-of-the-configuration-files)
+     1.   [The eNB Configuration file](#51-the-enb-configuration-file)
+     2.   [The UE Configuration file](#52-the-ue-configuration-file)
+6.   [Bring Up a second loopback interface](#6-bring-up-a-second-loopback-interface)
+7.   [Build the eNB](#7-build-the-enb)
+8.   [Build the UE](#8-build-the-ue)
+9.   [Initialize the NAS UE Layer](#9-initialize-the-nas-ue-layer)
+10.   [Start the eNB](#10-start-the-enb)
+11.   [Start the UE](#11-start-the-ue)
+12.   [Test with ping](#12-test-with-ping)
+13.   [Limitations](#13-limitations)
+
+# 1. Environment #
+
+2 servers are used in this deployment. You can use Virtual Machines instead of each server; like it is done in the CI process.
+
+*  Machine A contains the EPC.
+*  Machine B contains the OAI eNB and the OAI UE(s)
+
+Example of L2 nFAPI Simulator testing environment:
+
+<img src="../l2-nfapi-simulator/L2-sim-single-server-deployment.png" alt="" border=3>
+
+Note that the IP addresses are indicative and need to be adapted to your environment.
+
+# 2. Prepare the EPC #
+
+Create the environment for the EPC and register all **USIM** information into the **HSS** database.
+
+If you are using OAI-EPC ([see on GitHub](https://github.com/OPENAIRINTERFACE/openair-cn)), build **HSS/MME/SPGW** and create config files.
+
+# 3. Retrieve the OAI eNB-UE source code #
+
+The eNB and the UE executables will compiled into 2 separate folders on the same machine `B`.
+
+```bash
+$ ssh sudousername@machineB
+$ git clone https://gitlab.eurecom.fr/oai/openairinterface5g/ enb_folder
+$ cd enb_folder
+$ git checkout -f v1.0.0
+$ cd ..
+$ cp -Rf enb_folder ue_folder
+```
+
+# 4. Setup of the USIM information in UE folder #
+
+```bash
+$ ssh sudousername@machineB
+$ cd ue_folder
+# Edit openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf with your preferred editor
+```
+
+Edit the USIM information within this file in order to match the HSS database. They **HAVE TO** match:
+
+*  PLMN+MSIN and IMSI of users table of HSS database **SHALL** be the same.
+*  OPC of this file and OPC of users table of HSS database **SHALL** be the same.
+*  USIM_API_K of this file and the key of users table of HSS database **SHALL** be the same.
+
+When testing multiple UEs, it is necessary to add other UEs information like described below for 2 Users. Only UE0 (first UE) information is written in the original file.
+
+```
+UE0:
+{
+    USER: {
+        IMEI="356113022094149";
+        MANUFACTURER="EURECOM";
+        MODEL="LTE Android PC";
+        PIN="0000";
+    };
+
+    SIM: {
+        MSIN="0000000001";  // <-- Modify here
+        USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
+        OPC="e734f8734007d6c5ce7a0508809e7e9c";
+        MSISDN="33611123456";
+    };
+...
+};
+// Copy the UE0 and edit
+UE1: // <- Edit here
+{
+    USER: {
+        IMEI="356113022094149";
+        MANUFACTURER="EURECOM";
+        MODEL="LTE Android PC";
+        PIN="0000";
+    };
+
+    SIM: {
+        MSIN="0000000002";  // <-- Modify here
+        USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
+        OPC="e734f8734007d6c5ce7a0508809e7e9c";
+        MSISDN="33611123456";
+    };
+...
+};
+```
+
+You can repeat the operation for as many users you want to test with.
+
+# 5. Setup of the Configuration files #
+
+**CAUTION: both proposed configuration files resides in the ci-scripts realm. You can copy them but you CANNOT push any modification on these 2 files as part of an MR without informing the CI team.**
+
+## 5.1. The eNB Configuration file ##
+
+```bash
+$ ssh sudousername@machineB
+$ cd enb_folder
+# Edit ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf with your preferred editor
+```
+
+First verify the nFAPI interface setup on the 2nd loopback interface.
+
+```
+MACRLCs = (
+        {
+        num_cc = 1;
+        local_s_if_name  = "lo:";            // <-- HERE
+        remote_s_address = "127.0.0.1";      // <-- HERE
+        local_s_address  = "127.0.0.2";      // <-- HERE
+        local_s_portc    = 50001;
+        remote_s_portc   = 50000;
+        local_s_portd    = 50011;
+        remote_s_portd   = 50010;
+        tr_s_preference = "nfapi";
+        tr_n_preference = "local_RRC";
+        }
+);
+```
+
+If you are testing more than 16 UEs, a proper setting on the RUs is necessary. **Note that this part is NOT present in the original configuration file**.
+
+```
+RUs = (
+    {
+       local_rf       = "yes"
+         nb_tx          = 1
+         nb_rx          = 1
+         att_tx         = 20
+         att_rx         = 0;
+         bands          = [38];
+         max_pdschReferenceSignalPower = -23;
+         max_rxgain                    = 116;
+         eNB_instances  = [0];
+    }
+);
+```
+
+Last, the S1 interface shall be properly set.
+
+```
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR"; // replace with 192.168.10.20
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "ens3";            // replace with the proper interface name
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";  // replace with 192.168.10.10
+        ENB_INTERFACE_NAME_FOR_S1U               = "ens3";            // replace with the proper interface name
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";  // replace with 192.168.10.10
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";  // replace with 192.168.10.10
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+
+    };
+```
+
+## 5.2. The UE Configuration file ##
+
+```bash
+$ ssh sudousername@machineB
+$ cd ue_folder
+# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor
+```
+
+Verify the nFAPI interface setup on the loopback interface.
+
+```
+L1s = (
+        {
+        num_cc = 1;
+        tr_n_preference = "nfapi";
+        local_n_if_name  = "lo";         // <- HERE
+        remote_n_address = "127.0.0.2";  // <- HERE
+        local_n_address  = "127.0.0.1";  // <- HERE
+        local_n_portc    = 50000;
+        remote_n_portc   = 50001;
+        local_n_portd    = 50010;
+        remote_n_portd   = 50011;
+        }
+);
+```
+
+# 6. Bring Up a second loopback interface #
+
+A second loopback interface is used to connect the eNB and the UEs.
+
+```bash
+$ ssh sudousername@machineB
+$ sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up
+```
+
+# 7. [Build OAI UE and eNodeB](BUILD.md) #
+
+
+
+# 8. Initialize the NAS UE Layer #
+
+Start the EPC on machine `A`.
+
+```bash
+$ ssh sudousername@machineA
+# Start the EPC
+```
+
+# 9. Start the eNB #
+
+In the first terminal (the one you used to build the eNB):
+
+```bash
+$ ssh sudousername@machineB
+$ cd enb_folder/cmake_targets
+$ sudo -E ./lte_build_oai/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf > enb.log 2>&1
+```
+
+If you don't use redirection, you can test but many logs are printed on the console and this may affect performance of the L2-nFAPI simulator.
+
+We do recommend the redirection in steady mode once your setup is correct.
+
+# 10. Start the UE #
+
+In the second terminal (the one you used to build the UE):
+
+```bash
+$ ssh sudousername@machineB
+$ cd ue_folder/cmake_targets
+# Test 64 UEs, 64 threads in FDD mode
+$ sudo -E ./lte_build_oai/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 > ue.log 2>&1
+# Test 64 UEs, 64 threads in TDD mode
+$ sudo -E ./lte_build_oai/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 -T 1 > ue.log 2>&1
+# The "-T 1" option means TDD config
+```
+
+-   The number of UEs can set by using `--num-ues` option and the maximum UE number is 255 (with the `--mu*` options, otherwise 16).
+-   The umber of threads can set with the `--nums-ue-thread`. This number **SHALL NOT** be greater than the number of UEs.
+-   How many UE that can be tested depends on hardware (server , PC, etc) performance in your environment.
+
+# 11. Test with ping #
+
+In a third terminal, after around 10 seconds, the UE(s) shall be connected to the eNB:
+
+```bash
+$ ssh sudousername@machineA
+# Ping UE0 IP address based on the EPC pool used: in this example:
+$ ping -c 20 192.168.200.2
+# Ping UE1 IP address based on the EPC pool used: in this example:
+$ ping -c 20 192.168.200.4
+```
+
+# 12. Limitations #
+
+Testing on the CI process is currently limited at time of writing. Improvements will be made soon.
+
+
+
+
+
+
+
+
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[oai softmodem build procedure](BUILD.md)
+
+[L2 nfapi simulator](L2NFAPI.md)

doc/RUNMODEM.md

@@ -0,0 +1,55 @@
+# Running OAI softmodem
+
+After you have [built the softmodem executables](BUILD.md) you can set your default directory  to the build directory `cmake_targets/lte_build_oai/build/` and start testing some use cases. Below, the description of the different oai functionalities should help you choose the oai configuration that suits your need. 
+
+## rf simulator
+
+ The rf simulator is a oai device replacing the radio heads (for example the USRP device). It allows connecting the oai UE and the oai eNodeB through a network interface carrying the time-domain samples, getting rid of over the air unpredictable perturbations. This is the ideal tool to check signal processing algorithms and protocols implementation.
+
+It is planned to enhance this simulator with the following functionalities:
+
+- Support for multiple UE connections,each UE being a `lte-uesoftmodem` instance.
+- Support for multiple eNodeB for hand-over tests
+- Support for channel modeling
+
+   This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../targets/ARCH/rfsimulator/README.md ) contains the detailed documentation.
+
+## l2 nfapi simulator
+
+This simulator connects a eNodeB and UEs through a nfapi interface, short-cutting the L1 layer. The objective of this simulator is to allow multi UEs simulation, with a large number of UEs (ideally up to 255 ) .Here to ease the platform setup, UEs are simulated via a single `lte-uesoftmodem` instance. Today the CI tests just with one UE and architecture has to be reviewed to allow a number of UE above about 16. This work is on-going.
+
+  As for the rf simulator, no specific hardware is required. The [L2 nfapi simlator page](L2NFAPI.md) contains the detailed documentation.
+
+## l1 simulator
+
+The l1 simulator is using the ethernet fronthaul protocol, as used to connect a RRU and a RAU to connect UEs and a eNodeB. UEs are simulated in a single `lte-uesoftmodem` process, as for the nfapi simulator. 
+
+The [L1 simulator page](L1SIM.md) contains the detailed documentation.
+
+## noS1 mode
+
+The noS1 mode is now available via the `--noS1`command line option. It can be used with simulators, described above, or when using oai with true RF boards. Only the oai UE can be connected to the oai eNodeB in noS1 mode.
+
+By default the noS1 mode is using linux tun interfaces to send or receive ip packets to/from the linux ip stack. using the `--nokrnmod 0`option you can enforce kernel modules instead of tun.
+
+noS1 code has been revisited, it has been tested with the rf simulator, and tun interfaces. More tests are on going and CI will soon include noS1 tests.
+
+## Running with a true radio head
+
+oai supports [number of deployment](FEATURE_SET.md) model, the following are tested in the CI:
+
+1.  [Monolithic eNodeB](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/HowToConnectCOTSUEwithOAIeNBNew) where the whole signal processing is performed in a single process
+2. if4p5 mode, where frequency domain samples are carried over ethernet, from the RRU which implement part of L1(FFT,IFFT,part of PRACH),  to a RAU
+
+
+
+
+
+
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[oai softmodem build procedure](BUILD.md)
+

nfapi/open-nFAPI/nfapi/src/nfapi_p7.c

@@ -1545,7 +1545,7 @@ static uint8_t pack_tx_request_body_value(void* tlv, uint8_t **ppWritePackedMsg,
                         // DJP - if(pusharray8(pdu->segments[j].segment_data, (uint32_t)(-1), pdu->segments[j].segment_length, ppWritePackedMsg, end) == 0)
 			int push_ret = pusharray8(pdu->segments[j].segment_data, 65535, pdu->segments[j].segment_length, ppWritePackedMsg, end);
                         
-                        if (pdu->segments[j].segment_length == 3)
+                        if (pdu->segments[j].segment_length == 3)
                         {
                           NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() BCH? segment_data:%x %x %x\n", __FUNCTION__, 
                           pdu->segments[j].segment_data[0], 
@@ -4429,43 +4429,43 @@ static uint8_t unpack_tx_request(uint8_t **ppReadPackedMsg, uint8_t *end, void *
 				for(i = 0; i < totalNumPdus; ++i)
 				{
 					nfapi_tx_request_pdu_t* pdu = &(pNfapiMsg->tx_request_body.tx_pdu_list[i]);
-					if (pdu) {
-					  uint16_t length = 0;
-					  uint16_t index = 0;
+					if (pdu) {
+					  uint16_t length = 0;
+					  uint16_t index = 0;
 					
-					  if(!(pull16(ppReadPackedMsg, &length, end) &&
+					  if(!(pull16(ppReadPackedMsg, &length, end) &&
 						 pull16(ppReadPackedMsg, &index, end)))
-						  return 0;
+						  return 0;
 
-					  pdu->pdu_length = length;
-					  pdu->pdu_index = index;
+                                          pdu->pdu_length = length;
+                                          pdu->pdu_index = index;
 					
 
 					// TODO : May need to rethink this bit
-					  pdu->num_segments = 1;
-					  pdu->segments[0].segment_length = pdu->pdu_length;
-					  pdu->segments[0].segment_data = nfapi_p7_allocate(pdu->pdu_length, config);
+					  pdu->num_segments = 1;
+					  pdu->segments[0].segment_length = pdu->pdu_length;
+					  pdu->segments[0].segment_data = nfapi_p7_allocate(pdu->pdu_length, config);
 
-					  if(pdu->segments[0].segment_data)
-					  {
-						  if(!pullarray8(ppReadPackedMsg, pdu->segments[0].segment_data, pdu->segments[0].segment_length, pdu->segments[0].segment_length, end))
+					  if(pdu->segments[0].segment_data)
+					  {
+						  if(!pullarray8(ppReadPackedMsg, pdu->segments[0].segment_data, pdu->segments[0].segment_length, pdu->segments[0].segment_length, end))
 							return 0;
-                                                  if (pdu->segments[0].segment_length == 3)
-                                                  {
+                                                  if (pdu->segments[0].segment_length == 3)
+                                                  {
                                                   NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() BCH? segment_data:%x %x %x\n", __FUNCTION__, 
                                                       pdu->segments[0].segment_data[0], 
                                                       pdu->segments[0].segment_data[1], 
                                                       pdu->segments[0].segment_data[2]
                                                       );
-                                                  }
-					  }
-					  else
-					  {
+                                                  }
+					  }
+					  else
+					  {
 						NFAPI_TRACE(NFAPI_TRACE_ERROR, "unpack_tx_request: Failed to allocate pdu (len:%d) %d/%d %d\n", pdu->pdu_length, totalNumPdus, i, pdu->pdu_index);
-					  }
-                                      } else {
-                                          NFAPI_TRACE(NFAPI_TRACE_ERROR, "NULL pdu\n");
-                                      }
+					  }
+                                      } else {
+                                          NFAPI_TRACE(NFAPI_TRACE_ERROR, "NULL pdu\n");
+                                      }
 				}
 			}
 			break;

openair1/PHY/CODING/crc_byte.c

@@ -88,17 +88,17 @@ uint32_t crcbit (uint8_t * inputptr, int32_t octetlen, uint32_t poly)
 
  // Reference 38.212 V15.1.1 Section 5.1 (36-212 v8.6.0 , pp 8-9)
 // The highest degree is set by default
-// 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 
+// 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 poly24a = 0x864cfb00;
-// 1000 0000 0000 0000 0110 0011  D^24 + D^23 + D^6 + D^5 + D + 1 
+// 1000 0000 0000 0000 0110 0011  D^24 + D^23 + D^6 + D^5 + D + 1
 static const uint32_t poly24b = 0x80006300;
-// 0001 0000 0010 0001            D^16 + D^12 + D^5 + 1 
+// 0001 0000 0010 0001            D^16 + D^12 + D^5 + 1
 static const uint32_t poly16  = 0x10210000;
-// 1000 0000 1111                 D^12 + D^11 + D^3 + D^2 + D + 1 
+// 1000 0000 1111                 D^12 + D^11 + D^3 + D^2 + D + 1
 static const uint32_t poly12  = 0x80F00000;
-// 1001 1011                      D^8  + D^7  + D^4 + D^3 + D + 1 
+// 1001 1011                      D^8  + D^7  + D^4 + D^3 + D + 1
 static const uint32_t poly8   = 0x9B000000;
- 
+
 void crcTableInit (void)
 {
     uint8_t c = 0;

openair1/PHY/INIT/init_top.c

@@ -83,4 +83,4 @@ void free_lte_top(void) {
 
 
 /*
-   @}*/
+ * @}*/

openair1/PHY/INIT/lte_init.c

@@ -965,3 +965,4 @@ void install_schedule_handlers(IF_Module_t *if_inst)
   if_inst->PHY_config_req = phy_config_request;
   if_inst->schedule_response = schedule_response;
 }
+

openair1/PHY/INIT/lte_init_ue.c

@@ -974,4 +974,4 @@ void init_lte_ue_transport(PHY_VARS_UE *ue,int abstraction_flag) {
 
   ue->dlsch_MCH[0]  = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS_MBSFN,ue->frame_parms.N_RB_DL,0);
 
-}
+}

openair1/PHY/LTE_ESTIMATION/lte_sync_time.c

@@ -567,6 +567,31 @@ int lte_sync_time_eNB(int32_t **rxdata, ///rx data in time domain
 
 }
 
+#ifdef PHY_ABSTRACTION
+#include "SIMULATION/TOOLS/defs.h"
+#include "SIMULATION/RF/defs.h"
+//extern channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX];
 
+int lte_sync_time_eNB_emul(PHY_VARS_eNB *phy_vars_eNB,
+                           uint8_t sect_id,
+                           int32_t *sync_val)
+{
 
+  uint8_t UE_id;
+  uint8_t CC_id = phy_vars_eNB->CC_id;
+
+  LOG_E(PHY,"[PHY] EMUL lte_sync_time_eNB_emul eNB %d, sect_id %d\n",phy_vars_eNB->Mod_id,sect_id);
+  *sync_val = 0;
+
+  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
+    //LOG_E(PHY,"[PHY] EMUL : eNB %d checking UE %d (PRACH %d) PL %d dB\n",phy_vars_eNB->Mod_id,UE_id,PHY_vars_UE_g[UE_id]->generate_prach,UE2eNB[UE_id][phy_vars_eNB->Mod_id]->path_loss_dB);
+    if ((PHY_vars_UE_g[UE_id][CC_id]->generate_prach == 1) && (phy_vars_eNB->Mod_id == (UE_id % NB_eNB_INST))) {
+      *sync_val = 1;
+      return(0);
+    }
+  }
+
+  return(-1);
+}
+#endif
 

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -352,7 +352,7 @@ void fill_dci_and_dlsch(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_proc_t
                 &rel8->resource_block_coding,rel8->resource_block_coding,rel8->rnti,rel8->rnti_type,rel8->dci_format,rel8->harq_process);
   
     dci_alloc->format = format1A;
-    
+
     switch (fp->N_RB_DL) {
     case 6:
       if (fp->frame_type == TDD) {
@@ -1726,8 +1726,8 @@ void fill_mdci_and_dlsch(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,mDCI_ALLOC_t *dc
   dlsch0->subframe_tx[(subframe + 2) % 10] = 1;
   LOG_D(PHY,"PDSCH : resource_block_coding %x\n",rel13->resource_block_coding);
 
-  conv_eMTC_rballoc (rel13->resource_block_coding, 
-		     fp->N_RB_DL, 
+  conv_eMTC_rballoc (rel13->resource_block_coding,
+		     fp->N_RB_DL,
 		     dlsch0_harq->rb_alloc);
 
   dlsch0_harq->nb_rb = RIV2nb_rb_LUT6[rel13->resource_block_coding & 31];       // this is the 6PRB RIV
@@ -1767,7 +1767,7 @@ void fill_mdci_and_dlsch(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,mDCI_ALLOC_t *dc
     else if (rel13->tpc == 0)  //N1A_PRB=2, get TBS from table using mcs and nb_rb=2
       dlsch0_harq->TBS         = TBStable[get_I_TBS(dlsch0_harq->mcs)][1];
     else if (rel13->tpc == 1)  //N1A_PRB=3, get TBS from table using mcs and nb_rb=3
-      dlsch0_harq->TBS         = TBStable[get_I_TBS(dlsch0_harq->mcs)][2];      
+      dlsch0_harq->TBS         = TBStable[get_I_TBS(dlsch0_harq->mcs)][2];
     LOG_D(PHY,"TBS = %d(%d)\n",dlsch0_harq->TBS,dlsch0_harq->mcs);
   }
   dlsch0->active = 1;
@@ -1968,7 +1968,7 @@ void fill_dci0(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_proc_t *proc,
 
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
 int get_narrowband_index(int N_RB_UL,int rb) {
-  
+
   switch (N_RB_UL) {
   case 6: // 6 PRBs, N_NB=1, i_0=0
   case 25: // 25 PRBs, N_NB=4, i_0=0
@@ -2116,7 +2116,7 @@ void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
 
 int get_first_rb_in_narrowband(int N_RB_UL,int rb) {
-  
+
   switch (N_RB_UL) {
   case 6: // 6 PRBs, N_NB=1, i_0=0
   case 25: // 25 PRBs, N_NB=4, i_0=0
@@ -2288,6 +2288,3 @@ void fill_mpdcch_dci0 (PHY_VARS_eNB * eNB, L1_rxtx_proc_t * proc, mDCI_ALLOC_t *
   }
 }
 #endif
-
-
-

openair1/PHY/LTE_TRANSPORT/dci_tools_common.c

@@ -367,11 +367,11 @@ void conv_rballoc(uint8_t ra_header,uint32_t rb_alloc,uint32_t N_RB_DL,uint32_t
 	if ((rb_alloc&(1<<i)) != 0)
 	  rb_alloc2[(3*(16-i))>>5] |= (7<<((3*(16-i))%32));
       }
-      
+
       // bit mask across
       if ((rb_alloc2[0]>>31)==1)
 	rb_alloc2[1] |= 1;
-      
+
       if ((rb_alloc&1) != 0)
 	rb_alloc2[1] |= (3<<16);
     }
@@ -385,7 +385,7 @@ void conv_rballoc(uint8_t ra_header,uint32_t rb_alloc,uint32_t N_RB_DL,uint32_t
       for (i=0; i<25; i++) {
 	if ((rb_alloc&(1<<(24-i))) != 0)
 	  rb_alloc2[(4*i)>>5] |= (0xf<<((4*i)%32));
-	
+
 	//  printf("rb_alloc2[%d] (type 0) %x (%d)\n",(4*i)>>5,rb_alloc2[(4*i)>>5],rb_alloc&(1<<i));
       }
     }

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -2034,7 +2034,7 @@ int allocate_REs_in_RB_MCH(int32_t **txdataF,
 
     break;
     default:
-        LOG_E(PHY,"Invalid modulation order %i_n",mod_order); 
+        LOG_E(PHY,"Invalid modulation order %i_n",mod_order);
     break;
     }
   }

openair1/PHY/LTE_TRANSPORT/prach.c

@@ -96,14 +96,14 @@ void rx_prach0(PHY_VARS_eNB *eNB,
   int prach_ifft_cnt=0;
 #endif
 
-  
+
   if(eNB)  {
     fp    = &(eNB->frame_parms);
     nb_rx = fp->nb_antennas_rx;
   } else {
     fp    = &(ru->frame_parms);
     nb_rx = ru->nb_rx;
-  } 
+  }
   AssertFatal(fp!=NULL,"rx_prach called without valid RU or eNB descriptor\n");
 
   frame_type          = fp->frame_type;
@@ -154,7 +154,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
 
       if (LOG_DEBUGFLAG(PRACH)){
         if (((eNB->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (eNB) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d, rootSequenceIndex %d, repetition number %d,numRepetitionsPrePreambleAttempt %d\n",
-			  	     br_flag,ce_level,eNB->proc.frame_prach,subframe,
+               br_flag,ce_level,eNB->proc.frame_prach,subframe,
 				     fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
 				     prach_ConfigIndex,rootSequenceIndex,
 				     eNB->prach_vars_br.repetition_number[ce_level],

openair1/PHY/LTE_TRANSPORT/prach_common.c

@@ -573,7 +573,7 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, uint8_t s
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
   for (int i=0; i<4; i++) {
     if (frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i] == 1) 
-      prach_mask |= (is_prach_subframe0(frame_parms, frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[i], 
+      prach_mask |= (is_prach_subframe0(frame_parms, frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[i],
                                         frame, subframe) << (i+1));
   }
 #endif

openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c

@@ -748,7 +748,7 @@ unsigned int  ulsch_decoding(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
     }
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_DECODING0+harq_pid,1);
-  
+
   // x1 is set in lte_gold_generic
   x2 = ((uint32_t)ulsch->rnti<<14) + ((uint32_t)subframe<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.3.1
   ulsch_harq = ulsch->harq_processes[harq_pid];

openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c

@@ -46,6 +46,7 @@
 
 //#define DEBUG_DCI
 
+
 #include "../LTE_TRANSPORT/dci_tools_common_extern.h"
 #include "../LTE_TRANSPORT/transport_proto.h"
 #include "transport_proto_ue.h"
@@ -1281,7 +1282,7 @@ void compute_llr_offset(LTE_DL_FRAME_PARMS *frame_parms,
         symbol_mod = (symbol >= (7-frame_parms->Ncp))? (symbol-(7-frame_parms->Ncp)) : symbol;
         if((symbol_mod == 0) || symbol_mod == (4-frame_parms->Ncp))
         {
-	  if (frame_parms->nb_antenna_ports_eNB == 2) 
+	  if (frame_parms->nb_antenna_ports_eNB == 2)
 	    crs_re = 4;
 	  else
 	    crs_re = 2;

openair1/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c

@@ -672,7 +672,7 @@ int dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
     len = (nb_rb*12) - pbch_pss_sss_adjust;
   }
 
-  
+
   LOG_D(PHY,"[p %d : symb %d / FirstSym %d / Length %d]: @LLR Buff %p, @LLR Buff(symb) %p \n",
 	frame_parms->nb_antenna_ports_eNB,
 	symbol,
@@ -680,7 +680,7 @@ int dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
 	len,
 	dlsch_llr,
 	llr32);
- 
+
 
   qpsk_llr((short *)rxF,
            (short *)llr32,

openair1/PHY/LTE_UE_TRANSPORT/pch_ue.c

@@ -48,7 +48,7 @@ int init_ue_paging_info(PHY_VARS_UE *ue, long defaultPagingCycle, long nB) {
    else if (Ns==4)
      ue->PO = (fp->frame_type==FDD) ? (4*(i_s&1)+(5*(i_s>>1))) : ((i_s&1)+(5*(i_s>>1))); 
    else
-     AssertFatal(1==0,"init_ue_paging_info: Ns is %d\n",Ns);
+     AssertFatal(1==0,"init_ue_paging_info: Ns is %u\n",Ns);
 
    return(0);
 }

openair1/PHY/defs_eNB.h

@@ -312,6 +312,10 @@ typedef struct RU_t_s{
   LTE_DL_FRAME_PARMS frame_parms;
   ///timing offset used in TDD
   int              N_TA_offset; 
+  /// SF extension used in TDD (unit: number of samples at 30.72MHz) (this is an expert option)
+  int              sf_extension;
+  /// "end of burst delay" used in TDD (unit: number of samples at 30.72MHz) (this is an expert option)
+  int              end_of_burst_delay;
   /// RF device descriptor
   openair0_device rfdevice;
   /// HW configuration