Merge branch 'ru_rau_enhancement_L1_renaming' into rau_rru_reciprocity_measurements

This is for internal use at eurecom. No documentation provided.

.gitignore

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

README.txt

@@ -2,7 +2,7 @@ OpenAirInterface is under OpenAirInterface Software Alliance license.
 ├── http://www.openairinterface.org/?page_id=101
 ├── http://www.openairinterface.org/?page_id=698
 
-It is distributed under OAI Public License V1.1. 
+It is distributed under OAI Public License V1.0. 
 The license information is distributed under LICENSE file in the same directory.
 Please see NOTICE.txt for third party software that is included in the sources.
 
@@ -43,36 +43,17 @@ openairinterface5g
 
 RELEASE NOTES:
 
-v1.1.0 -> July 2019. This version adds the following implemented features:
-           * Experimental support of LTE-M
-             - Single LTE-M UE attachment, legacy-LTE UE attachment is disabled
-           * X2 interface and handover (also X2-U interface)
-             - In FDD and TDD
-           * CU/DU split (F1 interface)
-             - Tested only in FDD
-           * CDRX
-             - Tested only in FDD
-           * Experimental eMBMS support (only on UE side)
-           * Experimental multi-RRU support
-             - Tested only in TDD
-          This version has an improved code quality:
-           * Simplification of the Build System
-             - A single build includes all full-stack simulators, S1/noS1 modes and one HW platform (such as USRP, BladeRF, ...)
-           * TUN interface is now used as default for the data plane
-             - for UE, eNB-noS1 and UE-noS1
-           * Code Cleanup
-           * Better Static Code Analysis:
-             - Limited number of errors in cppcheck
-             - Important Decrease on high Impact errors in CoverityScan
-           * Better Test Coverage in Continuous Integration:
-             - TM2, CDRX, IF4.5, F1
-             - OAI UE is tested in S1 and noS1 modes with USRP board
-             - Multi-RRU TDD mode
-             - X2 Handover in FDD mode
-
-v1.0.3 -> June 2019: Bug fix for LimeSuite v19.04.0 API
-v1.0.2 -> February 2019: Full OAI support for 3.13.1 UHD
-v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
+v0.1 -> Last stable commit on develop branch before enhancement-10-harmony
+v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
+v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
+v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
+v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
+v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
+v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
+v0.6 -> RRH functionality, UE greatly improved, better TDD support,
+        a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
+        work, you need to use v0.5.2 for that.
+v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.
 v1.0.0 -> January 2019. This version first implements the architectural split described in doc/oai_lte_enb_func_split_arch.png picture.
             Only FAPI, nFAPI and IF4.5 interfaces are implemented.
             Repository tree structure prepares future integrations of features such as LTE-M, nbIOT or 5G-NR.
@@ -80,15 +61,5 @@ v1.0.0 -> January 2019. This version first implements the architectural split de
             S1-flex has been introduced.
             New tools: config library, telnet server, ...
             A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
-
-v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.
-v0.6 -> RRH functionality, UE greatly improved, better TDD support,
-        a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
-        work, you need to use v0.5.2 for that.
-v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
-v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
-v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
-v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
-v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
-v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
-v0.1 -> Last stable commit on develop branch before enhancement-10-harmony
+v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
+v1.0.2 -> February 2019: Full OAI support for 3.13.1 UHD

ci-scripts/Jenkinsfile-gitlab

@@ -44,7 +44,7 @@ pipeline {
         disableConcurrentBuilds()
         timestamps()
         gitLabConnection('OAI GitLab')
-        gitlabBuilds(builds: ["Build gNB-USRP", "Build nr-UE-USRP", "Build eNB-USRP", "Build basic-sim", "Build phy-sim", "Build eNB-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13", "Test-Mono-FDD-Band13-X2-HO"])
+        gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13"])
         ansiColor('xterm')
     }
 
@@ -154,22 +154,6 @@ pipeline {
             }
         }
 
-        stage ("Start VM -- gnb-usrp") {
-            steps {
-                timeout (time: 5, unit: 'MINUTES') {
-                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
-                }
-            }
-        }
-
-        stage ("Start VM -- nr-ue-usrp") {
-            steps {
-                timeout (time: 5, unit: 'MINUTES') {
-                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
-                }
-            }
-        }
-
         stage ("Start VM -- enb-usrp") {
             steps {
                 timeout (time: 5, unit: 'MINUTES') {
@@ -178,14 +162,6 @@ pipeline {
             }
         }
 
-        stage ("Start VM -- phy-sim") {
-            steps {
-                timeout (time: 5, unit: 'MINUTES') {
-                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
-                }
-            }
-        }
-        
         stage ("Start VM -- enb-ethernet") {
             steps {
                 timeout (time: 5, unit: 'MINUTES') {
@@ -201,7 +177,15 @@ pipeline {
                 }
             }
         }
-        
+
+        stage ("Start VM -- phy-sim") {
+            steps {
+                timeout (time: 5, unit: 'MINUTES') {
+                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
+                }
+            }
+        }
+
         stage ("Start VM -- cppcheck") {
             steps {
                 timeout (time: 5, unit: 'MINUTES') {
@@ -221,6 +205,15 @@ pipeline {
                         }
                     }
                 }
+                stage ("Build eNb-USRP") {
+                    steps {
+                        gitlabCommitStatus(name: "Build eNb-USRP") {
+                            timeout (time: 20, unit: 'MINUTES') {
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                            }
+                        }
+                    }
+                }
                 stage ("Build basic simulator") {
                     steps {
                         gitlabCommitStatus(name: "Build basic-sim") {
@@ -230,45 +223,9 @@ pipeline {
                         }
                     }
                 }
-                stage ("Build 5G gNB-USRP") {
+                stage ("Build eNb-ethernet") {
                     steps {
-                        gitlabCommitStatus(name: "Build gNB-USRP") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        }
-                    }
-                }
-                stage ("Build 5G NR-UE-USRP") {
-                    steps {
-                        gitlabCommitStatus(name: "Build nr-UE-USRP") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        }
-                    }
-                }
-                stage ("Build eNB-USRP") {
-                    steps {
-                        gitlabCommitStatus(name: "Build eNB-USRP") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        }
-                    }
-                }
-                stage ("Build physical simulators") {
-                    steps {
-                        gitlabCommitStatus(name: "Build phy-sim") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                               sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        }
-                    }
-                }
-                stage ("Build eNB-ethernet") {
-                    steps {
-                        gitlabCommitStatus(name: "Build eNB-ethernet") {
+                        gitlabCommitStatus(name: "Build eNb-ethernet") {
                             timeout (time: 20, unit: 'MINUTES') {
                                 sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
@@ -284,12 +241,21 @@ pipeline {
                         }
                     }
                 }
-                stage ("Build eNB-USRP on Red Hat") {
+                stage ("Build physical simulators") {
+                    steps {
+                        gitlabCommitStatus(name: "Build phy-sim") {
+                            timeout (time: 20, unit: 'MINUTES') {
+                               sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                            }
+                        }
+                    }
+                }
+                stage ("Build eNb-USRP on Red Hat") {
                     when {
                         expression {doRedHatBuild}
                     }
                     steps {
-                        gitlabCommitStatus(name: "Build eNB-USRP-RHE") {
+                        gitlabCommitStatus(name: "Build eNb-USRP-RHE") {
                             script {
                                 try {
                                     withCredentials([
@@ -316,7 +282,7 @@ pipeline {
                 always {
                     script {
                         dir ('archives') {
-                            sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth gnb_usrp nrue_usrp red_hat"
+                            sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth red_hat"
                         }
                         if(fileExists('archives/vm_build_logs.zip')) {
                             archiveArtifacts artifacts: 'archives/vm_build_logs.zip'
@@ -362,7 +328,7 @@ pipeline {
                         stage ("Test physical simulators") {
                             steps {
                                 script {
-                                    timeout (time: 45, unit: 'MINUTES') {
+                                    timeout (time: 20, unit: 'MINUTES') {
                                         try {
                                             gitlabCommitStatus(name: "Test phy-sim") {
                                                 sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
@@ -538,7 +504,6 @@ pipeline {
                 stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
                     steps {
                         script {
-                            sh "sleep 60"
                             triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13')
                         }
                     }
@@ -555,26 +520,6 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test X2 Handover - FDD - Band 13 - B210") {
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-X2HO-B210', 'Test-Mono-FDD-Band13-X2-HO')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-MONO-FDD-Band13-X2HO-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
                 stage ("Test OAI UE - FDD - Band 20 - B200") {
                     steps {
                         script {

ci-scripts/Jenkinsfile-poll-gNB-UE

@@ -1,376 +0,0 @@
-#!/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
-*/
-
-
-// Abstraction function to send social media messages:
-// like on Slack or Mattermost
-def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
-    if (params.pipelineUsesSlack != null) {
-        if (params.pipelineUsesSlack) {
-            slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
-        }
-    }
-}
-
-// Location of the test XML file to be run
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-
-// Name of the phone resource
-def ciUSRPsResource = params.USRPsResource
-
-// Terminate Status
-def termUE = 0
-def termENB = 1
-def termStatusArray = new Boolean[2]
-termStatusArray[termUE] = false
-termStatusArray[termENB] = false
-
-// Global Parameters.
-def eNB_Repository
-def eNB_Branch
-def eNB_CommitID
-def eNB_AllowMergeRequestProcess = false
-def eNB_TargetBranch = "develop-nr"
-def GIT_COMMIT_AUTHOR
-def GIT_COMMIT_EMAIL
-def testStageName
-// Global Parameters not to break the main.py command line and code.
-def ADB_IPAddress = "none"
-def ADB_Username = "none"
-def ADB_Password = "none"
-def EPC_IPAddress = "none"
-def EPC_Username = "none"
-def EPC_Password = "none"
-
-
-
-pipeline {
-    agent {
-        label pythonExecutor 
-    }
-    options {
-        disableConcurrentBuilds()
-        gitLabConnection('OAI GitLab')
-        ansiColor('xterm')
-	lock (ciUSRPsResource)
-    }
-
-    stages {
-        stage ('Retrieve latest from branch') {
-            steps {
-	        script {
-	            checkout([$class: 'GitSCM', branches: [[name: "${params.Branch}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.eurecom.fr/oai/openairinterface5g.git']]])
-	            sh "git clean -x -d -ff"
-	            sh "git log -n1"
-	        }
-            }
-        }
-        stage ("print latest commit info") {
-            steps {
-        	    script {
-        	        echo "Building on: "
-        	        echo "  Repository -- ${GIT_URL}"
-        	        echo "  Branch -- ${GIT_BRANCH}"
-        	        echo "  Commit -- ${GIT_COMMIT}"
-        	    }
-            }
-        }
-        stage ("Verify Parameters") {
-            steps {
-                script {
-                    JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
-                    JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
-
-                    echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
-                    def allParametersPresent = true
-
-                    // It is already too late to check it
-                    if (params.pythonExecutor != null) {
-                       echo "eNB CI executor node  :   ${pythonExecutor}"
-                    }
-                    if (params.eNB_Repository == null) {
-                        eNB_Repository = GIT_URL 
-                    } else {
-                        eNB_Repository = params.eNB_Repository
-                    }
-                    echo "eNB_Repository = ${eNB_Repository}"
-                    if (params.eNB_Branch== null) {
-                        eNB_Branch = GIT_BRANCH
-                    } else {
-                        eNB_Branch = params.eNB_Branch
-                    }
-                    echo "eNB_Branch = ${eNB_Branch}"
-                    if (params.eNB_CommitID == null) {
-                        eNB_CommitID = GIT_COMMIT 
-                    } else {
-                        eNB_CommitID = params.eNB_CommitID
-                    }
-                    echo "eNB_CommitID = ${eNB_CommitID}"
-                    // If not present picking a default Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    } else {
-			testStageName = params.pipelineTestStageName
-	            }
-
-                    if (params.USRPsResource == null) {
-                        allParametersPresent = false
-                    }
-	
-                    if (params.eNB_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.UE_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB_Credentials == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.UE_Credentials == null) {
-                        allParametersPresent = false
-                    }
-                    GIT_COMMIT_AUTHOR = sh (
-                        script: 'git show -s --pretty=%an',
-                        returnStdout: true
-                    ).trim()
-                    echo "The author of the commit is: ${GIT_COMMIT_AUTHOR}"
-                    GIT_COMMIT_EMAIL = sh (
-                        script: 'git show -s --pretty=%ae',
-                        returnStdout: true
-                    ).trim()
-                    echo "The email of the author is: ${GIT_COMMIT_EMAIL}"
-                    if (allParametersPresent) {
-                        echo "All parameters are present"
-                    } else {
-                        echo "Some parameters are missing"
-                        sh "./ci-scripts/fail.sh"
-                    }
-                }
-            }
-        }
-
-        stage ("Build and Test") {
-            steps {
-        	    script {
-        	        dir ('ci-scripts') {
-                        // If not present picking a default XML file
-                        if (params.pythonTestXmlFile == null) {
-                            // picking default
-                            testXMLFile = 'xml_files/gnb_usrp_build.xml'
-                            echo "Test XML file(default):   ${testXMLFile}"
-                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                        } else {
-                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                            for (xmlFile in myXmlTestSuite) {
-                                if (fileExists(xmlFile)) {
-                            	mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                            	echo "Test XML file         :   ${xmlFile}"
-                                }
-                            }
-                        }
-        	    	withCredentials([
-        	    	    [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
-        	    	    [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
-        	    	]) {
-        	    	    sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} ${mainPythonAllXmlFiles}"
-        	    	    String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-        	    	    for (xmlFile in myXmlTestSuite) {
-        	    	    if (fileExists(xmlFile)) {
-        	    	        try {
-        	    	            sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --UESourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --EPCIPAddress=${EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=/tmp/${EPC_Username} --EPCType=ltebox --XMLTestFile=${xmlFile}"
-        	    	        } catch (Exception e) {
-        	    	            currentBuild.result = 'FAILURE'
-        	    	            buildStageStatus = false
-        	    	        }
-        	    	    }
-        	    	    }
-                            sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
-        	        }
-        	    }
-                }
-            }
-	}	
-	
-        stage ("Terminate") {
-            parallel {
-        	stage('Terminate NR UE') {
-        	    steps {
-        		echo '\u2705 \u001B[32mTerminate NR UE\u001B[0m'
-                        withCredentials([
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
-                        ]) {
-                            sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
-                        }
-        	    }
-        	    post {
-        		success {
-        		    script {
-        			termStatusArray[termUE] = true
-        		    }
-        		}
-        	    }
-        	}
-       	    stage('Terminate NR eNB') {
-       	        steps {
-		    echo '\u2705 \u001B[32mTerminate NR eNB\u001B[0m'
-                        withCredentials([
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
-                        ]) {
-                            sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
-                        }
-        	      }
-                    post {
-        	        success {
-                            script {
-        		        termStatusArray[termENB] = true
-        		    }
-                        }
-        	    }
-                }
-            }
-        }
-
-        stage('Log Collection') {
-            parallel {
-        	stage('Log Collection (gNB and NR UE - Build)') {
-        	    steps {
-        		withCredentials([
-        		     [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
-        		]) {
-        		    echo '\u2705 \u001B[32mLog Collection (gNB and NR UE - Build)\u001B[0m'
-        		    sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
-        
-        		    echo '\u2705 \u001B[32mLog Transfer (gNB and NR UE - Build)\u001B[0m'
-        		    sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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 (gNB - Run)') {
-        	    steps {
-        		withCredentials([
-        		     [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
-        		]) {
-        		    echo '\u2705 \u001B[32mLog Collection (gNB - Run)\u001B[0m'
-        		    sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
-        
-        		    echo '\u2705 \u001B[32mLog Transfer (gNB - Run)\u001B[0m'
-        		    sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
-        		}
-        		script {
-        		    if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-        			archiveArtifacts "enb.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_BUILD_TIME#${JOB_TIMESTAMP}#' -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
-        			archiveArtifacts "test_results-${JOB_NAME}.html"
-        		    }
-        		}
-        	    }
-        	}
-        	stage('Log Collection (NR UE - Run)') {
-        	    steps {
-        		withCredentials([
-        		     [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
-        		]) {
-        		    echo '\u2705 \u001B[32mLog Collection (gNB - Run)\u001B[0m'
-        		    sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --UESourceCodePath=${params.eNB_SourceCodePath}"
-        
-        		    echo '\u2705 \u001B[32mLog Transfer (gNB - Run)\u001B[0m'
-        		    sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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"
-        		    }
-        		}
-        	    }
-        	}
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                if ("MERGE".equals(env.gitlabActionType)) {
-                    echo "This is a MERGE event"
-                } else {
-                    gitlabCommitStatus(name: "Test-gNB-nrUE") {
-                        if ((currentBuild.result == null) || (currentBuild.result == 'SUCCESS')) {
-                            echo "Setting the gitlab commit status to pass"
-                        } else {
-                            sh "./ci-scripts/fail.sh"
-                        }
-                    }
-                }
-                emailext attachmentsPattern: '*results*.html',
-                     body: '''Hi,
-Here are attached HTML report files for $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!
-
-Regards,
-OAI CI Team''',
-                     replyTo: 'no-reply@openairinterface.org',
-                     subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!',
-                     to: GIT_COMMIT_EMAIL
-	    }
-        }
-        success {
-            script {
-                def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
-                if ("MERGE".equals(env.gitlabActionType)) {
-                    echo "This is a MERGE event"
-                    //addGitLabMRComment comment: message
-                    def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
-                    sendSocialMediaMessage('ci-test', 'good', message2)
-                } else {
-                    sendSocialMediaMessage('ci-test', 'good', message)
-                }
-            }
-        }
-        failure {
-            script {
-                def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
-                if ("MERGE".equals(env.gitlabActionType)) {
-                    echo "This is a MERGE event"
-                    //addGitLabMRComment comment: message
-                    def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
-                    sendSocialMediaMessage('ci-test', 'danger', message2)
-                } else {
-                    sendSocialMediaMessage('ci-test', 'danger', message)
-                }
-            }
-        }
-    }
-}
-

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -1,282 +0,0 @@
-#!/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
-
-// 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)
-    }
-    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 Stage Name
-                    if (params.pipelineTestStageName == null) {
-                        // picking default
-                        testStageName = 'Template Test Stage'
-                    }
-
-                    if (params.smartphonesResource == null) {
-                        allParametersPresent = false
-                    }
-                    // 1st eNB parameters
-                    if (params.eNB_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB_Credentials == null) {
-                        allParametersPresent = false
-                    }
-                    // 2nd eNB parameters
-                    if (params.eNB1_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB1_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB1_Credentials == null) {
-                        allParametersPresent = false
-                    }
-                    // 3rd eNB parameters
-                    if (params.eNB2_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB2_SourceCodePath == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.eNB2_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"
-                        // 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(xmlFile)) {
-                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                    echo "Test XML file         :   ${xmlFile}"
-                                }
-                            }
-                        }
-                        withCredentials([
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
-                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${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=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_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} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
-                        }
-                    }
-                }
-            }
-        }
-        stage('Log Collection') {
-            parallel {
-                stage('Log Collection (eNB - Build)') {
-                    steps {
-                        withCredentials([
-                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
-                        ]) {
-                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
-
-                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
-                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_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 (eNB - Run)') {
-                    steps {
-                        withCredentials([
-                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
-                        ]) {
-                            echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
-
-                            echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
-                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
-                        }
-                        script {
-                            if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
-                                archiveArtifacts "enb.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/buildOnRH.sh

@@ -179,7 +179,7 @@ echo "############################################################"
 echo "Checking build status" 
 echo "############################################################"
 
-LOG_PATTERN=.Rel15.txt
+LOG_PATTERN=.Rel14.txt
 NB_PATTERN_FILES=7
 
 LOG_FILES=`ls $ARCHIVES_LOC/*.txt`

ci-scripts/buildOnVM.sh

@@ -25,7 +25,7 @@ function build_usage {
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- $VM_OSREL image already synced"
+    echo "     -- xenial image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -33,8 +33,31 @@ function build_usage {
     echo "------"
     echo "    oai-ci-vm-tool build [OPTIONS]"
     echo ""
-    command_options_usage
-
+    echo "Mandatory Options:"
+    echo "--------"
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "    --workspace #### OR -ws ####"
+    echo "    Specify the workspace."
+    echo ""
+    echo "Options:"
+    echo "--------"
+    variant_usage
+    echo "    Specify the variant to build."
+    echo ""
+    echo "    --keep-vm-alive OR -k"
+    echo "    Keep the VM alive after the build."
+    echo ""
+    echo "    --daemon OR -D"
+    echo "    Run as daemon"
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
 }
 
 function build_on_vm {
@@ -72,7 +95,7 @@ function build_on_vm {
         echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
         echo "############################################################"
         acquire_vm_create_lock
-        uvt-kvm create $VM_NAME release=$VM_OSREL --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+        uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
         echo "Waiting for VM to be started"
         uvt-kvm wait $VM_NAME --insecure
 
@@ -135,21 +158,11 @@ function build_on_vm {
         then
             echo "echo \"sudo apt-get --yes --quiet install zip subversion libboost-dev \"" >> $VM_CMDS
             echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
-            if [[ "$VM_NAME" == *"-phy-sim"* ]]
-            then
-                echo "sudo apt-get --yes install zip subversion libboost-dev make gcc >> zip-install.txt 2>&1" >> $VM_CMDS
-            else
-                echo "sudo apt-get --yes install zip subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
-            fi
+            echo "sudo apt-get --yes install zip subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
         else
             echo "echo \"sudo apt-get --yes --quiet install zip daemon subversion libboost-dev \"" >> $VM_CMDS
             echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
-            if [[ "$VM_NAME" == *"-phy-sim"* ]]
-            then
-                echo "sudo apt-get --yes install zip daemon subversion libboost-dev make gcc >> zip-install.txt 2>&1" >> $VM_CMDS
-            else
-                echo "sudo apt-get --yes install zip daemon subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
-            fi
+            echo "sudo apt-get --yes install zip daemon subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
         fi
     fi
     echo "mkdir tmp" >> $VM_CMDS
@@ -179,18 +192,12 @@ function build_on_vm {
         echo "echo \"./tools/install_dependencies \"" >> $VM_CMDS
         echo "./tools/install_dependencies > cmake_targets/log/install-build.txt 2>&1" >> $VM_CMDS
         echo "echo \"$BUILD_OPTIONS \"" >> $VM_CMDS
-        echo "$BUILD_OPTIONS > cmake_targets/log/rt_controller.Rel15.txt 2>&1" >> $VM_CMDS
+        echo "$BUILD_OPTIONS > cmake_targets/log/rt_controller.Rel14.txt 2>&1" >> $VM_CMDS
     fi
     if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]]
     then
         echo "echo \"source oaienv\"" >> $VM_CMDS
         echo "source oaienv" >> $VM_CMDS
-        if [[ "$VM_NAME" == *"-phy-sim"* ]]
-        then
-            echo "cd common/utils/T" >> $VM_CMDS
-            echo "make" >> $VM_CMDS
-            echo "cd ../../.." >> $VM_CMDS
-        fi
         echo "cd cmake_targets/" >> $VM_CMDS
         echo "mkdir log" >> $VM_CMDS
         echo "chmod 777 log" >> $VM_CMDS

ci-scripts/checkAddedWarnings.sh

@@ -110,7 +110,7 @@ MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-sta
 NB_WARNINGS_FILES=0
 
 # Retrieve list of warnings 
-LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel15.txt archives/*/basic_simulator_*txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
+LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel14.txt archives/*/basic_simulator_*txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
 
 echo ""
 echo "List of files that have been modified by the Merge Request AND"

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

@@ -1,271 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe01;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
-
-    nr_cellid = 98765L;
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "FDD";
-      tdd_config 					      = 3;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 13;
-      downlink_frequency      			      = 751000000L;
-      uplink_frequency_offset 			      = 31000000;
-      Nid_cell					      = 1;
-      N_RB_DL                 			      = 25;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 110;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 0;
-      prach_config_index      			      = 0;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 1;
-      prach_freq_offset       			      = 2;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      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_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      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";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal";
-      rxPool_sc_Period                                       = "sf40";
-      rxPool_data_CP_Len                                     = "normal";
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
-/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
-      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                               = 0;
-      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
-*/
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    ///X2
-    enable_x2 = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "local_RRC";
-	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
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 125;
-         eNB_instances  = [0];
-
-    }
-);  
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";//PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
-       hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
-       phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
-       mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
-       rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
-       pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
-       rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
-    };
-

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

@@ -171,7 +171,7 @@ eNBs =
                   lastPreamble_r13                  = 63;
                   ra_ResponseWindowSize_r13         = 20; #0
                   mac_ContentionResolutionTimer_r13 = 80; #0
-                  rar_HoppingConfig_r13             = 1; // Note 1 means off
+                  rar_HoppingConfig_r13             = "off";  #1;
               }
           );
 

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

@@ -1,276 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
-
-    nr_cellid = 123456L;
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "FDD";
-      tdd_config 					      = 3;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 13;
-      downlink_frequency      			      = 751000000L;
-      uplink_frequency_offset 			      = 31000000;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 25;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 110;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 0;
-      prach_config_index      			      = 0;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 1;
-      prach_freq_offset       			      = 2;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      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_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      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";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal";
-      rxPool_sc_Period                                       = "sf40";
-      rxPool_data_CP_Len                                     = "normal";
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
-/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
-      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                               = 0;
-      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
-*/
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-    ///X2
-    enable_x2 = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "CI_RCC_IP_ADDR";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "local_RRC";
-	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
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 125;
-         eNB_instances  = [0];
-
-    }
-);  
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";//PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
-       hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
-       phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
-       mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
-       rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
-       pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
-       rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
-    };
-

ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf

@@ -1,298 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});	 
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function                                                 = "3GPP_gNODEB";
-      node_timing                                                   = "synch_to_ext_device";
-      node_synch_ref                                                = 0;
-      frame_type                                                    = "TDD";
-      DL_prefix_type                                                = "NORMAL";
-      UL_prefix_type                                                = "NORMAL";
-      eutra_band                                                    = 78;
-      downlink_frequency                                            = 3510000000L;
-      uplink_frequency_offset                                       = -120000000;
-      Nid_cell                                                      = 0;
-      N_RB_DL                                                       = 106;
-      nb_antenna_ports                                              = 1;
-      nb_antennas_tx                                                = 1;
-      nb_antennas_rx                                                = 1;
-      tx_gain                                                       = 90;
-      rx_gain                                                       = 125;
-      MIB_subCarrierSpacingCommon                                   = 30;
-      MIB_ssb_SubcarrierOffset                                      = 0;
-      MIB_dmrs_TypeA_Position                                       = 2;
-      pdcch_ConfigSIB1                                              = 0;
-      SIB1_frequencyOffsetSSB                                       = "khz5";
-      SIB1_ssb_PeriodicityServingCell                               = 5;
-      SIB1_ss_PBCH_BlockPower                                       = -60;
-      absoluteFrequencySSB                                          = 0;
-      DL_FreqBandIndicatorNR                                        = 15;
-      DL_absoluteFrequencyPointA                                    = 15;
-      DL_offsetToCarrier                                            = 15;
-      DL_SCS_SubcarrierSpacing                                      = "kHz30";
-      DL_SCS_SpecificCarrier_k0                                     = 0;
-      DL_carrierBandwidth                                           = 15;
-      DL_locationAndBandwidth                                       = 15;
-      DL_BWP_SubcarrierSpacing                                      = "kHz30";
-      DL_BWP_prefix_type                                            = "NORMAL";
-      UL_FreqBandIndicatorNR                                        = 15;
-      UL_absoluteFrequencyPointA                                    = 13;
-      UL_additionalSpectrumEmission                                 = 3;
-      UL_p_Max                                                      = -1;
-      UL_frequencyShift7p5khz                                       = "TRUE";
-      UL_offsetToCarrier                                            = 10;
-      UL_SCS_SubcarrierSpacing                                      = "kHz30";
-      UL_SCS_SpecificCarrier_k0                                     = 0;
-      UL_carrierBandwidth                                           = 15;
-      UL_locationAndBandwidth                                       = 15;
-      UL_BWP_SubcarrierSpacing                                      = "kHz30";
-      UL_BWP_prefix_type                                            = "NORMAL";
-      UL_timeAlignmentTimerCommon                                   = "infinity";
-      ServingCellConfigCommon_n_TimingAdvanceOffset                 = "n0"
-      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = 0x01;
-      ServingCellConfigCommon_ssb_periodicityServingCell            = 10;
-      ServingCellConfigCommon_dmrs_TypeA_Position                   = 2;
-      NIA_SubcarrierSpacing                                         = "kHz15"; 
-      ServingCellConfigCommon_ss_PBCH_BlockPower                    = -60;
-      referenceSubcarrierSpacing                                    = "kHz15";
-      dl_UL_TransmissionPeriodicity                                 = "ms0p5";
-      nrofDownlinkSlots                                             = 10;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 10;
-      nrofUplinkSymbols                                             = 10;
-      rach_totalNumberOfRA_Preambles                                = 63;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice         = "oneEighth";
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneEighth      = 4;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneFourth      = 8;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneHalf        = 16;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_one            = 24;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_two            = 32;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_four           = 8;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_eight          = 4;
-      rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_sixteen        = 2;
-      rach_groupBconfigured                                         = "ENABLE";
-      rach_ra_Msg3SizeGroupA                                        = 56;
-      rach_messagePowerOffsetGroupB                                 = "dB0";
-      rach_numberOfRA_PreamblesGroupA                               = 32;
-      rach_ra_ContentionResolutionTimer                             = 8;
-      rsrp_ThresholdSSB                                             = 64;
-      rsrp_ThresholdSSB_SUL                                         = 64;
-      prach_RootSequenceIndex_choice                                = "l839";
-      prach_RootSequenceIndex_l839                                  = 0;
-      prach_RootSequenceIndex_l139                                  = 0;
-      prach_msg1_SubcarrierSpacing                                  = "kHz30";
-      restrictedSetConfig                                           = "unrestrictedSet";
-      msg3_transformPrecoding                                       = "ENABLE";
-      prach_ConfigurationIndex                                      = 10;
-      prach_msg1_FDM                                                = "one";
-      prach_msg1_FrequencyStart                                     = 10;
-      zeroCorrelationZoneConfig                                     = 10;
-      preambleReceivedTargetPower                                   = -150;
-      preambleTransMax                                              = 6;
-      powerRampingStep                                              = "dB0";
-      ra_ResponseWindow                                             = 8;
-      groupHoppingEnabledTransformPrecoding                         = "ENABLE";
-      msg3_DeltaPreamble                                            = 0;
-      p0_NominalWithGrant                                           = 0;
-      PUSCH_TimeDomainResourceAllocation_k2                         = 0;
-      PUSCH_TimeDomainResourceAllocation_mappingType                = "typeA";
-      PUSCH_TimeDomainResourceAllocation_startSymbolAndLength       = 0;
-      pucch_ResourceCommon                                          = 0;
-      pucch_GroupHopping                                            = "neither";
-      hoppingId                                                     = 0;
-      p0_nominal                                                    = -30;
-      PDSCH_TimeDomainResourceAllocation_k0                         = 2;
-      PDSCH_TimeDomainResourceAllocation_mappingType                = "typeA";
-      PDSCH_TimeDomainResourceAllocation_startSymbolAndLength       = 0;
-      rateMatchPatternId                                            = 0;
-      RateMatchPattern_patternType                                  = "bitmaps";
-      symbolsInResourceBlock                                        = "oneSlot";
-      periodicityAndPattern                                         = 2;
-      RateMatchPattern_controlResourceSet                           = 5;
-      RateMatchPattern_subcarrierSpacing                            = "kHz30";
-      RateMatchPattern_mode                                         = "dynamic";
-      controlResourceSetZero                                        = 0;
-      searchSpaceZero                                               = 0;
-      searchSpaceSIB1                                               = 10;
-      searchSpaceOtherSystemInformation                             = 10;
-      pagingSearchSpace                                             = 10;
-      ra_SearchSpace                                                = 10;
-      PDCCH_common_controlResourceSetId                             = 5;
-      PDCCH_common_ControlResourceSet_duration                      = 2;
-      PDCCH_cce_REG_MappingType                                     = "nonInterleaved";
-      PDCCH_reg_BundleSize                                          = 3;
-      PDCCH_interleaverSize                                         = 3;
-      PDCCH_shiftIndex                                              = 10;  
-      PDCCH_precoderGranularity                                     = "sameAsREG-bundle";
-      PDCCH_TCI_StateId                                             = 32;
-      tci_PresentInDCI                                              = "ENABLE";
-      PDCCH_DMRS_ScramblingID                                       = 0;
-      SearchSpaceId                                                 = 10;
-      commonSearchSpaces_controlResourceSetId                       = 5;
-      SearchSpace_monitoringSlotPeriodicityAndOffset_choice         = "sl1";
-      SearchSpace_monitoringSlotPeriodicityAndOffset_value          = 0;
-      SearchSpace_duration                                          = 2;
-      SearchSpace_nrofCandidates_aggregationLevel1                  = 0;
-      SearchSpace_nrofCandidates_aggregationLevel2                  = 0;
-      SearchSpace_nrofCandidates_aggregationLevel4                  = 0;
-      SearchSpace_nrofCandidates_aggregationLevel8                  = 0;
-      SearchSpace_nrofCandidates_aggregationLevel16                 = 0;
-      SearchSpace_searchSpaceType                                   = "common";
-      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel1     = 1;
-      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel2     = 1;
-      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel4     = 1;
-      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel8     = 1;
-      Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel16    = 1; 
-      Common_dci_Format2_3_monitoringPeriodicity                    = 1;
-      Common_dci_Format2_3_nrofPDCCH_Candidates                     = 1;
-      ue_Specific__dci_Formats                                      = "formats0-0-And-1-0";
-      RateMatchPatternLTE_CRS_carrierFreqDL                         = 6;
-      RateMatchPatternLTE_CRS_carrierBandwidthDL                    = 6;
-      RateMatchPatternLTE_CRS_nrofCRS_Ports                         = 1;
-      RateMatchPatternLTE_CRS_v_Shift                               = 0;
-      RateMatchPatternLTE_CRS_radioframeAllocationPeriod            = 1;
-      RateMatchPatternLTE_CRS_radioframeAllocationOffset            = 0;
-      RateMatchPatternLTE_CRS_subframeAllocation_choice             = "oneFrame";
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "local_RRC";
-        }  
-);
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
-);
-
-RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 114;
-         eNB_instances  = [0];
-	 sdr_addrs = "addr=192.168.20.2,second_addr=192.168.10.2,mgmt_addr=192.168.20.2,clock_source=external,time_source=external";
-
-    }
-);  
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-NETWORK_CONTROLLER :
-{
-    FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
-    FLEXRAN_PORT           = 2210;
-    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
-    FLEXRAN_AWAIT_RECONF   = "no";
-};
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
-       hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
-       phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
-       mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
-       rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
-       pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
-       rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
-    };
-

ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf

@@ -1,242 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB_Eurecom_LTEBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
-    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    component_carriers = (
-      {
-      node_function             = "NGFI_RCC_IF4p5";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "TDD";
-      tdd_config 					      = 1;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 38;
-      downlink_frequency      			      = 2580000000L;
-      uplink_frequency_offset 			      = 0;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50; #25;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 0;
-      prach_config_index      			      = 0;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 1;
-      prach_freq_offset       			      = 2;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 32;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      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_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -104; #-96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -96; #-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";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "enp129s0f0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "enp129s0f0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR"; #"127.0.0.4/24";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152\
-
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-
-    };
-  }
-);
-
-MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "local_RRC";
-        }  
-);
-
-L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
-);
-
-RUs = (
-    {		  
-      	local_if_name  = "enp129s0f0";			  
-      	local_address  = "CI_ENB_IP_ADDR";
-    	remote_address = "CI_RRU1_IP_ADDR";
-    	local_portc    = 50002;	
-    	remote_portc   = 50002;
-    	local_portd    = 50003;	
-    	remote_portd   = 50003;
-	local_rf       = "no"
-    	tr_preference  = "udp_if4p5"
-	nb_tx          = 1
-	nb_rx          = 1
-	att_tx         = 20
-	att_rx         = 20;
-	eNB_instances  = [0];
-	is_slave       = "no";
-	ota_sync_enabled = "yes";
-    },
-    {		  
-      	local_if_name  = "enp129s0f0";			  
-      	local_address  = "CI_ENB_IP_ADDR";
-    	remote_address = "CI_RRU2_IP_ADDR";
-    	local_portc    = 50010;	
-    	remote_portc   = 50010;
-    	local_portd    = 50011;	
-    	remote_portd   = 50011;
-	local_rf       = "no"
-    	tr_preference  = "udp_if4p5"
-	nb_tx          = 1
-	nb_rx          = 1
-	att_tx         = 20
-	att_rx         = 20;
-	eNB_instances  = [0];
-	is_slave       = "yes";
-	ota_sync_enabled = "yes";
-    }
-);  
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config = { 
-      global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
-      hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
-      phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
-      mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
-      rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
-      pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
-      rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
-};

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -218,7 +218,7 @@ MACRLCs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rru.band38.tm1.master.conf

@@ -1,47 +0,0 @@
-RUs = (
-    {		  
-      	local_if_name                    = "enp1s0";			  
-      	remote_address                   = "CI_RCC_IP_ADDR";
-    	local_address                    = "CI_ENB_IP_ADDR";
-    	local_portc                       = 50002;	     
-    	remote_portc                      = 50002;
-    	local_portd                       = 50003;	     
-    	remote_portd                      = 50003;
-	local_rf                         = "yes"
-    	tr_preference                    = "udp_if4p5";
-	nb_tx                            = 1;
-	nb_rx                            = 1;
-	max_pdschReferenceSignalPower    = -12;
-	max_rxgain                       = 100;
-	bands                            = [38];
-        is_slave			 = "no";
-        ota_sync_enabled		 = "yes";
-    }
-);  
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config = { 
-      global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
-      hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
-      phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
-      mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
-      rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
-      pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
-      rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
-};
-

ci-scripts/conf_files/rru.band38.tm1.slave.conf

@@ -1,47 +0,0 @@
-RUs = (
-    {		  
-      	local_if_name                    = "enp1s0";			  
-      	remote_address                   = "CI_RCC_IP_ADDR";
-    	local_address                    = "CI_ENB_IP_ADDR";
-    	local_portc                       = 50010;	     
-    	remote_portc                      = 50010;
-    	local_portd                       = 50011;	     
-    	remote_portd                      = 50011;
-	local_rf                         = "yes"
-    	tr_preference                    = "udp_if4p5";
-	nb_tx                            = 1;
-	nb_rx                            = 1;
-	max_pdschReferenceSignalPower    = -12;
-	max_rxgain                       = 100;
-	bands                            = [38];
-	is_slave			 = "yes";
-	ota_sync_enabled		 = "yes";
-    }
-);  
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config = { 
-      global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
-      hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
-      phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
-      mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
-      rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
-      pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
-      rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
-};
-

ci-scripts/createVM.sh

@@ -25,7 +25,7 @@ function create_usage {
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- $VM_OSREL image already synced"
+    echo "     -- xenial image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -90,7 +90,7 @@ function create_vm {
     echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
     echo "############################################################"
     acquire_vm_create_lock
-    uvt-kvm create $VM_NAME release=$VM_OSREL --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+    uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
     echo "Waiting for VM to be started"
     uvt-kvm wait $VM_NAME --insecure
 

ci-scripts/destroyAllRunningVM.sh

@@ -30,7 +30,19 @@ function destroy_usage {
     echo "------"
     echo "    oai-ci-vm-tool destroy [OPTIONS]"
     echo ""
-    command_options_usage
+    echo "Mandatory Options:"
+    echo "--------"
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
 }
 
 function destroy_vm {

ci-scripts/doGitLabMerge.sh

@@ -125,16 +125,7 @@ fi
 git config user.email "jenkins@openairinterface.org"
 git config user.name "OAI Jenkins"
 
-git checkout -f $SOURCE_COMMIT_ID > checkout.txt 2>&1
-STATUS=`egrep -c "fatal: reference is not a tree" checkout.txt`
-rm -f checkout.txt
-if [ $STATUS -ne 0 ]
-then
-    echo "fatal: reference is not a tree --> $SOURCE_COMMIT_ID"
-    STATUS=-1
-    exit $STATUS
-fi
-
+git checkout -f $SOURCE_COMMIT_ID
 git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG
 
 git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"

ci-scripts/doc/vm_based_simulator_main_scripts.md

@@ -52,7 +52,7 @@ The main script is including a bunch of sub BASH scripts.
 *  ci-scripts/reportBuildLocally.sh
 *  ci-scripts/reportTestLocally.sh
 
-**NOTE: ci-scripts/runTestOnVM.sh is getting big and will certainly be split to facilitate maintenance. Start functions will be also factorized.**
+**NOTE: ci-scripts/runTestOnVM.sh is getting big and will certainly be split to facilate maintenance. Start functions will be also factorized.**
 
 # 3. Main script features #
 
@@ -62,7 +62,7 @@ It is also **testing if uvtool and apt-cacher are installed.**
 
 It finally provides parameters to the requested functions. Parameter definition is centralized there.
 
-For example:
+For example: 
 
 for VM instance creation:
 
@@ -75,122 +75,13 @@ for OAI variant build:
 *  build log file to parse: LOG_PATTERN
 *  the number of log files to parse: NB_PATTERN_FILES
 
-You can get the list of variant specific variables specifying the variant argument when asking for help:
+These last 2 variables are very important if you change the build options or if you modify the build system and add more targets to build (especially true for physical simulator).
 
-``` bash
-./ci-scripts/oai-ci-vm-tool help variant
-    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
-               VM_NAME=ci-flexran-rtc           ARCHIVES_LOC=flexran        
-               VM_MEMORY=2048                   VM_CPU=4              
-               NB_PATTERN_FILES=1               BUILD_OPTIONS="cmake . && make -j2"
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant enb-usrp        OR -v1     ( build and test  )
-               VM_NAME=ci-enb-usrp              ARCHIVES_LOC=enb_usrp       
-               VM_MEMORY=2048                   VM_CPU=4              
-               NB_PATTERN_FILES=9               BUILD_OPTIONS="--eNB -w USRP --mu"
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant l1-sim          OR -v20    ( test  )
-               VM_NAME=ci-l1-sim                ARCHIVES_LOC=l1_sim         
-               VM_MEMORY=2048                   VM_CPU=4              
-               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant rf-sim          OR -v21    ( test  )
-               VM_NAME=ci-rf-sim                ARCHIVES_LOC=rf_sim         
-               VM_MEMORY=2048                   VM_CPU=4              
-               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant l2-sim          OR -v22    ( test  )
-               VM_NAME=ci-l2-sim                ARCHIVES_LOC=l2_sim         
-               VM_MEMORY=2048                   VM_CPU=4              
-               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant basic-sim       OR -v2     ( build and test  )
-               VM_NAME=ci-basic-sim             ARCHIVES_LOC=basic_sim      
-               VM_MEMORY=8192                   VM_CPU=4              
-               NB_PATTERN_FILES=13              BUILD_OPTIONS="--eNB --UE"   
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant phy-sim         OR -v3     ( build and test  )
-               VM_NAME=ci-phy-sim               ARCHIVES_LOC=phy_sim        
-               VM_MEMORY=2048                   VM_CPU=4              
-               NB_PATTERN_FILES=3               BUILD_OPTIONS="--phy_simulators"
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant cppcheck        OR -v4     ( build and test  )
-               VM_NAME=ci-cppcheck              ARCHIVES_LOC=cppcheck       
-               VM_MEMORY=4096                   VM_CPU=4              
-               NB_PATTERN_FILES=1               BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -j4"
-               LOG_PATTERN=cppcheck.xml   
-
-    --variant enb-ethernet    OR -v7     ( build and test  )
-               VM_NAME=ci-enb-ethernet          ARCHIVES_LOC=enb_eth        
-               VM_MEMORY=4096                   VM_CPU=4              
-               NB_PATTERN_FILES=8               BUILD_OPTIONS="--eNB"        
-               LOG_PATTERN=.Rel15.txt     
-
-    --variant ue-ethernet     OR -v8     ( build and test  )
-               VM_NAME=ci-ue-ethernet           ARCHIVES_LOC=ue_eth         
-               VM_MEMORY=4096                   VM_CPU=4              
-               NB_PATTERN_FILES=12              BUILD_OPTIONS="--UE"         
-               LOG_PATTERN=.Rel15.txt     
-
-```
-
-To define a new variant you just need to define a function which name conforms to `function variant__v<n>__<variant_name>` where n and variant_name will respectively define the short and long options for your variant. The function only needs to define the variant dependent variables. For many variables, default values are set in the `check_set_variant` function. When a variant doesn't define the BUILD_OPTIONS variable it cannot be used for the `build` `wait` and `create` commands.
-
-The main scripts also allows the definition of non variant-dependant variable via the `--setvar_<variable name> <variable value>` options.
-You can get the list of these variables by using `help setvar`:
-
-```BASH
-./ci-scripts/oai-ci-vm-tool help setvar
---setvar_<varname> <value> where varname is one of:
-            VM_OSREL :     OS release to use in virtual machines
-    RUN_EXPERIMENTAL :     Enforce execution of variants with EXPERIMENTAL variable set to "true"
-```
-
-To add a new non-variant dependant variable you need:
-* Add an item to the `AUTHORIZED_VAR` array
-* In the `setvar_usage`function,  add your help string in the HELP_VAR["<your variable name>"] variable.
-* Write the bash code for your variable.
-
-Example of non variant dependent usage:
-
-``` bash
-./ci-scripts/oai-ci-vm-tool test -v21  -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci
-Currently testci-b1-rf-sim Testing is not implemented / enabled
-Comment out these lines in ./ci-scripts/oai-ci-vm-tool if you want to run it
- or use option --setvar_RUN_EXPERIMENTAL=true to test it
-
-
- ./ci-scripts/oai-ci-vm-tool test -v21  -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci --setvar_RUN_EXPERIMENTAL true
- Setting RUN_EXPERIMENTAL to true...
- ############################################################
- OAI CI VM script
- ############################################################
- ENB_VM_NAME         = testci-b1-enb-ethernet
- ENB_VM_CMD_FILE     = testci-b1-enb-ethernet_cmds.txt
- UE_VM_NAME          = testci-b1-ue-ethernet
- UE_VM_CMD_FILE      = testci-b1-ue-ethernet_cmds.txt
- JENKINS_WKSP        = /usr/local/oai/enhance_CI_extEPC/openairinterface5g
- ARCHIVES_LOC        = /usr/local/oai/enhance_CI_extEPC/openairinterface5g/archives/rf_sim/test
- ############################################################
- Waiting for ENB VM to be started
-...........................
-```
-
-In the same way, you can set the variable `VM_OSREL` to run the test in virtual machines of the specified OS release:
-
-``` bash
-./ci-scripts/oai-ci-vm-tool test -v21  -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci --setvar_VM_OSREL bionic
-```
+There are many more variables.
 
 ---
 
 Next step: [how to create one or several VM instances](./vm_based_simulator_create.md)
 
 You can also go back to the [CI dev main page](./ci_dev_home.md)
+

ci-scripts/reportBuildLocally.sh

@@ -28,8 +28,56 @@ function report_build_usage {
     echo "------"
     echo "    oai-ci-vm-tool report-build [OPTIONS]"
     echo ""
-    command_options_usage
-
+    echo "Options:"
+    echo "--------"
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+    echo "Job Options:"
+    echo "------------"
+    echo ""
+    echo "    --git-url #### OR -gu ####"
+    echo "    Specify the URL of the GIT Repository."
+    echo ""
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "    --workspace #### OR -ws ####"
+    echo "    Specify the workspace."
+    echo ""
+    echo "    --trigger merge-request OR -mr"
+    echo "    --trigger push          OR -pu"
+    echo "    Specify trigger action of the Jenkins job. Either a merge-request event or a push event."
+    echo ""
+    echo "Merge-Request Options:"
+    echo "----------------------"
+    echo ""
+    echo "    --src-branch #### OR -sb ####"
+    echo "    Specify the source branch of the merge request."
+    echo ""
+    echo "    --src-commit #### OR -sc ####"
+    echo "    Specify the source commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "    --target-branch #### OR -tb ####"
+    echo "    Specify the target branch of the merge request (usually develop)."
+    echo ""
+    echo "    --target-commit #### OR -tc ####"
+    echo "    Specify the target commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "Push Options:"
+    echo "----------------------"
+    echo ""
+    echo "    --branch #### OR -br ####"
+    echo "    Specify the branch of the push event."
+    echo ""
+    echo "    --commit #### OR -co ####"
+    echo "    Specify the commit ID (SHA-1) of the push event."
+    echo ""
+    echo ""
 }
 
 function trigger_usage {
@@ -510,121 +558,68 @@ function report_build {
     sca_summary_table_footer ./archives/cppcheck/cppcheck.xml
 
     summary_table_header "OAI Build eNB -- USRP option" ./archives/enb_usrp
-    summary_table_row "LTE SoftModem - Release 15" ./archives/enb_usrp/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_usrp_row1.html
-    summary_table_row "Coding - Release 15" ./archives/enb_usrp/coding.Rel15.txt "Built target coding" ./enb_usrp_row2.html
-    summary_table_row "OAI USRP device if - Release 15" ./archives/enb_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
-    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/enb_usrp/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./enb_usrp_row4.html
-    summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_usrp_row5.html
-    summary_table_row "NASMESH - Release 15" ./archives/enb_usrp/nasmesh.Rel15.txt "Built target nasmesh" ./enb_usrp_row6.html
-    summary_table_row "RB Tool - Release 15" ./archives/enb_usrp/rb_tool.Rel15.txt "Built target rb_tool" ./enb_usrp_row7.html
-    summary_table_row "RF Simulator - Release 15" ./archives/enb_usrp/rfsimulator.Rel15.txt "Built target rfsimulator" ./enb_usrp_row8.html
-    summary_table_row "TCP Bridge - Release 15" ./archives/enb_usrp/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./enb_usrp_row9.html
+    summary_table_row "LTE SoftModem - Release 14" ./archives/enb_usrp/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_row1.html
+    summary_table_row "Coding - Release 14" ./archives/enb_usrp/coding.Rel14.txt "Built target coding" ./enb_usrp_row2.html
+    summary_table_row "OAI USRP device if - Release 14" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
+    summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_usrp/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_usrp_row4.html
+    summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_row5.html
     summary_table_footer
 
     summary_table_header "OAI Build basic simulator option" ./archives/basic_sim
-    summary_table_row "LTE SoftModem - Release 15" ./archives/basic_sim/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./basic_sim_row1.html
-    summary_table_row "LTE UE SoftModem - Release 15" ./archives/basic_sim/lte-uesoftmodem.Rel15.txt "Built target lte-uesoftmodem" ./basic_sim_row2.htm
-    summary_table_row "Coding - Release 15" ./archives/basic_sim/coding.Rel15.txt "Built target coding" ./basic_sim_row3.html
-    summary_table_row "Conf 2 UE data - Release 15" ./archives/basic_sim/conf2uedata.Rel15.txt "Built target conf2uedata" ./basic_sim_row4.html
-    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/basic_sim/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./basic_sim_row5.html
-    summary_table_row "NASMESH - Release 15" ./archives/basic_sim/nasmesh.Rel15.txt "Built target nasmesh" ./basic_sim_row6.html
-    summary_table_row "Parameters Lib Config - Release 15" ./archives/basic_sim/params_libconfig.Rel15.txt "Built target params_libconfig" ./basic_sim_row7.html
-    summary_table_row "RB Tool - Release 15" ./archives/basic_sim/rb_tool.Rel15.txt "Built target rb_tool" ./basic_sim_row8.html
-    summary_table_row "RF Simulator - Release 15" ./archives/basic_sim/rfsimulator.Rel15.txt "Built target rfsimulator" ./basic_sim_row9.html
-    summary_table_row "TCP Bridge - Release 15" ./archives/basic_sim/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./basic_sim_row10.html
-    summary_table_row "UE IP - Release 15" ./archives/basic_sim/ue_ip.Rel15.txt "Built target ue_ip" ./basic_sim_row11.html
-    summary_table_row "USIM - Release 15" ./archives/basic_sim/usim.Rel15.txt "Built target usim" ./basic_sim_row12.html
-    summary_table_row "NVRAM - Release 15" ./archives/basic_sim/nvram.Rel15.txt "Built target nvram" ./basic_sim_row13.html
+    summary_table_row "LTE SoftModem - Release 14" ./archives/basic_sim/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./basic_sim_row1.html
+    summary_table_row "LTE UE SoftModem - Release 14" ./archives/basic_sim/lte-uesoftmodem.Rel14.txt "Built target lte-uesoftmodem" ./basic_sim_row2.htm
+    summary_table_row "Conf 2 UE data - Release 14" ./archives/basic_sim/conf2uedata.Rel14.txt "Built target conf2uedata" ./basic_sim_row3.html
+    summary_table_row "RB Tool - Release 14" ./archives/basic_sim/rb_tool.Rel14.txt "Built target rb_tool" ./basic_sim_row4.html
+    summary_table_row "NASMESH - Release 14" ./archives/basic_sim/nasmesh.Rel14.txt "Built target nasmesh" ./basic_sim_row5.html
     summary_table_footer
 
     summary_table_header "OAI Build Physical simulators option" ./archives/phy_sim
-    summary_table_row "LTE DL Simulator - Release 15" ./archives/phy_sim/dlsim.Rel15.txt "Built target dlsim" ./phy_sim_row1.html
-    summary_table_row "LTE UL Simulator - Release 15" ./archives/phy_sim/ulsim.Rel15.txt "Built target ulsim" ./phy_sim_row2.html
-    summary_table_row "Coding - Release 15" ./archives/phy_sim/coding.Rel15.txt "Built target coding" ./phy_sim_row3.html
-    if [ -f ./archives/phy_sim/ldpctest.Rel15.txt ]
-    then
-        summary_table_row "NR LDPC Test - Release 15" ./archives/phy_sim/ldpctest.Rel15.txt "Built target ldpctest" ./phy_sim_row4.html
-    fi
-    if [ -f ./archives/phy_sim/polartest.Rel15.txt ]
-    then
-        summary_table_row "NR Polar Test - Release 15" ./archives/phy_sim/polartest.Rel15.txt "Built target polartest" ./phy_sim_row5.html
-    fi
-    if [ -f ./archives/phy_sim/nr_pbchsim.Rel15.txt ]
-    then
-        summary_table_row "NR PBCH Test - Release 15" ./archives/phy_sim/nr_pbchsim.Rel15.txt "Built target nr_pbchsim" ./phy_sim_row6.html
-    fi
-    if [ -f ./archives/phy_sim/nr_dlschsim.Rel15.txt ]
-    then
-        summary_table_row "NR DLSCH Test - Release 15" ./archives/phy_sim/nr_dlschsim.Rel15.txt "Built target nr_dlschsim" ./phy_sim_row7.html
-    fi
-    if [ -f ./archives/phy_sim/nr_pucchsim.Rel15.txt ]
-    then
-        summary_table_row "NR PUCCH Test - Release 15" ./archives/phy_sim/nr_pucchsim.Rel15.txt "Built target nr_pucchsim" ./phy_sim_row8.html
-    fi
-    if [ -f ./archives/phy_sim/smallblocktest.Rel15.txt ]
-    then
-        summary_table_row "NR Small Block Test - Release 15" ./archives/phy_sim/smallblocktest.Rel15.txt "Built target smallblocktest" ./phy_sim_row9.html
-    fi
-    if [ -f ./archives/phy_sim/nr_dlsim.Rel15.txt ]
-    then
-        summary_table_row "NR DL Sim Test - Release 15" ./archives/phy_sim/nr_dlsim.Rel15.txt "Built target nr_dlsim" ./phy_sim_row10.html
-    fi
-    if [ -f ./archives/phy_sim/nr_ulschsim.Rel15.txt ]
-    then
-        summary_table_row "NR ULSCH Test - Release 15" ./archives/phy_sim/nr_ulschsim.Rel15.txt "Built target nr_ulschsim" ./phy_sim_row11.html
-    fi
-    if [ -f ./archives/phy_sim/nr_ulsim.Rel15.txt ]
-    then
-        summary_table_row "NR UL Sim Test - Release 15" ./archives/phy_sim/nr_ulsim.Rel15.txt "Built target nr_ulsim" ./phy_sim_row12.html
-    fi
+    summary_table_row "DL Simulator - Release 14" ./archives/phy_sim/dlsim.Rel14.txt "Built target dlsim" ./phy_sim_row1.html
+    summary_table_row "UL Simulator - Release 14" ./archives/phy_sim/ulsim.Rel14.txt "Built target ulsim" ./phy_sim_row2.html
+    summary_table_row "Coding - Release 14" ./archives/phy_sim/coding.Rel14.txt "Built target coding" ./phy_sim_row3.html
     summary_table_footer
 
-    if [ -f archives/gnb_usrp/nr-softmodem.Rel15.txt ]
+
+    if [ -f archives/gnb_usrp/nr-softmodem.Rel14.txt ]
     then
         summary_table_header "OAI Build gNB -- USRP option" ./archives/gnb_usrp
-        summary_table_row "5G NR SoftModem - Release 15" ./archives/gnb_usrp/nr-softmodem.Rel15.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
-        summary_table_row "Coding - Release 15" ./archives/gnb_usrp/coding.Rel15.txt "Built target coding" ./gnb_usrp_row2.html
-        summary_table_row "OAI USRP device if - Release 15" ./archives/gnb_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
-        summary_table_row "OAI ETHERNET transport - Release 15" ./archives/gnb_usrp/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./gnb_usrp_row4.html
-        summary_table_row "NASMESH - Release 15" ./archives/gnb_usrp/nasmesh.Rel15.txt "Built target nasmesh" ./gnb_usrp_row5.html
-        summary_table_row "Parameters Lib Config - Release 15" ./archives/gnb_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./gnb_usrp_row6.html
-        summary_table_row "RB Tool - Release 15" ./archives/gnb_usrp/rb_tool.Rel15.txt "Built target rb_tool" ./gnb_usrp_row7.html
+        summary_table_row "LTE SoftModem - Release 14" ./archives/gnb_usrp/nr-softmodem.Rel14.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
+        summary_table_row "Coding - Release 14" ./archives/gnb_usrp/coding.Rel14.txt "Built target coding" ./gnb_usrp_row2.html
+        summary_table_row "OAI USRP device if - Release 14" ./archives/gnb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
+        summary_table_row "Parameters Lib Config - Release 14" ./archives/gnb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./gnb_usrp_row4.html
         summary_table_footer
     fi
 
-    if [ -f archives/nrue_usrp/nr-uesoftmodem.Rel15.txt ]
+    if [ -f archives/nrue_usrp/nr-uesoftmodem.Rel14.txt ]
     then
         summary_table_header "OAI Build 5G NR UE -- USRP option" ./archives/nrue_usrp
-        summary_table_row "5G NR UE SoftModem - Release 15" ./archives/nrue_usrp/nr-uesoftmodem.Rel15.txt "Built target nr-uesoftmodem" ./nrue_usrp_row1.html
-        summary_table_row "Coding - Release 15" ./archives/nrue_usrp/coding.Rel15.txt "Built target coding" ./nrue_usrp_row2.html
-        summary_table_row "OAI USRP device if - Release 15" ./archives/nrue_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./nrue_usrp_row3.html
-        summary_table_row "OAI ETHERNET transport - Release 15" ./archives/nrue_usrp/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./nrue_usrp_row4.html
-        summary_table_row "NASMESH - Release 15" ./archives/nrue_usrp/nasmesh.Rel15.txt "Built target nasmesh" ./nrue_usrp_row5.html
-        summary_table_row "Parameters Lib Config - Release 15" ./archives/nrue_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./nrue_usrp_row6.html
-        summary_table_row "RB Tool - Release 15" ./archives/nrue_usrp/rb_tool.Rel15.txt "Built target rb_tool" ./nrue_usrp_row7.html
+        summary_table_row "UE SoftModem - Release 14" ./archives/nrue_usrp/nr-uesoftmodem.Rel14.txt "Built target nr-uesoftmodem" ./nrue_usrp_row1.html
+        summary_table_row "Coding - Release 14" ./archives/nrue_usrp/coding.Rel14.txt "Built target coding" ./nrue_usrp_row2.html
+        summary_table_row "OAI USRP device if - Release 14" ./archives/nrue_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./nrue_usrp_row3.html
+        summary_table_row "Parameters Lib Config - Release 14" ./archives/nrue_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./nrue_usrp_row4.html
         summary_table_footer
     fi
 
     summary_table_header "OAI Build eNB -- ETHERNET transport option" ./archives/enb_eth
-    summary_table_row "LTE SoftModem - Release 15" ./archives/enb_eth/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_eth_row1.html
-    summary_table_row "Coding - Release 15" ./archives/enb_eth/coding.Rel15.txt "Built target coding" ./enb_eth_row2.html
-    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/enb_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
-    summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_eth_row4.html
-    summary_table_row "RF Simulator - Release 15" ./archives/enb_eth/rfsimulator.Rel15.txt "Built target rfsimulator" ./enb_eth_row5.html
-    summary_table_row "TCP OAI Bridge - Release 15" ./archives/enb_eth/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./enb_eth_row6.html
+    summary_table_row "LTE SoftModem - Release 14" ./archives/enb_eth/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
+    summary_table_row "Coding - Release 14" ./archives/enb_eth/coding.Rel14.txt "Built target coding" ./enb_eth_row2.html
+    summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
+    summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_eth_row4.html
+    summary_table_row "RF Simulator - Release 14" ./archives/enb_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./enb_eth_row5.html
+    summary_table_row "TCP OAI Bridge - Release 14" ./archives/enb_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./enb_eth_row6.html
     summary_table_footer
 
     summary_table_header "OAI Build UE -- ETHERNET transport option" ./archives/ue_eth
-    summary_table_row "LTE UE SoftModem - Release 15" ./archives/ue_eth/lte-uesoftmodem.Rel15.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
-    summary_table_row "Coding - Release 15" ./archives/ue_eth/coding.Rel15.txt "Built target coding" ./ue_eth_row2.html
-    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/ue_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
-    summary_table_row "Parameters Lib Config - Release 15" ./archives/ue_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./ue_eth_row4.html
-    summary_table_row "RF Simulator - Release 15" ./archives/ue_eth/rfsimulator.Rel15.txt "Built target rfsimulator" ./ue_eth_row5.html
-    summary_table_row "TCP OAI Bridge - Release 15" ./archives/ue_eth/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./ue_eth_row6.html
-    summary_table_row "Conf 2 UE Data - Release 15" ./archives/ue_eth/conf2uedata.Rel15.txt "Built target conf2uedata" ./ue_eth_row7.html
-    summary_table_row "NVRAM - Release 15" ./archives/ue_eth/nvram.Rel15.txt "Built target nvram" ./ue_eth_row8.html
-    summary_table_row "UE IP - Release 15" ./archives/ue_eth/ue_ip.Rel15.txt "Built target ue_ip" ./ue_eth_row9.html
-    summary_table_row "USIM - Release 15" ./archives/ue_eth/usim.Rel15.txt "Built target usim" ./ue_eth_row9a.html
+    summary_table_row "LTE UE SoftModem - Release 14" ./archives/ue_eth/lte-uesoftmodem.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
+    summary_table_row "Coding - Release 14" ./archives/ue_eth/coding.Rel14.txt "Built target coding" ./ue_eth_row2.html
+    summary_table_row "OAI ETHERNET transport - Release 14" ./archives/ue_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
+    summary_table_row "Parameters Lib Config - Release 14" ./archives/ue_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./ue_eth_row4.html
+    summary_table_row "RF Simulator - Release 14" ./archives/ue_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./ue_eth_row5.html
+    summary_table_row "TCP OAI Bridge - Release 14" ./archives/ue_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./ue_eth_row6.html
+    summary_table_row "Conf 2 UE Data - Release 14" ./archives/ue_eth/conf2uedata.Rel14.txt "Built target conf2uedata" ./ue_eth_row7.html
+    summary_table_row "NVRAM - Release 14" ./archives/ue_eth/nvram.Rel14.txt "Built target nvram" ./ue_eth_row8.html
+    summary_table_row "UE IP - Release 14" ./archives/ue_eth/ue_ip.Rel14.txt "Built target ue_ip" ./ue_eth_row9.html
+    summary_table_row "USIM - Release 14" ./archives/ue_eth/usim.Rel14.txt "Built target usim" ./ue_eth_row9a.html
     summary_table_footer
 
     if [ -e ./archives/red_hat ]
@@ -632,10 +627,11 @@ function report_build {
         echo "   <h2>Red Hat Enterprise Linux Server release 7.6) -- Summary</h2>" >> ./build_results.html
 
         summary_table_header "Red Hat -- OAI Build eNB -- USRP option" ./archives/red_hat
-        summary_table_row "LTE SoftModem - Release 15" ./archives/red_hat/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
-        summary_table_row "Coding - Release 15" ./archives/red_hat/coding.Rel15.txt "Built target coding" ./enb_usrp_rh_row2.html
-        summary_table_row "OAI USRP device if - Release 15" ./archives/red_hat/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
-        summary_table_row "Parameters Lib Config - Release 15" ./archives/red_hat/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_usrp_rh_row4.html
+        summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
+        summary_table_row "Coding - Release 14" ./archives/red_hat/coding.Rel14.txt "Built target coding" ./enb_usrp_rh_row2.html
+        summary_table_row "OAI USRP device if - Release 14" ./archives/red_hat/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
+        summary_table_row "OAI ETHERNET transport - Release 14" ./archives/red_hat/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_usrp_rh_row4.html
+        summary_table_row "Parameters Lib Config - Release 14" ./archives/red_hat/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_rh_row5.html
         summary_table_footer
     fi
 
@@ -657,7 +653,7 @@ function report_build {
             cat $DETAILS_TABLE >> ./build_results.html
         done
     fi
-    if [ -f ./phy_sim_row1.html ] || [ -f ./phy_sim_row2.html ] || [ -f ./phy_sim_row3.html ] || [ -f ./phy_sim_row4.html ] || [ -f ./phy_sim_row5.html ] || [ -f ./phy_sim_row6.html ] || [ -f ./phy_sim_row7.html ] || [ -f ./phy_sim_row8.html ]
+    if [ -f ./phy_sim_row1.html ] || [ -f ./phy_sim_row2.html ] || [ -f ./phy_sim_row3.html ]
     then
         for DETAILS_TABLE in `ls ./phy_sim_row*.html`
         do

ci-scripts/reportTestLocally.sh

@@ -28,7 +28,56 @@ function report_test_usage {
     echo "------"
     echo "    oai-ci-vm-tool report-test [OPTIONS]"
     echo ""
-    command_options_usage
+    echo "Options:"
+    echo "--------"
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+    echo "Job Options:"
+    echo "------------"
+    echo ""
+    echo "    --git-url #### OR -gu ####"
+    echo "    Specify the URL of the GIT Repository."
+    echo ""
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "    --workspace #### OR -ws ####"
+    echo "    Specify the workspace."
+    echo ""
+    echo "    --trigger merge-request OR -mr"
+    echo "    --trigger push          OR -pu"
+    echo "    Specify trigger action of the Jenkins job. Either a merge-request event or a push event."
+    echo ""
+    echo "Merge-Request Options:"
+    echo "----------------------"
+    echo ""
+    echo "    --src-branch #### OR -sb ####"
+    echo "    Specify the source branch of the merge request."
+    echo ""
+    echo "    --src-commit #### OR -sc ####"
+    echo "    Specify the source commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "    --target-branch #### OR -tb ####"
+    echo "    Specify the target branch of the merge request (usually develop)."
+    echo ""
+    echo "    --target-commit #### OR -tc ####"
+    echo "    Specify the target commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "Push Options:"
+    echo "----------------------"
+    echo ""
+    echo "    --branch #### OR -br ####"
+    echo "    Specify the branch of the push event."
+    echo ""
+    echo "    --commit #### OR -co ####"
+    echo "    Specify the commit ID (SHA-1) of the push event."
+    echo ""
+    echo ""
 }
 
 function analyzePingFiles {

ci-scripts/runTestOnVM.sh

@@ -20,12 +20,12 @@
 # *      contact@openairinterface.org
 # */
 
-function test_usage {
+function run_test_usage {
     echo "OAI CI VM script"
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- $VM_OSREL image already synced"
+    echo "     -- xenial image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -33,7 +33,26 @@ function test_usage {
     echo "------"
     echo "    oai-ci-vm-tool test [OPTIONS]"
     echo ""
-    command_options_usage
+    echo "Options:"
+    echo "--------"
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "    --workspace #### OR -ws ####"
+    echo "    Specify the workspace."
+    echo ""
+    variant_usage
+    echo "    Specify the variant to build."
+    echo ""
+    echo "    --keep-vm-alive OR -k"
+    echo "    Keep the VM alive after the build."
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
 }
 
 function start_basic_sim_enb {
@@ -61,15 +80,15 @@ function start_basic_sim_enb {
     fi
     echo "echo \"grep N_RB_DL ci-$LOC_CONF_FILE\"" >> $1
     echo "grep N_RB_DL ci-$LOC_CONF_FILE | sed -e 's#N_RB_DL.*=#N_RB_DL =#'" >> $1
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/" >> $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
     echo "echo \"ulimit -c unlimited && ./lte-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor --basicsim\" > ./my-lte-softmodem-run.sh " >> $1
     echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
     echo "cat ./my-lte-softmodem-run.sh" >> $1
     echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/ran_build/build -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
+    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
 
     ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1
     rm $1
@@ -104,14 +123,14 @@ function start_basic_sim_ue {
     local LOC_UE_LOG_FILE=$3
     local LOC_NB_RBS=$4
     local LOC_FREQUENCY=$5
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" > $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build" >> $1
-    echo "echo \"./lte-uesoftmodem -C ${LOC_FREQUENCY}000000 -r $LOC_NB_RBS  --log_config.global_log_options nocolor,level --basicsim\" > ./my-lte-uesoftmodem-run.sh" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" > $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build" >> $1
+    echo "echo \"./lte-uesoftmodem -C ${LOC_FREQUENCY}000000 -r $LOC_NB_RBS  --log_config.global_log_options level,nocolor --basicsim\" > ./my-lte-uesoftmodem-run.sh" >> $1
     echo "chmod 775 ./my-lte-uesoftmodem-run.sh" >> $1
     echo "cat ./my-lte-uesoftmodem-run.sh" >> $1
     echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_UE_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_UE_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp/cmake_targets/ran_build/build -o /home/ubuntu/tmp/cmake_targets/log/$LOC_UE_LOG_FILE ./my-lte-uesoftmodem-run.sh" >> $1
+    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build -o /home/ubuntu/tmp/cmake_targets/log/$LOC_UE_LOG_FILE ./my-lte-uesoftmodem-run.sh" >> $1
 
     ssh -T -o StrictHostKeyChecking=no ubuntu@$2 < $1
     rm $1
@@ -399,14 +418,14 @@ function recover_core_dump {
     then
         local TC=`echo $3 | sed -e "s#^.*enb_##" -e "s#Hz.*#Hz#"`
         echo "Segmentation fault detected on enb -> recovering core dump"
-        echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" > $1
+        echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" > $1
         echo "sync" >> $1
         echo "sudo tar -cjhf basic-simulator-enb-core-${TC}.bz2 core lte-softmodem *.so ci-lte-basic-sim.conf my-lte-softmodem-run.sh" >> $1
         echo "sudo rm core" >> $1
         echo "rm ci-lte-basic-sim.conf" >> $1
         echo "sync" >> $1
         ssh -T -o StrictHostKeyChecking=no ubuntu@$2 < $1
-        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/ran_build/build/basic-simulator-enb-core-${TC}.bz2 $4
+        scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/lte_build_oai/build/basic-simulator-enb-core-${TC}.bz2 $4
         rm -f $1
     fi
 }
@@ -464,7 +483,7 @@ function install_epc_on_vm {
         echo "Creating test EPC VM ($LOC_EPC_VM_NAME) on Ubuntu Cloud Image base"
         echo "############################################################"
         acquire_vm_create_lock
-        uvt-kvm create $LOC_EPC_VM_NAME release=$VM_OSREL --unsafe-caching
+        uvt-kvm create $LOC_EPC_VM_NAME release=xenial --unsafe-caching
         echo "Waiting for VM to be started"
         uvt-kvm wait $LOC_EPC_VM_NAME --insecure
         release_vm_create_lock
@@ -610,19 +629,14 @@ function retrieve_real_epc_ip_addr {
     local LOC_EPC_VM_CMDS=$2
     local LOC_EPC_VM_IP_ADDR=$3
 
-    if [[ "$EPC_IPADDR" == "" ]]
+    if [ $LTEBOX -eq 1 ]
     then
-        if [ $LTEBOX -eq 1 ]
-        then
-            # in our configuration file, we are using pool 5
-            echo "ifconfig tun5 | egrep \"inet addr\" | sed -e 's#^.*inet addr:##' -e 's#  P-t-P:.*\$##'" > $LOC_EPC_VM_CMDS
-            REAL_EPC_IP_ADDR=`ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS`
-            rm $LOC_EPC_VM_CMDS
-        fi
-    else
-        REAL_EPC_IP_ADDR=$EPC_TUN_IPADDR
+        # in our configuration file, we are using pool 5
+        echo "ifconfig tun5 | egrep \"inet addr\" | sed -e 's#^.*inet addr:##' -e 's#  P-t-P:.*\$##'" > $LOC_EPC_VM_CMDS
+        REAL_EPC_IP_ADDR=`ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_EPC_VM_IP_ADDR < $LOC_EPC_VM_CMDS`
+        echo "EPC IP Address     is : $REAL_EPC_IP_ADDR"
+        rm $LOC_EPC_VM_CMDS
     fi
-    echo "EPC IP Address     is : $REAL_EPC_IP_ADDR"
 }
 
 function terminate_epc {
@@ -710,9 +724,9 @@ function start_l2_sim_enb {
     echo "sed -i -e 's#N_RB_DL.*=.*;#N_RB_DL                                         = $LOC_NB_RBS;#' -e 's#CI_MME_IP_ADDR#$LOC_EPC_IP_ADDR#' -e 's#CI_ENB_IP_ADDR#$LOC_ENB_VM_IP_ADDR#' -e 's#CI_UE_IP_ADDR#$LOC_UE_VM_IP_ADDR#' ci-$LOC_CONF_FILE" >> $1
     echo "echo \"grep N_RB_DL ci-$LOC_CONF_FILE\"" >> $1
     echo "grep N_RB_DL ci-$LOC_CONF_FILE | sed -e 's#N_RB_DL.*=#N_RB_DL =#'" >> $1
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
     if [ $LOC_S1_CONFIGURATION -eq 0 ]
     then
         echo "echo \"ulimit -c unlimited && ./lte-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor --noS1\" > ./my-lte-softmodem-run.sh " >> $1
@@ -722,7 +736,7 @@ function start_l2_sim_enb {
     echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
     echo "cat ./my-lte-softmodem-run.sh" >> $1
     echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/ran_build/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
+    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
 
     ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_ENB_VM_IP_ADDR < $1
     rm $1
@@ -789,8 +803,8 @@ function add_ue_l2_sim_ue {
         echo "echo \"awk -v num_ues=$LOC_NB_UES -f /home/ubuntu/tmp/ci-scripts/add_user_to_conf_file.awk ue_eurecom_test_sfr.conf > ue_eurecom_test_sfr_multi_ues.conf\"" >> $1
         echo "awk -v num_ues=$LOC_NB_UES -f /home/ubuntu/tmp/ci-scripts/add_user_to_conf_file.awk ue_eurecom_test_sfr.conf > ue_eurecom_test_sfr_multi_ues.conf" >> $1
     fi
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
     echo "sudo rm -f *.u*" >> $1
     if [ $LOC_NB_UES -eq 1 ]
     then
@@ -818,9 +832,9 @@ function start_l2_sim_ue {
     echo "cd /home/ubuntu/tmp/ci-scripts/conf_files/" >> $1
     echo "cp $LOC_CONF_FILE ci-$LOC_CONF_FILE" >> $1
     echo "sed -i -e 's#CI_ENB_IP_ADDR#$LOC_ENB_VM_IP_ADDR#' -e 's#CI_UE_IP_ADDR#$LOC_UE_VM_IP_ADDR#' ci-$LOC_CONF_FILE" >> $1
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
     if [ $LOC_S1_CONFIGURATION -eq 0 ]
     then
         echo "echo \"ulimit -c unlimited && ./lte-uesoftmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --L2-emul 3 --num-ues $LOC_NB_UES --nums_ue_thread $LOC_NB_UES --nokrnmod 1 --log_config.global_log_options level,nocolor --noS1\" > ./my-lte-softmodem-run.sh " >> $1
@@ -830,7 +844,7 @@ function start_l2_sim_ue {
     echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
     echo "cat ./my-lte-softmodem-run.sh" >> $1
     echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp/cmake_targets/ran_build/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
+    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
 
     ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_UE_VM_IP_ADDR < $1
     rm $1
@@ -930,9 +944,9 @@ function start_rf_sim_enb {
     echo "sed -i -e 's#N_RB_DL.*=.*;#N_RB_DL                                         = $LOC_NB_RBS;#' -e 's#CI_MME_IP_ADDR#$LOC_EPC_IP_ADDR#' -e 's#CI_ENB_IP_ADDR#$LOC_ENB_VM_IP_ADDR#' -e 's#CI_UE_IP_ADDR#$LOC_UE_VM_IP_ADDR#' ci-$LOC_CONF_FILE" >> $1
     echo "echo \"grep N_RB_DL ci-$LOC_CONF_FILE\"" >> $1
     echo "grep N_RB_DL ci-$LOC_CONF_FILE | sed -e 's#N_RB_DL.*=#N_RB_DL =#'" >> $1
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
     if [ $LOC_S1_CONFIGURATION -eq 0 ]
     then
         echo "echo \"ulimit -c unlimited && ./lte-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --rfsim --log_config.global_log_options level,nocolor --noS1\" > ./my-lte-softmodem-run.sh " >> $1
@@ -942,7 +956,7 @@ function start_rf_sim_enb {
     echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
     echo "cat ./my-lte-softmodem-run.sh" >> $1
     echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/ran_build/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
+    echo "sudo -E daemon --inherit --unsafe --name=enb_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
 
     ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_ENB_VM_IP_ADDR < $1
     rm $1
@@ -1009,9 +1023,9 @@ function start_rf_sim_ue {
     echo "sudo apt-get --yes install daemon >> /home/ubuntu/tmp/cmake_targets/log/daemon-install.txt 2>&1" >> $1
     echo "echo \"export RFSIMULATOR=${LOC_ENB_VM_IP_ADDR}\"" >> $1
     echo "export RFSIMULATOR=${LOC_ENB_VM_IP_ADDR}" >> $1
-    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/\"" >> $1
-    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
-    echo "cd /home/ubuntu/tmp/cmake_targets/ran_build/build/" >> $1
+    echo "echo \"cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/\"" >> $1
+    echo "sudo chmod 777 /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
+    echo "cd /home/ubuntu/tmp/cmake_targets/lte_build_oai/build/" >> $1
     if [ $LOC_S1_CONFIGURATION -eq 0 ]
     then
         echo "echo \"ulimit -c unlimited && ./lte-uesoftmodem -C ${LOC_FREQUENCY}000000 -r $LOC_PRB --nokrnmod 1 --rfsim --log_config.global_log_options level,nocolor --noS1\" > ./my-lte-softmodem-run.sh " >> $1
@@ -1021,7 +1035,7 @@ function start_rf_sim_ue {
     echo "chmod 775 ./my-lte-softmodem-run.sh" >> $1
     echo "cat ./my-lte-softmodem-run.sh" >> $1
     echo "if [ -e /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ]; then sudo sudo rm -f /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE; fi" >> $1
-    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp/cmake_targets/ran_build/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
+    echo "sudo -E daemon --inherit --unsafe --name=ue_daemon --chdir=/home/ubuntu/tmp/cmake_targets/lte_build_oai/build/ -o /home/ubuntu/tmp/cmake_targets/log/$LOC_LOG_FILE ./my-lte-softmodem-run.sh" >> $1
 
     ssh -T -o StrictHostKeyChecking=no ubuntu@$LOC_UE_VM_IP_ADDR < $1
     rm $1
@@ -1079,7 +1093,7 @@ function run_test_on_vm {
     echo "############################################################"
     echo "OAI CI VM script"
     echo "############################################################"
-    if [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-l2-sim.* ))  ]] ||  [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-rf-sim.* ))  ]]
+    if [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-l2-sim.* )) || (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-rf-sim.* )) ]]
     then
         ENB_VM_NAME=`echo $VM_NAME | sed -e "s#l2-sim#enb-ethernet#" -e "s#rf-sim#enb-ethernet#"`
         ENB_VM_CMDS=${ENB_VM_NAME}_cmds.txt
@@ -1096,7 +1110,7 @@ function run_test_on_vm {
     echo "JENKINS_WKSP        = $JENKINS_WKSP"
     echo "ARCHIVES_LOC        = $ARCHIVES_LOC"
 
-    if [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-l2-sim.* ))  ]] ||  [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-rf-sim.* ))  ]]
+    if [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-l2-sim.* )) || (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-rf-sim.* )) ]]
     then
         echo "############################################################"
         echo "Waiting for ENB VM to be started"
@@ -1247,18 +1261,11 @@ function run_test_on_vm {
         EPC_VM_NAME=`echo $VM_NAME | sed -e "s#basic-sim#epc#"`
         EPC_VM_CMDS=${EPC_VM_NAME}_cmds.txt
         LTEBOX=0
-        if [[ "$EPC_IPADDR" == "" ]]
-        then
-            # Creating a VM for EPC and installing SW
-            install_epc_on_vm $EPC_VM_NAME $EPC_VM_CMDS
-            EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
+        install_epc_on_vm $EPC_VM_NAME $EPC_VM_CMDS
+        EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
 
-            # Starting EPC
-            start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-        else
-            echo "We will use EPC on $EPC_IPADDR"
-            EPC_VM_IP_ADDR=$EPC_IPADDR
-        fi
+        # Starting EPC
+        start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
 
         # Retrieve EPC real IP address
         retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
@@ -1270,7 +1277,8 @@ function run_test_on_vm {
         do
           for BW in ${BW_CASES[@]}
           do
-              # Not Running in TDD-20MHz : too unstable
+              # Not Running in TDD-10MHz and TDD-20MHz : too unstable
+              #if [[ $TMODE =~ .*tdd.* ]] && [[ $BW =~ .*10.* ]]; then continue; fi
               if [[ $TMODE =~ .*tdd.* ]] && [[ $BW =~ .*20.* ]]; then continue; fi
 
               if [[ $BW =~ .*05.* ]]; then PRB=25; fi
@@ -1292,9 +1300,15 @@ function run_test_on_vm {
               if [ $UE_SYNC -eq 0 ]
               then
                   echo "Problem w/ eNB and UE not syncing"
-                  full_terminate
+                  terminate_enb_ue_basic_sim $VM_CMDS $VM_IP_ADDR 0
+                  scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
+                  scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
+                  recover_core_dump $VM_CMDS $VM_IP_ADDR $ARCHIVES_LOC/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
+                  terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+                  full_basic_sim_destroy
+                  echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
                   STATUS=-1
-                  continue
+                  return
               fi
               get_ue_ip_addr $VM_CMDS $VM_IP_ADDR 1
 
@@ -1439,10 +1453,7 @@ function run_test_on_vm {
         echo "Terminate EPC"
         echo "############################################################"
 
-        if [[ "$EPC_IPADDR" == "" ]]
-        then
-            terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
-        fi
+        terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
 
         full_basic_sim_destroy
 
@@ -1470,56 +1481,43 @@ function run_test_on_vm {
             rm -Rf $ARCHIVES_LOC
         fi
         mkdir --parents $ARCHIVES_LOC
-        if [[ "$EPC_IPADDR" == "" ]]
-        then
+
         # Creating a VM for EPC and installing SW
-            EPC_VM_NAME=`echo $VM_NAME | sed -e "s#rf-sim#epc#"`
-            EPC_VM_CMDS=${EPC_VM_NAME}_cmds.txt
-            LTEBOX=0
-            install_epc_on_vm $EPC_VM_NAME $EPC_VM_CMDS
-            EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
-        fi
+        EPC_VM_NAME=`echo $VM_NAME | sed -e "s#rf-sim#epc#"`
+        EPC_VM_CMDS=${EPC_VM_NAME}_cmds.txt
+        LTEBOX=0
+        install_epc_on_vm $EPC_VM_NAME $EPC_VM_CMDS
+        EPC_VM_IP_ADDR=`uvt-kvm ip $EPC_VM_NAME`
+
         # withS1 configuration is not working
         #EPC_CONFIGS=("wS1" "noS1")
         #TRANS_MODES=("fdd" "tdd")
         #BW_CASES=(05 10 20)
-        EPC_CONFIGS=("noS1" "wS1")
+        EPC_CONFIGS=("noS1")
         TRANS_MODES=("fdd")
         BW_CASES=(05)
         for CN_CONFIG in ${EPC_CONFIGS[@]}
         do
           if [[ $CN_CONFIG =~ .*wS1.* ]]
           then
-              if [[ "$EPC_IPADDR" ==  "" ]]
-              then
-                  echo "############################################################"
-                  echo "Start EPC for the wS1 configuration"
-                  echo "############################################################"
-                  start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-                  # Retrieve EPC real IP address
-                  retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
-                  S1_NOS1_CFG=1
-              else
-                  echo "############################################################"
-                  echo "Using external EPC " $EPC_IPADDR
-                  echo "############################################################"
-                  $EPC_VM_IP_ADDR=$EPC_IPADDR
-                  S1_NOS1_CFG=1
-                  LTEBOX=0
-              fi
-          else
-              if [[ "$EPC_IPADDR" ==  "" ]]
-              then
-                  echo "############################################################"
-                  echo "Terminate EPC"
-                  echo "############################################################"
-                  terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+              echo "############################################################"
+              echo "Start EPC for the wS1 configuration"
+              echo "############################################################"
+              start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
 
-                  echo "############################################################"
-                  echo "Running now in a no-S1 "
-                  echo "############################################################"
-                  S1_NOS1_CFG=0
-              fi
+              # Retrieve EPC real IP address
+              retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
+              S1_NOS1_CFG=1
+          else
+              echo "############################################################"
+              echo "Terminate EPC"
+              echo "############################################################"
+              terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+
+              echo "############################################################"
+              echo "Running now in a no-S1 configuration"
+              echo "############################################################"
+              S1_NOS1_CFG=0
           fi
           for TMODE in ${TRANS_MODES[@]}
           do
@@ -1541,7 +1539,7 @@ function run_test_on_vm {
                   echo "${CN_CONFIG} : Starting the eNB in ${TMODE}-${BW}MHz mode"
                   echo "############################################################"
                   CURRENT_ENB_LOG_FILE=${TMODE}_${BW}MHz_${CN_CONFIG}_enb.log
-                  start_rf_sim_enb $ENB_VM_CMDS "$ENB_VM_IP_ADDR" "$EPC_VM_IP_ADDR" $CURRENT_ENB_LOG_FILE $PRB $CONF_FILE $S1_NOS1_CFG
+                  start_rf_sim_enb $ENB_VM_CMDS $ENB_VM_IP_ADDR $EPC_VM_IP_ADDR $CURRENT_ENB_LOG_FILE $PRB $CONF_FILE $S1_NOS1_CFG
 
                   echo "############################################################"
                   echo "${CN_CONFIG} : Starting the UE"
@@ -1741,8 +1739,14 @@ function run_test_on_vm {
                     terminate_enb_ue_basic_sim $UE_VM_CMDS $UE_VM_IP_ADDR 2
                     scp -o StrictHostKeyChecking=no ubuntu@$ENB_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
                     scp -o StrictHostKeyChecking=no ubuntu@$UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
+                    if [ $S1_NOS1_CFG -eq 1 ]
+                    then
+                        terminate_epc $EPC_VM_CMDS $EPC_VM_IP_ADDR
+                    fi
+                    full_l2_sim_destroy
+                    echo "TEST_KO" > $ARCHIVES_LOC/test_final_status.log
                     STATUS=-1
-                    continue
+                    return
                 fi
 
                 if [ $S1_NOS1_CFG -eq 1 ]
@@ -1843,7 +1847,7 @@ function run_test_on_vm {
                     fi
                 fi
 
-                if [ $S1_NOS1_CFG -eq 2 ]
+                if [ $S1_NOS1_CFG -eq 0 ]
                 then
                     get_enb_noS1_ip_addr $ENB_VM_CMDS $ENB_VM_IP_ADDR
                     echo "############################################################"

ci-scripts/waitBuildOnVM.sh

@@ -25,7 +25,7 @@ function wait_usage {
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- $VM_OSREL image already synced"
+    echo "     -- xenial image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -33,7 +33,28 @@ function wait_usage {
     echo "------"
     echo "    oai-ci-vm-tool wait [OPTIONS]"
     echo ""
-    command_options_usage
+    echo "Mandatory Options:"
+    echo "--------"
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "    --workspace #### OR -ws ####"
+    echo "    Specify the workspace."
+    echo ""
+    variant_usage
+    echo "    Specify the variant to build."
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --keep-vm-alive OR -k"
+    echo "    Keep the VM alive after the build."
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
 }
 
 function wait_on_vm_build {
@@ -134,10 +155,14 @@ function check_on_vm_build {
         if [[ $FULLFILE == *"$LOG_PATTERN"* ]]
         then
             filename=$(basename -- "$FULLFILE")
-            if [ "$LOG_PATTERN" == ".Rel15.txt" ]
+            if [ "$LOG_PATTERN" == ".Rel14.txt" ]
             then
                 PASS_PATTERN=`echo $filename | sed -e "s#$LOG_PATTERN##"`
             fi
+            if [ "$LOG_PATTERN" == "basic_simulator" ]
+            then
+                PASS_PATTERN="lte-"
+            fi
             if [ "$LOG_PATTERN" == "cppcheck.xml" ]
             then
                 PASS_PATTERN="results version"
@@ -168,9 +193,6 @@ function check_on_vm_build {
     if [[ "$VM_NAME" == *"-cppcheck"* ]]
     then
         echo "COMMAND: cppcheck $BUILD_OPTIONS . 2> cppcheck.xml" > $ARCHIVES_LOC/build_final_status.log
-    elif [[ "$VM_NAME" == *"-flexran-rtc"* ]]
-    then
-        echo "COMMAND: $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log
     else
         echo "COMMAND: build_oai -I $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log
     fi

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml

@@ -24,7 +24,6 @@
 	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml

@@ -24,7 +24,6 @@
 	<htmlTabRef>test-05-tm1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
 	<TestCaseRequestedList>
  030201 090109
  030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml

@@ -25,7 +25,6 @@
 	<htmlTabRef>test-05-tm2</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM2</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
         <TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml

@@ -30,7 +30,7 @@
  030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
  030102 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 030201
  050102
- 030103 000020 040301 040504 000021 040302 000001 000022 040303 000002 040504 000023 040401 040201 030201
+ 030102 000020 040301 040504 000021 040302 000001 000022 040303 000002 040504 000023 040401 040201 030201
  050202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
@@ -113,13 +113,13 @@
 
 	<testCase id="030102">
 		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) for RRC Inactivity Timer testing -- no FlexRan Ctl</desc>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
 	</testCase>
 
 	<testCase id="030103">
 		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) for RRC Inactivity Timer testing -- with FlexRan Ctl</desc>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
 	</testCase>
 

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml

@@ -34,7 +34,7 @@
 	<testCase id="030111">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf --eNBs.[0].component_carriers.[0].drx_Config_present prRelease</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf</Initialize_eNB_args>
 	</testCase>
 
 	<testCase id="030201">

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml

@@ -1,90 +0,0 @@
-<!--
-
- 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-10-cdrx-tm1</htmlTabRef>
-	<htmlTabName>Test-10MHz-CDRX-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030112 040302 040512 040612 040650 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030112">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/10MHz) with CDRX</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf  --eNBs.[0].component_carriers.[0].drx_Config_present prSetup</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040512">
-		<class>Ping</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040612">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040650">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_05mhz.xml

@@ -22,23 +22,16 @@
 -->
 <testCaseList>
 	<htmlTabRef>test-f1-05</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-05MHz</htmlTabName>
+	<htmlTabName>Test-F1-CU/DU-05MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101
- 030142 030141 000002 040301 000002 040541 040601 040641 040401 040201 030201 030202
+ 030142 030141 040301 040541 040601 040641 040401 040201 030201 030202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
 	<testCase id="030141">
 		<class>Initialize_eNB</class>
 		<desc>Initialize DU (FDD/Band7/5MHz)</desc>

ci-scripts/xml_files/f1_usrp210_band7_test_10mhz.xml

@@ -22,23 +22,16 @@
 -->
 <testCaseList>
 	<htmlTabRef>test-f1-10</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-10MHz</htmlTabName>
+	<htmlTabName>Test-F1-CU/DU-10MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101
- 030152 030151 000002 040301 000002 040551 040611 040651 040401 040201 030201 030202
+ 030152 030151 040301 040551 040611 040651 040401 040201 030201 030202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
 	<testCase id="030151">
 		<class>Initialize_eNB</class>
 		<desc>Initialize DU (FDD/Band7/10MHz)</desc>

ci-scripts/xml_files/f1_usrp210_band7_test_20mhz.xml

@@ -22,23 +22,16 @@
 -->
 <testCaseList>
 	<htmlTabRef>test-f1-20</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-20MHz</htmlTabName>
+	<htmlTabName>Test-F1-CU/DU-20MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101
- 030162 030161 000002 040301 000002 040561 040621 040661 040401 040201 030201 030202
+ 030162 030161 040301 040561 040621 040661 040401 040201 030201 030202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
 	<testCase id="030161">
 		<class>Initialize_eNB</class>
 		<desc>Initialize DU (FDD/Band7/20MHz)</desc>

ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml

@@ -1,71 +0,0 @@
-<!--
-
- 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>run-OAI-gNB-NR-UE-USRP</htmlTabRef>
-        <htmlTabName>run OAI gNB and OAI NR UE USRP</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
-090101 000001 090102 000002 090108 090109
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-	
-        <testCase id="090101">
-                <class>Initialize_eNB</class>
-                <desc>Initialize gNB USRP</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf</Initialize_eNB_args>
-		<air_interface>NR</air_interface>
-        </testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Waiting for NR UE to synchronize w/ gNB</desc>
-		<idle_sleep_time_in_sec>180</idle_sleep_time_in_sec>
-	</testCase>
-
-        <testCase id="090102">
-                <class>Initialize_OAI_UE</class>
-                <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>-C 3510000000 --numerology 1 -r 106 --phy-test --usrp-args "addr=192.168.30.2,clock_source=external,time_source=external" --threadoffset 16</Initialize_OAI_UE_args>
-		<air_interface>NR</air_interface>
-        </testCase>
-
-        <testCase id="090108">
-                <class>Terminate_OAI_UE</class>
-                <desc>Terminate NR UE</desc>
-		<air_interface>NR</air_interface>
-        </testCase>
-
-        <testCase id="090109">
-                <class>Terminate_eNB</class>
-                <desc>Terminate gNB</desc>
-		<air_interface>NR</air_interface>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/gnb_nr_ue_usrp_terminate.xml

@@ -1,44 +0,0 @@
-<!--
-
- 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>run-OAI-gNB-NR-UE-USRP</htmlTabRef>
-        <htmlTabName>run OAI gNB and OAI NR UE USRP</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>	
-	<TestCaseRequestedList>
-090108 090109
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-	
-        <testCase id="090108">
-                <class>Terminate_OAI_UE</class>
-                <desc>Terminate NR UE</desc>
-		<air_interface>NR</air_interface>
-        </testCase>
-
-        <testCase id="090109">
-                <class>Terminate_eNB</class>
-                <desc>Terminate gNB</desc>
-		<air_interface>NR</air_interface>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -1,39 +0,0 @@
-<!--
-
- 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>gnb-build-tab</htmlTabRef>
-	<htmlTabName>Build-gNB</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<mode>TesteNB</mode>	
-		<class>Build_eNB</class>
-		<desc>Build gNB (USRP)</desc>
-		<Build_eNB_args>--gNB -w USRP</Build_eNB_args>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml

@@ -24,7 +24,6 @@
 	<htmlTabRef>test-20</htmlTabRef>
 	<htmlTabName>Test-20MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
 	<TestCaseRequestedList>
  030201
  040101

ci-scripts/xml_files/multi_rru_band38_build.xml

@@ -1,84 +0,0 @@
-<!--
-
- 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>
- 010101 010102 010103
- 000101 000102 000103
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build RCC</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<backgroundBuild>True</backgroundBuild>
-	</testCase>
-
-	<testCase id="000101">
-		<class>WaitEndBuild_eNB</class>
-		<desc>Wait for end of Build RCC</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="010102">
-		<class>Build_eNB</class>
-		<desc>Build Master RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<backgroundBuild>True</backgroundBuild>
-	</testCase>
-
-	<testCase id="000102">
-		<class>WaitEndBuild_eNB</class>
-		<desc>Wait for end of Build Master RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="010103">
-		<class>Build_eNB</class>
-		<desc>Build Slave RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>2</eNB_instance>
-		<eNB_serverId>2</eNB_serverId>
-		<backgroundBuild>True</backgroundBuild>
-	</testCase>
-
-	<testCase id="000103">
-		<class>WaitEndBuild_eNB</class>
-		<desc>Wait for end of Build Slave RRU</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>2</eNB_instance>
-		<eNB_serverId>2</eNB_serverId>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/multi_rru_band38_full_termination.xml

@@ -1,53 +0,0 @@
-<!--
-
- 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-full-termintation</htmlTabRef>
-	<htmlTabName>Test-RCC-RRUs-Termination</htmlTabName>
-	<htmlTabIcon>off</htmlTabIcon>
-	<TestCaseRequestedList>
- 030211 030212 030213
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030211">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030212">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Master RRU</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="030213">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Slave RRU</desc>
-		<eNB_instance>2</eNB_instance>
-		<eNB_serverId>2</eNB_serverId>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/multi_rru_band38_test_10mhz_tm1.xml

@@ -1,87 +0,0 @@
-<!--
-
- 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-multi-rru-10</htmlTabRef>
-	<htmlTabName>Test-Multi-RRU-10MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030211 030212 030213
- 030111 030112 030113
- 000001
- 030211 030212 030213
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030111">
-		<class>Initialize_eNB</class>
-		<desc>Initialize RCC (TDD/Band38/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf --noS1</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030112">
-		<class>Initialize_eNB</class>
-		<desc>Initialize Master RRU (TDD/Band38/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.band38.tm1.master.conf --noS1</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="030113">
-		<class>Initialize_eNB</class>
-		<desc>Initialize Slave RRU (TDD/Band38/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.band38.tm1.slave.conf --noS1</Initialize_eNB_args>
-		<eNB_instance>2</eNB_instance>
-		<eNB_serverId>2</eNB_serverId>
-	</testCase>
-
-	<testCase id="030211">
-		<class>Terminate_eNB</class>
-		<desc>Terminate RCC</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030212">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Master RRU</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="030213">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Slave RRU</desc>
-		<eNB_instance>2</eNB_instance>
-		<eNB_serverId>2</eNB_serverId>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/nr_ue_usrp_build.xml

@@ -1,40 +0,0 @@
-<!--
-
- 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>nr-ue-build-tab</htmlTabRef>
-	<htmlTabName>Build-NR-UE</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-010102
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010102">
-		<mode>TestUE</mode>
-		<class>Build_OAI_UE</class>
-		<desc>Build NR UE (USRP)</desc>
-		<Build_OAI_UE_args>--nrUE -w USRP</Build_OAI_UE_args>
-		<clean_repository>false</clean_repository>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/test_case_list_template.xml

@@ -20,7 +20,6 @@
       contact@openairinterface.org
 
 -->
-
 <testCaseList>
 	<TestCaseRequestedList>010101 050101 060101 070101 030101 030201 050201 070201 060201</TestCaseRequestedList>
 	<TestCaseExclusionList>010102 030102 030103 030104 030105 030106</TestCaseExclusionList>

ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml

@@ -24,7 +24,6 @@
 	<htmlTabRef>test-10mhz-orange</htmlTabRef>
 	<htmlTabName>Test-10Mhz-Orange</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>4</repeatCount>	
 	<TestCaseRequestedList>
  090109
  090110 000001 090109

ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml

@@ -24,7 +24,6 @@
 	<htmlTabRef>test-10mHz-sfr</htmlTabRef>
 	<htmlTabName>Test-10MHz-SFR</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
  090109
  090111 000001 090109

ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml

@@ -1,66 +0,0 @@
-<!--
-
- 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>
- 010101
- 010102
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build Master eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="010102">
-		<class>Build_eNB</class>
-		<desc>Build Slave eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_closure.xml

@@ -1,47 +0,0 @@
-<!--
-
- 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>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml

@@ -1,46 +0,0 @@
-<!--
-
- 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-x2-ho-full-end</htmlTabRef>
-	<htmlTabName>Test-X2-HO-Full-Terminate</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Master eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Slave eNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml

@@ -1,191 +0,0 @@
-<!--
-
- 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
-
- 030101 000002 030102 040301 040501 040601 040641 050401 000002 040502 040602 040642 050402 000002 040503 040603 040643 040401 040201 030201 030202
--->
-<testCaseList>
-	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
-	<htmlTabName>Test-X2-HO-FDD-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
-	<TestCaseRequestedList>
- 030201 030202
- 040101
- 050102
- 030101 000002 030102 040301 040501 050401 000002 040502 050402 000002 040503 040401 040201 030201 030202
- 050202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Waiting for 60 seconds</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Waiting for 10 seconds</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="050102">
-		<class>Initialize_FlexranCtrl</class>
-		<desc>Starting Flexran Controller</desc>
-	</testCase>
-
-	<testCase id="050202">
-		<class>Terminate_FlexranCtrl</class>
-		<desc>Stopping Flexran Controller</desc>
-	</testCase>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize Master eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030102">
-		<class>Initialize_eNB</class>
-		<desc>Initialize Slave eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Master eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Slave eNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040502">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040503">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 8M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 8M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 8M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="050401">
-		<class>Perform_X2_Handover</class>
-		<desc>Doing a Flexran-Controlled X2 Handover</desc>
-		<x2_ho_options>network</x2_ho_options>
-	</testCase>
-
-	<testCase id="050402">
-		<class>Perform_X2_Handover</class>
-		<desc>Doing a Flexran-Controlled X2 Handover</desc>
-		<x2_ho_options>network</x2_ho_options>
-	</testCase>
-
-</testCaseList>

cmake_targets/autotests/run_exec_autotests.bash

@@ -303,9 +303,8 @@ function test_compile_and_run() {
       do
         global_result=1
         result_string=""
-        PROPER_DESC=`echo ${desc_array[$tags_array_index]} | sed -e "s@^.*Test cases.*(Test@Test@" -e "s@^ *(@@" -e"s/)$//" -e "s/),$//"`
-        echo_info "$PROPER_DESC"
-
+        PROPER_DESC=`echo ${desc_array[$tags_array_index]} | sed -e "s@^.*lsim.*est case.*(Test@Test@" -e "s@^ *(@@" -e "s/),$//"`
+        
        for (( run_index=1; run_index <= $nruns; run_index++ ))
         do
           temp_exec_log=$log_dir/test.$test_case_name.${tags_array[$tags_array_index]}.run_$run_index

cmake_targets/autotests/v2/actions/run_enb.bash

@@ -5,8 +5,8 @@ cd /tmp/oai_test_setup/oai
 source oaienv
 sudo rmmod nasmesh || true
 sudo rmmod ue_ip || true
-cd cmake_targets/ran_build/build
+cd cmake_targets/lte_build_oai/build
 ulimit -c unlimited
 sudo rm -f core
 #sudo -E ./lte-softmodem -O $OPENAIR_DIR/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.conf
-sudo -E ./lte-softmodem -O /tmp/enb.conf
+sudo -E ./lte-softmodem -O /tmp/enb.conf

cmake_targets/build_oai

@@ -26,15 +26,17 @@
 
 set -e
 
-# Include helper functions
+################################
+# include helper functions
+################################
 ORIGIN_PATH=$PWD
 THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
 source $THIS_SCRIPT_PATH/tools/build_helper
 
-# Set environment variables (OPENAIR_HOME, ...)
+# set environment variables (OPENAIR_HOME, ...)
 set_openair_env
 
-# Variables for UE data generation
+#variables for UE data generation
 gen_nvram_path=$OPENAIR_DIR/targets/bin
 conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 
@@ -44,10 +46,10 @@ UE_EXPANSION="False"
 UESIM_EXPANSION="False"
 PRINT_STATS="False"
 VCD_TIMING="False"
-DEADLINE_SCHEDULER_FLAG_USER=""
-CPU_AFFINITY_FLAG_USER="False" #Only valid when low-latency flag is set to False
-REL="Rel15"
-NR_REL="NR_Rel15"
+DEADLINE_SCHEDULER_FLAG_USER="False"
+FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
+CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
+REL="Rel14"
 HW="None"
 TP="None"
 EPC=0
@@ -66,7 +68,6 @@ UE_DEBUG_TRACE="False"
 UE_TIMING_TRACE="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
-NR="False"
 OPTIONAL_LIBRARIES="telnetsrv enbscope uescope msc"
 trap handle_ctrl_c INT
 
@@ -75,6 +76,8 @@ function print_help() {
 This program installs OpenAirInterface Software
 You should have ubuntu 16.xx or 18.04 updated
 Options
+-h
+   This help
 -c | --clean
    Erase all files to make a rebuild from start
 -C | --clean-all
@@ -86,25 +89,18 @@ Options
    This option will require root password
 --install-optional-packages
    Install useful but not mandatory packages such as valgrind
--i | --install-system-files
-   Install OpenAirInterface required files in Linux system
-   This option will require root password
 -g | --run-with-gdb
    Add debugging symbols to compilation directives. It also disables any compiler optimization. Only for debugging. Do not use in normal operation!
+-h | --help
+   Print this help
 --eNB
-  Makes the LTE softmodem
---gNB
-  Makes the NR softmodem
---nrUE
-  Makes the NR UE softmodem
+   Makes the LTE softmodem
 --UE
    Makes the UE specific parts (ue_ip, usim, nvram) from the given configuration file
 --UE-conf-nvram [configuration file]
    Specify conf_nvram_path (default \"$conf_nvram_path\")
 --UE-gen-nvram [output path]
    Specify gen_nvram_path (default \"$gen_nvram_path\")
---HWLAT
-    Makes test program for haw latency tests
 -a | --agent
    Enables agent for software-defined control of the eNB
 -r | --3gpp-release
@@ -112,11 +108,11 @@ Options
    Rel8 limits the implementation to 3GPP Release 8 version
    Rel10 limits the implementation to 3GPP Release 10 version
 -w | --hardware
-   EXMIMO, USRP, BLADERF, LMSSDR, IRIS, ADRV9371_ZC706, SIMU, None (Default)
+   EXMIMO, USRP, BLADERF, LMSSDR, IRIS, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
--P | --phy_simulators
+--phy_simulators
    Makes the unitary tests Layer 1 simulators
--S | --core_simulators
+--core_simulators
    Makes the core security features unitary simulators
 -s | --check
    runs a set of auto-tests based on simulators and several compilation tests
@@ -124,6 +120,9 @@ Options
    runs only specified test cases specified here. This flag is only valid with -s
 -V | --vcd
    Adds a debgging facility to the binary files: GUI with major internal synchronization events
+--install-system-files
+   Install OpenArInterface required files in Linux system
+   (will ask root password)
 --verbose-compile
    Shows detailed compilation instructions in makefile
 --cflags_processor
@@ -138,31 +137,26 @@ Options
    Enable deadline scheduler of Linux kernel (>=3.14.x). 
 --disable-cpu-affinity
    Disables CPU Affinity between UHD/TX/RX Threads (Valid only when deadline scheduler is disabled). By defaulT, CPU Affinity is enabled when not using deadline scheduler. It is enabled only with >2 CPUs. For eNB, CPU_0-> Device library (UHD), CPU_1->TX Threads, CPU_2...CPU_MAX->Rx Threads. For UE, CPU_0->Device Library(UHD), CPU_1..CPU_MAX -> All the UE threads
---enable-cpu-affinity
 --disable-T-Tracer
    Disables the T tracer.
 --disable-hardware-dependency
    Disable HW dependency during installation
 --ue-autotest-trace
-   Enable specific traces for UE autotest framework
+    Enable specific traces for UE autotest framework
 --ue-trace
-   Enable traces for UE debugging
+    Enable traces for UE debugging
 --ue-timing
-   Enable traces for timing
---uhd-images-dir
-   Download UHD images in the indicated location
+    Enable traces for timing
 --build-eclipse
    Build eclipse project files. Paths are auto corrected by fixprj.sh
 --build-lib <libraries>
    Build optional shared library, <libraries> can be one or several of $OPTIONAL_LIBRARIES
 --usrp-recplay
    Build for I/Q record-playback modes
--h | --help
-   Print this help
 
 Usage (first build):
- NI/ETTUS B201  + COTS UE : ./build_oai -I -i --eNB -w USRP
-Usage (regular):
+ NI/ETTUS B201  + COTS UE : ./build_oai -I  --eNB --install-system-files -w USRP
+Usage (Regular):
  Eurecom EXMIMO + OAI ENB : ./build_oai --eNB  
  NI/ETTUS B201  + OAI ENB : ./build_oai --eNB -w USRP"
 }
@@ -191,10 +185,6 @@ function main() {
             INSTALL_OPTIONAL=1
             echo_info "Will install optional packages"
             shift;;
-       -i | --install-system-files)
-            INSTALL_SYSTEM_FILES=1
-            echo_info "Will copy OpenAirInterface files in Linux directories"
-            shift;;
        -g | --run-with-gdb)
             GDB=1
             CMAKE_BUILD_TYPE="Debug"
@@ -205,23 +195,13 @@ function main() {
             eNB=1
             echo_info "Will compile eNB"
             shift;;
-       --gNB)
-            gNB=1
-            NR="True"
-            echo_info "Will compile gNB"
-            shift;;
        -a | --agent)
-            echo_info "FlexRAN support is always compiled into the eNB"
-            shift;;
+	    echo_info "FlexRAN support is always compiled into the eNB"
+	    shift;;
        --UE)
             UE=1
             echo_info "Will compile UE"
             shift;;
-       --nrUE)
-            nrUE=1
-            NR="True"
-            echo_info "Will compile NR UE"
-            shift;;
        --mu)
             UE_EXPANSION="True"
             echo_info "Will compile with UE_EXPANSION"
@@ -233,7 +213,7 @@ function main() {
        --UE-conf-nvram)
             conf_nvram_path=$(readlink -f $2)
             shift 2;;
-       --UE-gen-nvram)
+        --UE-gen-nvram)
             gen_nvram_path=$(readlink -f $2)
             shift 2;;
        -r | --3gpp-release)
@@ -241,27 +221,24 @@ 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           
-            case "$2" in
-                "EXMIMO")
-                    HW="EXMIMO"
-                    ;;
-                "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "ADRV9371_ZC706" | "SIMU")
-                    HW="OAI_"$2
-                    ;;
-                "None")
-                    HW="None"
-                    ;;
-                *)
-                    echo_fatal "Unknown HW type $HW: exit..."
-            esac
-			echo_info "Setting hardware to: $HW"
+            # Use OAI_USRP  as the key word USRP is used inside UHD driver           
+                case "$2" in
+                    "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "SIMU")
+                        HW="OAI_"$2
+                        ;;
+                    "None")
+                        HW="None"
+                        ;;
+                    *)
+                        echo_fatal "Unknown HW type $HW: exit..."
+                esac
+		echo_info "Setting hardware to: $HW"
             shift 2;;
-       -P | --phy_simulators)
+       --phy_simulators)
             SIMUS_PHY=1
             echo_info "Will compile dlsim, ulsim, ..."
             shift;;
-       -S | --core_simulators)
+       --core_simulators)
             SIMUS_CORE=1
             echo_info "Will compile security unitary tests"
             shift;;
@@ -284,16 +261,12 @@ function main() {
             EXE_ARGUMENTS="$EXE_ARGUMENTS -d"
             echo_info "Will generate the software oscilloscope features"
             shift;;
-       --HWLAT)
-            HWLAT=1
-            echo_info "Will compile hw latency test program"
-            shift;;
-       --HWLAT_TEST)
-            HWLAT_TEST=1
-            echo_info "Will compile hw latency test program"
+       --install-system-files)
+            INSTALL_SYSTEM_FILES=1
+            echo_info "Will copy OpenAirInterface files in Linux directories"
             shift;;
        --verbose-compile)
-	        VERBOSE_COMPILE=1
+	    VERBOSE_COMPILE=1
             echo_info "Will compile with verbose instructions"
             shift;;
        --cflags_processor)
@@ -301,25 +274,21 @@ function main() {
             echo_info "Setting CPU FLAGS from USER to: $CFLAGS_PROCESSOR_USER"
             shift 2;;
        --build-doxygen)
-	        BUILD_DOXYGEN=1
+	    BUILD_DOXYGEN=1
             echo_info "Will build doxygen support"
             shift;;     
        --build-coverity-scan)
-            BUILD_COVERITY_SCAN=1
+           BUILD_COVERITY_SCAN=1
             echo_info "Will build Coverity-Scan objects for upload"
             shift;;
        --disable-deadline)
-            DEADLINE_SCHEDULER_FLAG_USER="False"
+            FORCE_DEADLINE_SCHEDULER_FLAG_USER="False"
             echo_info "Disabling the usage of deadline scheduler"
             shift 1;;
        --enable-deadline)
-            DEADLINE_SCHEDULER_FLAG_USER="True"
+            FORCE_DEADLINE_SCHEDULER_FLAG_USER="True"
             echo_info "Enabling the usage of deadline scheduler"
             shift 1;;
-       --enable-cpu-affinity)
-            CPU_AFFINITY_FLAG_USER="True"
-            echo_info "Enabling CPU Affinity (only valid when not using deadline scheduler)"
-            shift 1;;
        --disable-cpu-affinity)
             CPU_AFFINITY_FLAG_USER="False"
             echo_info "Disabling CPU Affinity (only valid when not using deadline scheduler)"
@@ -332,19 +301,19 @@ function main() {
             echo_info "Disabling hardware dependency for compiling software"
             DISABLE_HARDWARE_DEPENDENCY="True"
             shift 1;;
-       --ue-autotest-trace)
+        --ue-autotest-trace)
             UE_AUTOTEST_TRACE="True"
             echo_info "Enabling autotest specific trace for UE"
             shift 1;;
-       --ue-trace)
+        --ue-trace)
             UE_DEBUG_TRACE="True"
             echo_info "Enabling UE trace for debug"
             shift 1;;
-       --ue-timing)
+        --ue-timing)
             UE_TIMING_TRACE="True"
             echo_info "Enabling UE timing trace"
             shift 1;;
-       --uhd-images-dir)
+        --uhd-images-dir)
             UHD_IMAGES_DIR=$2
             echo_info "Downloading UHD images in the indicated location"
             shift 2;;
@@ -381,9 +350,9 @@ function main() {
    esac
   done
 
-  ###################################
-  # Check if cov-build is installed #
-  ###################################
+  #########################################################
+  # check if cov-build is installed
+  #########################################################
   if [ "$BUILD_COVERITY_SCAN" == "1" ] ; then
       echo_info "Checking cov-build is installed"
       IS_INSTALLED=`which cov-build | grep -c cov-build || true`
@@ -396,43 +365,28 @@ function main() {
 
   CMAKE_CMD="$CMAKE_CMD .."
   echo_info "CMAKE_CMD=$CMAKE_CMD"
-
-  ########################################################
-  # Check validity of HW and TP parameters for eNB / gNB #
-  ########################################################
+  #########################################################
+  # check validity of HW and TP parameters for eNB
+  #########################################################
   # to be discussed
   
-  if [ "$eNB" = "1" -o "$gNB" = "1" ] ; then
+  if [ "$eNB" = "1" ] ; then
       if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
-	      echo_info "No local radio head and no transport protocol selected"
+	  echo_info "No local radio head and no transport protocol selected"
       fi
       if [ "$HW" = "None" ] ; then 
-	      echo_info "No radio head has been selected (HW set to $HW)"	
+	  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)"	
+	  echo_info "No transport protocol has been selected (TP set to $TP)"	
       fi
   fi
   
-  if [ "$HWLAT" = "1" ] ; then
-      if [ "$HW" = "None" ] ; then
-          echo_info "No radio head has been selected (HW set to $HW)" 
-      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="False"
-		      ;;
-      esac
+    # If the user doesn't specify the Linux scheduler to use, we set a value
+    if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
+        DEADLINE_SCHEDULER_FLAG_USER="False"
   fi
-
   #Disable CPU Affinity for deadline scheduler
   if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then 
      CPU_AFFINITY_FLAG_USER="False"
@@ -445,10 +399,9 @@ function main() {
     echo_error "UHD images download settings will not be applied without -I present"
     exit
   fi
-  
-  #######################################################
-  # Setting and printing OAI envs, we should check here #
-  #######################################################
+  ############################################
+  # setting and printing OAI envs, we should check here
+  ############################################
 
   echo_info "2. Setting the OAI PATHS ..."
 
@@ -465,6 +418,7 @@ function main() {
     fi
   fi
 
+
   if [ "$CLEAN_ALL" = "1" ] ; then
     clean_all_files
     echo_info "Erased all previously producted files"
@@ -484,10 +438,6 @@ function main() {
         install_usrp_uhd_driver $UHD_IMAGES_DIR
       fi
     fi 
-#    if [ "$HW" == "OAI_ADRV9371_ZC706" ] ; then
-#      echo_info "\nInstalling packages for ADRV9371_ZC706 support"
-#      check_install_libiio_driver
-#    fi 
     if [ "$HW" == "OAI_BLADERF" ] ; then
       echo_info "installing packages for BLADERF support"
       check_install_bladerf_driver
@@ -517,105 +467,96 @@ function main() {
   echo_info "3. building the compilation directives ..."
 
   DIR=$OPENAIR_DIR/cmake_targets
+    
+    if [ "$T_TRACER" =  "False" ] ; then
+        noLOGDirsuffix="_noLOG"
+      fi
+    lte_build_dir=lte_build_oai
+      bin_suffix=""
 
-  if [ "$T_TRACER" =  "False" ] ; then
-      build_dir=ran_build_noLOG
-  else
-      build_dir=ran_build  
-  fi
-
-  if [ "$gNB" = "1" ] ; then
-     exec=nr-softmodem
-  elif [ "$nrUE" = "1" ] ; then
-     exec=nr-uesoftmodem
-  elif [ "$eNB" = "1" ] ; then
-     exec=lte-softmodem
-  elif [ "$UE" = "1" ] ; then
-     exec=lte-uesoftmodem
-  fi
-
+    lte_build_dir="lte_build_oai${noLOGDirsuffix}"
 # configuration module libraries, one currently available, using libconfig 
   config_libconfig_shlib=params_libconfig
   
   # first generate the CMakefile in the right directory
-  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" -o "$HW" = "EXMIMO" ] ; then
+  if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
 
-    # softmodem compilation
-    [ "$CLEAN" = "1" ] && rm -rf $DIR/$build_dir/build
-    mkdir -p $DIR/$build_dir/build
-    cmake_file=$DIR/$build_dir/CMakeLists.txt
-    echo "cmake_minimum_required(VERSION 2.8)"                             >  $cmake_file
-    echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )"                     >> $cmake_file
-    echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )"       >> $cmake_file
-    echo "set ( UE_EXPANSION $UE_EXPANSION )"                             >> $cmake_file
-#    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"                            >> $cmake_file
-    echo "set ( PRE_SCD_THREAD $UE_EXPANSION )"                           >> $cmake_file
-    echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )"                       >> $cmake_file
-    echo "set ( RRC_ASN1_VERSION \"${REL}\")"                             >> $cmake_file
-    echo "set ( NR_RRC_ASN1_VERSION \"${NR_REL}\")"                       >> $cmake_file
-    echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"                            >> $cmake_file
-    echo "set ( RF_BOARD \"${HW}\")"                                      >> $cmake_file
-    echo "set ( TRANSP_PRO \"${TP}\")"                                    >> $cmake_file
-    echo "set ( PACKAGE_NAME \"${exec}\")"                                >> $cmake_file
-    echo "set ( DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >> $cmake_file
-    echo "set ( CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"             >> $cmake_file
-    echo "set ( T_TRACER $T_TRACER )"                                     >> $cmake_file
-    echo "set ( UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE )"                   >> $cmake_file
-    echo "set ( UE_DEBUG_TRACE $UE_DEBUG_TRACE )"                         >> $cmake_file
-    echo "set ( UE_TIMING_TRACE $UE_TIMING_TRACE )"                       >> $cmake_file
-    echo "set ( USRP_REC_PLAY $USRP_REC_PLAY )"                           >> $cmake_file
-    echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'         >> $cmake_file
-    cd  $DIR/$build_dir/build
+    # LTE softmodem compilation
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/$lte_build_dir/build
+    mkdir -p $DIR/$lte_build_dir/build
+    cmake_file=$DIR/$lte_build_dir/CMakeLists.txt
+    echo "cmake_minimum_required(VERSION 2.8)"   >  $cmake_file
+    echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
+    echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
+    echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
+#    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"     >>  $cmake_file
+    echo "set ( PRE_SCD_THREAD $UE_EXPANSION )"    >>  $cmake_file
+    echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )"      >>  $cmake_file
+    echo "set ( RRC_ASN1_VERSION \"${REL}\")"      >>  $cmake_file
+    echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
+    echo "set ( RF_BOARD \"${HW}\")"               >>  $cmake_file
+    echo "set ( TRANSP_PRO \"${TP}\")"             >>  $cmake_file
+    echo "set(PACKAGE_NAME \"${lte_exec}\")"       >>  $cmake_file
+    echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )"    >>$cmake_file
+    echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
+    echo "set ( T_TRACER $T_TRACER )"              >>  $cmake_file
+    echo "set (UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE)"        >>  $cmake_file
+    echo "set (UE_DEBUG_TRACE $UE_DEBUG_TRACE)"        >>  $cmake_file
+    echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
+    echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"        >>  $cmake_file
+    echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
+    cd  $DIR/$lte_build_dir/build
     eval $CMAKE_CMD
   fi
 
-  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" ] ; then
-    echo_info "Compiling $exec"
+  if [ "$eNB" = "1" ] ; then
+    lte_exec=lte-softmodem${bin_suffix}
     compilations \
-	  $build_dir $exec \
-	  $exec $dbin/$exec.$REL
-	  
-# if --eNB --UE are both provided together as build options
-	  if [ "$eNB" = "1" -a "$UE" = "1" ] ; then
-	    echo_info "Compiling lte-uesoftmodem"
-        compilations \
-	      $build_dir lte-uesoftmodem \
-	      lte-uesoftmodem $dbin/lte-uesoftmodem.$REL	  
-	  fi
-	  
-# if --gNB --nrUE are both provided together as build options
-	  if [ "$gNB" = "1" -a "$nrUE" = "1" ] ; then
-	    echo_info "Compiling nr-uesoftmodem"
-        compilations \
-	      $build_dir nr-uesoftmodem \
-	      nr-uesoftmodem $dbin/nr-uesoftmodem.$REL	  
-	  fi
+	  $lte_build_dir $lte_exec \
+	  $lte_exec $dbin/$lte_exec.$REL
 
 # mandatory shared lib
     compilations \
-	  $build_dir $config_libconfig_shlib \
+	  $lte_build_dir $config_libconfig_shlib \
 	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
-
     compilations \
-      $build_dir coding \
-      libcoding.so $dbin/libcoding.so
-
-	compilations \
-	  $build_dir nasmesh \
-	  CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
-
-	compilations \
-	  $build_dir rb_tool \
-	  rb_tool $dbin/rb_tool
-      cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin
+          $lte_build_dir coding \
+          libcoding.so $dbin/libcoding.so
+# optional libs (used when noS1 with kernel modules 
+    compilations \
+          $lte_build_dir nasmesh \
+          CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
+    compilations \
+          $lte_build_dir rb_tool \
+          rb_tool $dbin/rb_tool
+          cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin	  
   fi
-  
-  if [ "$UE" = 1 ] ; then
-    # ue_ip driver compilation
-    echo_info "Compiling UE specific part"
+
+  if [ "$UE" = 1  ] ; then
+    lte_exec=lte-uesoftmodem${bin_suffix}
     compilations \
-      $build_dir ue_ip \
-      CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
+        $lte_build_dir $lte_exec \
+        $lte_exec $dbin/$lte_exec.$REL
+        
+    # mandatory shared lib
+    compilations \
+        $lte_build_dir $config_libconfig_shlib \
+        lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
+    compilations \
+        $lte_build_dir coding \
+        libcoding.so $dbin/libcoding.so
+# optional libs (used when noS1 with kernel modules
+    compilations \
+          $lte_build_dir nasmesh \
+          CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
+    compilations \
+          $lte_build_dir rb_tool \
+          rb_tool $dbin/rb_tool
+          cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin
+    # ue_ip driver compilation
+    compilations \
+          $lte_build_dir ue_ip \
+          CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
 
 #    mkdir -p $DIR/at_commands/build
 #    cd $DIR/at_commands/build
@@ -636,23 +577,23 @@ function main() {
       nas_sim_tools nvram \
       nvram $dbin/nvram
     compilations \
-      nas_sim_tools conf2uedata \
-      conf2uedata $dbin/conf2uedata
+        nas_sim_tools conf2uedata \
+        conf2uedata $dbin/conf2uedata
 
     # generate USIM data
     if [ -f $dbin/conf2uedata ]; then
       install_nas_tools $conf_nvram_path $gen_nvram_path
-      echo_info "Copying UE specific part to $DIR/$build_dir/build"
-      cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$build_dir/build
-      cp -Rvf $dbin/.ue.nvram0 $DIR/$build_dir/build
-      cp -Rvf $dbin/.usim.nvram0 $DIR/$build_dir/build
+      echo_info "Copying UE specific part to $DIR/$lte_build_dir/build"
+      cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$lte_build_dir/build
+      cp -Rvf $dbin/.ue.nvram0 $DIR/$lte_build_dir/build
+      cp -Rvf $dbin/.usim.nvram0 $DIR/$lte_build_dir/build
     else
       echo_warning "not generated UE NAS files: binaries not found"
     fi
   fi
 
   if [ "$SIMUS_PHY" = "1" -o "$SIMUS_CORE" = "1" ] ; then
-    cd $OPENAIR_DIR/cmake_targets/phy_simulators
+    cd $OPENAIR_DIR/cmake_targets/lte-simulators
     [ "$CLEAN" = "1" ] && rm -rf build
     mkdir -p build
     cd build
@@ -660,231 +601,156 @@ function main() {
     eval $CMAKE_CMD
   fi
 
-  ##################
-  # PHY simulators #
-  ##################
   if [ "$SIMUS_PHY" = "1" ] ; then
-    echo_info "Compiling physical unitary tests simulators"
+    # lte unitary simulators compilation
+    echo_info "Compiling unitary tests simulators"
     # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-    simlist="dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim"
+    #simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
+    simlist="dlsim ulsim"
     for f in $simlist ; do
       compilations \
-        phy_simulators $f \
-	    $f $dbin/$f.$REL
+      lte-simulators $f \
+	  $f $dbin/$f.$REL
     done
     compilations \
-      phy_simulators coding \
-      libcoding.so $dbin/libcoding.so
+          lte-simulators coding \
+          libcoding.so $dbin/libcoding.so
 #    compilations \
-#	   lte-simulators $config_libconfig_shlib \
-#	   lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
+#	  lte-simulators $config_libconfig_shlib \
+#	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
   fi
 
-  ###################
-  # Core simulators #
-  ###################
+  # Core simulators
+  #############
   if [ "$SIMUS_CORE" = "1" ] ; then
-    echo_info "Compiling security unitary tests simulators"
+    # lte unitary simulators compilation
+    echo_info "Compiling unitary tests simulators"
     simlist="secu_knas_encrypt_eia1 secu_kenb aes128_ctr_encrypt aes128_ctr_decrypt secu_knas_encrypt_eea2 secu_knas secu_knas_encrypt_eea1 kdf aes128_cmac_encrypt secu_knas_encrypt_eia2"
     for f in $simlist ; do
       compilations \
-	    phy_simulators test_$f \
-	    test_$f $dbin/test_$f.$REL
+	  lte-simulators test_$f \
+	  test_$f $dbin/test_$f.$REL
     done
   fi
 
-  ####################################
-  # EXMIMO drivers & firmware loader #
-  ####################################
+  # EXMIMO drivers & firmware loader
+  ###############
   if [ "$HW" = "EXMIMO" ] ; then
+    
     echo_info "Compiling Express MIMO 2 board drivers"
     compilations \
-      $build_dir openair_rf \
-      CMakeFiles/openair_rf/openair_rf.ko $dbin/openair_rf.ko
+        $lte_build_dir openair_rf \
+        CMakeFiles/openair_rf/openair_rf.ko $dbin/openair_rf.ko
     compilations \
-	  $build_dir updatefw \
+	  $lte_build_dir updatefw \
 	  updatefw $dbin/updatefw
     echo_info "Compiling oarf tools. The logfile for compilation is here: $dlog/oarf.txt"
-    make -j4 -C $OPENAIR_DIR/cmake_targets/$build_dir/build oarf > $dlog/oarf.txt 2>&1
-    cp $OPENAIR_DIR/cmake_targets/$build_dir/build/*.oct $dbin
+    make -C $OPENAIR_DIR/cmake_targets/$lte_build_dir/build oarf > $dlog/oarf.txt 2>&1
+    cp $OPENAIR_DIR/cmake_targets/$lte_build_dir/build/*.oct $dbin
     if [ -s $dbin/oarf_config_exmimo.oct ] ; then
-	  echo_success "oarf tools compiled"
+	echo_success "oarf tools compiled"
     else
-	  echo_error "oarf tools compilation failed"
+	echo_error "oarf tools compilation failed"
     fi
     cp $OPENAIR_DIR/cmake_targets/tools/init_exmimo2 $dbin
   fi
-  
-  ######################
-  # Optional libraries #
-  ######################
+  # optional libraries
+  #####################
   if [ ! -z "$BUILD_OPTLIB" ] ; then 
      for oklib in $BUILD_OPTLIB ; do
          compilations \
-             $build_dir $oklib \
-             lib${oklib}.so $dbin/lib${oklib}.so
+            $lte_build_dir $oklib \
+                  lib${oklib}.so $dbin/lib${oklib}.so
      done
-  fi
 
-  #####################
-  # HWLAT compilation #
-  #####################
-  if [ "$HWLAT" = "1" ] ; then
-
-      hwlat_exec=lte-hwlat
-      hwlat_build_dir=lte-hwlat
-     
-      echo_info "Compiling $hwlat_exec ..."
-    
-      [ "$CLEAN" = "1" ] && rm -rf $DIR/lte-hwlat/build 
-      mkdir -p $DIR/$hwlat_build_dir/build
-      cmake_file=$DIR/$hwlat_build_dir/CMakeLists.txt
-      echo "cmake_minimum_required(VERSION 2.8)"                             > $cmake_file
-      echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )"                     >> $cmake_file
-      echo "set ( RF_BOARD \"${HW}\")"                                      >> $cmake_file
-      echo 'set ( PACKAGE_NAME "\"lte-hwlat\"")'                            >> $cmake_file
-      echo "set ( DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >> $cmake_file
-      echo "set ( CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"             >> $cmake_file
-      echo "set ( HWLAT \"${HWLAT}\" )"                                     >> $cmake_file
-      echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'         >> $cmake_file    
-      cd $DIR/$hwlat_build_dir/build
-      cmake ..
-      compilations \
-          lte-hwlat lte-hwlat \
-          lte-hwlat $dbin/lte-hwlat
-  fi  
+  fi 
  
-  ##########################
-  # HWLAT_TEST compilation #
-  ##########################
-  if [ "$HWLAT_TEST" = "1" ] ; then
-
-      hwlat_test_exec=lte-hwlat-test
-      hwlat_test_build_dir=lte-hwlat-test
-     
-      echo_info "Compiling $hwlat_test_exec ..."
-    
-      [ "$CLEAN" = "1" ] && rm -rf $DIR/lte-hwlat-test/build 
-      mkdir -p $DIR/$hwlat_test_build_dir/build
-      cmake_file=$DIR/$hwlat_test_build_dir/CMakeLists.txt
-      echo "cmake_minimum_required(VERSION 2.8)"                             > $cmake_file
-      echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )"                     >> $cmake_file
-      echo "set ( RF_BOARD \"${HW}\")"                                      >> $cmake_file
-      echo 'set ( PACKAGE_NAME "\"lte-hwlat-test\"")'                       >> $cmake_file
-      echo "set ( DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >> $cmake_file
-      echo "set ( CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"             >> $cmake_file
-      echo "set ( HWLAT \"${HWLAT}\" )"                                     >> $cmake_file
-      echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'         >> $cmake_file    
-      cd $DIR/$hwlat_test_build_dir/build
-      cmake ..
-      compilations \
-          lte-hwlat-test lte-hwlat-test \
-          lte-hwlat-test $dbin/lte-hwlat-test
-  fi
-  
-  ####################################################
-  # Build RF device and transport protocol libraries #
-  ####################################################
-  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" -o "$HWLAT" = "1" ] ; then
+  # 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
+	  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 \
-                  $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
+	  # link liboai_device.so with the selected RF device library
+	  if [ "$HW" == "OAI_USRP" ] ; then
               compilations \
-                  $build_dir oai_usrpdevif \
+                    $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 \
-                      $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
-#              if [ -f "/usr/include/libbladeRF.h" ] ; then
-                  compilations \
-                      $build_dir oai_lmssdrdevif \
-                      liboai_lmssdrdevif.so $dbin/liboai_lmssdrdevif.so.$REL
-#              fi
+	      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_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"	 
+	      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 \
+                    $lte_build_dir oai_lmssdrdevif \
+		      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 \
-                  $build_dir oai_irisdevif \
-                  liboai_irisdevif.so $dbin/liboai_irisdevif.so.$REL
+                  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"
-          elif [ "$HW" == "OAI_ADRV9371_ZC706" ] ; then
-              SYRIQ_KVER=$(uname -r)
-              SYRIQ_KMAJ=$(echo $SYRIQ_KVER | sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/')
-              SYRIQ_KMIN=$(echo $SYRIQ_KVER | sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/')
-#              echo $SYRIQ_KMAJ$SYRIQ_KMIN
-              if [ "$SYRIQ_KMAJ$SYRIQ_KMIN" == "319" ] || [ "$SYRIQ_KMAJ$SYRIQ_KMIN" == "410" ] || [ "$SYRIQ_KMAJ$SYRIQ_KMIN" == "415" ] ; then
-#                  echo "Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN detected"
-                  ln -sf /usr/local/lib/syriq/libadrv9371zc706.so liboai_device.so
-              else
-                  echo_error "== FAILED == Unexpected Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
-              fi
-              echo_info "liboai_device.so is linked to ADRV9371_ZC706 device library for Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
-	      else 
-	          echo_info "liboai_device.so is not linked to any device library"	    
-	      fi
+	  else 
+	      echo_info "liboai_device.so is not linked to any device library"	    
+	  fi
       fi
       
-      #build simulators devices
-      echo_info "Compiling rfsimulator"
-      compilations \
-          $build_dir rfsimulator \
-          librfsimulator.so $dbin/librfsimulator.so.$REL
-      
-      echo_info "Compiling basicsimulator"
-      compilations \
-          $build_dir tcp_bridge_oai \
-          libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
+        # build simulators devices
+        echo_info "Compiling rfsimulator"
+        compilations \
+            $lte_build_dir rfsimulator \
+            librfsimulator.so $dbin/librfsimulator.so.$REL
+        echo_info "Compiling basicsimulator"
+        compilations \
+            $lte_build_dir tcp_bridge_oai \
+            libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
+        # build transport protocol libraries (currently only ETHERNET is available)
 
-      #build transport protocol libraries (currently only ETHERNET is available)
-      rm -f liboai_transpro.so
+	  rm -f liboai_transpro.so
 	  rm -f $dbin/liboai_transpro.so
-	  compilations \
-          $build_dir oai_eth_transpro \
+	      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
-	  echo_info "liboai_transpro.so is linked to ETHERNET transport"
-  fi
-  
+	      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
 
-  ###################
-  # Doxygen Support #
-  ###################
-  if [ "$BUILD_DOXYGEN" = "1" ] ; then
+    if [ "$RFSIMULATOR" == "true" -o "$HW" == "OAI_SIMU" ] ; then
+        echo_info "Compiling rfsimulator"
+        compilations \
+            $lte_build_dir rfsimulator \
+            librfsimulator.so $dbin/librfsimulator.so.$REL
+    fi
+
+  # Doxygen Support
+  #####################
+  if [ "$BUILD_DOXYGEN" = "1" ] ;then
     doxygen_log=$OPENAIR_DIR/cmake_targets/log/doxygen.log
-    echo_info "Building Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/targets/DOCS/html/index.html"
-    echo_info "Doxygen generation log is located here: $doxygen_log"
-    echo_info "Generating Doxygen files....please wait"
+    echo_info "Building doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/targets/DOCS/html/index.html"
+    echo_info "Doxygen Generation log is located here: $doxygen_log"
+    echo_info "Generating doxygen files....please wait"
     (
     [ "$CLEAN" = "1" ] && rm -rf $OPENAIR_DIR/cmake_targets/doxygen/build
     mkdir -p $OPENAIR_DIR/cmake_targets/doxygen/build
@@ -894,10 +760,9 @@ function main() {
     ) >& $doxygen_log
   fi
 
-  ##############
-  # Auto-tests #
-  ##############
-  if [ "$OAI_TEST" = "1" ] ; then
+  # Auto-tests
+  #####################
+  if [ "$OAI_TEST" = "1" ]; then
     echo_info "10. Running OAI pre commit tests (pre-ci) ..."
     echo_error "These scripts ASSUME that user is in /etc/sudoers and can execute commands without PASSWORD prompt"
     echo_error "Add the following lines in /etc/sudoers file to make your __user_name__ sudo without password prompt"
@@ -905,7 +770,7 @@ function main() {
     echo_error " __your_user_name__ ALL = (ALL) NOPASSWD: ALL "
     echo_info "The log file for the autotest script for debugging is located here: $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log "
     echo_info "The results of autotests results is located here: $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml "
-    echo_info "You can hit CTRL-C at any time to terminate the autotests..."
+    echo_info "You can hit CTRL-C any time to terminate the autotests..."
     echo "Current User Name: $USER"
     read -s -p "Enter Password: " mypassword
     echo -e "\n"

cmake_targets/build_ue

@@ -0,0 +1,6 @@
+#!/bin/bash
+#sudo ./build_oai -c -C -I --install-optional-packages --install-system-files --UE -w USRP -V 
+#sudo ./build_oai -c -C -I --install-optional-packages --UE -w USRP -V 
+#sudo ./build_oai -c -C --UE -w USRP -V
+sudo ./build_oai -c -C --UE -w USRP
+#sudo ./build_oai -c -C --UE -w USRP --build-eclipse

cmake_targets/lte-simulators/CMakeLists.txt

@@ -3,11 +3,11 @@ set(PACKAGE_NAME "unitary_tests_simulators")
 set(PHYSIM True)
 set(RF_BOARD None)
 set(XFORMS True)
-set(ENABLE_ITTI True)
+set(ENABLE_ITTI False)
 set(DEBUG_PHY False)
 set(MU_RECIEVER False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
-set(RRC_ASN1_VERSION "Rel15")
-set(T_TRACER True)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
+set(RRC_ASN1_VERSION "Rel14")
+set (UE_TIMING_TRACE True)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)

cmake_targets/lte_noS1_build_oai/CMakeLists.template

@@ -0,0 +1,10 @@
+set(ENABLE_ITTI True)
+set(ENABLE_USE_MME False)
+set(PDCP_USE_NETLINK True)
+set(LINK_ENB_PDCP_TO_IP_DRIVER True)
+set(LINK_ENB_PDCP_TO_GTPV1U False)
+set(PDCP_USE_NETLINK_QUEUES False)
+set(LINUX True)
+set(SECU False)
+set(NAS_UE False)
+

cmake_targets/oaisim_build_oai/CMakeLists.template

@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 2.8)
+
+set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
+set (  DEBUG_OMG False )
+set (  DISABLE_XER_PRINT False )
+set (  DRIVER2013 True )
+set (  ENABLE_ITTI True )
+set (  ENABLE_NAS_UE_LOGGING True )
+set (  ENABLE_NEW_MULTICAST True )
+set (  ENABLE_RAL False )
+set (  ENABLE_STANDALONE_EPC False)
+set (  ENABLE_USE_CPU_EXECUTION_TIME True )
+set (  ENABLE_USE_MME True )
+set (  ENABLE_USE_RAW_SOCKET_FOR_SGI True)
+set (  ENABLE_VCD_FIFO False )
+set (  ENB_MODE True )
+set (  EXMIMO_IOT True )
+set (  JUMBO_FRAME True )
+set (  LARGE_SCALE False )
+set (  LINK_ENB_PDCP_TO_GTPV1U True)
+set (  LINUX_LIST False )
+set (  LINUX True )
+set (  LOCALIZATION False )
+set (  LOG_NO_THREAD True )
+set (  DEADLINE_SCHEDULER False )
+set (  MAC_CONTEXT 1 )
+set (  MAX_NUM_CCs 1 )
+set (  MESSAGE_CHART_GENERATOR False)
+set (  MSG_PRINT False )
+set (  MU_RECEIVER False )
+set (  NAS_ADDRESS_FIX False )
+set (  NAS_BUILT_IN_UE True)
+set (  NAS_MME False )
+set (  NAS_UE True )
+set (  NB_ANTENNAS_RX "2" )
+set (  NB_ANTENNAS_TX "2" )
+set (  NO_RRM True )
+set (  OAISIM True )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
+set (  OAI_NW_DRIVER_USE_NETLINK True )
+set (  OPENAIR2 True )
+set (  OPENAIR_LTE True )
+set (  PACKAGE_NAME "oaisim" )
+set (  PDCP_USE_NETLINK True )
+set (  PDCP_MSG_PRINT False )
+set (  PHY_CONTEXT False )
+set (  PHY_EMUL False )
+set (  PHYSIM True )
+set (  RF_BOARD "False" )
+set (  RLC_STOP_ON_LOST_PDU False )
+set (  RRC_ASN1_VERSION "Rel10" )
+set (  RRC_DEFAULT_RAB_IS_AM True)
+set (  RRC_MSG_PRINT False )
+set (  SECU False )
+set (  SMBV False )
+set (  TEST_OMG False )
+set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
+set (  USE_MME "R10" )
+set (  XER_PRINT False )

cmake_targets/oaisim_mme_build_oai/CMakeLists.template

@@ -0,0 +1,61 @@
+cmake_minimum_required(VERSION 2.8)
+
+set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
+set (  DEBUG_OMG False )
+set (  DISABLE_XER_PRINT False )
+set (  DRIVER2013 False )
+set (  ENABLE_ITTI True )
+set (  ENABLE_NAS_UE_LOGGING False )
+set (  ENABLE_NEW_MULTICAST False )
+set (  ENABLE_RAL False )
+set (  ENABLE_STANDALONE_EPC False )
+set (  ENABLE_USE_CPU_EXECUTION_TIME False )
+set (  ENABLE_USE_MME False )
+set (  ENABLE_USE_RAW_SOCKET_FOR_SGI True)
+set (  ENABLE_VCD_FIFO False )
+set (  ENB_MODE False )
+set (  EPC_BUILD True )
+set (  EXMIMO_IOT False )
+set (  JUMBO_FRAME False )
+set (  LARGE_SCALE False )
+set (  LINK_ENB_PDCP_TO_GTPV1U True)
+set (  LINUX_LIST False )
+set (  LINUX False )
+set (  LOCALIZATION False )
+set (  LOG_NO_THREAD False )
+set (  DEADLINE_SCHEDULER False )
+set (  MAC_CONTEXT 1 )
+set (  MAX_NUM_CCs 1 )
+set (  MSG_PRINT False )
+set (  MU_RECEIVER False )
+set (  NAS_ADDRESS_FIX False )
+set (  NAS_BUILT_IN_EPC True )
+set (  NAS_MME True )
+set (  NAS_NETLINK False )
+set (  NAS_UE False )
+set (  NB_ANTENNAS_RX "2" )
+set (  NB_ANTENNAS_TX "2" )
+set (  NO_RRM False )
+set (  OAISIM False )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
+set (  OAI_NW_DRIVER_USE_NETLINK False )
+set (  OPENAIR2 False )
+set (  OPENAIR_LTE False )
+set (  PACKAGE_NAME "EPC" )
+set (  PDCP_MSG_PRINT False )
+set (  PHY_CONTEXT False )
+set (  PHY_EMUL False )
+set (  PHYSIM False )
+set (  RF_BOARD "False" )
+set (  RRC_ASN1_VERSION "Rel10" )
+set (  RLC_STOP_ON_LOST_PDU False )
+set (  RRC_MSG_PRINT False )
+set (  SECU False )
+set (  SMBV False )
+set (  TEST_OMG False )
+set (  UPDATE_RELEASE_9 True)
+set (  UPDATE_RELEASE_10 True)
+set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
+set (  USE_MME "R10" )
+set (  XER_PRINT False )
+set (  XFORMS False )

cmake_targets/oaisim_noS1_build_oai/CMakeLists.template

@@ -0,0 +1,62 @@
+cmake_minimum_required(VERSION 2.8)
+
+set (  DEBUG_OMG False )
+set (  DISABLE_XER_PRINT False )
+set (  DRIVER2013 True )
+set (  ENABLE_ITTI True )
+set (  ENABLE_NAS_UE_LOGGING False )
+set (  ENABLE_NEW_MULTICAST True )
+set (  ENABLE_RAL False )
+set (  ENABLE_STANDALONE_EPC False)
+set (  ENABLE_USE_CPU_EXECUTION_TIME True )
+set (  ENABLE_USE_MME False )
+set (  ENABLE_USE_RAW_SOCKET_FOR_SGI False)
+set (  ENABLE_VCD_FIFO False )
+set (  ENB_MODE True )
+set (  EXMIMO_IOT True )
+set (  JUMBO_FRAME True )
+set (  LARGE_SCALE False )
+set (  LINK_ENB_PDCP_TO_GTPV1U False)
+set (  LINUX_LIST False )
+set (  LINUX True )
+set (  LOCALIZATION False )
+set (  LOG_NO_THREAD 1 )
+set (  DEADLINE_SCHEDULER False )
+set (  MAC_CONTEXT 1 )
+set (  MAX_NUM_CCs 1 )
+set (  MESSAGE_CHART_GENERATOR         False )
+set (  MESSAGE_CHART_GENERATOR_RLC_MAC False )
+set (  MESSAGE_CHART_GENERATOR_PHY     False )
+set (  MSG_PRINT False )
+set (  MU_RECEIVER False )
+set (  NAS_ADDRESS_FIX False )
+set (  NAS_BUILT_IN_UE False)
+set (  NAS_MME False )
+set (  NAS_UE False )
+set (  NB_ANTENNAS_RX "2" )
+set (  NB_ANTENNAS_TX "2" )
+set (  NO_RRM True )
+set (  OAISIM True )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
+set (  OAI_NW_DRIVER_USE_NETLINK True )
+set (  OPENAIR2 True )
+set (  OPENAIR_LTE True )
+set (  PACKAGE_NAME "oaisim" )
+set (  PDCP_USE_NETLINK True )
+set (  PDCP_MSG_PRINT False )
+set (  PHY_CONTEXT False )
+set (  PHY_EMUL False )
+set (  PHYSIM True )
+set (  RF_BOARD "False" )
+set (  RRC_ASN1_VERSION "Rel10" )
+set (  RLC_STOP_ON_LOST_PDU False )
+set (  RRC_MSG_PRINT False )
+set (  SECU False )
+set (  SMBV False )
+set (  TEST_OMG False )
+set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
+set (  USE_MME "R10" )
+set (  XER_PRINT False )
+set (  DEBUG_PHY False )
+set (  DEBUG_PHY_PROC False)
+set (  DEBUG_DLSCH False)

cmake_targets/ran_build/CMakeLists.txt

@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-set ( CMAKE_BUILD_TYPE  )
-set ( CFLAGS_PROCESSOR_USER "" )
-set ( UE_EXPANSION False )
-set ( PRE_SCD_THREAD False )
-set ( UESIM_EXPANSION False )
-set ( RRC_ASN1_VERSION "Rel15")
-set ( NR_RRC_ASN1_VERSION "NR_Rel15")
-set ( ENABLE_VCD_FIFO False )
-set ( RF_BOARD "None")
-set ( TRANSP_PRO "None")
-set ( PACKAGE_NAME "nr-softmodem")
-set ( DEADLINE_SCHEDULER "False" )
-set ( CPU_AFFINITY "False" )
-set ( T_TRACER True )
-set ( UE_AUTOTEST_TRACE False )
-set ( UE_DEBUG_TRACE False )
-set ( UE_TIMING_TRACE False )
-set ( USRP_REC_PLAY False )
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)

cmake_targets/tools/build_helper

@@ -149,7 +149,7 @@ clean_all_files() {
  set_openair_env
  dir=$OPENAIR_DIR/cmake_targets
  rm -rf $dir/log $OPENAIR_DIR/targets/bin/*
- rm -rf $dir/ran_build $dir/lte-simulators/build
+ rm -rf $dir/lte_build_oai $dir/lte-simulators/build
  rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt
  rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build
 }
@@ -299,7 +299,7 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
     elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
         $SUDO $INSTALLER -y install python boost libusb-devel libusbx-devel boost-devel python-mako python-docutils cmake
-        $SUDO -H pip install requests
+        $SUDO pip install requests
         if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
             # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
             $SUDO $INSTALLER -y remove uhd uhd-devel uhd-firmware
@@ -560,8 +560,8 @@ check_install_additional_tools (){
 
   #The packages below are already installed for Redhat distros (RHEL, CentOS, Fedora)
   if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-    $SUDO -H pip install paramiko
-    $SUDO -H pip install pyroute2 colorama
+    $SUDO pip install paramiko
+    $SUDO pip install pyroute2 colorama
     log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
     echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
     (
@@ -761,7 +761,7 @@ install_asn1c_from_source(){
     # better to use a given commit than a branch in case the branch
     # is updated and requires modifications in the source of OAI
     #git checkout velichkov_s1ap_plus_option_group
-    git checkout f12568d617dbf48497588f8e227d70388fa217c9
+    git checkout 0a7524184f16e7093990a31d8d4db487a16e5782
     autoreconf -iv
     ./configure
     make -j`nproc`

cmake_targets/tools/fix_asn1

@@ -94,7 +94,7 @@ function patch_rrc()
   case "$version" in
     Rel14 )
       echo "patching RRC files release 14"
-      #apply_patches "$directory" RRC_Rel14 ${#RRC_Rel14[*]}
+      apply_patches "$directory" RRC_Rel14 ${#RRC_Rel14[*]}
       ;;
     Rel10 )
       echo "patching RRC files release 10"
@@ -109,31 +109,12 @@ function patch_rrc()
   esac
 }
 
-function patch_nr_rrc()
-{
-  local directory="$1"
-  local version="$2"
-
-  case "$version" in
-    NR_Rel15 )
-      echo "patching NR_RRC files release 15"
-      apply_patches "$directory" NR_RRC_Rel15 ${#NR_RRC_Rel15[*]}
-      ;;
-    * )
-      error unknwon/unhandled NR_RRC version \'"$version"\'
-      ;;
-  esac
-}
-
-
 function patch_x2ap()
 {
   local directory="$1"
   local version="$2"
 
   case "$version" in
-    R14 )
-      ;;
     R11 )
       echo "patching X2AP files release 11.2"
       apply_patches "$directory" X2AP_Rel11_2 ${#X2AP_Rel11_2[*]}
@@ -150,8 +131,6 @@ function patch_s1ap()
   local version="$2"
 
   case "$version" in
-    R14 )
-      ;;
     R10 )
       #nothing to do anymore (fixes went to asn1c)
       ;;
@@ -198,9 +177,6 @@ function main()
     RRC )
       patch_rrc "$directory" "$version"
       ;;
-    NR_RRC )
-      patch_nr_rrc "$directory" "$version"
-      ;;
     X2AP )
       patch_x2ap "$directory" "$version"
       ;;

cmake_targets/tools/generate_asn1

@@ -9,11 +9,12 @@ cd ${PROTOCOL_DIR}
 # Because use $* also include directory, so we need shift
 shift
 
-local module="$2"
+# There are three types parameter for asn1c
+# One is for RRC
+# and one is for F1AP
+# another is for other protocols
 
-#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 2 ]; then
+if echo ${PROTOCOL_DIR} | grep -q "RRC"; then
 
     #asn1c does not work well with extension groups, we need the following fix:
     # replace [[ by '<name> SEQUENCE {'
@@ -104,24 +105,7 @@ EOF
 
     echo running asn1c
 
-case "$module" in
-  RRC )
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  NR_RRC )
-    	export ASN1C_PREFIX=NR_
-  	asn1c -gen-PER -fcompound-names -findirect-choice -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  S1AP )
-	export ASN1C_PREFIX=S1AP_
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  X2AP )
-	export ASN1C_PREFIX=X2AP_
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-esac
-
+    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
 
@@ -132,25 +116,9 @@ 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
-
-case "$module" in
-  RRC )
-  	 asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
-  ;; 
-  NR_RRC )
-    	export ASN1C_PREFIX=NR_
-  	asn1c -fcompound-names -findirect-choice -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  S1AP )
-    	export ASN1C_PREFIX=S1AP_
-    	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  X2AP )
-    	export ASN1C_PREFIX=X2AP_
-    	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-esac
-
+    
+    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

@@ -12,4 +12,4 @@ if [ "$done_flag" -ot $ASN1_SOURCE_DIR ] ; then
    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
 fi
-touch $done_flag
+touch $done_flag

common/config/config_cmdline.c

@@ -41,7 +41,7 @@
 
 int parse_stringlist(paramdef_t *cfgoptions, char *val) {
   char *atoken;
-  char *tokctx = NULL;
+  char *tokctx;
   char *tmpval=strdup(val);
   int   numelt=0;
   cfgoptions->numelt=0;
@@ -74,7 +74,7 @@ int processoption(paramdef_t *cfgoptions, char *value) {
 
   if ( value == NULL) {
     if( (cfgoptions->paramflags &PARAMFLAG_BOOL) == 0 ) { /* not a boolean, argument required */
-      fprintf(stderr, "[CONFIG] command line, option %s requires an argument\n",cfgoptions->optname);
+      CONFIG_PRINTF_ERROR("[CONFIG] command line, option %s requires an argument\n",cfgoptions->optname);
     } else {        /* boolean value option without argument, set value to true*/
       tmpval = defbool;
     }
@@ -91,7 +91,7 @@ int processoption(paramdef_t *cfgoptions, char *value) {
         sprintf( (char *)(cfgoptions->strptr), "%s",tmpval);
       }
 
-      fprintf(stderr, "[CONFIG] %s set to  %s from command line\n", cfgoptions->optname, tmpval);
+      printf_cmdl("[CONFIG] %s set to  %s from command line\n", cfgoptions->optname, tmpval);
       optisset=1;
       break;
 
@@ -208,17 +208,13 @@ int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
   char cfgpath[CONFIG_MAXOPTLENGTH];
   j = 0;
   i = 0;
-  if (prefix == NULL)
-    fprintf(stderr,"-###-\nNULL\n-###-\n");
-  else
-    fprintf(stderr,"-###-\n%s\n-###-\n",prefix);
 
   while (c > 0 ) {
     char *oneargv = strdup(config_get_if()->argv[i]);          /* we use strtok_r which modifies its string paramater, and we don't want argv to be modified */
 
     /* first check help options, either --help, -h or --help_<section> */
     if (strncmp(oneargv, "-h",2) == 0 || strncmp(oneargv, "--help",6) == 0 ) {
-      char *tokctx = NULL;
+      char *tokctx;
       pp=strtok_r(oneargv, "_",&tokctx);
       config_get_if()->argv_info[i] |= CONFIG_CMDLINEOPT_PROCESSED;
 
@@ -295,6 +291,6 @@ int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
     c--;
   }   /* fin du while */
 
-  fprintf(stderr, "[CONFIG] %s %i options set from command line\n",((prefix == NULL) ? "(root)":prefix),j);
+  printf_cmdl("[CONFIG] %s %i options set from command line\n",((prefix == NULL) ? "(root)":prefix),j);
   return j;
 }  /* parse_cmdline*/

common/config/config_load_configmodule.c

@@ -181,10 +181,7 @@ int config_cmdlineonly_get(paramdef_t *cfgoptions,int numoptions, char *prefix )
   return numdefvals;
 }
 
-configmodule_interface_t *load_configmodule(int argc,
-		                                    char **argv,
-											uint32_t initflags)
-{
+configmodule_interface_t *load_configmodule(int argc, char **argv, uint32_t initflags) {
   char *cfgparam=NULL;
   char *modeparams=NULL;
   char *cfgmode=NULL;
@@ -196,8 +193,7 @@ configmodule_interface_t *load_configmodule(int argc,
 
   /* first parse the command line to look for the -O option */
   for (i = 0; i<argc; i++) {
-    if (strlen(argv[i]) < 2)
-    	continue;
+    if (strlen(argv[i]) < 2) continue;
 
     if ( argv[i][1] == 'O' && i < (argc -1)) {
       cfgparam = argv[i+1];
@@ -227,7 +223,7 @@ configmodule_interface_t *load_configmodule(int argc,
   if (cfgparam == NULL) {
     tmpflags = tmpflags | CONFIG_NOOOPT;
 
-    if ( initflags & CONFIG_ENABLECMDLINEONLY) {
+    if ( initflags &  CONFIG_ENABLECMDLINEONLY) {
       cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ;
     } else {
       cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ;

common/config/config_paramdesc.h

@@ -34,6 +34,9 @@
 #define INCLUDE_CONFIG_PARAMDESC_H
 
 
+
+
+
 #define MAX_OPTNAME_SIZE 64
 #define CONFIG_MAXOPTLENGTH 512 /* max full option length, full option name exemple: (prefix1.[<index>].prefix2.optname */
 
@@ -101,8 +104,8 @@ typedef struct paramdef {
   char         *helpstr;                  /* help string */
   unsigned int paramflags;                /* value is a "ored" combination of above PARAMFLAG_XXXX values */
   union {                                 /* pointer to the parameter value, completed by the config module */
-    char      **strptr;
-    char      **strlistptr;
+    char **strptr;
+    char **strlistptr;
     uint8_t   *u8ptr;
     int8_t    *i8ptr;
     uint16_t  *u16ptr;

common/config/config_userapi.c

@@ -184,7 +184,7 @@ void config_printhelp(paramdef_t *params,int numparams, char *prefix) {
   printf("--------------------------------------------------------------------\n\n");
 }
 
-int config_execcheck(paramdef_t *params, int numparams, char *prefix) {
+int config_execcheck(paramdef_t *params,int numparams, char *prefix) {
   int st=0;
 
   for (int i=0 ; i<numparams ; i++) {
@@ -204,7 +204,7 @@ int config_execcheck(paramdef_t *params, int numparams, char *prefix) {
   return st;
 }
 
-int config_get(paramdef_t *params, int numparams, char *prefix) {
+int config_get(paramdef_t *params,int numparams, char *prefix) {
   int ret= -1;
 
   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
@@ -215,11 +215,11 @@ int config_get(paramdef_t *params, int numparams, char *prefix) {
   configmodule_interface_t *cfgif = config_get_if();
 
   if (cfgif != NULL) {
-    ret = config_get_if()->get(params, numparams, prefix);
+    ret = config_get_if()->get(params, numparams,prefix);
 
     if (ret >= 0) {
-      config_process_cmdline(params, numparams, prefix);
-      config_execcheck(params, numparams, prefix);
+      config_process_cmdline(params,numparams,prefix);
+      config_execcheck(params,numparams,prefix);
     }
 
     return ret;
@@ -450,7 +450,7 @@ int config_setdefault_double(paramdef_t *cfgoptions, char *prefix) {
   config_check_valptr(cfgoptions, (char **)&(cfgoptions->dblptr),sizeof(double));
 
   if( ((cfgoptions->paramflags & PARAMFLAG_MANDATORY) == 0)) {
-    *(cfgoptions->dblptr)=cfgoptions->defdblval;
+    *(cfgoptions->u64ptr)=cfgoptions->defdblval;
     status=1;
     printf_params("[CONFIG] %s set to default value %lf\n",cfgoptions->optname , *(cfgoptions->dblptr));
   }

common/ran_context.h

@@ -19,13 +19,13 @@
  *      contact@openairinterface.org
  */
 
-/*! \file common/ran_context.h
+/*! \file PHY/impl_defs_lte.h
 * \brief LTE Physical channel configuration and variable structure definitions
 * \author R. Knopp, F. Kaltenberger
 * \date 2011
 * \version 0.1
 * \company Eurecom
-* \email: knopp@eurecom.fr, florian.kaltenberger@eurecom.fr
+* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
 * \note
 * \warning
 */
@@ -38,8 +38,10 @@
 #include "PHY/defs_eNB.h"
 #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"
 
 #include "gtpv1u.h"
@@ -49,9 +51,9 @@
 #include "gtpv1u_eNB_defs.h"
 
 #include "PHY/defs_L1_NB_IoT.h"
+
 #include "RRC/LTE/defs_NB_IoT.h"
-#include "RRC/LTE/rrc_defs.h"
-#include "RRC/NR/nr_rrc_defs.h"
+
 
 
 typedef struct {
@@ -59,56 +61,40 @@ typedef struct {
   char *config_file_name;
   /// Number of RRC instances in this node
   int nb_inst;
-  /// Number of NB_IoT RRC instances in this node
-  int nb_nb_iot_rrc_inst;
-  /// Number of NR RRC instances in this node
-  int nb_nr_inst;
   /// Number of Component Carriers per instance in this node
   int *nb_CC;
-  /// Number of NR Component Carriers per instance in this node
-  int *nb_nr_CC;
+  /// Number of NB_IoT instances in this node
+  int nb_nb_iot_rrc_inst;
   /// Number of MACRLC instances in this node
   int nb_macrlc_inst;
   /// Number of NB_IoT MACRLC instances in this node
   int nb_nb_iot_macrlc_inst;
-  /// Number of NR MACRLC instances in this node
-  int nb_nr_macrlc_inst;
   /// Number of component carriers per instance in this node
   int *nb_mac_CC;
-  /// Number of component carriers per instance in this node
-  int *nb_nr_mac_CC;
   /// Number of L1 instances in this node
   int nb_L1_inst;
   /// Number of NB_IoT L1 instances in this node
   int nb_nb_iot_L1_inst;
-  /// Number of NR L1 instances in this node
-  int nb_nr_L1_inst;  
   /// Number of Component Carriers per instance in this node
   int *nb_L1_CC;
-  /// Number of NR Component Carriers per instance in this node
-  int *nb_nr_L1_CC;
   /// Number of RU instances in this node
   int nb_RU;
+  /// Flag to start collecting channel estimates sent from the RRUs
+  int collect;
   /// FlexRAN context variables
   flexran_agent_info_t **flexran;
   /// eNB context variables
   struct PHY_VARS_eNB_s ***eNB;
-  /// gNB context variables
-  struct PHY_VARS_gNB_s ***gNB;
   /// NB_IoT L1 context variables
   struct PHY_VARS_eNB_NB_IoT_s **L1_NB_IoT;
   /// RRC context variables
   struct eNB_RRC_INST_s **rrc;
   /// NB_IoT RRC context variables
   //struct eNB_RRC_INST_NB_IoT_s **nb_iot_rrc;
-  /// NR RRC context variables
-  struct gNB_RRC_INST_s **nrrrc;
   /// MAC context variables
   struct eNB_MAC_INST_s **mac;
   /// NB_IoT MAC context variables
   struct eNB_MAC_INST_NB_IoT_s **nb_iot_mac;
-  /// NR MAC context variables
-  struct gNB_MAC_INST_s **nrmac;
   /// GTPu descriptor 
   gtpv1u_data_t *gtpv1u_data_g;
   /// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces

common/utils/LOG/log.c

@@ -43,22 +43,10 @@
 #include <string.h>
 #include <linux/prctl.h>
 #include "common/config/config_userapi.h"
-
 // main log variables
 
-log_mem_cnt_t log_mem_d[2];
-int log_mem_flag=0;
-int log_mem_multi=1;
-volatile int log_mem_side=0;
-pthread_mutex_t log_mem_lock;
-pthread_cond_t log_mem_notify;
-pthread_t log_mem_thread;
-int log_mem_file_cnt=0;
-volatile int log_mem_write_flag=0;
-volatile int log_mem_write_side=0;
-char __log_mem_filename[1024]={0};
-char * log_mem_filename = &__log_mem_filename[0];
-char logmem_filename[1024] = {0};
+
+
 
 mapping log_level_names[] = {
   {"error",  OAILOG_ERR},
@@ -83,13 +71,7 @@ char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, "", LOG_BLUE, LOG_CYBL
 char *log_level_highlight_end[]   = {LOG_RESET,LOG_RESET,LOG_RESET, LOG_RESET,LOG_RESET};   /*!< \brief Optional end-format strings for highlighting */
 
 
-int write_file_matlab(const char *fname,
-		              const char *vname,
-					  void *data,
-					  int length,
-					  int dec,
-					  char format)
-{
+int write_file_matlab(const char *fname,const char *vname,void *data,int length,int dec,char format) {
   FILE *fp=NULL;
   int i;
 
@@ -229,8 +211,7 @@ int write_file_matlab(const char *fname,
 }
 
 /* get log parameters from configuration file */
-void  log_getconfig(log_t *g_log)
-{
+void  log_getconfig(log_t *g_log) {
   char *gloglevel = NULL;
   int consolelog ;
   paramdef_t logparams_defaults[] = LOG_GLOBALPARAMS_DESC;
@@ -339,10 +320,7 @@ void  log_getconfig(log_t *g_log)
   set_glog_onlinelog(consolelog);
 }
 
-int register_log_component(char *name,
-		                   char *fext,
-						   int compidx)
-{
+int register_log_component(char *name, char *fext, int compidx) {
   int computed_compidx=compidx;
 
   if (strlen(fext) > 3) {
@@ -365,14 +343,13 @@ int register_log_component(char *name,
     g_log->log_component[computed_compidx].filelog_name = malloc(strlen(name)+16);/* /tmp/<name>.%s  */
     sprintf(g_log->log_component[computed_compidx].filelog_name,"/tmp/%s.%s",name,fext);
   } else {
-    fprintf(stderr,"{LOG} %s %d Couldn't register component %s\n",__FILE__,__LINE__,name);
+    fprintf(stderr,"{LOG} %s %d Couldn't register componemt %s\n",__FILE__,__LINE__,name);
   }
 
   return computed_compidx;
 }
 
-int isLogInitDone (void)
-{
+int isLogInitDone (void) {
   if (g_log == NULL)
     return 0;
 
@@ -382,8 +359,7 @@ int isLogInitDone (void)
   return 1;
 }
 
-int logInit (void)
-{
+int logInit (void) {
   int i;
   g_log = calloc(1, sizeof(log_t));
 
@@ -422,18 +398,20 @@ int logInit (void)
   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);
   register_log_component("LOADER","log",LOADER);
   register_log_component("ASN","log",ASN);
-  register_log_component("NFAPI_VNF","log",NFAPI_VNF);
   register_log_component("NFAPI_PNF","log",NFAPI_PNF);
+  register_log_component("NFAPI_VNF","log",NFAPI_VNF);
 
   for (int i=0 ; log_level_names[i].name != NULL ; i++)
     g_log->level2string[i]           = toupper(log_level_names[i].name[0]); // uppercased first letter of level name
@@ -452,9 +430,7 @@ int logInit (void)
 }
 
 
-char *log_getthreadname(char *threadname,
-		                int bufsize)
-{
+char *log_getthreadname(char *threadname, int bufsize) {
   int rt =   pthread_getname_np(pthread_self(), threadname,bufsize) ;
 
   if (rt == 0) {
@@ -464,12 +440,7 @@ char *log_getthreadname(char *threadname,
   }
 }
 
-static int log_header(char *log_buffer,
-		              int buffsize,
-					  int comp,
-					  int level,
-					  const char *format)
-{
+static int log_header(char *log_buffer, int buffsize, int comp, int level,const char *format) {
   char threadname[PR_SET_NAME];
   return  snprintf(log_buffer, buffsize, "%s%s[%s]%c %s %s%s",
                    log_level_highlight_end[level],
@@ -481,51 +452,22 @@ static int log_header(char *log_buffer,
                    log_level_highlight_end[level]);
 }
 
-void logRecord_mt(const char *file,
-		          const char *func,
-				  int line,
-				  int comp,
-				  int level,
-				  const char *format,
-				  ... )
-{
-  char log_buffer[MAX_LOG_TOTAL]= {0};
+void logRecord_mt(const char *file, const char *func, int line, int comp, int level, const char *format, ... ) {
+  char log_buffer[MAX_LOG_TOTAL];
   va_list args;
-  va_start(args,format);
-  if (log_mem_flag == 1) {
-    log_output_memory(file,func,line,comp,level,format,args);
-  } else {
-  log_header(log_buffer,MAX_LOG_TOTAL,comp,level,format);
-  g_log->log_component[comp].vprint(g_log->log_component[comp].stream,log_buffer,args);
-  fflush(g_log->log_component[comp].stream);
-  }
+  va_start(args, format);
+  log_header(log_buffer,MAX_LOG_TOTAL,comp, level,format);
+  g_log->log_component[comp].vprint(g_log->log_component[comp].stream,log_buffer, args);
   va_end(args);
 }
 
-void vlogRecord_mt(const char *file,
-		           const char *func,
-				   int line,
-				   int comp,
-				   int level,
-				   const char *format,
-				   va_list args )
-{
+void vlogRecord_mt(const char *file, const char *func, int line, int comp, int level, const char *format, va_list args ) {
   char log_buffer[MAX_LOG_TOTAL];
-  if (log_mem_flag == 1) {
-    log_output_memory(file,func,line,comp,level, format,args);
-  } else {
   log_header(log_buffer,MAX_LOG_TOTAL,comp, level,format);
   g_log->log_component[comp].vprint(g_log->log_component[comp].stream,log_buffer, args);
-  }
 }
 
-void log_dump(int component,
-		      void *buffer,
-			  int buffsize,
-			  int datatype,
-			  const char *format,
-			  ... )
-{
+void log_dump(int component, void *buffer, int buffsize,int datatype, const char *format, ... ) {
   va_list args;
   char *wbuf;
 
@@ -566,9 +508,7 @@ void log_dump(int component,
   }
 }
 
-int set_log(int component,
-		    int level)
-{
+int set_log(int component, int level) {
   /* Checking parameters */
   DevCheck((component >= MIN_LOG_COMPONENTS) && (component < MAX_LOG_COMPONENTS),
            component, MIN_LOG_COMPONENTS, MAX_LOG_COMPONENTS);
@@ -584,15 +524,13 @@ int set_log(int component,
 
 
 
-void set_glog(int level)
-{
+void set_glog(int level) {
   for (int c=0; c< MAX_LOG_COMPONENTS; c++ ) {
     set_log(c, level);
   }
 }
 
-void set_glog_onlinelog(int enable)
-{
+void set_glog_onlinelog(int enable) {
   for (int c=0; c< MAX_LOG_COMPONENTS; c++ ) {
     if ( enable ) {
       g_log->log_component[c].level = g_log->log_component[c].savedlevel;
@@ -604,8 +542,7 @@ void set_glog_onlinelog(int enable)
     }
   }
 }
-void set_glog_filelog(int enable)
-{
+void set_glog_filelog(int enable) {
   static FILE *fptr;
 
   if ( enable ) {
@@ -629,8 +566,7 @@ void set_glog_filelog(int enable)
   }
 }
 
-void set_component_filelog(int comp)
-{
+void set_component_filelog(int comp) {
   if (g_log->log_component[comp].stream == NULL || g_log->log_component[comp].stream == stdout) {
     g_log->log_component[comp].stream = fopen(g_log->log_component[comp].filelog_name,"w");
   }
@@ -639,8 +575,7 @@ void set_component_filelog(int comp)
   g_log->log_component[comp].print = fprintf;
   g_log->log_component[comp].filelog =  1;
 }
-void close_component_filelog(int comp)
-{
+void close_component_filelog(int comp) {
   g_log->log_component[comp].filelog =  0;
 
   if (g_log->log_component[comp].stream != NULL && g_log->log_component[comp].stream != stdout ) {
@@ -657,9 +592,7 @@ void close_component_filelog(int comp)
  * with string value NULL
  */
 /* map a string to an int. Takes a mapping array and a string as arg */
-int map_str_to_int(mapping *map,
-		           const char *str)
-{
+int map_str_to_int(mapping *map, const char *str) {
   while (1) {
     if (map->name == NULL) {
       return(-1);
@@ -674,9 +607,7 @@ int map_str_to_int(mapping *map,
 }
 
 /* map an int to a string. Takes a mapping array and a value */
-char *map_int_to_str(mapping *map,
-		             int val)
-{
+char *map_int_to_str(mapping *map, int val) {
   while (1) {
     if (map->name == NULL) {
       return NULL;
@@ -690,9 +621,7 @@ char *map_int_to_str(mapping *map,
   }
 }
 
-int is_newline(char *str,
-		       int size)
-{
+int is_newline( char *str, int size) {
   int i;
 
   for (  i = 0; i < size; i++ ) {
@@ -705,8 +634,7 @@ int is_newline(char *str,
   return 0;
 }
 
-void logClean (void)
-{
+void logClean (void) {
   int i;
 
   if(isLogInitDone()) {
@@ -718,265 +646,6 @@ void logClean (void)
   }
 }
 
-extern volatile int oai_exit;//extern int oai_exit;
-void flush_mem_to_file(void)
-{
-  int fp;
-  char f_name[1024];
-  struct timespec slp_tm;
-  slp_tm.tv_sec = 0;
-  slp_tm.tv_nsec = 10000;
-  
-  pthread_setname_np( pthread_self(), "flush_mem_to_file");
-
-  while (!oai_exit) {
-    pthread_mutex_lock(&log_mem_lock);
-    log_mem_write_flag=0;
-    pthread_cond_wait(&log_mem_notify, &log_mem_lock);
-    log_mem_write_flag=1;
-    pthread_mutex_unlock(&log_mem_lock);
-    // write!
-    if(log_mem_d[log_mem_write_side].enable_flag==0){
-      if(log_mem_file_cnt>5){
-        log_mem_file_cnt=5;
-        printf("log over write!!!\n");
-      }
-      snprintf(f_name,1024, "%s_%d.log",log_mem_filename,log_mem_file_cnt);
-      fp=open(f_name, O_WRONLY | O_CREAT, 0666);
-      int ret = write(fp, log_mem_d[log_mem_write_side].buf_p, log_mem_d[log_mem_write_side].buf_index);
-      if ( ret < 0) {
-          fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,f_name);
-          exit(EXIT_FAILURE);
-      }
-      close(fp);
-      log_mem_file_cnt++;
-      log_mem_d[log_mem_write_side].buf_index=0;
-      log_mem_d[log_mem_write_side].enable_flag=1;
-    }else{
-      printf("If you'd like to write log, you should set enable flag to 0!!!\n");
-      nanosleep(&slp_tm,NULL);
-    }
-  }
-}
-
-char logmem_log_level[NUM_LOG_LEVEL]={'E','W','I','D','T'};
-
-void log_output_memory(const char *file, const char *func, int line, int comp, int level, const char* format,va_list args)
-{
-  //logRecord_mt(file,func,line, pthread_self(), comp, level, format, ##args)
-  int len = 0;
-  log_component_t *c;
-  char *log_start;
-  char *log_end;
-  /* The main difference with the version above is the use of this local log_buffer.
-   * The other difference is the return value of snprintf which was not used
-   * correctly. It was not a big problem because in practice MAX_LOG_TOTAL is
-   * big enough so that the buffer is never full.
-   */
-  char log_buffer[MAX_LOG_TOTAL];
-
-  /* for no gcc warnings */
-  (void)log_start;
-  (void)log_end;
-
-
-  c = &g_log->log_component[comp];
-
-  //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_LOG_RECORD, VCD_FUNCTION_IN);
-
-  // make sure that for log trace the extra info is only printed once, reset when the level changes
-  if (level == OAILOG_TRACE) {
-    log_start = log_buffer;
-    len = vsnprintf(log_buffer, MAX_LOG_TOTAL, format, args);
-    if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    log_end = log_buffer + len;
-  } else {
-    if ( (g_log->flag & 0x001) || (c->flag & 0x001) ) {
-      len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "%s",
-                      log_level_highlight_start[level]);
-      if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    }
-
-    log_start = log_buffer + len;
-
-//    if ( (g_log->flag & 0x004) || (c->flag & 0x004) ) {
-      len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]",
-                      g_log->log_component[comp].name);
-      if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-//    }
-
-    if ( (level >= OAILOG_ERR) && (level <= OAILOG_TRACE) ) {
-      len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%c]",
-                      logmem_log_level[level]);
-      if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    }
-
-    if ( (g_log->flag & FLAG_THREAD) || (c->flag & FLAG_THREAD) ) {
-#     define THREAD_NAME_LEN 128
-      char threadname[THREAD_NAME_LEN];
-      if (pthread_getname_np(pthread_self(), threadname, THREAD_NAME_LEN) != 0)
-      {
-        perror("pthread_getname_np : ");
-      } else {
-        len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]", threadname);
-        if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-      }
-#     undef THREAD_NAME_LEN
-    }
-
-    if ( (g_log->flag & FLAG_FUNCT) || (c->flag & FLAG_FUNCT) ) {
-      len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s] ",
-                      func);
-      if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    }
-
-    if ( (g_log->flag & FLAG_FILE_LINE) || (c->flag & FLAG_FILE_LINE) ) {
-      len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s:%d]",
-                      file, line);
-      if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    }
-
-/*    len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%08lx]", thread_id);
-    if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-
-    struct timeval gettime;
-    gettimeofday(&gettime,NULL);
-    len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%ld.%06ld]", gettime.tv_sec, gettime.tv_usec);
-    if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-*/
-    if ( (g_log->flag & FLAG_NOCOLOR) || (c->flag & FLAG_NOCOLOR) ) {
-      len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "%s",
-          log_level_highlight_end[level]);
-      if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    }
-
-    len += vsnprintf(&log_buffer[len], MAX_LOG_TOTAL - len, format, args);
-    if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
-    log_end = log_buffer + len;
-  }
-
-  //va_end(args);
-
-  // OAI printf compatibility
-    if(log_mem_flag==1){
-      if(log_mem_d[log_mem_side].enable_flag==1){
-        int temp_index;
-        temp_index=log_mem_d[log_mem_side].buf_index;
-        if(temp_index+len+1 < LOG_MEM_SIZE){
-          log_mem_d[log_mem_side].buf_index+=len;
-          memcpy(&log_mem_d[log_mem_side].buf_p[temp_index],log_buffer,len);
-        }else{
-          log_mem_d[log_mem_side].enable_flag=0;
-          if(log_mem_d[1-log_mem_side].enable_flag==1){
-            temp_index=log_mem_d[1-log_mem_side].buf_index;
-            if(temp_index+len+1 < LOG_MEM_SIZE){
-              log_mem_d[1-log_mem_side].buf_index+=len;
-              log_mem_side=1-log_mem_side;
-              memcpy(&log_mem_d[log_mem_side].buf_p[temp_index],log_buffer,len);
-              /* write down !*/
-              if (pthread_mutex_lock(&log_mem_lock) != 0) {
-                return;
-              }
-              if(log_mem_write_flag==0){
-                log_mem_write_side=1-log_mem_side;
-                if(pthread_cond_signal(&log_mem_notify) != 0) {
-                }
-              }
-              if(pthread_mutex_unlock(&log_mem_lock) != 0) {
-                return;
-              }
-            }else{
-              log_mem_d[1-log_mem_side].enable_flag=0;
-            }
-          }
-        }
-      }
-    }else{
-      fwrite(log_buffer, len, 1, stdout);
-    }
-}
-
-int logInit_log_mem (void)
-{
-  if(log_mem_flag==1){
-    if(log_mem_multi==1){
-      printf("log-mem multi!!!\n");
-      log_mem_d[0].buf_p = malloc(LOG_MEM_SIZE);
-      log_mem_d[0].buf_index=0;
-      log_mem_d[0].enable_flag=1;
-      log_mem_d[1].buf_p = malloc(LOG_MEM_SIZE);
-      log_mem_d[1].buf_index=0;
-      log_mem_d[1].enable_flag=1;
-      log_mem_side=0;
-      if ((pthread_mutex_init (&log_mem_lock, NULL) != 0)
-          || (pthread_cond_init (&log_mem_notify, NULL) != 0)) {
-        log_mem_d[1].enable_flag=0;
-        return -1;
-      }
-      pthread_create(&log_mem_thread, NULL, (void *(*)(void *))flush_mem_to_file, (void*)NULL);
-    }else{
-      printf("log-mem single!!!\n");
-      log_mem_d[0].buf_p = malloc(LOG_MEM_SIZE);
-      log_mem_d[0].buf_index=0;
-      log_mem_d[0].enable_flag=1;
-      log_mem_d[1].enable_flag=0;
-      log_mem_side=0;
-    }
-  }else{
-    log_mem_d[0].buf_p=NULL;
-    log_mem_d[1].buf_p=NULL;
-    log_mem_d[0].enable_flag=0;
-    log_mem_d[1].enable_flag=0;
-  }
-
-  printf("log init done\n");
-  
-  return 0;
-}
-
-void close_log_mem(void){
-  int fp;
-  char f_name[1024];
-
-  if(log_mem_flag==1){
-    log_mem_d[0].enable_flag=0;
-    log_mem_d[1].enable_flag=0;
-    usleep(10); // wait for log writing
-    while(log_mem_write_flag==1){
-      usleep(100);
-    }
-    if(log_mem_multi==1){
-      snprintf(f_name,1024, "%s_%d.log",log_mem_filename,log_mem_file_cnt);
-      fp=open(f_name, O_WRONLY | O_CREAT, 0666);
-      int ret = write(fp, log_mem_d[0].buf_p, log_mem_d[0].buf_index);
-      if ( ret < 0) {
-          fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,f_name);
-          exit(EXIT_FAILURE);
-      }
-      close(fp);
-      free(log_mem_d[0].buf_p);
-      
-      snprintf(f_name,1024, "%s_%d.log",log_mem_filename,log_mem_file_cnt);
-      fp=open(f_name, O_WRONLY | O_CREAT, 0666);
-      ret = write(fp, log_mem_d[1].buf_p, log_mem_d[1].buf_index);
-      if ( ret < 0) {
-          fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,f_name);
-          exit(EXIT_FAILURE);
-      }
-      close(fp);
-      free(log_mem_d[1].buf_p);
-    }else{
-      fp=open(log_mem_filename, O_WRONLY | O_CREAT, 0666);
-      int ret = write(fp, log_mem_d[0].buf_p, log_mem_d[0].buf_index);
-      if ( ret < 0) {
-          fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,log_mem_filename);
-          exit(EXIT_FAILURE);
-       }
-      close(fp);
-      free(log_mem_d[0].buf_p);
-    }
-  }
- }
 
 #ifdef LOG_TEST
 

common/utils/LOG/log.h

@@ -53,7 +53,6 @@
 #endif
 #include <pthread.h>
 #include "T.h"
-#include <common/utils/utils.h>
 /*----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
@@ -83,11 +82,11 @@ extern "C" {
  *  @brief LOG defines 9 levels of messages for users. Importance of these levels decrease gradually from 0 to 8
  * @{*/
 # define  OAILOG_DISABLE -1 /*!< \brief disable all LOG messages, cannot be used in LOG macros, use only in LOG module */
-# define  OAILOG_ERR      0 /*!< \brief critical error conditions, impact on "must have" functionalities */
+# define  OAILOG_ERR      0 /*!< \brief critical error conditions, impact on "must have" fuctinalities */
 # define  OAILOG_WARNING  1 /*!< \brief warning conditions, shouldn't happen but doesn't impact "must have" functionalities */
 # define  OAILOG_INFO     2 /*!< \brief informational messages most people don't need, shouldn't impact real-time behavior */
-# define  OAILOG_DEBUG    3 /*!< \brief first level debug-level messages, for developers, may impact real-time behavior */
-# define  OAILOG_TRACE    4 /*!< \brief second level debug-level messages, for developers, likely impact real-time behavior*/
+# define  OAILOG_DEBUG    3 /*!< \brief first level debug-level messages, for developers , may impact real-time behavior */
+# define  OAILOG_TRACE    4 /*!< \brief  second level debug-level messages, for developers ,likely impact real-time behavior*/
 
 #define NUM_LOG_LEVEL 5 /*!< \brief the number of message levels users have with LOG (OAILOG_DISABLE is not available to user as a level, so it is not included)*/
 /* @}*/
@@ -119,8 +118,6 @@ extern "C" {
 #define FLAG_NOCOLOR     0x0001  /*!< \brief use colors in log messages, depending on level */
 #define FLAG_THREAD      0x0008  /*!< \brief display thread name in log messages */
 #define FLAG_LEVEL       0x0010  /*!< \brief display log level in log messages */
-#define FLAG_FUNCT       0x0020
-#define FLAG_FILE_LINE   0x0040
 #define FLAG_TIME        0x0100
 #define FLAG_INITIALIZED 0x8000
 
@@ -185,7 +182,6 @@ typedef enum {
   MIN_LOG_COMPONENTS = 0,
   PHY = MIN_LOG_COMPONENTS,
   MAC,
-  EMU,
   SIM,
   OCG,
   OMG,
@@ -202,7 +198,6 @@ typedef enum {
   NAS,
   PERF,
   OIP,
-  CLI,
   MSC,
   OCM,
   UDP_,
@@ -223,10 +218,6 @@ typedef enum {
   PROTO_AGENT,
   F1U,
   X2AP,
-  GNB_APP,
-  NR_RRC,
-  NR_MAC,
-  NR_PHY,
   LOADER,
   ASN,
   NFAPI_VNF,
@@ -316,19 +307,6 @@ int  is_newline( char *str, int size);
 
 int register_log_component(char *name, char *fext, int compidx);
 
-#define LOG_MEM_SIZE 100*1024*1024
-#define LOG_MEM_FILE "./logmem.log"
-void flush_mem_to_file(void);
-void log_output_memory(const char *file, const char *func, int line, int comp, int level, const char* format,va_list args);
-int logInit_log_mem(void);
-void close_log_mem(void);
-  
-typedef struct {
-  char* buf_p;
-  int buf_index;
-  int enable_flag;
-} log_mem_cnt_t;
-
 /* @}*/
 
 /*!\fn int32_t write_file_matlab(const char *fname, const char *vname, void *data, int length, int dec, char format);
@@ -404,17 +382,17 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 /* define variable only used in LOG macro's */
 #    define LOG_VAR(A,B) A B
 #  else /* T_TRACER: remove all debugging and tracing messages, except errors */
-#    define LOG_I(c, x...) do {logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_INFO, x) ; } while(0)/* */
-#    define LOG_W(c, x...) do {logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_WARNING, x) ; } while(0)/* */
-#    define LOG_E(c, x...) do {logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_ERR, x) ; } while(0)/* */
-#    define LOG_D(c, x...) do {logRecord_mt(__FILE__, __FUNCTION__, __LINE__,c, OAILOG_DEBUG, x) ; } while(0)/* */
+#    define LOG_I(c, x...) /* */
+#    define LOG_W(c, x...) /* */
+#    define LOG_E(c, x...) /* */
+#    define LOG_D(c, x...) /* */
 #    define LOG_T(c, x...) /* */
 
 #    define LOG_DUMPMSG(c, b, s, x...) /* */
 #    define nfapi_log(FILE, FNC, LN, COMP, LVL, FMT...)
 #    define LOG_DEBUGFLAG(D)  ( 0 )
 #    define LOG_DUMPFLAG(D) ( 0 )
-#    define LOG_M(file, vector, data, len, dec, format) do { write_file_matlab(file, vector, data, len, dec, format);} while(0)
+#    define LOG_M(file, vector, data, len, dec, format)
 #    define LOG_VAR(A,B)
 #  endif /* T_TRACER */
 /* avoid warnings for variables only used in LOG macro's but set outside debug section */
@@ -451,10 +429,7 @@ static __inline__ uint64_t rdtsc(void) {
 
 extern double cpuf;
 
-static inline uint64_t checkTCPU(int timeout,
-		                         char *file,
-								 int line)
-{
+static inline uint64_t checkTCPU(int timeout, char *file, int line) {
   static uint64_t __thread lastCPUTime=0;
   static uint64_t __thread last=0;
   uint64_t cur=rdtsc();
@@ -476,10 +451,7 @@ static inline uint64_t checkTCPU(int timeout,
   return cur;
 }
 
-static inline unsigned long long checkT(int timeout,
-		                                char *file,
-										int line)
-{
+static inline unsigned long long checkT(int timeout, char *file, int line) {
   static unsigned long long __thread last=0;
   unsigned long long cur=rdtsc();
   int microCycles=(int)(cpuf*1000);
@@ -499,10 +471,7 @@ typedef struct m {
   uint64_t maxArray[11];
 } Meas;
 
-static inline void printMeas(char *txt,
-		                     Meas *M,
-							 int period)
-{
+static inline void printMeas(char *txt, Meas *M, int period) {
   if (M->iterations%period == 0 ) {
     char txt2[512];
     sprintf(txt2,"%s avg=%" PRIu64 " iterations=%" PRIu64 " max=%"
@@ -520,19 +489,13 @@ static inline void printMeas(char *txt,
   }
 }
 
-static inline int cmpint(const void *a,
-		                 const void *b)
-{
+static inline int cmpint(const void *a, const void *b) {
   uint64_t *aa=(uint64_t *)a;
   uint64_t *bb=(uint64_t *)b;
   return (int)(*aa-*bb);
 }
 
-static inline void updateTimes(uint64_t start,
-		                       Meas *M,
-							   int period,
-							   char *txt)
-{
+static inline void updateTimes(uint64_t start, Meas *M, int period, char *txt) {
   if (start!=0) {
     uint64_t end=rdtsc();
     long long diff=(end-start)/(cpuf*1000);
@@ -569,3 +532,5 @@ static inline void updateTimes(uint64_t start,
 #endif
 
 #endif
+
+

common/utils/LOG/log_extern.h

@@ -27,6 +27,4 @@ extern log_t *g_log;
 extern mapping log_level_names[];
 extern mapping log_options[];
 extern mapping log_maskmap[];
-extern int log_mem_flag;
-extern char * log_mem_filename;
-extern char logmem_filename[1024];
+

common/utils/LOG/vcd_signal_dumper.c

@@ -76,10 +76,10 @@ const char* eurecomVariablesNames[] = {
   "frame_number_TX1_RU",
   "frame_number_RX0_RU",
   "frame_number_RX1_RU",
-  "tti_number_TX0_RU",
-  "tti_number_TX1_RU",
-  "tti_number_RX0_RU",
-  "tti_number_RX1_RU",
+  "subframe_number_TX0_RU",
+  "subframe_number_TX1_RU",
+  "subframe_number_RX0_RU",
+  "subframe_number_RX1_RU",
   "subframe_number_if4p5_north_out",
   "frame_number_if4p5_north_out",
   "subframe_number_if4p5_north_asynch_in",
@@ -238,16 +238,7 @@ const char* eurecomVariablesNames[] = {
   "ue0_drx_long_cycle",
   "ue0_drx_retransmission_harq0",
   "ue0_drx_active_time",
-  "ue0_drx_active_time_condition",
-  /*signal for NR*/
-  "frame_number_TX0_gNB",
-  "frame_number_TX1_gNB",
-  "frame_number_RX0_gNB",
-  "frame_number_RX1_gNB",
-  "slot_number_TX0_gNB",
-  "slot_number_TX1_gNB",
-  "slot_number_RX0_gNB",
-  "slot_number_RX1_gNB"
+  "ue0_drx_active_time_condition"
 };
 
 const char* eurecomFunctionsNames[] = {
@@ -285,7 +276,7 @@ const char* eurecomFunctionsNames[] = {
   "do_DL_sig",
   "do_UL_sig",
   "UE_trx_read",
-  /* RRH signals  */
+ /* RRH signals  */ 
   "eNB_tx",
   "eNB_rx",
   "eNB_trx",
@@ -295,11 +286,10 @@ const char* eurecomFunctionsNames[] = {
   "eNB_proc_sleep",
   "trx_read_rf",
   "trx_write_rf",
+
   /* PHY signals  */
   "ue_synch",
   "ue_slot_fep",
-  "ue_slot_fep_mbsfn",
-  "ue_slot_fep_mbsfn_khz_1dot25",
   "ue_rrc_measurements",
   "ue_gain_control",
   "ue_adjust_synch",
@@ -343,7 +333,6 @@ const char* eurecomFunctionsNames[] = {
   "phy_procedures_ue_tx",
   "phy_procedures_ue_rx",
   "phy_procedures_ue_tx_ulsch_uespec",
-  "phy_procedures_nr_ue_tx_ulsch_uespec",
   "phy_procedures_ue_tx_pucch",
   "phy_procedures_ue_tx_ulsch_common",
   "phy_procedures_ue_tx_prach",
@@ -367,17 +356,9 @@ const char* eurecomFunctionsNames[] = {
   "dlsch_decoding5",
   "dlsch_decoding6",
   "dlsch_decoding7",
-  "dlsch_segmentation",
-  "dlsch_deinterleaving",
-  "dlsch_rate_matching",
-  "dlsch_ldpc",
-  "dlsch_compine_seg",
-  "dlsch_pmch_decoding",
   "rx_pdcch",
   "dci_decoding",
   "rx_phich",
-  "rx_pmch",
-  "rx_pmch_khz_1dot25",
   "pdsch_procedures",
   "pdsch_procedures_si",
   "pdsch_procedures_p",
@@ -400,7 +381,6 @@ const char* eurecomFunctionsNames[] = {
   "phy_enb_prach_rx",
   "phy_ru_prach_rx",
   "phy_enb_pdcch_tx",
-  "phy_enb_common_tx",
   "phy_enb_rs_tx",
   "phy_ue_generate_prach",
   "phy_ue_ulsch_modulation",
@@ -415,6 +395,7 @@ const char* eurecomFunctionsNames[] = {
   "phy_eNB_dlsch_scrambling",
   "phy_eNB_beam_precoding",
   "phy_eNB_ofdm_mod_l",
+
   /* MAC  signals  */
   "macxface_macphy_init",
   "macxface_macphy_exit",
@@ -431,6 +412,7 @@ const char* eurecomFunctionsNames[] = {
   "mac_dlsch_preprocessor",
   "mac_schedule_dlsch",
   "mac_fill_dlsch_dci",
+
   "macxface_out_of_sync_ind",
   "macxface_ue_decode_si",
   "macxface_ue_decode_pcch",
@@ -442,7 +424,9 @@ const char* eurecomFunctionsNames[] = {
   "macxface_ue_process_rar",
   "macxface_ue_scheduler",
   "macxface_ue_get_sr",
+
   "ue_send_mch_sdu",
+
   /*RLC signals   */
   "rlc_data_req",
   // "rlc_data_ind", // this calls "pdcp_data_ind",
@@ -452,6 +436,7 @@ const char* eurecomFunctionsNames[] = {
   "rlc_um_try_reassembly",
   "rlc_um_check_timer_dar_time_out",
   "rlc_um_receive_process_dar",
+
   /* PDCP signals   */
   "pdcp_run",
   "pdcp_data_req",
@@ -481,6 +466,7 @@ const char* eurecomFunctionsNames[] = {
   "itti_dump_enqueue_message_malloc",
   "itti_relay_thread",
   "test",
+  
   /* IF4/IF5 signals */
   "send_if4_ru",
   "send_if4_ru1",
@@ -490,8 +476,10 @@ const char* eurecomFunctionsNames[] = {
   "recv_if4_ru2",
   "send_if5",
   "recv_if5",
+
   "compress_if",
   "decompress_if",
+
   "nfapi_subframe",
   "generate_pcfich",
   "generate_dci0",
@@ -501,9 +489,7 @@ const char* eurecomFunctionsNames[] = {
   "pdcch_modulation",
   "pdcch_interleaving",
   "pdcch_tx",
-  /*NR softmodem signal*/
-  "gNB_thread_rxtx0",
-  "gNB_thread_rxtx1"
+
 };
 
 struct vcd_module_s vcd_modules[] = {

common/utils/LOG/vcd_signal_dumper.h

@@ -53,10 +53,10 @@ typedef enum {
   VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_RU,
   VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_RU,
   VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX1_RU,
-  VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_TX0_RU,
-  VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_TX1_RU,
-  VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_RX0_RU,
-  VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_RX1_RU,
+  VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_RU,
+  VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX1_RU,
+  VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX0_RU,
+  VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX1_RU,
   VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_IF4P5_NORTH_OUT,
   VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_IF4P5_NORTH_OUT,
   VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_IF4P5_NORTH_ASYNCH_IN,
@@ -216,17 +216,6 @@ typedef enum {
   VCD_SIGNAL_DUMPER_VARIABLES_DRX_RETRANSMISSION_HARQ0,
   VCD_SIGNAL_DUMPER_VARIABLES_DRX_ACTIVE_TIME,
   VCD_SIGNAL_DUMPER_VARIABLES_DRX_ACTIVE_TIME_CONDITION,
-  /*signal for NR*/
-  VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX1_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_SLOT_NUMBER_TX0_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_SLOT_NUMBER_TX1_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_SLOT_NUMBER_RX0_GNB,
-  VCD_SIGNAL_DUMPER_VARIABLES_SLOT_NUMBER_RX1_GNB,
-
-
   VCD_SIGNAL_DUMPER_VARIABLES_END
 } vcd_signal_dump_variables;
 
@@ -279,8 +268,6 @@ typedef enum {
   /* PHY signals  */
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SYNCH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP_MBSFN,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP_MBSFN_KHZ_1DOT25,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_RRC_MEASUREMENTS,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ADJUST_SYNCH,
@@ -324,7 +311,6 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_NR_UE_TX_ULSCH_UESPEC,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH,
@@ -348,17 +334,9 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DECODING5,
   VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DECODING6,
   VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DECODING7,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_SEGMENTATION,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_DEINTERLEAVING,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_RATE_MATCHING,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_LDPC,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_COMBINE_SEG,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PMCH_DECODING,
   VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_DCI_DECODING,
   VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PHICH,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PMCH,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PMCH_KHZ_1DOT25,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_SI,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_P,
@@ -381,7 +359,6 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PDCCH_TX,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_COMMON_TX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GENERATE_PRACH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ULSCH_MODULATION,
@@ -493,10 +470,6 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_INTERLEAVING,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_TX,
 
-  /*NR softmodem signal*/
-  VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_PROC_RXTX0,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_PROC_RXTX1,
-
   VCD_SIGNAL_DUMPER_FUNCTIONS_END
 } vcd_signal_dump_functions;
 
@@ -555,20 +528,12 @@ extern int ouput_vcd;
 
 #include "T.h"
 
-#define VCD_SIGNAL_DUMPER_INIT(x)         /* nothing */
-#define VCD_SIGNAL_DUMPER_CLOSE()         /* nothing */
-#define VCD_SIGNAL_DUMPER_CREATE_HEADER() /* nothing */
 #define VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(var, val) T_VCD_VARIABLE(var, val)
 #define VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(var, val) T_VCD_FUNCTION(var, val)
+#else
 
-#else /* T_TRACER */
-
-#define VCD_SIGNAL_DUMPER_INIT(aRgUmEnT)                   vcd_signal_dumper_init(aRgUmEnT)
-#define VCD_SIGNAL_DUMPER_CLOSE()                          vcd_signal_dumper_close()
-#define VCD_SIGNAL_DUMPER_CREATE_HEADER()                  vcd_signal_dumper_create_header()
-#define VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(vAr1,vAr2) vcd_signal_dumper_dump_variable_by_name(vAr1,vAr2)
-#define VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(vAr1,vAr2) vcd_signal_dumper_dump_function_by_name(vAr1,vAr2)
-
+#define VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(var, val)
+#define VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(var, val)
  
 #endif /* T_TRACER */
 

common/utils/T/T_defs.h

@@ -1,35 +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.
- * 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/utils/T/T_defs.h
- * \brief
- * \author
- * \date
- * \version
- * \company EURECOM
- * \email
- * \note
- * \warning
-*/
-
 #ifndef _T_defs_H_
 #define _T_defs_H_
 
@@ -73,10 +41,10 @@ typedef struct {
 } T_cache_t;
 
 /* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS (237)//(232)
+#define VCD_NUM_FUNCTIONS (223)
 
 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES (185)
+#define VCD_NUM_VARIABLES (177) 
 
 /* first VCD function (to be kept up to date! see in T_messages.txt) */
 #define VCD_FIRST_FUNCTION    ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)

common/utils/T/T_messages.txt

@@ -45,6 +45,22 @@ ID = ENB_PHY_INPUT_SIGNAL
     DESC = eNodeB received signal in the time domain for a duration of 1ms
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
     FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
+ID = RAU_INPUT_SIGNAL
+    DESC = RAU received data from the RRUs
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
+    FORMAT = int,tag : int,frame : int,subframe : buffer,rxdataF
+ID = RAU_INPUT_DMRS
+    DESC = RAU received DMRS from the RRUs
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
+    FORMAT = int,tag : int,frame : int,subframe : buffer,rxdataF_ext
+ID = CALIBRATION_CHANNEL_ESTIMATES
+    DESC = RAU received DMRS estimates from the RRUs
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
+    FORMAT = int,tag : int,frame : int,subframe : buffer,calib_ch
+ID = CALIBRATION_CHANNEL_ESTIMATES_TIME
+    DESC = RAU received DMRS estimates in the time domain from the RRUs
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
+    FORMAT = int,tag : int,frame : int,subframe : buffer,calib_ch_time
 ID = ENB_PHY_OUTPUT_SIGNAL
     DESC = eNodeB sent signal in the time domain for a duration of 1ms
     GROUP = ALL:PHY:HEAVY:ENB
@@ -77,10 +93,6 @@ ID = ENB_PHY_INITIATE_RA_PROCEDURE
     DESC = eNodeB initiates a random access procedure after detecting enough energy for one of the preambles
     GROUP = ALL:PHY:ENB:WIRESHARK
     FORMAT = int,eNB_ID : int,frame : int,subframe : int,preamble : int,energy : int,delay
-ID = GNB_PHY_DL_TICK
-    DESC = gNodeB downlink tick - one tick per ms at start of downlink processing
-    GROUP = ALL:PHY:GRAPHIC:GNB
-    FORMAT = int,gNB_ID : int,frame : int,subframe
 ID = ENB_PHY_MIB
     DESC = MIB data
     GROUP = ALL:PHY:ENB:WIRESHARK
@@ -300,27 +312,6 @@ ID = LEGACY_MAC_TRACE
     GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
-ID = LEGACY_NR_MAC_INFO
-    DESC = NR_MAC legacy logs - info level
-    GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_INFO:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_MAC_ERROR
-    DESC = NR_MAC legacy logs - error level
-    GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_ERROR:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_MAC_WARNING
-    DESC = NR_MAC legacy logs - warning level
-    GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_WARNING:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_MAC_DEBUG
-    DESC = NR_MAC legacy logs - debug level
-    GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_DEBUG:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_MAC_TRACE
-    DESC = NR_MAC legacy logs - trace level
-    GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_TRACE:LEGACY
-    FORMAT = string,log
-
 ID = LEGACY_PHY_INFO
     DESC = PHY legacy logs - info level
     GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_INFO:LEGACY
@@ -342,27 +333,6 @@ ID = LEGACY_PHY_TRACE
     GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
-ID = LEGACY_NR_PHY_INFO
-    DESC = NR_PHY legacy logs - info level
-    GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_INFO:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_PHY_ERROR
-    DESC = NR_PHY legacy logs - error level
-    GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_ERROR:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_PHY_WARNING
-    DESC = NR_PHY legacy logs - warning level
-    GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_WARNING:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_PHY_DEBUG
-    DESC = NR_PHY legacy logs - debug level
-    GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_DEBUG:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_PHY_TRACE
-    DESC = NR_PHY legacy logs - trace level
-    GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_TRACE:LEGACY
-    FORMAT = string,log
-
 ID = LEGACY_S1AP_INFO
     DESC = S1AP legacy logs - info level
     GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_INFO:LEGACY
@@ -426,27 +396,6 @@ ID = LEGACY_RRC_TRACE
     GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
-ID = LEGACY_NR_RRC_INFO
-    DESC = NR_RRC legacy logs - info level
-    GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_INFO:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_RRC_ERROR
-    DESC = NR_RRC legacy logs - error level
-    GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_ERROR:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_RRC_WARNING
-    DESC = NR_RRC legacy logs - warning level
-    GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_WARNING:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_RRC_DEBUG
-    DESC = NR_RRC legacy logs - debug level
-    GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_DEBUG:LEGACY
-    FORMAT = string,log
-ID = LEGACY_NR_RRC_TRACE
-    DESC = NR_RRC legacy logs - trace level
-    GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_TRACE:LEGACY
-    FORMAT = string,log
-
 ID = LEGACY_RLC_INFO
     DESC = RLC legacy logs - info level
     GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_INFO:LEGACY
@@ -510,27 +459,6 @@ ID = LEGACY_ENB_APP_TRACE
     GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
-ID = LEGACY_GNB_APP_INFO
-    DESC = GNB_APP legacy logs - info level
-    GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_INFO:LEGACY
-    FORMAT = string,log
-ID = LEGACY_GNB_APP_ERROR
-    DESC = GNB_APP legacy logs - error level
-    GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_ERROR:LEGACY
-    FORMAT = string,log
-ID = LEGACY_GNB_APP_WARNING
-    DESC = GNB_APP legacy logs - warning level
-    GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_WARNING:LEGACY
-    FORMAT = string,log
-ID = LEGACY_GNB_APP_DEBUG
-    DESC = GNB_APP legacy logs - debug level
-    GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_DEBUG:LEGACY
-    FORMAT = string,log
-ID = LEGACY_GNB_APP_TRACE
-    DESC = GNB_APP legacy logs - trace level
-    GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_TRACE:LEGACY
-    FORMAT = string,log
-
 ID = LEGACY_FLEXRAN_AGENT_INFO
     DESC = FLEXRAN_AGENT legacy logs - info level
     GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_INFO:LEGACY
@@ -1193,26 +1121,26 @@ ID = VCD_VARIABLE_FRAME_NUMBER_RX1_RU
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
     VCD_NAME = frame_number_RX1_RU
-ID = VCD_VARIABLE_TTI_NUMBER_TX0_RU
-    DESC = VCD variable TTI_NUMBER_TX0_RU
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_RU
+    DESC = VCD variable SUBFRAME_NUMBER_TX0_RU
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-    VCD_NAME = tti_number_TX0_RU
-ID = VCD_VARIABLE_TTI_NUMBER_TX1_RU
-    DESC = VCD variable TTI_NUMBER_TX1_RU
+    VCD_NAME = subframe_number_TX0_RU
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_RU
+    DESC = VCD variable SUBFRAME_NUMBER_TX1_RU
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-    VCD_NAME = tti_number_TX1_RU
-ID = VCD_VARIABLE_TTI_NUMBER_RX0_RU
-    DESC = VCD variable TTI_NUMBER_RX0_RU
+    VCD_NAME = subframe_number_TX1_RU
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_RU
+    DESC = VCD variable SUBFRAME_NUMBER_RX0_RU
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-    VCD_NAME = tti_number_RX0_RU
-ID = VCD_VARIABLE_TTI_NUMBER_RX1_RU
-    DESC = VCD variable TTI_NUMBER_RX1_RU
+    VCD_NAME = subframe_number_RX0_RU
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_RU
+    DESC = VCD variable SUBFRAME_NUMBER_RX1_RU
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-    VCD_NAME = tti_number_RX1_RU
+    VCD_NAME = subframe_number_RX1_RU
 ID = VCD_VARIABLE_SUBFRAME_NUMBER_IF4P5_NORTH_OUT
     DESC = VCD variable SUBFRAME_NUMBER_IF4P5_NORTH_OUT
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -2009,48 +1937,6 @@ ID = VCD_VARIABLE_DRX_ACTIVE_TIME_CONDITION
     FORMAT = ulong,value
     VCD_NAME = ue0_drx_active_time_condition
 
- #variable for gNB
-ID = VCD_VARIABLE_FRAME_NUMBER_TX0_GNB
-    DESC = VCD variable FRAME_NUMBER_TX0_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = frame_number_TX0_gNB
-ID = VCD_VARIABLE_FRAME_NUMBER_TX1_GNB
-    DESC = VCD variable FRAME_NUMBER_TX1_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = frame_number_TX1_gNB
-ID = VCD_VARIABLE_FRAME_NUMBER_RX0_GNB
-    DESC = VCD variable FRAME_NUMBER_RX0_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = frame_number_RX0_gNB
-ID = VCD_VARIABLE_FRAME_NUMBER_RX1_GNB
-    DESC = VCD variable FRAME_NUMBER_RX1_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = frame_number_RX1_gNB
-ID = VCD_VARIABLE_SLOT_NUMBER_TX0_GNB
-    DESC = VCD variable SLOT_NUMBER_TX0_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = slot_number_TX0_gNB
-ID = VCD_VARIABLE_SLOT_NUMBER_TX1_GNB
-    DESC = VCD variable SLOT_NUMBER_TX1_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = slot_number_TX1_gNB
-ID = VCD_VARIABLE_SLOT_NUMBER_RX0_GNB
-    DESC = VCD variable SLOT_NUMBER_RX0_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = slot_number_RX0_gNB
-ID = VCD_VARIABLE_SLOT_NUMBER_RX1_GNB
-    DESC = VCD variable SLOT_NUMBER_RX1_GNB
-    GROUP = ALL:VCD:ENB:VCD_VARIABLE
-    FORMAT = ulong,value
-    VCD_NAME = slot_number_RX1_gNB
-
 #functions
 
 ID = VCD_FUNCTION_RT_SLEEP
@@ -2268,16 +2154,6 @@ ID = VCD_FUNCTION_UE_SLOT_FEP
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = ue_slot_fep
-ID = VCD_FUNCTION_UE_SLOT_FEP_MBSFN
-    DESC = VCD function UE_SLOT_FEP_MBSFN
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = ue_slot_fep_mbsfn
-ID = VCD_FUNCTION_UE_SLOT_FEP_MBSFN_KHZ_1DOT25
-    DESC = VCD function UE_SLOT_FEP_MBSFN_KHZ_1DOT25
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = ue_slot_fep_mbsfn_khz_1dot25
 ID = VCD_FUNCTION_UE_RRC_MEASUREMENTS
     DESC = VCD function UE_RRC_MEASUREMENTS
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -2493,11 +2369,6 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = phy_procedures_ue_tx_ulsch_uespec
-ID = VCD_FUNCTION_PHY_PROCEDURES_NR_UE_TX_ULSCH_UESPEC
-    DESC = VCD function PHY_PROCEDURES_NR_UE_TX_ULSCH_UESPEC
-    GROUP = ALL:VCD:UE:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = phy_procedures_nr_ue_tx_ulsch_uespec
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_PUCCH
     DESC = VCD function PHY_PROCEDURES_UE_TX_PUCCH
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -2613,36 +2484,6 @@ ID = VCD_FUNCTION_DLSCH_DECODING7
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = dlsch_decoding7
-ID = VCD_FUNCTION_DLSCH_SEGMENTATION
-    DESC = VCD function DLSCH_SEGMENTATION
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = dlsch_segmentation
-ID = VCD_FUNCTION_DLSCH_DEINTERLEAVING
-    DESC = VCD function DLSCH_DEINTERLEAVING
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = dlsch_deinterleaving
-ID = VCD_FUNCTION_DLSCH_RATE_MATCHING
-    DESC = VCD function DLSCH_RATE_MATCHING
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = dlsch_rate_matching
-ID = VCD_FUNCTION_DLSCH_LDPC
-    DESC = VCD function DLSCH_LDPC
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = dlsch_ldpc
-ID = VCD_FUNCTION_DLSCH_COMBINE_SEG
-    DESC = VCD function DLSCH_COMBINE_SEG
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = dlsch_compine_seg
-ID = VCD_FUNCTION_DLSCH_PMCH_DECODING
-    DESC = VCD function DLSCH_PMCH_DECODING
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = dlsch_pmch_decoding
 ID = VCD_FUNCTION_RX_PDCCH
     DESC = VCD function RX_PDCCH
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -2658,16 +2499,6 @@ ID = VCD_FUNCTION_RX_PHICH
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = rx_phich
-ID = VCD_FUNCTION_RX_PMCH
-    DESC = VCD function RX_PMCH
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = rx_pmch
-ID = VCD_FUNCTION_RX_PMCH_KHZ_1DOT25
-    DESC = VCD function RX_PMCH_KHZ_1DOT25
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = rx_pmch_khz_1dot25
 ID = VCD_FUNCTION_PDSCH_PROC
     DESC = VCD function PDSCH_PROC
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -2778,11 +2609,6 @@ ID = VCD_FUNCTION_PHY_ENB_PDCCH_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = phy_enb_pdcch_tx
-ID = VCD_FUNCTION_PHY_ENB_COMMON_TX
-    DESC = VCD function PHY_ENB_COMMON_TX
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = phy_enb_common_tx
 ID = VCD_FUNCTION_PHY_ENB_RS_TX
     DESC = VCD function PHY_ENB_RS_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -3228,15 +3054,3 @@ ID = VCD_FUNCTION_PDCCH_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = pdcch_tx
-
-  #function for gNB
-ID = VCD_FUNCTION_gNB_PROC_RXTX0
-    DESC = VCD function gNB_PROC_RXTX0
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = gNB_thread_rxtx0
-ID = VCD_FUNCTION_gNB_PROC_RXTX1
-    DESC = VCD function gNB_PROC_RXTX1
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-    VCD_NAME = gNB_thread_rxtx1

common/utils/T/tracer/extract.c

@@ -131,9 +131,8 @@ int main(int n, char **v)
       continue;
     if (fwrite(e.e[buffer_arg].b, e.e[buffer_arg].bsize, 1, out) != 1)
       { perror(output_file); exit(1); }
-    found++;
-    if (found == count)
-      break;
+    found = 1;
+    //break;
   }
 
   if (found == 0) printf("ERROR: event not found\n");

common/utils/T/tracer/macpdu2wireshark.c

@@ -52,7 +52,6 @@ typedef struct {
   int max_mib;
   int max_sib;
   int live;
-  int no_bind;
   /* runtime vars */
   int cur_mib;
   int cur_sib;
@@ -265,11 +264,9 @@ void *receiver(void *_d) {
     abort();
   }
 
-  if (d->no_bind == 0) {
-    if (bind(s, (struct sockaddr *)&d->to, sizeof(struct sockaddr_in)) == -1) {
-      perror("bind");
-      abort();
-    }
+  if (bind(s, (struct sockaddr *)&d->to, sizeof(struct sockaddr_in)) == -1) {
+    perror("bind");
+    abort();
   }
 
   while (1) {
@@ -293,7 +290,6 @@ void usage(void) {
     "    -live                     run live\n"
     "    -live-ip <IP address>     tracee's IP address (default %s)\n"
     "    -live-port <port>         tracee's port (default %d)\n"
-    "    -no-bind                  don't bind to IP address (for remote logging)\n"
     "-i and -live are mutually exclusive options. One of them must be provided\n"
     "but not both.\n",
     DEFAULT_IP,
@@ -322,18 +318,78 @@ int main(int n, char **v) {
 
   for (i = 1; i < n; i++) {
     if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
-    if (!strcmp(v[i], "-d"))         { if(i>n-2)usage(); database_filename = v[++i]; continue; }
-    if (!strcmp(v[i], "-i"))         { if(i>n-2)usage(); input_filename = v[++i];    continue; }
-    if (!strcmp(v[i], "-ip"))        { if(i>n-2)usage(); ip = v[++i];                continue; }
-    if (!strcmp(v[i], "-p"))         { if(i>n-2)usage(); port = atoi(v[++i]);        continue; }
-    if (!strcmp(v[i], "-no-mib"))    {                   d.no_mib = 1;               continue; }
-    if (!strcmp(v[i], "-no-sib"))    {                   d.no_sib = 1;               continue; }
-    if (!strcmp(v[i], "-max-mib"))   { if(i>n-2)usage(); d.max_mib = atoi(v[++i]);   continue; }
-    if (!strcmp(v[i], "-max-sib"))   { if(i>n-2)usage(); d.max_sib = atoi(v[++i]);   continue; }
-    if (!strcmp(v[i], "-live"))      {                   live = 1;                   continue; }
-    if (!strcmp(v[i], "-live-ip"))   { if(i>n-2)usage(); live_ip = v[++i];           continue; }
-    if (!strcmp(v[i], "-live-port")) { if(i>n-2)usage(); live_port = atoi(v[++i]);   continue; }
-    if (!strcmp(v[i], "-no-bind"))   {                   d.no_bind = 1;              continue; }
+
+    if (!strcmp(v[i], "-d")) {
+      if (i > n-2) usage();
+
+      database_filename = v[++i];
+      continue;
+    }
+
+    if (!strcmp(v[i], "-i")) {
+      if (i > n-2) usage();
+
+      input_filename = v[++i];
+      continue;
+    }
+
+    if (!strcmp(v[i], "-ip")) {
+      if (i > n-2) usage();
+
+      ip = v[++i];
+      continue;
+    }
+
+    if (!strcmp(v[i], "-p")) {
+      if(i>n-2)usage();
+
+      port=atoi(v[++i]);
+      continue;
+    }
+
+    if (!strcmp(v[i], "-no-mib")) {
+      d.no_mib = 1;
+      continue;
+    }
+
+    if (!strcmp(v[i], "-no-sib")) {
+      d.no_sib = 1;
+      continue;
+    }
+
+    if (!strcmp(v[i], "-max-mib")) {
+      if (i > n-2) usage();
+
+      d.max_mib = atoi(v[++i]);
+      continue;
+    }
+
+    if (!strcmp(v[i], "-max-sib")) {
+      if (i > n-2) usage();
+
+      d.max_sib = atoi(v[++i]);
+      continue;
+    }
+
+    if (!strcmp(v[i], "-live")) {
+      live = 1;
+      continue;
+    }
+
+    if (!strcmp(v[i], "-live-ip")) {
+      if (i > n-2) usage();
+
+      live_ip = v[++i];
+      continue;
+    }
+
+    if (!strcmp(v[i], "-live-port")) {
+      if (i > n-2) usage();
+
+      live_port = atoi(v[++i]);
+      continue;
+    }
+
     usage();
   }
 

common/utils/backtrace.h

@@ -23,16 +23,9 @@
 
 #ifndef BACKTRACE_H_
 #define BACKTRACE_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 void display_backtrace(void);
 
 void backtrace_handle_signal(siginfo_t *info);
-#ifdef __cplusplus
-}
-#endif
-
 
 #endif /* BACKTRACE_H_ */

common/utils/hashtable/hashtable.c

@@ -358,7 +358,6 @@ hashtable_rc_t hashtable_resize(hash_table_t *const hashtblP, const hash_size_t
 
   newtbl.size     = sizeP;
   newtbl.hashfunc = hashtblP->hashfunc;
-  newtbl.num_elements = 0;
 
   if(!(newtbl.nodes=calloc(sizeP, sizeof(hash_node_t *)))) return -1;
 

common/utils/itti_analyzer/COPYING

@@ -1 +0,0 @@
-/usr/share/automake-1.15/COPYING

common/utils/itti_analyzer/autom4te.cache/requests

@@ -1,314 +0,0 @@
-# This file was generated by Autom4te Fri Oct 23 20:57:39 UTC 2015.
-# It contains the lists of macros which have been traced.
-# It can be safely removed.
-
-@request = (
-             bless( [
-                      '0',
-                      1,
-                      [
-                        '/usr/share/autoconf'
-                      ],
-                      [
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        '-',
-                        '/usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4',
-                        '/usr/share/aclocal/gtk-3.0.m4',
-                        '/usr/share/aclocal/libtool.m4',
-                        '/usr/share/aclocal/ltargz.m4',
-                        '/usr/share/aclocal/ltdl.m4',
-                        '/usr/share/aclocal/ltoptions.m4',
-                        '/usr/share/aclocal/ltsugar.m4',
-                        '/usr/share/aclocal/ltversion.m4',
-                        '/usr/share/aclocal/lt~obsolete.m4',
-                        '/usr/share/aclocal/pkg.m4',
-                        '/usr/share/aclocal-1.15/amversion.m4',
-                        '/usr/share/aclocal-1.15/auxdir.m4',
-                        '/usr/share/aclocal-1.15/cond.m4',
-                        '/usr/share/aclocal-1.15/depend.m4',
-                        '/usr/share/aclocal-1.15/depout.m4',
-                        '/usr/share/aclocal-1.15/init.m4',
-                        '/usr/share/aclocal-1.15/install-sh.m4',
-                        '/usr/share/aclocal-1.15/lead-dot.m4',
-                        '/usr/share/aclocal-1.15/maintainer.m4',
-                        '/usr/share/aclocal-1.15/make.m4',
-                        '/usr/share/aclocal-1.15/missing.m4',
-                        '/usr/share/aclocal-1.15/options.m4',
-                        '/usr/share/aclocal-1.15/prog-cc-c-o.m4',
-                        '/usr/share/aclocal-1.15/runlog.m4',
-                        '/usr/share/aclocal-1.15/sanity.m4',
-                        '/usr/share/aclocal-1.15/silent.m4',
-                        '/usr/share/aclocal-1.15/strip.m4',
-                        '/usr/share/aclocal-1.15/substnot.m4',
-                        '/usr/share/aclocal-1.15/tar.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'GTK_CHECK_BACKEND' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'PKG_INSTALLDIR' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'LT_INIT' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'PKG_CHECK_MODULES_STATIC' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AM_PROG_NM' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'LT_PROG_RC' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AU_DEFUN' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'include' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'LT_PROG_GO' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AM_PATH_GTK_3_0' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'LT_LANG' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_DEFUN' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'm4_include' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        '_m4_warn' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'LTDL_INIT' => 1
-                      }
-                    ], 'Autom4te::Request' ),
-             bless( [
-                      '1',
-                      1,
-                      [
-                        '/usr/share/autoconf'
-                      ],
-                      [
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'aclocal.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'sinclude' => 1,
-                        'm4_include' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'm4_sinclude' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'include' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_INIT' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_m4_warn' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'LT_INIT' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_SUBST' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_NLS' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AH_OUTPUT' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1
-                      }
-                    ], 'Autom4te::Request' )
-           );
-

common/utils/itti_analyzer/autom4te.cache/traces.1

@@ -1,867 +0,0 @@
-m4trace:configure.ac:5: -1- AC_DEFINE_TRACE_LITERAL([SVN_REVISION])
-m4trace:configure.ac:5: -1- m4_pattern_allow([^SVN_REVISION$])
-m4trace:configure.ac:5: -1- AH_OUTPUT([SVN_REVISION], [/* SVN Revision */
-@%:@undef SVN_REVISION])
-m4trace:configure.ac:7: -1- AC_INIT([itti_analyzer], [0.2.svnversion], [openair_admin@eurecom.fr])
-m4trace:configure.ac:7: -1- m4_pattern_forbid([^_?A[CHUM]_])
-m4trace:configure.ac:7: -1- m4_pattern_forbid([_AC_])
-m4trace:configure.ac:7: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^AS_FLAGS$])
-m4trace:configure.ac:7: -1- m4_pattern_forbid([^_?m4_])
-m4trace:configure.ac:7: -1- m4_pattern_forbid([^dnl$])
-m4trace:configure.ac:7: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.ac:7: -1- AC_SUBST([SHELL])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([SHELL])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.ac:7: -1- AC_SUBST([PATH_SEPARATOR])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.ac:7: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:7: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:7: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:7: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:7: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:7: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL],       ['AC_PACKAGE_URL'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([PACKAGE_URL])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.ac:7: -1- AC_SUBST([exec_prefix], [NONE])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([exec_prefix])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.ac:7: -1- AC_SUBST([prefix], [NONE])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([prefix])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.ac:7: -1- AC_SUBST([program_transform_name], [s,x,x,])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([program_transform_name])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.ac:7: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([bindir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.ac:7: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([sbindir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.ac:7: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([libexecdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([datarootdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([datadir], ['${datarootdir}'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([datadir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.ac:7: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([sysconfdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([sharedstatedir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.ac:7: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([localstatedir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.ac:7: -1- AC_SUBST([runstatedir], ['${localstatedir}/run'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([runstatedir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^runstatedir$])
-m4trace:configure.ac:7: -1- AC_SUBST([includedir], ['${prefix}/include'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([includedir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.ac:7: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([oldincludedir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.ac:7: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-				     ['${datarootdir}/doc/${PACKAGE}'])])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([docdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([infodir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.ac:7: -1- AC_SUBST([htmldir], ['${docdir}'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([htmldir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.ac:7: -1- AC_SUBST([dvidir], ['${docdir}'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([dvidir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.ac:7: -1- AC_SUBST([pdfdir], ['${docdir}'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([pdfdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([psdir], ['${docdir}'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([psdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([libdir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.ac:7: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([localedir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:7: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([mandir])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.ac:7: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:7: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-@%:@undef PACKAGE_NAME])
-m4trace:configure.ac:7: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:7: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-@%:@undef PACKAGE_TARNAME])
-m4trace:configure.ac:7: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:7: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-@%:@undef PACKAGE_VERSION])
-m4trace:configure.ac:7: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:7: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-@%:@undef PACKAGE_STRING])
-m4trace:configure.ac:7: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:7: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-@%:@undef PACKAGE_BUGREPORT])
-m4trace:configure.ac:7: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.ac:7: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
-@%:@undef PACKAGE_URL])
-m4trace:configure.ac:7: -1- AC_SUBST([DEFS])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([DEFS])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:7: -1- AC_SUBST([ECHO_C])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([ECHO_C])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:7: -1- AC_SUBST([ECHO_N])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([ECHO_N])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:7: -1- AC_SUBST([ECHO_T])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([ECHO_T])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.ac:7: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:7: -1- AC_SUBST([build_alias])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([build_alias])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.ac:7: -1- AC_SUBST([host_alias])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([host_alias])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.ac:7: -1- AC_SUBST([target_alias])
-m4trace:configure.ac:7: -1- AC_SUBST_TRACE([target_alias])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:8: -1- AC_CANONICAL_BUILD
-m4trace:configure.ac:8: -1- AC_REQUIRE_AUX_FILE([config.sub])
-m4trace:configure.ac:8: -1- AC_REQUIRE_AUX_FILE([config.guess])
-m4trace:configure.ac:8: -1- AC_SUBST([build], [$ac_cv_build])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([build])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:8: -1- AC_SUBST([build_cpu], [$[1]])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([build_cpu])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:8: -1- AC_SUBST([build_vendor], [$[2]])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([build_vendor])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:8: -1- AC_SUBST([build_os])
-m4trace:configure.ac:8: -1- AC_SUBST_TRACE([build_os])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:9: -1- AC_CANONICAL_TARGET
-m4trace:configure.ac:9: -1- AC_CANONICAL_HOST
-m4trace:configure.ac:9: -1- AC_SUBST([host], [$ac_cv_host])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([host])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:9: -1- AC_SUBST([host_cpu], [$[1]])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([host_cpu])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:9: -1- AC_SUBST([host_vendor], [$[2]])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([host_vendor])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:9: -1- AC_SUBST([host_os])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([host_os])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:9: -1- AC_SUBST([target], [$ac_cv_target])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([target])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^target$])
-m4trace:configure.ac:9: -1- AC_SUBST([target_cpu], [$[1]])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([target_cpu])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^target_cpu$])
-m4trace:configure.ac:9: -1- AC_SUBST([target_vendor], [$[2]])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([target_vendor])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^target_vendor$])
-m4trace:configure.ac:9: -1- AC_SUBST([target_os])
-m4trace:configure.ac:9: -1- AC_SUBST_TRACE([target_os])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^target_os$])
-m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE([1.11 silent-rules])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15])
-m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:10: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([am__isrc])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:10: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([CYGPATH_W])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:10: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([PACKAGE])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:10: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([VERSION])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:10: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:10: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-@%:@undef PACKAGE])
-m4trace:configure.ac:10: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:10: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-@%:@undef VERSION])
-m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([missing])
-m4trace:configure.ac:10: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([ACLOCAL])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:10: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AUTOCONF])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:10: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AUTOMAKE])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:10: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AUTOHEADER])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:10: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([MAKEINFO])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:10: -1- AC_SUBST([install_sh])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([install_sh])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:10: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:10: -1- AC_SUBST([MKDIR_P])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:10: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([mkdir_p])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:10: -1- AC_SUBST([AWK])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AWK])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:10: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([SET_MAKE])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:10: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([am__leading_dot])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:10: -1- AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AMTAR])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:10: -1- AC_SUBST([am__tar])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([am__tar])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:10: -1- AC_SUBST([am__untar])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([am__untar])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:10: -1- AM_SILENT_RULES
-m4trace:configure.ac:10: -1- AC_SUBST([AM_V])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AM_V])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_V$])
-m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([AM_V])
-m4trace:configure.ac:10: -1- AC_SUBST([AM_DEFAULT_V])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_DEFAULT_V$])
-m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
-m4trace:configure.ac:10: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
-m4trace:configure.ac:10: -1- AC_SUBST([AM_BACKSLASH])
-m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AM_BACKSLASH])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_BACKSLASH$])
-m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:14: -1- AC_CONFIG_HEADERS([config.h])
-m4trace:configure.ac:16: -1- AM_MAINTAINER_MODE
-m4trace:configure.ac:16: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-m4trace:configure.ac:16: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:16: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:16: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
-m4trace:configure.ac:16: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:16: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:16: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
-m4trace:configure.ac:16: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:16: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:16: -1- AC_SUBST([MAINT])
-m4trace:configure.ac:16: -1- AC_SUBST_TRACE([MAINT])
-m4trace:configure.ac:16: -1- m4_pattern_allow([^MAINT$])
-m4trace:configure.ac:18: -1- AM_SILENT_RULES([yes])
-m4trace:configure.ac:18: -1- AC_SUBST([AM_V])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([AM_V])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^AM_V$])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([AM_V])
-m4trace:configure.ac:18: -1- AC_SUBST([AM_DEFAULT_V])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^AM_DEFAULT_V$])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
-m4trace:configure.ac:18: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
-m4trace:configure.ac:18: -1- AC_SUBST([AM_BACKSLASH])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([AM_BACKSLASH])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^AM_BACKSLASH$])
-m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:20: -1- AM_PROG_LIBTOOL
-m4trace:configure.ac:20: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.], [aclocal.m4:340: AM_PROG_LIBTOOL is expanded from...
-configure.ac:20: the top level])
-m4trace:configure.ac:20: -1- LT_INIT
-m4trace:configure.ac:20: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:20: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-m4trace:configure.ac:20: -1- AC_SUBST([LIBTOOL])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LIBTOOL])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:20: -1- AC_SUBST([CC])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:20: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:20: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:20: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:20: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:20: -1- AC_SUBST([CC])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:20: -1- AC_SUBST([CC])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:20: -1- AC_SUBST([CC])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:20: -1- AC_SUBST([CC])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:20: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ac_ct_CC])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:20: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([EXEEXT])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:20: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OBJEXT])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:20: -1- AC_REQUIRE_AUX_FILE([compile])
-m4trace:configure.ac:20: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DEPDIR])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:20: -1- AC_SUBST([am__include])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([am__include])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:20: -1- AC_SUBST([am__quote])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([am__quote])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:20: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:20: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:20: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:20: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:20: -1- AC_SUBST([am__nodep])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([am__nodep])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:20: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CCDEPMODE])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:20: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:20: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:20: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:20: -1- AC_SUBST([SED])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SED])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:20: -1- AC_SUBST([GREP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:20: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([EGREP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:20: -1- AC_SUBST([FGREP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([FGREP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:20: -1- AC_SUBST([GREP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:20: -1- AC_SUBST([LD])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LD])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:20: -1- AC_SUBST([DUMPBIN])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DUMPBIN])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:20: -1- AC_SUBST([ac_ct_DUMPBIN])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:20: -1- AC_SUBST([DUMPBIN])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DUMPBIN])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:20: -1- AC_SUBST([NM])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([NM])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:20: -1- AC_SUBST([LN_S], [$as_ln_s])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LN_S])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:20: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:20: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:20: -1- AC_SUBST([DLLTOOL])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DLLTOOL])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:20: -1- AC_SUBST([DLLTOOL])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DLLTOOL])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:20: -1- AC_SUBST([AR])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([AR])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:20: -1- AC_SUBST([ac_ct_AR])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ac_ct_AR])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^ac_ct_AR$])
-m4trace:configure.ac:20: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:20: -1- AC_SUBST([RANLIB])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:20: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:20: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory where libtool stores uninstalled libraries. */
-@%:@undef LT_OBJDIR])
-m4trace:configure.ac:20: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:20: -1- AC_SUBST([MANIFEST_TOOL])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([MANIFEST_TOOL])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^MANIFEST_TOOL$])
-m4trace:configure.ac:20: -1- AC_SUBST([DSYMUTIL])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DSYMUTIL])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:20: -1- AC_SUBST([NMEDIT])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([NMEDIT])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:20: -1- AC_SUBST([LIPO])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LIPO])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:20: -1- AC_SUBST([OTOOL])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OTOOL])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:20: -1- AC_SUBST([OTOOL64])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OTOOL64])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:20: -1- AC_SUBST([LT_SYS_LIBRARY_PATH])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LT_SYS_LIBRARY_PATH])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LT_SYS_LIBRARY_PATH$])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
-@%:@undef HAVE_DLFCN_H])
-m4trace:configure.ac:20: -1- AC_SUBST([CPP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:20: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:20: -1- AC_SUBST([CPP])
-m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:20: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-@%:@undef STDC_HEADERS])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-@%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-@%:@undef HAVE_SYS_STAT_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-@%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-@%:@undef HAVE_STRING_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-@%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-@%:@undef HAVE_STRINGS_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-@%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-@%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:20: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-@%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:22: -1- AC_SUBST([RANLIB])
-m4trace:configure.ac:22: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.ac:22: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:23: -1- AC_SUBST([CXX])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:23: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:23: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:23: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:23: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:23: -1- AC_SUBST([CXX])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:23: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:23: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CXXDEPMODE])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:23: -1- AM_CONDITIONAL([am__fastdepCXX], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:23: -1- AC_SUBST([am__fastdepCXX_TRUE])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:23: -1- AC_SUBST([am__fastdepCXX_FALSE])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:23: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:23: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:23: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:23: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:23: -1- AC_SUBST([LD])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([LD])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:23: -1- AC_SUBST([LT_SYS_LIBRARY_PATH])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([LT_SYS_LIBRARY_PATH])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^LT_SYS_LIBRARY_PATH$])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
-@%:@undef size_t])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA_H])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^HAVE_ALLOCA_H$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([HAVE_ALLOCA_H], [/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-@%:@undef HAVE_ALLOCA_H])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^HAVE_ALLOCA$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([HAVE_ALLOCA], [/* Define to 1 if you have `alloca\', as a function or macro. */
-@%:@undef HAVE_ALLOCA])
-m4trace:configure.ac:25: -1- AC_LIBSOURCE([alloca.c])
-m4trace:configure.ac:25: -1- AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([ALLOCA])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^ALLOCA$])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([C_ALLOCA])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^C_ALLOCA$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([C_ALLOCA], [/* Define to 1 if using `alloca.c\'. */
-@%:@undef C_ALLOCA])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([CRAY_STACKSEG_END])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^CRAY_STACKSEG_END$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([CRAY_STACKSEG_END], [/* Define to one of `_getb67\', `GETB67\', `getb67\' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c\' support on those systems.
-   */
-@%:@undef CRAY_STACKSEG_END])
-m4trace:configure.ac:25: -1- AH_OUTPUT([STACK_DIRECTION], [/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-@%:@undef STACK_DIRECTION])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([STACK_DIRECTION])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^STACK_DIRECTION$])
-m4trace:configure.ac:26: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-@%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:26: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
-m4trace:configure.ac:26: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
-m4trace:configure.ac:26: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
-m4trace:configure.ac:26: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:26: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if your system has a GNU libc compatible `malloc\' function, and
-   to 0 otherwise. */
-@%:@undef HAVE_MALLOC])
-m4trace:configure.ac:26: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
-m4trace:configure.ac:26: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:26: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS malloc.$ac_objext"])
-m4trace:configure.ac:26: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:26: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:26: -1- AC_LIBSOURCE([malloc.c])
-m4trace:configure.ac:26: -1- AC_DEFINE_TRACE_LITERAL([malloc])
-m4trace:configure.ac:26: -1- m4_pattern_allow([^malloc$])
-m4trace:configure.ac:26: -1- AH_OUTPUT([malloc], [/* Define to rpl_malloc if the replacement function should be used. */
-@%:@undef malloc])
-m4trace:configure.ac:27: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-@%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:27: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
-m4trace:configure.ac:27: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:27: -1- AH_OUTPUT([HAVE_REALLOC], [/* Define to 1 if your system has a GNU libc compatible `realloc\' function,
-   and to 0 otherwise. */
-@%:@undef HAVE_REALLOC])
-m4trace:configure.ac:27: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:27: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS realloc.$ac_objext"])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:27: -1- AC_LIBSOURCE([realloc.c])
-m4trace:configure.ac:27: -1- AC_DEFINE_TRACE_LITERAL([realloc])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^realloc$])
-m4trace:configure.ac:27: -1- AH_OUTPUT([realloc], [/* Define to rpl_realloc if the replacement function should be used. */
-@%:@undef realloc])
-m4trace:configure.ac:29: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:29: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:29: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
-@%:@undef size_t])
-m4trace:configure.ac:30: -1- AC_DEFINE_TRACE_LITERAL([ssize_t])
-m4trace:configure.ac:30: -1- m4_pattern_allow([^ssize_t$])
-m4trace:configure.ac:30: -1- AH_OUTPUT([ssize_t], [/* Define to `int\' if <sys/types.h> does not define. */
-@%:@undef ssize_t])
-m4trace:configure.ac:31: -1- AC_DEFINE_TRACE_LITERAL([int8_t])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^int8_t$])
-m4trace:configure.ac:31: -1- AH_OUTPUT([int8_t], [/* Define to the type of a signed integer type of width exactly 8 bits if such
-   a type exists and the standard includes do not define it. */
-@%:@undef int8_t])
-m4trace:configure.ac:32: -1- AC_DEFINE_TRACE_LITERAL([int16_t])
-m4trace:configure.ac:32: -1- m4_pattern_allow([^int16_t$])
-m4trace:configure.ac:32: -1- AH_OUTPUT([int16_t], [/* Define to the type of a signed integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef int16_t])
-m4trace:configure.ac:33: -1- AC_DEFINE_TRACE_LITERAL([int32_t])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^int32_t$])
-m4trace:configure.ac:33: -1- AH_OUTPUT([int32_t], [/* Define to the type of a signed integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef int32_t])
-m4trace:configure.ac:34: -1- AC_DEFINE_TRACE_LITERAL([int64_t])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^int64_t$])
-m4trace:configure.ac:34: -1- AH_OUTPUT([int64_t], [/* Define to the type of a signed integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef int64_t])
-m4trace:configure.ac:35: -1- AC_DEFINE_TRACE_LITERAL([_UINT8_T])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^_UINT8_T$])
-m4trace:configure.ac:35: -1- AH_OUTPUT([_UINT8_T], [/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   @%:@define below would cause a syntax error. */
-@%:@undef _UINT8_T])
-m4trace:configure.ac:35: -1- AC_DEFINE_TRACE_LITERAL([uint8_t])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^uint8_t$])
-m4trace:configure.ac:35: -1- AH_OUTPUT([uint8_t], [/* Define to the type of an unsigned integer type of width exactly 8 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef uint8_t])
-m4trace:configure.ac:36: -1- AC_DEFINE_TRACE_LITERAL([uint16_t])
-m4trace:configure.ac:36: -1- m4_pattern_allow([^uint16_t$])
-m4trace:configure.ac:36: -1- AH_OUTPUT([uint16_t], [/* Define to the type of an unsigned integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef uint16_t])
-m4trace:configure.ac:37: -1- AC_DEFINE_TRACE_LITERAL([_UINT32_T])
-m4trace:configure.ac:37: -1- m4_pattern_allow([^_UINT32_T$])
-m4trace:configure.ac:37: -1- AH_OUTPUT([_UINT32_T], [/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   @%:@define below would cause a syntax error. */
-@%:@undef _UINT32_T])
-m4trace:configure.ac:37: -1- AC_DEFINE_TRACE_LITERAL([uint32_t])
-m4trace:configure.ac:37: -1- m4_pattern_allow([^uint32_t$])
-m4trace:configure.ac:37: -1- AH_OUTPUT([uint32_t], [/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef uint32_t])
-m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([_UINT64_T])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^_UINT64_T$])
-m4trace:configure.ac:38: -1- AH_OUTPUT([_UINT64_T], [/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   @%:@define below would cause a syntax error. */
-@%:@undef _UINT64_T])
-m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([uint64_t])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^uint64_t$])
-m4trace:configure.ac:38: -1- AH_OUTPUT([uint64_t], [/* Define to the type of an unsigned integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-@%:@undef uint64_t])
-m4trace:configure.ac:40: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
-@%:@undef HAVE_MEMSET])
-m4trace:configure.ac:40: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MEMSET])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^HAVE_MEMSET$])
-m4trace:configure.ac:41: -1- AH_OUTPUT([HAVE_SOCKET], [/* Define to 1 if you have the `socket\' function. */
-@%:@undef HAVE_SOCKET])
-m4trace:configure.ac:41: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKET])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^HAVE_SOCKET$])
-m4trace:configure.ac:42: -1- AH_OUTPUT([HAVE_STRDUP], [/* Define to 1 if you have the `strdup\' function. */
-@%:@undef HAVE_STRDUP])
-m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRDUP])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^HAVE_STRDUP$])
-m4trace:configure.ac:43: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
-@%:@undef HAVE_STRERROR])
-m4trace:configure.ac:43: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRERROR])
-m4trace:configure.ac:43: -1- m4_pattern_allow([^HAVE_STRERROR$])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
-@%:@undef HAVE_SELECT])
-m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SELECT])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^HAVE_SELECT$])
-m4trace:configure.ac:45: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
-@%:@undef HAVE_STRSTR])
-m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRSTR])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^HAVE_STRSTR$])
-m4trace:configure.ac:47: -1- AH_OUTPUT([HAVE_ARPA_INET_H], [/* Define to 1 if you have the <arpa/inet.h> header file. */
-@%:@undef HAVE_ARPA_INET_H])
-m4trace:configure.ac:47: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ARPA_INET_H])
-m4trace:configure.ac:47: -1- m4_pattern_allow([^HAVE_ARPA_INET_H$])
-m4trace:configure.ac:48: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
-@%:@undef HAVE_FCNTL_H])
-m4trace:configure.ac:48: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FCNTL_H])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^HAVE_FCNTL_H$])
-m4trace:configure.ac:49: -1- AH_OUTPUT([HAVE_LIBINTL_H], [/* Define to 1 if you have the <libintl.h> header file. */
-@%:@undef HAVE_LIBINTL_H])
-m4trace:configure.ac:49: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBINTL_H])
-m4trace:configure.ac:49: -1- m4_pattern_allow([^HAVE_LIBINTL_H$])
-m4trace:configure.ac:50: -1- AH_OUTPUT([HAVE_MALLOC_H], [/* Define to 1 if you have the <malloc.h> header file. */
-@%:@undef HAVE_MALLOC_H])
-m4trace:configure.ac:50: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC_H])
-m4trace:configure.ac:50: -1- m4_pattern_allow([^HAVE_MALLOC_H$])
-m4trace:configure.ac:51: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define to 1 if you have the <stddef.h> header file. */
-@%:@undef HAVE_STDDEF_H])
-m4trace:configure.ac:51: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDDEF_H])
-m4trace:configure.ac:51: -1- m4_pattern_allow([^HAVE_STDDEF_H$])
-m4trace:configure.ac:52: -1- AH_OUTPUT([HAVE_NETINET_IN_H], [/* Define to 1 if you have the <netinet/in.h> header file. */
-@%:@undef HAVE_NETINET_IN_H])
-m4trace:configure.ac:52: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETINET_IN_H])
-m4trace:configure.ac:52: -1- m4_pattern_allow([^HAVE_NETINET_IN_H$])
-m4trace:configure.ac:54: -1- AH_OUTPUT([HAVE_LIBM], [/* Define to 1 if you have the `m\' library (-lm). */
-@%:@undef HAVE_LIBM])
-m4trace:configure.ac:54: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^HAVE_LIBM$])
-m4trace:configure.ac:56: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:56: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:56: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:56: -1- AC_SUBST([PKG_CONFIG_PATH])
-m4trace:configure.ac:56: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:56: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:56: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:56: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:56: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:56: -1- AC_SUBST([XML2_CFLAGS])
-m4trace:configure.ac:56: -1- AC_SUBST_TRACE([XML2_CFLAGS])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^XML2_CFLAGS$])
-m4trace:configure.ac:56: -1- AC_SUBST([XML2_LIBS])
-m4trace:configure.ac:56: -1- AC_SUBST_TRACE([XML2_LIBS])
-m4trace:configure.ac:56: -1- m4_pattern_allow([^XML2_LIBS$])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead], [aclocal.m4:30: AM_PATH_GTK_3_0 is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2775: AC_TRY_RUN is expanded from...
-aclocal.m4:30: AM_PATH_GTK_3_0 is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2698: AC_TRY_LINK is expanded from...
-aclocal.m4:30: AM_PATH_GTK_3_0 is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AC_SUBST([GTK_CFLAGS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([GTK_CFLAGS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^GTK_CFLAGS$])
-m4trace:configure.ac:60: -1- AC_SUBST([GTK_LIBS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([GTK_LIBS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^GTK_LIBS$])
-m4trace:configure.ac:73: -1- AC_SUBST([AM_CFLAGS])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([AM_CFLAGS])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:74: -1- AC_SUBST([ADD_CFLAGS])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([ADD_CFLAGS])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^ADD_CFLAGS$])
-m4trace:configure.ac:81: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([AUTOCONF])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:82: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.ac:82: -1- AC_SUBST_TRACE([AUTOHEADER])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:88: -1- AC_SUBST([CONFIGURE_DEPENDS])
-m4trace:configure.ac:88: -1- AC_SUBST_TRACE([CONFIGURE_DEPENDS])
-m4trace:configure.ac:88: -1- m4_pattern_allow([^CONFIGURE_DEPENDS$])
-m4trace:configure.ac:90: -1- AC_CONFIG_FILES([libbuffers/Makefile             \
-    libparser/Makefile              \
-    libresolver/Makefile            \
-    libui/Makefile                  \
-    Makefile                        \
-])
-m4trace:configure.ac:97: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:97: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:97: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:97: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:97: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:97: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:97: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:97: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:97: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])

common/utils/itti_analyzer/compile

@@ -1 +0,0 @@
-/usr/share/automake-1.15/compile

common/utils/itti_analyzer/config.guess

@@ -1 +0,0 @@
-/usr/share/automake-1.15/config.guess

common/utils/itti_analyzer/config.h.in

@@ -1,193 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
-   and to 0 otherwise. */
-#undef HAVE_REALLOC
-
-/* Define to 1 if you have the `select' function. */
-#undef HAVE_SELECT
-
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* SVN Revision */
-#undef SVN_REVISION
-
-/* Version number of package */
-#undef VERSION
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT32_T
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT64_T
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT8_T
-
-/* Define to the type of a signed integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int16_t
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int32_t
-
-/* Define to the type of a signed integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int64_t
-
-/* Define to the type of a signed integer type of width exactly 8 bits if such
-   a type exists and the standard includes do not define it. */
-#undef int8_t
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to rpl_realloc if the replacement function should be used. */
-#undef realloc
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint16_t
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint32_t
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint64_t
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint8_t

common/utils/itti_analyzer/config.sub

@@ -1 +0,0 @@
-/usr/share/automake-1.15/config.sub

common/utils/itti_analyzer/depcomp

@@ -1 +0,0 @@
-/usr/share/automake-1.15/depcomp

common/utils/itti_analyzer/filters.xml

@@ -91,8 +91,6 @@
     <TASK_MAC_ENB enabled="1"/>
     <TASK_RLC_ENB enabled="1"/>
     <TASK_PDCP_ENB enabled="1"/>
-    <TASK_DATA_FORWARDING enabled="1"/>
-    <TASK_END_MARKER enabled="1"/>
     <TASK_RRC_ENB enabled="1"/>
     <TASK_RAL_ENB enabled="1"/>
     <TASK_S1AP enabled="1"/>
@@ -116,8 +114,6 @@
     <TASK_MAC_ENB enabled="1"/>
     <TASK_RLC_ENB enabled="1"/>
     <TASK_PDCP_ENB enabled="1"/>
-    <TASK_DATA_FORWARDING enabled="1"/>
-    <TASK_END_MARKER enabled="1"/>
     <TASK_RRC_ENB enabled="1"/>
     <TASK_RAL_ENB enabled="1"/>
     <TASK_S1AP enabled="1"/>

common/utils/itti_analyzer/filters_ue_enb.xml

@@ -130,8 +130,6 @@
     <TASK_MAC_ENB enabled="1"/>
     <TASK_RLC_ENB enabled="1"/>
     <TASK_PDCP_ENB enabled="1"/>
-    <TASK_DATA_FORWARDING enabled="1"/>
-    <TASK_END_MARKER enabled="1"/>
     <TASK_RRC_ENB enabled="1"/>
     <TASK_RAL_ENB enabled="1"/>
     <TASK_S1AP enabled="1"/>
@@ -155,8 +153,6 @@
     <TASK_MAC_ENB enabled="1"/>
     <TASK_RLC_ENB enabled="1"/>
     <TASK_PDCP_ENB enabled="1"/>
-    <TASK_DATA_FORWARDING enabled="1"/>
-    <TASK_END_MARKER enabled="1"/>
     <TASK_RRC_ENB enabled="1"/>
     <TASK_RAL_ENB enabled="1"/>
     <TASK_S1AP enabled="1"/>

common/utils/itti_analyzer/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.15/install-sh

common/utils/itti_analyzer/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.15/missing

common/utils/minimal_stub.c

@@ -1,4 +0,0 @@
-int T_stdout;
-
-void exit_function(const char *file, const char *function, const int line, const char *s) {
-}

common/utils/ocp_itti/intertask_interface.cpp

@@ -8,7 +8,6 @@
 
 
 #include <intertask_interface.h>
-#include <common/utils/system.h>
 
 typedef struct timer_elm_s {
   timer_type_t      type;     ///< Timer type
@@ -264,8 +263,7 @@ extern "C" {
     pthread_mutex_unlock (&t->queue_cond_lock);
   }
 
-  void itti_poll_msg(task_id_t task_id, MessageDef **received_msg)
-  {
+  void itti_poll_msg(task_id_t task_id, MessageDef **received_msg) {
     //reception of one message, non-blocking
     task_list_t *t=&tasks[task_id];
     pthread_mutex_lock(&t->queue_cond_lock);
@@ -280,13 +278,24 @@ extern "C" {
     pthread_mutex_unlock (&t->queue_cond_lock);
   }
 
-  int itti_create_task(task_id_t task_id,
-		               void *(*start_routine)(void *),
-					   void *args_p)
-  {
-    task_list_t *t=&tasks[task_id];                          //--------src572
-    threadCreate (&t->thread, start_routine, args_p, (char*)itti_get_task_name(task_id),-1,OAI_PRIORITY_RT);    //-- this creates a pthread
+  int itti_create_task(task_id_t task_id, void *(*start_routine)(void *), void *args_p) {
+    task_list_t *t=&tasks[task_id];
+    AssertFatal ( pthread_create (&t->thread, NULL, start_routine, args_p) ==0,
+                  "Thread creation for task %d failed!\n", task_id);
+    pthread_setname_np( t->thread, itti_get_task_name(task_id) );
     LOG_I(TMR,"Created Posix thread %s\n",  itti_get_task_name(task_id) );
+#if 1 // BMC test RT prio
+    {
+      int policy;
+      struct sched_param sparam;
+      memset(&sparam, 0, sizeof(sparam));
+      sparam.sched_priority = sched_get_priority_max(SCHED_FIFO)-10;
+      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
     return 0;
   }
 
@@ -294,23 +303,16 @@ extern "C" {
     pthread_exit (NULL);
   }
 
-  void itti_terminate_tasks(task_id_t task_id)
-  {
+  void itti_terminate_tasks(task_id_t task_id) {
     // Sends Terminate signals to all tasks.
     itti_send_terminate_message (task_id);
     usleep(100*1000); // Allow the tasks to receive the message before going returning to main thread
   }
 
-  int itti_init(task_id_t task_max,
-		        thread_id_t thread_max,
-				MessagesIds messages_id_max,
-				const task_info_t *tasks_info,
-                const message_info_t *messages_info)
-  {
+  int itti_init(task_id_t task_max, thread_id_t thread_max, MessagesIds messages_id_max, const task_info_t *tasks_info,
+                const message_info_t *messages_info) {
     AssertFatal(TASK_MAX<UINT16_MAX, "Max itti tasks");
 
-    fprintf(stderr, "%s\n","itti_init() in openairinterface5g/common/utils/ocp_itti/intertask_interface.cpp line 313 \n" );    //  ---src572
-
     for(int i=0; i<task_max; ++i) {
       LOG_I(TMR,"Starting itti queue: %s as task %d\n", tasks_info[i].name, i);
       pthread_mutex_init(&tasks[i].queue_cond_lock, NULL);
@@ -320,11 +322,7 @@ extern "C" {
       itti_subscribe_event_fd((task_id_t)i, tasks[i].sem_fd);
 
       if (tasks[i].admin.threadFunc != NULL)
-        {
-          itti_create_task((task_id_t)i, tasks[i].admin.threadFunc, NULL);
-          fprintf(stderr, "%s\n","itti_init()  line 325 checking if threads get created\n" );    //  ---src572
-
-        }
+        itti_create_task((task_id_t)i, tasks[i].admin.threadFunc, NULL);
     }
 
     return 0;
@@ -337,8 +335,7 @@ extern "C" {
     int32_t       instance,
     timer_type_t  type,
     void         *timer_arg,
-    long         *timer_id)
-  {
+    long         *timer_id) {
     task_list_t *t=&tasks[task_id];
 
     do {
@@ -372,8 +369,7 @@ extern "C" {
     return 0;
   }
 
-  int timer_remove(long timer_id)
-  {
+  int timer_remove(long timer_id) {
     task_id_t task_id=(task_id_t)(timer_id&0xffff);
     int ret;
     pthread_mutex_lock (&tasks[task_id].queue_cond_lock);