added missing files

.vscode/launch.json

@@ -25,4 +25,4 @@
             ]
         }
     ]
-}
+}

ci-scripts/Jenkinsfile-gitlab

@@ -38,10 +38,6 @@ def nodeExecutor = params.nodeExecutor
 // VM Lockable resources
 def vmResource = params.vmLockableResource
 
-// Tags to shorten pipeline duration
-def doMandatoryTests = false
-def doFullTestsuite = false
-
 pipeline {
     agent {
         label nodeExecutor
@@ -50,6 +46,31 @@ 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 L1-sim",
+            "Test RF-sim",
+            "Test L2-sim",
+            "Test-Mono-FDD-Band7",
+            "Test-Mono-TDD-Band40",
+            "Test-IF4p5-FDD-Band7",
+            "Test-IF4p5-TDD-Band40",
+            "Test-Mono-FDD-Band13-LTE-M",
+            "Test-IF4p5-TDD-Band38-Multi-RRU",
+            "Test-eNB-OAI-UE-FDD-Band7",
+            "Test-Mono-FDD-Band13-X2-HO",
+            "Test-TDD-Band78-gNB-NR-UE",
+            "Test-OCP-FDD-Band7"
+        ])
         ansiColor('xterm')
     }
 
@@ -72,33 +93,6 @@ pipeline {
                     if (fileExists("flexran")) {
                         sh "rm -Rf flexran > /dev/null 2>&1"
                     }
-
-                    echo '\u2705 \u001B[32mVerify Labels\u001B[0m'
-                    if ("MERGE".equals(env.gitlabActionType)) {
-                        LABEL_CHECK = sh returnStdout: true, script: 'ci-scripts/checkGitLabMergeRequestLabels.sh --mr-id ' + env.gitlabMergeRequestIid
-                        LABEL_CHECK = LABEL_CHECK.trim()
-                        if (LABEL_CHECK == 'NONE') {
-                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Your merge request has none of the mandatory labels:\n\n"
-                            message += " - BUILD-ONLY\n"
-                            message += " - 4G-LTE\n"
-                            message += " - 5G-NR\n"
-                            message += " - CI\n\n"
-                            message += "Not performing CI due to lack of labels"
-                            addGitLabMRComment comment: message
-                            error('Not performing CI due to lack of labels')
-                        } else if (LABEL_CHECK == 'FULL') {
-                            doMandatoryTests = true
-                            doFullTestsuite = true
-                        } else if (LABEL_CHECK == 'SHORTEN-5G') {
-                            doMandatoryTests = true
-                        } else {
-                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): We will perform only build stages on your Merge Request"
-                            addGitLabMRComment comment: message
-                        }
-                    } else {
-                        doMandatoryTests = true
-                        doFullTestsuite = true
-                    }
                 }
             }
         }
@@ -141,7 +135,7 @@ pipeline {
                         // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
                         sh "./ci-scripts/checkCodingFormattingRules.sh"
                     }
-                    if (doFlexranCtrlTest && doMandatoryTests) {
+                    if (doFlexranCtrlTest) {
                         sh "mkdir flexran"
                         dir ('flexran') {
                             withCredentials([
@@ -381,9 +375,6 @@ pipeline {
                 stage ("VM-based tests") {
                     stages {
                         stage ("Test physical simulators") {
-                            when {
-                                expression {doMandatoryTests}
-                            }
                             steps {
                               lock (vmResource) {
                                 script {
@@ -402,7 +393,7 @@ pipeline {
                         }
                         stage ("Build Flexran Controller") {
                             when {
-                                expression {doFlexranCtrlTest && doMandatoryTests}
+                                expression {doFlexranCtrlTest}
                             }
                             steps {
                               lock (vmResource) {
@@ -419,9 +410,6 @@ pipeline {
                             }
                         }
                         stage ("Test basic simulator") {
-                            when {
-                                expression {doMandatoryTests}
-                            }
                             steps {
                               lock (vmResource) {
                                 script {
@@ -439,9 +427,6 @@ pipeline {
                             }
                         }
                         stage ("Test L1 simulator") {
-                            when {
-                                expression {doMandatoryTests}
-                            }
                             steps {
                               lock (vmResource) {
                                 script {
@@ -459,9 +444,6 @@ pipeline {
                             }
                         }
                         stage ("Test RF simulator") {
-                            when {
-                                expression {doMandatoryTests}
-                            }
                             steps {
                               lock (vmResource) {
                                 script {
@@ -479,9 +461,6 @@ pipeline {
                             }
                         }
                         stage ("Test L2 simulator") {
-                            when {
-                                expression {doFullTestsuite}
-                            }
                             steps {
                               lock (vmResource) {
                                 script {
@@ -499,9 +478,6 @@ pipeline {
                             }
                         }
                         stage ("Destroy all Virtual Machines") {
-                            when {
-                                expression {doMandatoryTests}
-                            }
                             steps {
                               lock (vmResource) {
                                 sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
@@ -511,9 +487,6 @@ pipeline {
                     }
                 }
                 stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             triggerSlaveJob ('eNB-CI-FDD-Band7-B210', 'Test-Mono-FDD-Band7')
@@ -533,9 +506,6 @@ pipeline {
                     }
                 }
                 stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             triggerSlaveJob ('eNB-CI-TDD-Band40-B210', 'Test-Mono-TDD-Band40')
@@ -555,9 +525,6 @@ pipeline {
                     }
                 }
                 stage ("Test IF4p5 - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             sh "sleep 60"
@@ -578,9 +545,6 @@ pipeline {
                     }
                 }
                 stage ("Test IF4p5 - TDD - Band 40 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             sh "sleep 60"
@@ -601,9 +565,6 @@ pipeline {
                     }
                 }
                 stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             sh "sleep 60"
@@ -624,9 +585,6 @@ pipeline {
                     }
                 }
                 stage ("Test X2 Handover - FDD - Band 13 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             sh "sleep 60"
@@ -647,9 +605,6 @@ pipeline {
                     }
                 }
                 stage ("Test IF4p5 - TDD - Band 38 - B210 - MultiRRU") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band38-MultiRRU-B210', 'Test-IF4p5-TDD-Band38-Multi-RRU')
@@ -669,9 +624,6 @@ pipeline {
                     }
                 }
                 stage ("Test OAI UE - FDD - Band 20 - B200") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             triggerSlaveJobNoGitLab ('UE-CI-FDD-Band20-B200')
@@ -691,9 +643,6 @@ pipeline {
                     }
                 }
                 stage ("Test OAI UE - OAI eNB - FDD - Band 7 - B200") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             // Delayed trigger on slave job, so it is always the last one to run
@@ -715,9 +664,6 @@ pipeline {
                     }
                 }
                 stage ("Test OAI NR UE - OAI gNB - TDD - Band 78 - N300") {
-                    when {
-                        expression {doMandatoryTests}
-                    }
                     steps {
                         script {
                             triggerSlaveJob ('gNB-nrUE-MONO-TDD-Band78-N300', 'Test-TDD-Band78-gNB-NR-UE')
@@ -737,9 +683,6 @@ pipeline {
                     }
                 }
                 stage ("Test OAI OCP-eNB - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
                     steps {
                         script {
                             triggerSlaveJob ('OCPeNB-FDD-Band7-B210', 'Test-OCP-FDD-Band7')
@@ -762,7 +705,6 @@ pipeline {
             post {
                 always {
                     script {
-                      if (doMandatoryTests) {
                         dir ('archives') {
                             sh "if [ -d basic_sim/test ] || [ -d phy_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
                         }
@@ -778,7 +720,6 @@ pipeline {
                                 archiveArtifacts artifacts: 'test_simulator_results.html'
                             }
                         }
-                      }
                     }
                 }
             }

ci-scripts/args_parse.py

@@ -41,7 +41,7 @@ import constants as CONST
 #-----------------------------------------------------------
 
 
-def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
 
 
     py_param_file_present = False
@@ -79,7 +79,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP):
             RAN.ranRepository=matchReg.group(1)
             HTML.ranRepository=matchReg.group(1)
             ldpc.ranRepository=matchReg.group(1)
-            CONTAINERS.ranRepository=matchReg.group(1)
         elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
@@ -91,7 +90,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP):
                 CiTestObj.ranAllowMerge = True
                 RAN.ranAllowMerge=True
                 HTML.ranAllowMerge=True
-                CONTAINERS.ranAllowMerge=True
         elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
@@ -101,7 +99,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP):
             RAN.ranBranch=matchReg.group(1)
             HTML.ranBranch=matchReg.group(1)
             ldpc.ranBranch=matchReg.group(1)
-            CONTAINERS.ranBranch=matchReg.group(1)
         elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
@@ -111,7 +108,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP):
             RAN.ranCommitID=matchReg.group(1)
             HTML.ranCommitID=matchReg.group(1)
             ldpc.ranCommitID=matchReg.group(1)
-            CONTAINERS.ranCommitID=matchReg.group(1)
         elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
@@ -121,63 +117,50 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP):
             RAN.ranTargetBranch=matchReg.group(1)
             HTML.ranTargetBranch=matchReg.group(1)
             ldpc.ranTargetBranch=matchReg.group(1)
-            CONTAINERS.ranTargetBranch=matchReg.group(1)
         elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBIPAddress=matchReg.group(1)
                 ldpc.eNBIpAddr=matchReg.group(1)
-                CONTAINERS.eNBIPAddress=matchReg.group(1)
             elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1IPAddress=matchReg.group(1)
-                CONTAINERS.eNB1IPAddress=matchReg.group(1)
             elif re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2IPAddress=matchReg.group(1)
-                CONTAINERS.eNB2IPAddress=matchReg.group(1)
         elif re.match('^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBUserName=matchReg.group(1)
                 ldpc.eNBUserName=matchReg.group(1)
-                CONTAINERS.eNBUserName=matchReg.group(1)
             elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1UserName=matchReg.group(1)
-                CONTAINERS.eNB1UserName=matchReg.group(1)
             elif re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2UserName=matchReg.group(1)
-                CONTAINERS.eNB2UserName=matchReg.group(1)
         elif re.match('^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBPassword=matchReg.group(1)
                 ldpc.eNBPassWord=matchReg.group(1)
-                CONTAINERS.eNBPassword=matchReg.group(1)
             elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1Password=matchReg.group(1)
-                CONTAINERS.eNB1Password=matchReg.group(1)
             elif re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2Password=matchReg.group(1)
-                CONTAINERS.eNB2Password=matchReg.group(1)
         elif re.match('^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
             if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBSourceCodePath=matchReg.group(1)
                 ldpc.eNBSourceCodePath=matchReg.group(1)
-                CONTAINERS.eNBSourceCodePath=matchReg.group(1)
             elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB1SourceCodePath=matchReg.group(1)
-                CONTAINERS.eNB1SourceCodePath=matchReg.group(1)
             elif re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNB2SourceCodePath=matchReg.group(1)
-                CONTAINERS.eNB2SourceCodePath=matchReg.group(1)
         elif re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE)
             EPC.IPAddress=matchReg.group(1)

ci-scripts/buildOnVM.sh

@@ -178,8 +178,6 @@ function build_on_vm {
         echo "mkdir -p cmake_targets/log" >> $VM_CMDS
         echo "chmod 777 cmake_targets/log" >> $VM_CMDS
         echo "cp /home/ubuntu/zip-install.txt cmake_targets/log" >> $VM_CMDS
-        # Patching the pistache build for Xenial (cmake too old for new commits)
-        echo "sed -i -e 's@cd pistache@cd pistache \&\& git checkout -f 9a65f40975fafca5bb5370ba6d0d00f42cbc4356@' ./tools/install_dependencies" >> $VM_CMDS
         echo "echo \"./tools/install_dependencies \"" >> $VM_CMDS
         echo "./tools/install_dependencies > cmake_targets/log/install-build.txt 2>&1" >> $VM_CMDS
         echo "echo \"mkdir build\"" >> $VM_CMDS

ci-scripts/build_fr1_from_yaml.py

@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Created on Tue Jul  7 23:04:51 2020
-
-@author: hardy
-"""
-
-
-
-import yaml
-import sys
-import subprocess
-
-      
-
-def main():
-  f_yaml=sys.argv[1]
-  f_sh=sys.argv[2]
-  #filename='py_params_template.yaml'
-  with open(f_yaml,'r') as file:
-    # The FullLoader parameter handles the conversion from YAML
-    # scalar values to Python the dictionary format
-    print('Loading '+f_yaml)
-    params = yaml.load(file,Loader=yaml.FullLoader)
-
-
-  with open(f_sh,'w') as f:
-    f.write('#!/bin/sh\n')
-    for i in range (0, len(params['steps'])):
-      step=params['steps'][i].split(',')
-      mode=step[0]
-      f_xml=step[1]
-      line='python3 main.py ' + \
-           '--mode='+ mode + ' ' + \
-           '--ranRepository=' + params['ranRepository'] + ' ' + \
-           '--ranBranch=' + params['ranBranch'] + ' ' + \
-           '--ranCommitID=' + params['ranCommitID'] + ' ' + \
-           '--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \
-           '--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \
-           \
-           '--ADBIPAddress=' + params['ADB']['ADBIPAddress'] + ' ' + \
-           '--ADBUserName=' + params['ADB']['ADBUserName'] + ' ' + \
-           '--ADBPassword=' + params['ADB']['ADBPassword'] + ' ' + \
-           \
-           '--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \
-           '--UEUserName=' + params['UE']['UEUserName'] + ' ' + \
-           '--UEPassword=' + params['UE']['UEPassword'] + ' ' + \
-           '--UESourceCodePath=' + params['UE']['UESourceCodePath'] + ' ' + \
-           \
-           '--EPCIPAddress=' + params['EPC']['EPCIPAddress'] + ' ' + \
-           '--EPCUserName=' + params['EPC']['EPCUserName'] + ' ' + \
-           '--EPCPassword=' + params['EPC']['EPCPassword'] + ' ' + \
-           '--EPCSourceCodePath=' + params['EPC']['EPCSourceCodePath'] + ' ' + \
-           '--EPCType=' + params['EPC']['EPCType'] + ' ' + \
-           \
-           '--eNBIPAddress=' + params['RAN'][0]['eNBIPAddress'] + ' ' + \
-           '--eNBUserName=' + params['RAN'][0]['eNBUserName'] + ' ' + \
-           '--eNBPassword=' + params['RAN'][0]['eNBPassword'] + ' ' + \
-           '--eNBSourceCodePath=' + params['RAN'][0]['eNBSourceCodePath'] + ' ' + \
-           \
-           '--eNB1IPAddress=' + params['RAN'][1]['eNB1IPAddress'] + ' ' + \
-           '--eNB1UserName=' + params['RAN'][1]['eNB1UserName'] + ' ' + \
-           '--eNB1Password=' + params['RAN'][1]['eNB1Password'] + ' ' + \
-           '--eNB1SourceCodePath=' + params['RAN'][1]['eNB1SourceCodePath'] + ' '
-      if mode!="InitiateHtml":
-         line+='--XMLTestFile=' + f_xml
-      #if mode is InitiateHTML we have a special processing to mention all xml files from the list
-      #loop starting at 1 to avoid the xml file mentioned with InitiateHtml in yaml file (file is none)
-      else:
-         for i in range (1, len(params['steps'])):
-            step=params['steps'][i].split(',')
-            f_xml=step[1]
-            line+='--XMLTestFile=' + f_xml+' '
-      line+='\n'
-      print(line)
-      f.write(line)
-  subprocess.call(['chmod','777',f_sh])
-
-if __name__ == "__main__":
-    main()
-
-

ci-scripts/build_fr1_template.yaml

@@ -1,46 +0,0 @@
-
-ranRepository : https://gitlab.eurecom.fr/oai/openairinterface5g.git
-ranBranch : BRANCH_NAME 
-ranCommitID : COMMIT_ID 
-ranAllowMerge : 'true' 
-ranTargetBranch : develop
-
-steps:
-  - InitiateHtml,none
-  - TesteNB,xml_files/fr1_multi_node_build.xml
-  - TesteNB,xml_files/fr1_epc_start.xml
-  - TesteNB,xml_files/fr1_ran_ue_base.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate
-  - TesteNB,xml_files/fr1_epc_closure.xml
-
-
-ADB: #on Caracal
-  ADBIPAddress : 192.168.18.196
-  ADBUserName : oaici
-  ADBPassword : KkexF6CErOi1fNuebCPsuIVK
-
-RAN:
-    - eNBIPAddress : 192.168.18.199 #eNB on Minimassive
-      eNBUserName : oaicicd
-      eNBPassword : HzB*nkryaITdVd08TKlT#2Z5a!7M#~qn
-      eNBSourceCodePath : /tmp/CI-FR1-eNB
-    - eNB1IPAddress : 192.168.18.198 #gNB on Mozart
-      eNB1UserName : oaicicd
-      eNB1Password : 7zkDOFgh@w3HvRBMPTMh@BAx
-      eNB1SourceCodePath : /tmp/CI-FR1-gNB
-
-
-EPC: #on Nikaia 
-  EPCIPAddress : 192.168.18.99
-  EPCUserName : nikaia
-  EPCPassword : linux
-  EPCSourceCodePath : /tmp/CI-FR1-EPC
-  EPCType : ltebox
-
-
-UE:
-  UEIPAddress : none
-  UEUserName : none
-  UEPassword : none
-  UESourceCodePath : none
-
-

ci-scripts/checkGitLabMergeRequestLabels.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-#/*
-# * 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
-# */
-
-function usage {
-    echo "OAI GitLab merge request applying script"
-    echo "   Original Author: Raphael Defosseux"
-    echo ""
-    echo "Usage:"
-    echo "------"
-    echo ""
-    echo "    checkGitLabMergeRequestLabels.sh [OPTIONS]"
-    echo ""
-    echo "Options:"
-    echo "------------------"
-    echo ""
-    echo "    --mr-id ####"
-    echo "    Specify the ID of the merge request."
-    echo ""
-    echo "    --help OR -h"
-    echo "    Print this help message."
-    echo ""
-}
-
-if [ $# -ne 2 ] && [ $# -ne 1 ]
-then
-    echo "Syntax Error: not the correct number of arguments"
-    echo ""
-    usage
-    exit 1
-fi
-
-while [[ $# -gt 0 ]]
-do
-key="$1"
-
-case $key in
-    -h|--help)
-    shift
-    usage
-    exit 0
-    ;;
-    --mr-id)
-    MERGE_REQUEST_ID="$2"
-    shift
-    shift
-    ;;
-    *)
-    echo "Syntax Error: unknown option: $key"
-    echo ""
-    usage
-    exit 1
-esac
-done
-
-LABELS=`curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/$MERGE_REQUEST_ID" | jq '.labels' || true`
-
-IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY || true`
-IS_MR_CI=`echo $LABELS | grep -c CI || true`
-IS_MR_4G=`echo $LABELS | grep -c 4G-LTE || true`
-IS_MR_5G=`echo $LABELS | grep -c 5G-NR || true`
-
-# First case: none is present! No CI
-if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ]
-then
-    echo "NONE"
-    exit 0
-fi
-
-# Second case: Build-Only
-if [ $IS_MR_BUILD_ONLY -eq 1 ]
-then
-    echo "BUILD-ONLY"
-    exit 0
-fi
-
-# Third case: CI or 4G label --> Full CI run
-if [ $IS_MR_4G -eq 1 ] || [ $IS_MR_CI -eq 1 ] 
-then
-    echo "FULL"
-    exit 0
-fi
-
-# Fourth case: 5G label
-if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 1 ]
-then
-    echo "SHORTEN-5G"
-    exit 0
-fi
-

ci-scripts/cls_containerize.py

@@ -1,488 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#-----------------------------------------------------------
-# Import
-#-----------------------------------------------------------
-import sys              # arg
-import re               # reg
-import logging
-import os
-import time
-from multiprocessing import Process, Lock, SimpleQueue
-from zipfile import ZipFile
-
-#-----------------------------------------------------------
-# OAI Testing modules
-#-----------------------------------------------------------
-import sshconnection as SSH
-import helpreadme as HELP
-import constants as CONST
-
-#-----------------------------------------------------------
-# Class Declaration
-#-----------------------------------------------------------
-class Containerize():
-
-	def __init__(self):
-		
-		self.ranRepository = ''
-		self.ranBranch = ''
-		self.ranAllowMerge = False
-		self.ranCommitID = ''
-		self.ranTargetBranch = ''
-		self.eNBIPAddress = ''
-		self.eNBUserName = ''
-		self.eNBPassword = ''
-		self.eNBSourceCodePath = ''
-		self.eNB1IPAddress = ''
-		self.eNB1UserName = ''
-		self.eNB1Password = ''
-		self.eNB1SourceCodePath = ''
-		self.eNB2IPAddress = ''
-		self.eNB2UserName = ''
-		self.eNB2Password = ''
-		self.eNB2SourceCodePath = ''
-		self.forcedWorkspaceCleanup = False
-		self.imageKind = ''
-		self.eNB_instance = 0
-		self.eNB_serverId = ['', '', '']
-		self.yamlPath = ['', '', '']
-		self.eNB_logFile = ['', '', '']
-
-		self.testCase_id = ''
-
-		self.flexranCtrlDeployed = False
-		self.flexranCtrlIpAddress = ''
-		self.cli = ''
-		self.dockerfileprefix = ''
-		self.host = ''
-		self.allImagesSize = {}
-		self.collectInfo = {}
-#-----------------------------------------------------------
-# Container management functions
-#-----------------------------------------------------------
-
-	def BuildImage(self, HTML):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('Building on server: ' + lIpAddr)
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-	
-		# Checking the hostname to get adapted on cli and dockerfileprefixes
-		mySSH.command('hostnamectl', '\$', 5)
-		result = re.search('Ubuntu|Red Hat',  mySSH.getBefore())
-		self.host = result.group(0)
-		if self.host == 'Ubuntu':
-			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu18'
-		elif self.host == 'Red Hat':
-			self.cli = 'podman'
-			self.dockerfileprefix = '.rhel8.2'
-
-		imageNames = []
-		result = re.search('eNB', self.imageKind)
-		# Creating a tupple with the imageName and the DockerFile prefix pattern on obelix
-		if result is not None:
-			imageNames.append(('oai-enb', 'eNB'))
-		else:
-			result = re.search('gNB', self.imageKind)
-			if result is not None:
-				imageNames.append(('oai-gnb', 'gNB'))
-			else:
-				result = re.search('all', self.imageKind)
-				if result is not None:
-					imageNames.append(('oai-enb', 'eNB'))
-					imageNames.append(('oai-gnb', 'gNB'))
-					imageNames.append(('oai-lte-ue', 'lteUE'))
-					imageNames.append(('oai-nr-ue', 'nrUE'))
-		if len(imageNames) == 0:
-			imageNames.append(('oai-enb', 'eNB'))
-		
-		# Workaround for some servers, we need to erase completely the workspace
-		if self.forcedWorkspaceCleanup:
-			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
-	
-		self.testCase_id = HTML.testCase_id
-	
-		# on RedHat/CentOS .git extension is mandatory
-		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
-		if result is not None:
-			full_ran_repo_name = self.ranRepository
-		else:
-			full_ran_repo_name = self.ranRepository + '.git'
-		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
-		mySSH.command('cd ' + lSourcePath, '\$', 5)
-		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
-		# Raphael: here add a check if git clone or git fetch went smoothly
-		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
-		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
-
-		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
-		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
-		# if the commit ID is provided use it to point to it
-		if self.ranCommitID != '':
-			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 5)
-		# if the branch is not develop, then it is a merge request and we need to do 
-		# the potential merge. Note that merge conflicts should already been checked earlier
-		imageTag = 'develop'
-		if (self.ranAllowMerge):
-			imageTag = 'ci-temp'
-			if self.ranTargetBranch == '':
-				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
-			else:
-				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
-
- 		# if asterix, copy the entitlement and subscription manager configurations
-		if self.host == 'Red Hat':
-			mySSH.command('mkdir -p  tmp/ca/', '\$', 5)
-			mySSH.command('mkdir -p tmp/entitlement/', '\$', 5) 
-			mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca/', '\$', 5)
-			mySSH.command('sudo cp /etc/pki/entitlement/*.pem tmp/entitlement/', '\$', 5)
-			
-		#mySSH.close()
-		#return 0
-		sharedimage = 'ran-build'
-		# Let's remove any previous run artifacts if still there
-		mySSH.command(self.cli + ' image prune --force', '\$', 5)
-		mySSH.command(self.cli + ' image rm ' + sharedimage + ':' + imageTag, '\$', 5)
-		for image,pattern in imageNames:
-			mySSH.command(self.cli + ' image rm ' + image + ':' + imageTag, '\$', 5)
-		# Build the shared image
-		mySSH.command(self.cli + ' build --target ' + sharedimage + ' --tag ' + sharedimage + ':' + imageTag + ' --file docker/Dockerfile.ran' + self.dockerfileprefix + ' --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > cmake_targets/log/ran-build.log 2>&1', '\$', 1600)
-		# Build the target image(s)
-		previousImage = sharedimage + ':' + imageTag
-		danglingShaOnes=[]
-		for image,pattern in imageNames:
-			# the archived Dockerfiles have "ran-build:latest" as base image
-			# we need to update them with proper tag
-			mySSH.command('sed -i -e "s#' + sharedimage + ':latest#' + sharedimage + ':' + imageTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5)
-			mySSH.command(self.cli + ' build --target ' + image + ' --tag ' + image + ':' + imageTag + ' --file docker/Dockerfile.' + pattern + self.dockerfileprefix + ' . > cmake_targets/log/' + image + '.log 2>&1', '\$', 1200)
-			# Retrieving the dangling image(s) for the log collection
-			mySSH.command(self.cli + ' images --filter "dangling=true" --filter "since=' + previousImage + '" -q | sed -e "s#^#sha=#"', '\$', 5)
-			result = re.search('sha=(?P<imageShaOne>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
-			if result is not None:
-				danglingShaOnes.append((image, result.group('imageShaOne')))
-			previousImage = image + ':' + imageTag
-
-		imageTag = 'ci-temp'
-		# First verify if images were properly created.
-		status = True
-		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + sharedimage + ':' + imageTag, '\$', 5)
-		if mySSH.getBefore().count('No such object') != 0:
-			logging.error('Could not build properly ran-build')
-			status = False
-		else:
-			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-			if result is not None:
-				imageSize = float(result.group('size'))
-				imageSize = imageSize / 1000
-				if imageSize < 1000:
-					logging.debug('\u001B[1m   ran-build size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-					self.allImagesSize['ran-build'] = str(round(imageSize,1)) + ' kbytes'
-				else:
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   ran-build size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-						self.allImagesSize['ran-build'] = str(round(imageSize,1)) + ' Mbytes'
-					else:
-						imageSize = imageSize / 1000
-						logging.debug('\u001B[1m   ran-build size is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-						self.allImagesSize['ran-build'] = str(round(imageSize,1)) + ' Gbytes'
-			else:
-				logging.debug('ran-build size is unknown')
-		for image,pattern in imageNames:
-			mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + image + ':' + imageTag, '\$', 5)
-			if mySSH.getBefore().count('No such object') != 0:
-				logging.error('Could not build properly ' + image)
-				status = False
-			else:
-				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-				if result is not None:
-					imageSize = float(result.group('size'))
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-						self.allImagesSize[image] = str(round(imageSize,1)) + ' kbytes'
-					else:
-						imageSize = imageSize / 1000
-						if imageSize < 1000:
-							logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-							self.allImagesSize[image] = str(round(imageSize,1)) + ' Mbytes'
-						else:
-							imageSize = imageSize / 1000
-							logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-							self.allImagesSize[image] = str(round(imageSize,1)) + ' Gbytes'
-				else:
-					logging.debug('ran-build size is unknown')
-		if not status:
-			mySSH.close()
-			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
-			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			#HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
-			HTML.CreateHtmlTabFooter(False)
-			sys.exit(1)
-
-		# Recover build logs, for the moment only possible when build is successful
-		mySSH.command(self.cli + ' create --name test ' + sharedimage + ':' + imageTag, '\$', 5)
-		mySSH.command('mkdir -p cmake_targets/log/ran-build', '\$', 5)
-		mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-build', '\$', 5)
-		mySSH.command(self.cli + ' rm -f test', '\$', 5)
-		for image,shaone in danglingShaOnes:
-			mySSH.command('mkdir -p cmake_targets/log/' + image, '\$', 5)
-			mySSH.command(self.cli + ' create --name test ' + shaone, '\$', 5)
-			mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/' + image, '\$', 5)
-			mySSH.command(self.cli + ' rm -f test', '\$', 5)
-		mySSH.command(self.cli + ' image prune --force', '\$', 5)
-		mySSH.command('cd cmake_targets', '\$', 5)
-		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
-		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
-		#mySSH.close()
-	
-		mySSH.command('cd /tmp/CI-eNB/cmake_targets', '\$', 5)
-		if (os.path.isfile('./build_log_' + self.testCase_id + '.zip')):
-			os.remove('./build_log_' + self.testCase_id + '.zip')
-		mySSH.command('zip -r -qq build_log_' + self.testCase_id + '.zip build_log_' + self.testCase_id, '\$', 5)
-		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
-		#mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
-		mySSH.close()
-		ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
-	
-		#Trying to identify the errors and warnings for each built images
-		imageNames1 = imageNames
-		shared = ('ran-build','ran')
-		imageNames1.insert(0, shared) 
-		for image,pattern in imageNames1:
-			files = {}
-			file_list = [f for f in os.listdir('build_log_' + self.testCase_id + '/' + image) if os.path.isfile(os.path.join('build_log_' + self.testCase_id + '/' + image, f)) and f.endswith('.txt')]
-			for fil in file_list:
-				errorandwarnings = {}
-				warningsNo = 0
-				errorsNo = 0
-				with open('build_log_{}/{}/{}'.format(self.testCase_id,image,fil), mode='r') as inputfile:
-					for line in inputfile:
-						result = re.search(' ERROR ', str(line))
-						if result is not None:
-							errorsNo += 1
-						result = re.search(' error:', str(line))
-						if result is not None:
-							errorsNo += 1
-						result = re.search(' WARNING ', str(line))
-						if result is not None:
-							warningsNo += 1
-						result = re.search(' warning:', str(line))
-						if result is not None:
-							warningsNo += 1
-					errorandwarnings['errors'] = errorsNo
-					errorandwarnings['warnings'] = warningsNo
-					errorandwarnings['status'] = status
-				files[fil] = errorandwarnings
-			self.collectInfo[image] = files
-		
-		logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
-		HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
-		HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
-
-	def DeployObject(self, HTML, EPC):
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-		# Putting the CPUs in a good state, we do that only on a few servers
-		mySSH.command('hostname', '\$', 5)
-		result = re.search('obelix|asterix',  mySSH.getBefore())
-		if result is not None:
-			mySSH.command('if command -v cpupower &> /dev/null; then echo ' + lPassWord + ' | sudo -S cpupower idle-set -D 0; fi', '\$', 5)
-			time.sleep(5)
-		
-		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-		mySSH.command('cp docker-compose.yml ci-docker-compose.yml', '\$', 5)
-		imageTag = 'develop'
-		if (self.ranAllowMerge):
-			imageTag = 'ci-temp'
-		mySSH.command('sed -i -e "s/image: oai-enb:latest/image: oai-enb:' + imageTag + '/" ci-docker-compose.yml', '\$', 2)
-		localMmeIpAddr = EPC.MmeIPAddress
-		mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)
-		if self.flexranCtrlDeployed:
-			mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED:.*/FLEXRAN_ENABLED: "yes"/\' ci-docker-compose.yml', '\$', 2)
-			mySSH.command('sed -i -e "s/CI_FLEXRAN_CTL_IP_ADDR/' + self.flexranCtrlIpAddress + '/" ci-docker-compose.yml', '\$', 2)
-		else:
-			mySSH.command('sed -i -e "s/FLEXRAN_ENABLED:.*$/FLEXRAN_ENABLED: \"no\"/" ci-docker-compose.yml', '\$', 2)
-			mySSH.command('sed -i -e "s/CI_FLEXRAN_CTL_IP_ADDR/127.0.0.1/" ci-docker-compose.yml', '\$', 2)
-		# Currently support only one
-		mySSH.command('docker-compose --file ci-docker-compose.yml config --services | sed -e "s@^@service=@"', '\$', 2)
-		result = re.search('service=(?P<svc_name>[a-zA-Z0-9\_]+)', mySSH.getBefore())
-		if result is not None:
-			svcName = result.group('svc_name')
-			mySSH.command('docker-compose --file ci-docker-compose.yml up -d ' + svcName, '\$', 2)
-
-		# Checking Status
-		mySSH.command('docker-compose --file ci-docker-compose.yml config', '\$', 5)
-		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
-		unhealthyNb = 0
-		healthyNb = 0
-		startingNb = 0
-		containerName = ''
-		if result is not None:
-			containerName = result.group('container_name')
-			time.sleep(5)
-			cnt = 0
-			while (cnt < 3):
-				mySSH.command('docker inspect --format=\'{{.State.Health.Status}}\' ' + containerName, '\$', 5)
-				unhealthyNb = mySSH.getBefore().count('unhealthy')
-				healthyNb = mySSH.getBefore().count('healthy') - unhealthyNb
-				startingNb = mySSH.getBefore().count('starting')
-				if healthyNb == 1:
-					cnt = 10
-				else:
-					time.sleep(10)
-					cnt += 1
-		logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)')
-		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
-		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
-
-		status = False
-		if healthyNb == 1:
-			cnt = 0
-			while (cnt < 20):
-				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30) 
-				result = re.search('got sync|Starting F1AP at CU', mySSH.getBefore())
-				if result is None:
-					time.sleep(6)
-					cnt += 1
-				else:
-					cnt = 100
-					status = True
-					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
-					time.sleep(10)
-		mySSH.close()
-
-		self.testCase_id = HTML.testCase_id
-		self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log'
-
-		if status:
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		else:
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
-
-	def UndeployObject(self, HTML, RAN):
-		logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-		# Currently support only one
-		mySSH.command('docker-compose --file ci-docker-compose.yml config', '\$', 5)
-		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
-		if result is not None:
-			containerName = result.group('container_name')
-			mySSH.command('docker kill --signal INT ' + containerName, '\$', 30)
-			time.sleep(5)
-			mySSH.command('docker logs ' + containerName + ' > ' + lSourcePath + '/cmake_targets/' + self.eNB_logFile[self.eNB_instance], '\$', 30)
-			mySSH.command('docker rm -f ' + containerName, '\$', 30)
-
-		# Putting the CPUs back in a idle state, we do that only on a few servers
-		mySSH.command('hostname', '\$', 5)
-		result = re.search('obelix|asterix',  mySSH.getBefore())
-		if result is not None:
-			mySSH.command('if command -v cpupower &> /dev/null; then echo ' + lPassWord + ' | sudo -S cpupower idle-set -E; fi', '\$', 5)
-		mySSH.close()
-
-		# Analyzing log file!
-		copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + self.eNB_logFile[self.eNB_instance], '.')
-		nodeB_prefix = 'e'
-		if (copyin_res == -1):
-			HTML.htmleNBFailureMsg='Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!'
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
-		else:
-			logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + self.eNB_logFile[self.eNB_instance])
-			logStatus = RAN.AnalyzeLogFile_eNB(self.eNB_logFile[self.eNB_instance], HTML)
-			if (logStatus < 0):
-				HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
-			else:
-				HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
-

ci-scripts/cls_oaicitest.py

@@ -42,7 +42,6 @@ import xml.etree.ElementTree as ET
 import logging
 import datetime
 import signal
-import statistics as stat
 from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
@@ -54,52 +53,6 @@ import helpreadme as HELP
 import constants as CONST
 import sshconnection
 
-
-
-
-#-----------------------------------------------------------
-# Utility functions
-#-----------------------------------------------------------
-
-def GetPingTimeAnalysis(ping_log_file):
-	#ping time values read from file
-	t_ping=[]
-	#ping stats (dictionary) to be returned by the function
-	ping_stat={}
-	if (os.path.isfile(ping_log_file)):
-		with open(ping_log_file,"r") as f:
-			for line in f:
-				#looking for time=xxx ms field
-				result=re.match('^.+time=(?P<ping_time>[0-9\.]+)',line)
-				if result != None:
-					t_ping.append(float(result.group('ping_time')))
-
-		#initial stats
-		ping_stat['min_0']=min(t_ping)
-		ping_stat['mean_0']=stat.mean(t_ping)
-		ping_stat['median_0']=stat.median(t_ping)
-		ping_stat['max_0']=max(t_ping)
-
-		#get index of max value
-		
-		max_loc=t_ping.index(max(t_ping))
-		ping_stat['max_loc']=max_loc
-		#remove it
-		t_ping.pop(max_loc)
-		#new stats after removing max value
-		ping_stat['min_1']=min(t_ping)
-		ping_stat['mean_1']=stat.mean(t_ping)
-		ping_stat['median_1']=stat.median(t_ping)
-		ping_stat['max_1']=max(t_ping)
-
-		return ping_stat
-
-	else:
-		logging.error("Ping log file does not exist")
-		return -1
-
-	
-
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
@@ -232,7 +185,7 @@ class OaiCiTest():
 		SSH.command('mkdir -p log', '\$', 5)
 		SSH.command('chmod 777 log', '\$', 5)
 		# no need to remove in log (git clean did the trick)
-		SSH.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 1200)
+		SSH.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 900)
 		SSH.command('ls ran_build/build', '\$', 3)
 		SSH.command('ls ran_build/build', '\$', 3)
 		buildStatus = True
@@ -263,7 +216,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTabFooter(False)
 			self.ConditionalExit()
 
-	def CheckFlexranCtrlInstallation(self,RAN,EPC,CONTAINERS):
+	def CheckFlexranCtrlInstallation(self,RAN,EPC):
 		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '':
 			return
 		SSH = sshconnection.SSHConnection()
@@ -272,18 +225,7 @@ class OaiCiTest():
 		result = re.search('/opt/flexran_rtc/build/rt_controller', SSH.getBefore())
 		if result is not None:
 			RAN.flexranCtrlInstalled=True
-			RAN.flexranCtrlIpAddress=EPC.IPAddress
 			logging.debug('Flexran Controller is installed')
-		else:
-			# Maybe flexran-rtc is deployed into a container
-			SSH.command('docker inspect --format="FLEX_RTC_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-flexran-rtc', '\$', 5)
-			result = re.search('FLEX_RTC_IP_ADDR = (?P<flex_ip_addr>[0-9\.]+)', SSH.getBefore())
-			if result is not None:
-				RAN.flexranCtrlDeployed=True
-				RAN.flexranCtrlIpAddress=result.group('flex_ip_addr')
-				CONTAINERS.flexranCtrlDeployed=True
-				CONTAINERS.flexranCtrlIpAddress=result.group('flex_ip_addr')
-				logging.debug('Flexran Controller is deployed: ' + RAN.flexranCtrlIpAddress)
 		SSH.close()
 
 	def InitializeFlexranCtrl(self, HTML,RAN,EPC):
@@ -605,7 +547,7 @@ class OaiCiTest():
 				HTML.htmlUEFailureMsg='nr-uesoftmodem did NOT synced'
 				HTML.CreateHtmlTestRow(self.air_interface + ' ' +  self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
 			logging.error('\033[91mInitialize OAI UE Failed! \033[0m')
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def checkDevTTYisUnlocked(self):
 		SSH = sshconnection.SSHConnection()
@@ -683,7 +625,7 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		self.checkDevTTYisUnlocked()
 
-	def AttachCatM(self,HTML,RAN,COTS_UE,EPC):
+	def AttachCatM(self,HTML,RAN,COTS_UE):
 		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
@@ -756,7 +698,7 @@ class OaiCiTest():
 			html_cell = '<pre style="background-color:white">CAT-M module Attachment Failed</pre>'
 			html_queue.put(html_cell)
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', 1, html_queue)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def PingCatM(self,HTML,RAN,EPC,COTS_UE):
 		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
@@ -767,7 +709,7 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		try:
 			statusQueue = SimpleQueue()
@@ -788,7 +730,7 @@ class OaiCiTest():
 					moduleIPAddr = result.group('ipaddr')
 				else:
 					HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-					self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+					self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 					return
 			ping_time = re.findall("-c (\d+)",str(self.ping_args))
 			device_id = 'catm'
@@ -852,7 +794,7 @@ class OaiCiTest():
 				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', 1, statusQueue)
 			else:
 				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', 1, statusQueue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 		except:
 			os.kill(os.getppid(),signal.SIGUSR1)
 
@@ -953,7 +895,7 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		multi_jobs = []
 		status_queue = SimpleQueue()
@@ -972,7 +914,7 @@ class OaiCiTest():
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		else:
 			attach_status = True
@@ -1001,7 +943,7 @@ class OaiCiTest():
 					time.sleep(5)
 			else:
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def DetachUE_common(self, device_id, idx,COTS_UE):
 		try:
@@ -1034,7 +976,7 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		multi_jobs = []
 		cnt = 0
@@ -1285,8 +1227,6 @@ class OaiCiTest():
 				if lDataConnectionState == 3:
 					dataConnectionState = 'Data State:    SUSPENDED'
 			result = re.search('mDataConnectionReason=(?P<dataConnectionReason>[0-9a-zA-Z_]+)', SSH.getBefore())
-			time.sleep(1)
-			SSH.close()
 			dataConnectionReason = 'Data Reason:   UNKNOWN'
 			if result is not None:
 				dataConnectionReason = 'Data Reason:   ' + result.group('dataConnectionReason')
@@ -1300,6 +1240,7 @@ class OaiCiTest():
 			qMsg = serviceState + '\n' + dataConnectionState + '\n' + dataConnectionReason
 			statusQueue.put(qMsg)
 			lock.release()
+			SSH.close()
 		except:
 			os.kill(os.getppid(),signal.SIGUSR1)
 
@@ -1326,12 +1267,12 @@ class OaiCiTest():
 			i += 1
 		for job in multi_jobs:
 			job.join()
-		if (RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted) or RAN.flexranCtrlDeployed:
+		if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
 			SSH = sshconnection.SSHConnection()
 			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-			SSH.command('curl http://' + RAN.flexranCtrlIpAddress + ':9999/stats | jq \'.\' > check_status_' + self.testCase_id + '.log 2>&1', '\$', 5)
-			SSH.command('cat check_status_' + self.testCase_id + '.log | jq \'.eNB_config[0].UE\' | grep -c rnti | sed -e "s#^#Nb Connected UE = #"', '\$', 5)
+			SSH.command('cd /opt/flexran_rtc', '\$', 5)
+			SSH.command('curl http://localhost:9999/stats | jq \'.\' > log/check_status_' + self.testCase_id + '.log 2>&1', '\$', 5)
+			SSH.command('cat log/check_status_' + self.testCase_id + '.log | jq \'.eNB_config[0].UE\' | grep -c rnti | sed -e "s#^#Nb Connected UE = #"', '\$', 5)
 			result = re.search('Nb Connected UE = (?P<nb_ues>[0-9]+)', SSH.getBefore())
 			passStatus = True
 			if result is not None:
@@ -1350,7 +1291,7 @@ class OaiCiTest():
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow(htmlOptions, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 		else:
 			check_status = True
 			html_queue = SimpleQueue()
@@ -1366,7 +1307,7 @@ class OaiCiTest():
 				HTML.CreateHtmlTestRowQueue(htmlOptions, 'OK', len(self.UEDevices), html_queue)
 			else:
 				HTML.CreateHtmlTestRowQueue(htmlOptions, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def GetAllUEIPAddresses(self):
 		SSH = sshconnection.SSHConnection()
@@ -1456,26 +1397,17 @@ class OaiCiTest():
 				if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
 					launchFromTrfContainer = True
 				if launchFromTrfContainer:
-					ping_status = SSH.command('docker exec -it prod-trf-gen /bin/bash -c "ping ' + self.ping_args + ' ' + UE_IPAddress + '" 2>&1 | tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)				
+					ping_status = SSH.command('docker exec -it prod-trf-gen /bin/bash -c "ping ' + self.ping_args + ' ' + UE_IPAddress + '" 2>&1 | tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
 				else:
 					ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
-				#copy the ping log file to have it locally for analysis (ping stats)
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '.')				
 			else:
-				#ping log file is on the python executor
 				cmd = 'ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 > ping_' + self.testCase_id + '_' + device_id + '.log' 
 				message = cmd + '\n'
 				logging.debug(cmd)
 				ret = subprocess.run(cmd, shell=True)
 				ping_status = ret.returncode
-				#copy the ping log file to an other folder for log collection (source and destination are EPC)
 				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'ping_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
-                #copy the ping log file to have it locally for analysis (ping stats)
-				logging.debug(EPC.SourceCodePath + 'ping_' + self.testCase_id + '_' + device_id + '.log')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath  +'/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '.')
-
 				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				#cat is executed on EPC
 				SSH.command('cat ' + EPC.SourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
 			# TIMEOUT CASE
 			if ping_status < 0:
@@ -1484,7 +1416,6 @@ class OaiCiTest():
 				SSH.close()
 				self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
 				return
-			#search is done on cat result
 			result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
 			if result is None:
 				message = 'Packet Loss Not Found!'
@@ -1519,27 +1450,7 @@ class OaiCiTest():
 			logging.debug('\u001B[1;34m    ' + min_msg + '\u001B[0m')
 			logging.debug('\u001B[1;34m    ' + avg_msg + '\u001B[0m')
 			logging.debug('\u001B[1;34m    ' + max_msg + '\u001B[0m')
-
-			#adding extra ping stats from local file
-			ping_log_file='ping_' + self.testCase_id + '_' + device_id + '.log'
-			logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
-			ping_stat=GetPingTimeAnalysis(ping_log_file)
-			ping_stat_msg=''
-			if (ping_stat!=-1) and (len(ping_stat)!=0):
-				ping_stat_msg+='Ping stats before removing largest value : \n'
-				ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_0'])) + 'ms \n'
-				ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_0'])) + 'ms \n'
-				ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_0'])) + 'ms \n'
-				ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_0'])) + 'ms \n'
-				ping_stat_msg+='Max Index   : ' + str(ping_stat['max_loc']) + '\n'
-				ping_stat_msg+='Ping stats after removing largest value : \n'
-				ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_1'])) + 'ms \n'
-				ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_1'])) + 'ms \n'
-				ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_1'])) + 'ms \n'
-				ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_1'])) + 'ms \n'
-
-			#building html message
-			qMsg = pal_msg + '\n' + min_msg + '\n' + avg_msg + '\n' + max_msg + '\n' + ping_stat_msg
+			qMsg = pal_msg + '\n' + min_msg + '\n' + avg_msg + '\n' + max_msg
 			packetLossOK = True
 			if packetloss is not None:
 				if float(packetloss) > float(self.ping_packetloss_threshold):
@@ -1574,7 +1485,7 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		ping_from_eNB = re.search('oaitun_enb1', str(self.ping_args))
 		if ping_from_eNB is not None:
@@ -1676,12 +1587,12 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		ueIpStatus = self.GetAllUEIPAddresses()
 		if (ueIpStatus < 0):
 			HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		multi_jobs = []
 		i = 0
@@ -1699,7 +1610,7 @@ class OaiCiTest():
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 		else:
 			ping_status = True
 			html_queue = SimpleQueue()
@@ -1716,7 +1627,7 @@ class OaiCiTest():
 				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
 			else:
 				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def Iperf_ComputeTime(self):
 		result = re.search('-t (?P<iperf_time>\d+)', str(self.iperf_args))
@@ -2023,34 +1934,15 @@ class OaiCiTest():
 			ret = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, encoding='utf-8')
 			if ret.stdout is not None:
 				EPC_Iperf_UE_IPAddress = ret.stdout.strip()
-		# When using a docker-based deployment, IPERF client shall be launched from trf container
-		launchFromTrfContainer = False
-		if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
-			launchFromTrfContainer = True
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('docker inspect --format="TRF_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-trf-gen', '\$', 5)
-			result = re.search('TRF_IP_ADDR = (?P<trf_ip_addr>[0-9\.]+)', SSH.getBefore())
-			if result is not None:
-				EPC_Iperf_UE_IPAddress = result.group('trf_ip_addr')
-			SSH.close()
 		port = 5001 + idx
-		udpOptions = ''
-		if udpIperf:
-			udpOptions = '-u '
 		if launchFromEpc:
 			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 			SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
 			SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-			if launchFromTrfContainer:
-				if self.ueIperfVersion == self.dummyIperfVersion:
-					prefix = ''
-				else:
-					prefix = ''
-					if self.ueIperfVersion == '2.0.5':
-						prefix = '/iperf-2.0.5/bin/'
-				SSH.command('docker exec -d prod-trf-gen /bin/bash -c "nohup ' + prefix + 'iperf ' + udpOptions + '-s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &"', '\$', 5)
+			if udpIperf:
+				SSH.command('echo $USER; nohup iperf -u -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', EPC.UserName, 5)
 			else:
-				SSH.command('echo $USER; nohup iperf ' + udpOptions + '-s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', EPC.UserName, 5)
+				SSH.command('echo $USER; nohup iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', EPC.UserName, 5)
 			SSH.close()
 		else:
 			if self.ueIperfVersion == self.dummyIperfVersion:
@@ -2059,7 +1951,10 @@ class OaiCiTest():
 				prefix = ''
 				if self.ueIperfVersion == '2.0.5':
 					prefix = '/opt/iperf-2.0.5/bin/'
-			cmd = 'nohup ' + prefix + 'iperf ' + udpOptions + '-s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
+			if udpIperf:
+				cmd = 'nohup ' + prefix + 'iperf -u -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
+			else:
+				cmd = 'nohup ' + prefix + 'iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
 			logging.debug(cmd)
 			subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, encoding='utf-8')
 		time.sleep(0.5)
@@ -2105,16 +2000,13 @@ class OaiCiTest():
 		# Kill iperf server on EPC side
 		if launchFromEpc:
 			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			if launchFromTrfContainer:
-				SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
-			else:
-				SSH.command('killall --signal SIGKILL iperf', EPC.UserName, 5)
+			SSH.command('killall --signal SIGKILL iperf', EPC.UserName, 5)
 			SSH.close()
 		else:
 			cmd = 'killall --signal SIGKILL iperf'
 			logging.debug(cmd)
 			subprocess.run(cmd, shell=True)
-			time.sleep(1)
+			time.sleep(1)			
 			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
 		# in case of failure, retrieve server log
 		if (clientStatus == -1) or (clientStatus == -2):
@@ -2122,10 +2014,6 @@ class OaiCiTest():
 				time.sleep(1)
 				if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
 					os.remove('iperf_server_' + self.testCase_id + '_' + device_id + '.log')
-				if launchFromTrfContainer:
-					SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-					SSH.command('docker cp prod-trf-gen:/iperf-2.0.5/iperf_server_' + self.testCase_id + '_' + device_id + '.log ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-					SSH.close()
 				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath+ '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
 			self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options)
 		# in case of OAI-UE 
@@ -2324,16 +2212,8 @@ class OaiCiTest():
 				else:
 					SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.SourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
 				# fromdos has to be called on the python executor not on ADB server
-				cmd = 'fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 > /dev/null'
-				try:
-					subprocess.run(cmd, shell=True)
-				except:
-					pass
-				cmd = 'dos2unix -o iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 > /dev/null'
-				try:
-					subprocess.run(cmd, shell=True)
-				except:
-					pass
+				cmd = 'fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log'
+				subprocess.run(cmd, shell=True)
 				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options)
 
 			# in case of OAI UE: 
@@ -2357,7 +2237,7 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		server_on_enb = re.search('-R', str(self.iperf_args))
 		if server_on_enb is not None:
@@ -2455,7 +2335,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
 		else:
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def Iperf(self,HTML,RAN,EPC,COTS_UE):
 		result = re.search('noS1', str(RAN.Initialize_eNB_args))
@@ -2473,13 +2353,13 @@ class OaiCiTest():
 		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 		if (pStatus < 0):
 			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 		ueIpStatus = self.GetAllUEIPAddresses()
 		if (ueIpStatus < 0):
 			logging.debug('going here')
 			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			return
 
 		self.dummyIperfVersion = '2.0.10'
@@ -2510,7 +2390,7 @@ class OaiCiTest():
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 		else:
 			iperf_status = True
 			iperf_noperf = False
@@ -2532,7 +2412,7 @@ class OaiCiTest():
 				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
 			else:
 				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 
 	def CheckProcessExist(self, check_eNB, check_OAI_UE,RAN,EPC):
 		multi_jobs = []
@@ -2952,7 +2832,7 @@ class OaiCiTest():
 			job.join()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def TerminateOAIUE(self,HTML,RAN,COTS_UE,EPC):
+	def TerminateOAIUE(self,HTML,RAN,COTS_UE):
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
 		SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
@@ -2993,11 +2873,11 @@ class OaiCiTest():
 					# Not an error then
 					if (logStatus != CONST.OAI_UE_PROCESS_COULD_NOT_SYNC) or (ueAction != 'Sniffing'):
 						self.Initialize_OAI_UE_args = ''
-						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 				else:
 					if (logStatus == CONST.OAI_UE_PROCESS_COULD_NOT_SYNC):
 						self.Initialize_OAI_UE_args = ''
-						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC)
+						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE)
 			else:
 				logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
 				HTML.htmlUEFailureMsg='<b>' + ueAction + ' Completed</b>\n' + HTML.htmlUEFailureMsg
@@ -3006,7 +2886,7 @@ class OaiCiTest():
 		else:
 			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def AutoTerminateUEandeNB(self,HTML,RAN,COTS_UE,EPC):
+	def AutoTerminateUEandeNB(self,HTML,RAN,COTS_UE):
 		if (self.ADBIPAddress != 'none'):
 			self.testCase_id = 'AUTO-KILL-UE'
 			HTML.testCase_id=self.testCase_id
@@ -3020,19 +2900,15 @@ class OaiCiTest():
 			self.desc = 'Automatic Termination of OAI-UE'
 			HTML.desc='Automatic Termination of OAI-UE'
 			self.ShowTestID()
-			self.TerminateOAIUE(HTML,RAN,COTS_UE,EPC)
+			self.TerminateOAIUE(HTML,RAN,COTS_UE)
 		if (RAN.Initialize_eNB_args != ''):
-			self.testCase_id = 'AUTO-KILL-RAN'
+			self.testCase_id = 'AUTO-KILL-eNB'
 			HTML.testCase_id=self.testCase_id
-			self.desc = 'Automatic Termination of all RAN nodes'
-			HTML.desc='Automatic Termination of RAN nodes'
+			self.desc = 'Automatic Termination of eNB'
+			HTML.desc='Automatic Termination of eNB'
 			self.ShowTestID()
-			#terminate all RAN nodes eNB/gNB/OCP
-			for instance in range(0, len(RAN.air_interface)):
-				if RAN.air_interface[instance]!='':
-					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
-					RAN.eNB_instance=instance
-					RAN.TerminateeNB(HTML,EPC)
+			RAN.eNB_instance=0
+			RAN.TerminateeNB()
 		if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
 			self.testCase_id = 'AUTO-KILL-flexran-ctl'
 			HTML.testCase_id=self.testCase_id
@@ -3174,7 +3050,7 @@ class OaiCiTest():
 		SSH.command('cd ' + SourceCodePath, '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('rm -f build.log.zip', '\$', 5)
-		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
+		SSH.command('zip build.log.zip build_log_*/*', '\$', 60)
 		SSH.close()
 
 	def LogCollectPing(self,EPC):

ci-scripts/conf_files/cu.band7.tm1.100PRB.conf

@@ -215,7 +215,7 @@ log_config = {
 NETWORK_CONTROLLER : {
   FLEXRAN_ENABLED        = "no";
   FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
   FLEXRAN_PORT           = 2210;
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/cu.band7.tm1.25PRB.conf

@@ -215,7 +215,7 @@ log_config = {
 NETWORK_CONTROLLER : {
   FLEXRAN_ENABLED        = "no";
   FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
   FLEXRAN_PORT           = 2210;
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/cu.band7.tm1.50PRB.conf

@@ -215,7 +215,7 @@ log_config = {
 NETWORK_CONTROLLER : {
   FLEXRAN_ENABLED        = "no";
   FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
   FLEXRAN_PORT           = 2210;
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -112,7 +112,7 @@ log_config = {
 NETWORK_CONTROLLER : {
   FLEXRAN_ENABLED        = "no";
   FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
   FLEXRAN_PORT           = 2210;
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -112,7 +112,7 @@ log_config = {
 NETWORK_CONTROLLER : {
   FLEXRAN_ENABLED        = "no";
   FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
   FLEXRAN_PORT           = 2210;
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf

@@ -112,7 +112,7 @@ log_config = {
 NETWORK_CONTROLLER : {
   FLEXRAN_ENABLED        = "no";
   FLEXRAN_INTERFACE_NAME = "lo";
-  FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
   FLEXRAN_PORT           = 2210;
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -239,7 +239,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -448,7 +448,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -251,7 +251,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -395,7 +395,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -228,7 +228,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -228,7 +228,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -228,7 +228,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -226,7 +226,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -247,7 +247,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -256,7 +256,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -28,85 +28,83 @@ eNBs =
       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                = 7;
-      downlink_frequency        = 2680000000L;
-      uplink_frequency_offset   = -120000000;
-      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                   = 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               = 0;
-      pdsch_referenceSignalPower= -25;
-      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";
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2680000000L;
+      uplink_frequency_offset 			      = -120000000;
+      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                                            = 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             			      = 0;
+      pdsch_referenceSignalPower 			      = -25;
+      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";
       /*
-      srs_BandwidthConfig       =;
-      srs_SubframeConfig        =;
-      srs_ackNackST             =;
-      srs_MaxUpPts              =;
+      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;
 
-      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;
+      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";
@@ -118,28 +116,27 @@ eNBs =
       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";
+      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_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;
 
       }
@@ -207,43 +204,40 @@ eNBs =
   }
 );
 
-MACRLCs =
-(
-  {
-    num_cc          = 1;
-    tr_s_preference = "local_L1";
-    tr_n_preference = "local_RRC";
-    phy_test_mode   = 0;
-    puSch10xSnr     =  160;
-    puCch10xSnr     =  160;
-  }  
+MACRLCs = (
+	{
+	num_cc = 1;
+	tr_s_preference = "local_L1";
+	tr_n_preference = "local_RRC";
+	phy_test_mode = 0;
+        puSch10xSnr     =  160;
+        puCch10xSnr     =  160;
+        }  
 );
 
-L1s =
-(
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-  }  
+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];
-  }
+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];
+
+    }
 );  
 
-THREAD_STRUCT =
-(
+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";
@@ -256,27 +250,27 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     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";
-};
+     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.band7.tm1.50PRB.usrpb210.conf

@@ -255,7 +255,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -266,7 +266,7 @@ RUs = (
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 118;
     eNB_instances  = [0];
-#    clock_src      = "external";
+    clock_src      = "external";
   }
 );  
 

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

@@ -249,7 +249,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -244,7 +244,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "eth0";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -2,7 +2,6 @@ Active_gNBs = ( "gNB-Eurecom-5GNRBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
-
 gNBs =
 (
  {
@@ -22,10 +21,7 @@ gNBs =
 
     ssb_SubcarrierOffset                                      = 31; //0;
     pdsch_AntennaPorts                                        = 1;
-    pusch_TargetSNRx10                                        = 200; 
-    pucch_TargetSNRx10                                        = 200;
-
- 
+  
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
@@ -250,7 +246,6 @@ L1s = (
       {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  pusch_proc_threads = 8;
         }  
 );
 
@@ -265,7 +260,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
-#         clock_src = "external";
+         clock_src = "external";
     }
 );  
 

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

@@ -235,7 +235,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -235,7 +235,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -235,7 +235,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -254,7 +254,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -254,7 +254,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -254,7 +254,7 @@ NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
     FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "CI_FLEXRAN_CTL_IP_ADDR";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

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

@@ -1,25 +1,23 @@
-RUs =
-(
-  {
-    local_if_name                 = "lo";
-    remote_address                = "127.0.0.1"
-    local_address                 = "127.0.0.2";
-    local_portc                   = 50000;
-    remote_portc                  = 50000;
-    local_portd                   = 50001;
-    remote_portd                  = 50001;
-    local_rf                      = "yes"
-    tr_preference                 = "udp_if4p5";
-    nb_tx                         = 1;
-    nb_rx                         = 1;
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    bands                         = [7];
-  }
+RUs = (
+    {
+        local_if_name                    = "lo";
+        remote_address                   = "127.0.0.1"
+        local_address                    = "127.0.0.2";
+        local_portc                       = 50000;
+        remote_portc                      = 50000;
+        local_portd                       = 50001;
+        remote_portd                      = 50001;
+        local_rf                         = "yes"
+        tr_preference                    = "udp_if4p5";
+        nb_tx                            = 1;
+        nb_rx                            = 1;
+        max_pdschReferenceSignalPower    = -27;
+        max_rxgain                       = 115;
+        bands                            = [7];
+    }
 );
 
-THREAD_STRUCT =
-(
+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";
@@ -28,20 +26,19 @@ THREAD_STRUCT =
   }
 );
 
-log_config =
-{
-  global_log_level      ="error";
-  global_log_verbosity  ="medium";
-  hw_log_level          ="error";
-  hw_log_verbosity      ="medium";
-  phy_log_level         ="error";
-  phy_log_verbosity     ="medium";
-  mac_log_level         ="error";
-  mac_log_verbosity     ="high";
-  rlc_log_level         ="error";
-  rlc_log_verbosity     ="medium";
-  pdcp_log_level        ="error";
-  pdcp_log_verbosity    ="medium";
-  rrc_log_level         ="error";
-  rrc_log_verbosity     ="medium";
+log_config = {
+      global_log_level                      ="error";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="error";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="error";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="error";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="error";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="error";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="error";
+      rrc_log_verbosity                     ="medium";
 };

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

@@ -1,25 +1,23 @@
-RUs =
-(
-  {
-    local_if_name                 = "lo";
-    remote_address                = "127.0.0.1"
-    local_address                 = "127.0.0.2";
-    local_portc                   = 50000;
-    remote_portc                  = 50000;
-    local_portd                   = 50001;
-    remote_portd                  = 50001;
-    local_rf                      = "yes"
-    tr_preference                 = "udp_if4p5";
-    nb_tx                         = 1;
-    nb_rx                         = 1;
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 115;
-    bands                         = [40];
-  }
+RUs = (
+    {
+        local_if_name                    = "lo";
+        remote_address                   = "127.0.0.1"
+        local_address                    = "127.0.0.2";
+        local_portc                       = 50000;
+        remote_portc                      = 50000;
+        local_portd                       = 50001;
+        remote_portd                      = 50001;
+        local_rf                         = "yes"
+        tr_preference                    = "udp_if4p5";
+        nb_tx                            = 1;
+        nb_rx                            = 1;
+        max_pdschReferenceSignalPower    = -27;
+        max_rxgain                       = 115;
+        bands                            = [40];
+    }
 );
 
-THREAD_STRUCT =
-(
+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";
@@ -28,20 +26,19 @@ THREAD_STRUCT =
   }
 );
 
-log_config =
-{
-  global_log_level      ="error";
-  global_log_verbosity  ="medium";
-  hw_log_level          ="error";
-  hw_log_verbosity      ="medium";
-  phy_log_level         ="error";
-  phy_log_verbosity     ="medium";
-  mac_log_level         ="error";
-  mac_log_verbosity     ="high";
-  rlc_log_level         ="error";
-  rlc_log_verbosity     ="medium";
-  pdcp_log_level        ="error";
-  pdcp_log_verbosity    ="medium";
-  rrc_log_level         ="error";
-  rrc_log_verbosity     ="medium";
+log_config = {
+      global_log_level                      ="error";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="error";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="error";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="error";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="error";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="error";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="error";
+      rrc_log_verbosity                     ="medium";
 };

ci-scripts/constants.py

@@ -59,7 +59,6 @@ OAI_UE_PROCESS_NO_TUNNEL_INTERFACE = -24
 OAI_UE_PROCESS_SEG_FAULT = -25
 OAI_UE_PROCESS_NO_MBMS_MSGS = -26
 OAI_UE_PROCESS_OK = +6
-INVALID_PARAMETER = -50
 
 UE_STATUS_DETACHED = 0
 UE_STATUS_DETACHING = 1

ci-scripts/epc.py

@@ -46,6 +46,7 @@ from multiprocessing import Process, Lock, SimpleQueue
 import sshconnection as SSH 
 import helpreadme as HELP
 import constants as CONST
+import html
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -60,18 +61,18 @@ class EPCManagement():
 		self.SourceCodePath = ''
 		self.Type = ''
 		self.PcapFileName = ''
+		self.htmlObj = None
 		self.testCase_id = ''
 		self.MmeIPAddress = ''
 		self.containerPrefix = 'prod'
 		self.mmeConfFile = 'mme.conf'
-		self.yamlPath = ''
 
 
 #-----------------------------------------------------------
 # EPC management functions
 #-----------------------------------------------------------
 
-	def InitializeHSS(self, HTML):
+	def InitializeHSS(self):
 		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
 			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
@@ -113,9 +114,10 @@ class EPCManagement():
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
 
-	def InitializeMME(self, HTML):
+	def InitializeMME(self):
 		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
 			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
@@ -151,7 +153,8 @@ class EPCManagement():
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
 
 	def SetMmeIPAddress(self):
 		# Not an error if we don't need an EPC
@@ -172,7 +175,7 @@ class EPCManagement():
 		else:
 			self.MmeIPAddress = self.IPAddress
 
-	def InitializeSPGW(self, HTML):
+	def InitializeSPGW(self):
 		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
 			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
@@ -209,14 +212,15 @@ class EPCManagement():
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
 
 	def CheckHSSProcess(self, status_queue):
 		try:
 			mySSH = SSH.SSHConnection() 
 			mySSH.open(self.IPAddress, self.UserName, self.Password)
 			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				mySSH.command('docker top ' + self.containerPrefix + '-oai-hss', '\$', 5)
+				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-hss /bin/bash -c "ps aux | grep oai_hss"', '\$', 5)
 			else:
 				mySSH.command('stdbuf -o0 ps -aux | grep --color=never hss | grep -v grep', '\$', 5)
 			if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
@@ -241,7 +245,7 @@ class EPCManagement():
 			mySSH = SSH.SSHConnection() 
 			mySSH.open(self.IPAddress, self.UserName, self.Password)
 			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				mySSH.command('docker top ' + self.containerPrefix + '-oai-mme', '\$', 5)
+				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-mme /bin/bash -c "ps aux | grep oai_mme"', '\$', 5)
 			else:
 				mySSH.command('stdbuf -o0 ps -aux | grep --color=never mme | grep -v grep', '\$', 5)
 			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
@@ -268,11 +272,11 @@ class EPCManagement():
 			mySSH = SSH.SSHConnection() 
 			mySSH.open(self.IPAddress, self.UserName, self.Password)
 			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				mySSH.command('docker top ' + self.containerPrefix + '-oai-spgwc', '\$', 5)
-				result = re.search('oai_spgwc -', mySSH.getBefore())
+				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "ps aux | grep oai_spgwc"', '\$', 5)
+				result = re.search('oai_spgwc -o -c ', mySSH.getBefore())
 				if result is not None:
-					mySSH.command('docker top ' + self.containerPrefix + '-oai-spgwu-tiny', '\$', 5)
-					result = re.search('oai_spgwu -', mySSH.getBefore())
+					mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "ps aux | grep oai_spgwu"', '\$', 5)
+					result = re.search('oai_spgwu -o -c ', mySSH.getBefore())
 			elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 				mySSH.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
 				result = re.search('spgwu -c ', mySSH.getBefore())
@@ -293,7 +297,7 @@ class EPCManagement():
 		except:
 			os.kill(os.getppid(),signal.SIGUSR1)
 
-	def TerminateHSS(self, HTML):
+	def TerminateHSS(self):
 		mySSH = SSH.SSHConnection() 
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
@@ -326,9 +330,10 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def TerminateMME(self, HTML):
+	def TerminateMME(self):
 		mySSH = SSH.SSHConnection() 
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
@@ -352,9 +357,10 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def TerminateSPGW(self, HTML):
+	def TerminateSPGW(self):
 		mySSH = SSH.SSHConnection() 
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
@@ -395,155 +401,8 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def DeployEpc(self, HTML):
-		logging.debug('Trying to deploy')
-		if not re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-			HTML.CreateHtmlTabFooter(False)
-			sys.exit('Deploy not possible with this EPC type: ' + self.Type)
-
-		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(CONST.Version)
-			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
-			sys.exit('Insufficient EPC Parameters')
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		mySSH.command('docker-compose --version', '\$', 5)
-		result = re.search('docker-compose version 1', mySSH.getBefore())
-		if result is None:
-			mySSH.close()
-			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-			HTML.CreateHtmlTabFooter(False)
-			sys.exit('docker-compose not installed on ' + self.IPAddress)
-
-		mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
-		mySSH.command('if [ -d ' + self.SourceCodePath + '/logs ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/logs ; fi', '\$', 5)
-		mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts ' + self.SourceCodePath + '/logs', '\$', 5)
-
-		# deploying and configuring the cassandra database
-		# container names and services are currently hard-coded.
-		# they could be recovered by:
-		# - docker-compose config --services
-		# - docker-compose config | grep container_name
-		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-		mySSH.copyout(self.IPAddress, self.UserName, self.Password, './' + self.yamlPath + '/docker-compose.yml', self.SourceCodePath + '/scripts')
-		mySSH.command('wget --quiet --tries=3 --retry-connrefused https://raw.githubusercontent.com/OPENAIRINTERFACE/openair-hss/develop/src/hss_rel14/db/oai_db.cql', '\$', 30)
-		mySSH.command('docker-compose down', '\$', 60)
-		mySSH.command('docker-compose up -d db_init', '\$', 60)
-
-		# databases take time...
-		time.sleep(10)
-		cnt = 0
-		db_init_status = False
-		while (cnt < 10):
-			mySSH.command('docker logs prod-db-init', '\$', 5)
-			result = re.search('OK', mySSH.getBefore())
-			if result is not None:
-				cnt = 10
-				db_init_status = True
-			else:
-				time.sleep(5)
-				cnt += 1
-		mySSH.command('docker rm -f prod-db-init', '\$', 5)
-		if not db_init_status:
-			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-			HTML.CreateHtmlTabFooter(False)
-			sys.exit('Cassandra DB deployment/configuration went wrong!')
-
-		# deploying EPC cNFs
-		mySSH.command('docker-compose up -d oai_spgwu', '\$', 60)
-		listOfContainers = 'prod-cassandra prod-oai-hss prod-oai-mme prod-oai-spgwc prod-oai-spgwu-tiny'
-		expectedHealthyContainers = 5
-
-		# Checking for additional services
-		mySSH.command('docker-compose config', '\$', 5)
-		configResponse = mySSH.getBefore()
-		if configResponse.count('flexran_rtc') == 1:
-			mySSH.command('docker-compose up -d flexran_rtc', '\$', 60)
-			listOfContainers += ' prod-flexran-rtc'
-			expectedHealthyContainers += 1
-		if configResponse.count('trf_gen') == 1:
-			mySSH.command('docker-compose up -d trf_gen', '\$', 60)
-			listOfContainers += ' prod-trf-gen'
-			expectedHealthyContainers += 1
-
-		# Checking if all are healthy
-		cnt = 0
-		while (cnt < 3):
-			mySSH.command('docker inspect --format=\'{{.State.Health.Status}}\' ' + listOfContainers, '\$', 10)
-			unhealthyNb = mySSH.getBefore().count('unhealthy')
-			healthyNb = mySSH.getBefore().count('healthy') - unhealthyNb
-			startingNb = mySSH.getBefore().count('starting')
-			if healthyNb == expectedHealthyContainers:
-				cnt = 10
-			else:
-				time.sleep(10)
-				cnt += 1
-		logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)')
-		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
-		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
-		if healthyNb == expectedHealthyContainers:
-			mySSH.command('docker exec -d prod-oai-hss /bin/bash -c "nohup tshark -i any -f \'port 9042 or port 3868\' -w /tmp/hss_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
-			mySSH.command('docker exec -d prod-oai-mme /bin/bash -c "nohup tshark -i any -f \'port 3868 or port 2123 or port 36412\' -w /tmp/mme_check_run.pcap 2>&1 > /dev/null"', '\$', 10)
-			mySSH.command('docker exec -d prod-oai-spgwc /bin/bash -c "nohup tshark -i any -f \'port 2123 or port 8805\' -w /tmp/spgwc_check_run.pcap 2>&1 > /dev/null"', '\$', 10)
-			# on SPGW-U, not capturing on SGI to avoid huge file
-			mySSH.command('docker exec -d prod-oai-spgwu-tiny /bin/bash -c "nohup tshark -i any -f \'port 8805\'  -w /tmp/spgwu_check_run.pcap 2>&1 > /dev/null"', '\$', 10)
-			mySSH.close()
-			logging.debug('Deployment OK')
-			HTML.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
-		else:
-			mySSH.close()
-			logging.debug('Deployment went wrong')
-			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-
-	def UndeployEpc(self, HTML):
-		logging.debug('Trying to undeploy')
-		# No check down, we suppose everything done before.
-
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		# Recovering logs and pcap files
-		mySSH.command('cd ' + self.SourceCodePath + '/logs', '\$', 5)
-		mySSH.command('docker exec -it prod-oai-hss /bin/bash -c "killall --signal SIGINT oai_hss tshark"', '\$', 5)
-		mySSH.command('docker exec -it prod-oai-mme /bin/bash -c "killall --signal SIGINT tshark"', '\$', 5)
-		mySSH.command('docker exec -it prod-oai-spgwc /bin/bash -c "killall --signal SIGINT oai_spgwc tshark"', '\$', 5)
-		mySSH.command('docker exec -it prod-oai-spgwu-tiny /bin/bash -c "killall --signal SIGINT tshark"', '\$', 5)
-		mySSH.command('docker logs prod-oai-hss > hss_' + self.testCase_id + '.log', '\$', 5)
-		mySSH.command('docker logs prod-oai-mme > mme_' + self.testCase_id + '.log', '\$', 5)
-		mySSH.command('docker logs prod-oai-spgwc > spgwc_' + self.testCase_id + '.log', '\$', 5)
-		mySSH.command('docker logs prod-oai-spgwu-tiny > spgwu_' + self.testCase_id + '.log', '\$', 5)
-		mySSH.command('docker cp prod-oai-hss:/tmp/hss_check_run.pcap hss_' + self.testCase_id + '.pcap', '\$', 60)
-		mySSH.command('docker cp prod-oai-mme:/tmp/mme_check_run.pcap mme_' + self.testCase_id + '.pcap', '\$', 60)
-		mySSH.command('docker cp prod-oai-spgwc:/tmp/spgwc_check_run.pcap spgwc_' + self.testCase_id + '.pcap', '\$', 60)
-		mySSH.command('docker cp prod-oai-spgwu-tiny:/tmp/spgwu_check_run.pcap spgwu_' + self.testCase_id + '.pcap', '\$', 60)
-		# Remove all
-		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-		listOfContainers = 'prod-cassandra prod-oai-hss prod-oai-mme prod-oai-spgwc prod-oai-spgwu-tiny'
-		nbContainers = 5
-		# Checking for additional services
-		mySSH.command('docker-compose config', '\$', 5)
-		configResponse = mySSH.getBefore()
-		if configResponse.count('flexran_rtc') == 1:
-			listOfContainers += ' prod-flexran-rtc'
-			nbContainers += 1
-		if configResponse.count('trf_gen') == 1:
-			listOfContainers += ' prod-trf-gen'
-			nbContainers += 1
-
-		mySSH.command('docker-compose down', '\$', 60)
-		mySSH.command('docker inspect --format=\'{{.State.Health.Status}}\' ' + listOfContainers, '\$', 10)
-		noMoreContainerNb = mySSH.getBefore().count('No such object')
-		mySSH.command('docker inspect --format=\'{{.Name}}\' prod-oai-public-net prod-oai-private-net', '\$', 10)
-		noMoreNetworkNb = mySSH.getBefore().count('No such object')
-		mySSH.close()
-		if noMoreContainerNb == nbContainers and noMoreNetworkNb == 2:
-			logging.debug('Undeployment OK')
-			HTML.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
-		else:
-			logging.debug('Undeployment went wrong')
-			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
 	def LogCollectHSS(self):
 		mySSH = SSH.SSHConnection() 
@@ -551,17 +410,9 @@ class EPCManagement():
 		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
 		mySSH.command('rm -f hss.log.zip', '\$', 5)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker inspect prod-oai-hss', '\$', 10)
-			result = re.search('No such object', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('cd ../logs', '\$', 5)
-				mySSH.command('rm -f hss.log.zip', '\$', 5)
-				mySSH.command('zip hss.log.zip hss_*.*', '\$', 60)
-				mySSH.command('mv hss.log.zip ../scripts', '\$', 60)
-			else:
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-hss:/openair-hss/hss_check_run.log .', '\$', 60)
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-hss:/tmp/hss_check_run.pcap .', '\$', 60)
-				mySSH.command('zip hss.log.zip hss_check_run.*', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-hss:/openair-hss/hss_check_run.log .', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-hss:/tmp/hss_check_run.pcap .', '\$', 60)
+			mySSH.command('zip hss.log.zip hss_check_run.*', '\$', 60)
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip hss.log.zip hss*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm hss*.log', '\$', 5)
@@ -581,17 +432,9 @@ class EPCManagement():
 		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
 		mySSH.command('rm -f mme.log.zip', '\$', 5)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker inspect prod-oai-mme', '\$', 10)
-			result = re.search('No such object', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('cd ../logs', '\$', 5)
-				mySSH.command('rm -f mme.log.zip', '\$', 5)
-				mySSH.command('zip mme.log.zip mme_*.*', '\$', 60)
-				mySSH.command('mv mme.log.zip ../scripts', '\$', 60)
-			else:
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-mme:/openair-mme/mme_check_run.log .', '\$', 60)
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-mme:/tmp/mme_check_run.pcap .', '\$', 60)
-				mySSH.command('zip mme.log.zip mme_check_run.*', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-mme:/openair-mme/mme_check_run.log .', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-mme:/tmp/mme_check_run.pcap .', '\$', 60)
+			mySSH.command('zip mme.log.zip mme_check_run.*', '\$', 60)
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip mme.log.zip mme*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm mme*.log', '\$', 5)
@@ -608,19 +451,11 @@ class EPCManagement():
 		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
 		mySSH.command('rm -f spgw.log.zip', '\$', 5)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker inspect prod-oai-mme', '\$', 10)
-			result = re.search('No such object', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('cd ../logs', '\$', 5)
-				mySSH.command('rm -f spgw.log.zip', '\$', 5)
-				mySSH.command('zip spgw.log.zip spgw*.*', '\$', 60)
-				mySSH.command('mv spgw.log.zip ../scripts', '\$', 60)
-			else:
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwc:/openair-spgwc/spgwc_check_run.log .', '\$', 60)
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwu-tiny:/openair-spgwu-tiny/spgwu_check_run.log .', '\$', 60)
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwc:/tmp/spgwc_check_run.pcap .', '\$', 60)
-				mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwu-tiny:/tmp/spgwu_check_run.pcap .', '\$', 60)
-				mySSH.command('zip spgw.log.zip spgw*_check_run.*', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwc:/openair-spgwc/spgwc_check_run.log .', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwu-tiny:/openair-spgwu-tiny/spgwu_check_run.log .', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwc:/tmp/spgwc_check_run.pcap .', '\$', 60)
+			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwu-tiny:/tmp/spgwu_check_run.pcap .', '\$', 60)
+			mySSH.command('zip spgw.log.zip spgw*_check_run.*', '\$', 60)
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip spgw.log.zip spgw*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm spgw*.log', '\$', 5)

ci-scripts/html.py

@@ -218,7 +218,7 @@ class HTMLManagement():
 				self.htmlFile.write('  <div id="build-tab" class="tab-pane fade">\n')
 			self.htmlFile.write('  <table class="table" border = "1">\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
-			self.htmlFile.write('        <th>Relative Time (s)</th>\n')
+			self.htmlFile.write('        <th>Relative Time (ms)</th>\n')
 			self.htmlFile.write('        <th>Test Id</th>\n')
 			self.htmlFile.write('        <th>Test Desc</th>\n')
 			self.htmlFile.write('        <th>Test Options</th>\n')
@@ -399,53 +399,6 @@ class HTMLManagement():
 		self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 
-
-	def CreateHtmlNextTabHeaderTestRow(self, collectInfo, allImagesSize, machine='eNB'):
-		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
-			return
-		self.htmlFile = open('test_results.html', 'a')
-		if bool(collectInfo) == False:
-			self.htmlFile.write('      <tr bgcolor = "red" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ----IMAGES BUILDING FAILED - Unable to recover the image logs ---- </b></td>\n')
-			self.htmlFile.write('      </tr>\n')
-		else:
-			for image in collectInfo:
-				files = collectInfo[image]
-        		# TabHeader for image logs on built shared and target images
-				self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-				self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- ' + image  + ' IMAGE STATUS ----> Size ' + allImagesSize[image] + ' </b></td>\n')
-				self.htmlFile.write('      </tr>\n')
-				self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
-				self.htmlFile.write('        <th colspan="2">Element</th>\n')
-				self.htmlFile.write('        <th>Nb Errors</th>\n')
-				self.htmlFile.write('        <th>Nb Warnings</th>\n')
-				self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>Status</th>\n')
-				self.htmlFile.write('      </tr>\n')
-
-				for fil in files:
-					parameters = files[fil]
-					# TestRow for image logs on built shared and target images
-					self.htmlFile.write('      <tr>\n')
-					self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + fil  + ' </td>\n')
-					if (parameters['errors'] == 0):
-						self.htmlFile.write('        <td bgcolor = "green" >' + str(parameters['errors'])  + '</td>\n')
-					else:
-						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['errors'])  + '</td>\n')
-					if (parameters['warnings'] == 0):
-						self.htmlFile.write('        <td bgcolor = "green" >' + str(parameters['warnings'])  + '</td>\n')
-					elif ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)):
-						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
-					else:
-						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['warnings'])  + '</td>\n')	
-					if (parameters['errors'] == 0) and (parameters['warnings'] == 0):
-						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" ><font color="white">OK </font></th>\n')
-					elif (parameters['errors'] == 0) and ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)):
-						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "orange" ><font color="white">OK </font></th>\n')
-					else:
-						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" > NOT OK  </th>\n')	
-					self.htmlFile.write('      </tr>\n')
-		self.htmlFile.close()
-
 	def CreateHtmlTestRowQueue(self, options, status, ue_status, ue_queue):
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile = open('test_results.html', 'a')

ci-scripts/main.py

@@ -41,7 +41,6 @@ import constants as CONST
 import cls_oaicitest		#main class for OAI CI test framework
 import cls_physim           #class PhySim for physical simulators build and test
 import cls_cots_ue			#class CotsUe for Airplane mode control
-import cls_containerize     #class Containerize for all container-based operations on RAN/UE objects
 
 
 import sshconnection 
@@ -99,34 +98,24 @@ def AssignParams(params_dict):
 
 
 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image':
+	if action == 'Build_eNB':
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
-		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
 		if (forced_workspace_cleanup is None):
 			RAN.Build_eNB_forced_workspace_cleanup=False
-			CONTAINERS.forcedWorkspaceCleanup=False
 		else:
 			if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
 				RAN.Build_eNB_forced_workspace_cleanup=True
-				CONTAINERS.forcedWorkspaceCleanup=True
 			else:
-				RAN.Build_eNB_forced_workspace_cleanup=True
-				CONTAINERS.forcedWorkspaceCleanup=False
+				RAN.Build_eNB_forced_workspace_cleanup=False
 		eNB_instance=test.findtext('eNB_instance')
 		if (eNB_instance is None):
 			RAN.eNB_instance=0
-			CONTAINERS.eNB_instance=0
 		else:
 			RAN.eNB_instance=int(eNB_instance)
-			CONTAINERS.eNB_instance=int(eNB_instance)
-		eNB_serverId=test.findtext('eNB_serverId')
-		if (eNB_serverId is None):
-			RAN.eNB_serverId[RAN.eNB_instance]='0'
-			CONTAINERS.eNB_serverId[RAN.eNB_instance]='0'
-		else:
-			RAN.eNB_serverId[RAN.eNB_instance]=eNB_serverId
-			CONTAINERS.eNB_serverId[CONTAINERS.eNB_instance]=eNB_serverId
+		RAN.eNB_serverId=test.findtext('eNB_serverId')
+		if (RAN.eNB_serverId is None):
+			RAN.eNB_serverId='0'
 		xmlBgBuildField = test.findtext('backgroundBuild')
 		if (xmlBgBuildField is None):
 			RAN.backgroundBuild=False
@@ -143,11 +132,9 @@ def GetParametersFromXML(action):
 			RAN.eNB_instance=0
 		else:
 			RAN.eNB_instance=int(eNB_instance)
-		eNB_serverId=test.findtext('eNB_serverId')
-		if (eNB_serverId is None):
-			RAN.eNB_serverId[RAN.eNB_instance]='0'
-		else:
-			RAN.eNB_serverId[RAN.eNB_instance]=eNB_serverId
+		RAN.eNB_serverId=test.findtext('eNB_serverId')
+		if (RAN.eNB_serverId is None):
+			RAN.eNB_serverId='0'
 
 	elif action == 'Initialize_eNB':
 		RAN.Initialize_eNB_args=test.findtext('Initialize_eNB_args')
@@ -156,11 +143,9 @@ def GetParametersFromXML(action):
 			RAN.eNB_instance=0
 		else:
 			RAN.eNB_instance=int(eNB_instance)
-		eNB_serverId=test.findtext('eNB_serverId')
-		if (eNB_serverId is None):
-			RAN.eNB_serverId[RAN.eNB_instance]='0'
-		else:
-			RAN.eNB_serverId[RAN.eNB_instance]=eNB_serverId
+		RAN.eNB_serverId=test.findtext('eNB_serverId')
+		if (RAN.eNB_serverId is None):
+			RAN.eNB_serverId='0'
 			
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
@@ -177,12 +162,10 @@ def GetParametersFromXML(action):
 			RAN.eNB_instance=0
 		else:
 			RAN.eNB_instance=int(eNB_instance)
-		eNB_serverId=test.findtext('eNB_serverId')
-		if (eNB_serverId is None):
-			RAN.eNB_serverId[RAN.eNB_instance]='0'
-		else:
-			RAN.eNB_serverId[RAN.eNB_instance]=eNB_serverId
-
+		RAN.eNB_serverId=test.findtext('eNB_serverId')
+		if (RAN.eNB_serverId is None):
+			RAN.eNB_serverId='0'
+			
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
 		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
@@ -305,27 +288,6 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			EPC.mmeConfFile = string_field
 
-	elif action == 'Deploy_EPC':
-		string_field = test.findtext('parameters')
-		if (string_field is not None):
-			EPC.yamlPath = string_field
-
-	elif action == 'Deploy_Object' or action == 'Undeploy_Object':
-		eNB_instance=test.findtext('eNB_instance')
-		if (eNB_instance is None):
-			CONTAINERS.eNB_instance=0
-		else:
-			CONTAINERS.eNB_instance=int(eNB_instance)
-		eNB_serverId=test.findtext('eNB_serverId')
-		if (eNB_serverId is None):
-			CONTAINERS.eNB_serverId[CONTAINERS.eNB_instance]='0'
-		else:
-			CONTAINERS.eNB_serverId[CONTAINERS.eNB_instance]=eNB_serverId
-		string_field = test.findtext('yaml_path')
-		if (string_field is not None):
-			CONTAINERS.yamlPath[CONTAINERS.eNB_instance] = string_field
-
-
 	else: # ie action == 'Run_PhySim':
 		ldpc.runargs = test.findtext('physim_run_args')
 		
@@ -377,7 +339,11 @@ SSH = sshconnection.SSHConnection()
 EPC = epc.EPCManagement()
 RAN = ran.RANManagement()
 HTML = html.HTMLManagement()
-CONTAINERS = cls_containerize.Containerize()
+
+EPC.htmlObj=HTML
+RAN.htmlObj=HTML
+RAN.epcObj=EPC
+
 
 ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU build
 
@@ -388,7 +354,7 @@ ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU b
 #-----------------------------------------------------------
 
 import args_parse
-py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP)
+py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,HELP)
 
 
 
@@ -417,10 +383,10 @@ if re.match('^TerminateeNB$', mode, re.IGNORECASE):
 	if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
+	RAN.eNB_serverId='0'
 	RAN.eNB_instance=0
-	RAN.eNB_serverId[0]='0'
 	RAN.eNBSourceCodePath='/tmp/'
-	RAN.TerminateeNB(HTML, EPC)
+	RAN.TerminateeNB()
 elif re.match('^TerminateUE$', mode, re.IGNORECASE):
 	if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
 		HELP.GenericHelp(CONST.Version)
@@ -432,22 +398,22 @@ elif re.match('^TerminateOAIUE$', mode, re.IGNORECASE):
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
 	signal.signal(signal.SIGUSR1, receive_signal)
-	CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC)
+	CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE)
 elif re.match('^TerminateHSS$', mode, re.IGNORECASE):
 	if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
-	EPC.TerminateHSS(HTML)
+	EPC.TerminateHSS()
 elif re.match('^TerminateMME$', mode, re.IGNORECASE):
 	if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
-	EPC.TerminateMME(HTML)
+	EPC.TerminateMME()
 elif re.match('^TerminateSPGW$', mode, re.IGNORECASE):
 	if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath== '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
-	EPC.TerminateSPGW(HTML)
+	EPC.TerminateSPGW()
 elif re.match('^LogCollectBuild$', mode, re.IGNORECASE):
 	if (RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '') and (CiTestObj.UEIPAddress == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '' or CiTestObj.UESourceCodePath == ''):
 		HELP.GenericHelp(CONST.Version)
@@ -529,7 +495,7 @@ elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
 	HTML.CreateHtmlFooter(CiTestObj.finalStatus)
 elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re.IGNORECASE):
 	logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-	logging.debug('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
+	logging.debug('\u001B[1m  Starting Scenario \u001B[0m')
 	logging.debug('\u001B[1m----------------------------------------\u001B[0m')
 	if re.match('^TesteNB$', mode, re.IGNORECASE):
 		if RAN.eNBIPAddress == '' or RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '' or EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '' or CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == '':
@@ -600,7 +566,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			logging.debug('ERROR: requested test is invalidly formatted: ' + test)
 			sys.exit(1)
 	if (EPC.IPAddress != '') and (EPC.IPAddress != 'none'):
-		CiTestObj.CheckFlexranCtrlInstallation(RAN,EPC,CONTAINERS)
+		CiTestObj.CheckFlexranCtrlInstallation(RAN,EPC)
 		EPC.SetMmeIPAddress()
 
 	#get the list of tests to be done
@@ -660,16 +626,17 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 							RAN.prematureExit = True
 							break
 				if action == 'Build_eNB':
-					RAN.BuildeNB(HTML)
+					RAN.BuildeNB()
 				elif action == 'WaitEndBuild_eNB':
-					RAN.WaitBuildeNBisFinished(HTML)
+					RAN.WaitBuildeNBisFinished()
 				elif action == 'Initialize_eNB':
 					check_eNB = False
 					check_OAI_UE = False
 					RAN.pStatus=CiTestObj.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-					RAN.InitializeeNB(HTML, EPC)
+
+					RAN.InitializeeNB()
 				elif action == 'Terminate_eNB':
-					RAN.TerminateeNB(HTML, EPC)
+					RAN.TerminateeNB()
 				elif action == 'Initialize_UE':
 					CiTestObj.InitializeUE(HTML,COTS_UE)
 				elif action == 'Terminate_UE':
@@ -689,17 +656,17 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				elif action == 'Initialize_OAI_UE':
 					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,COTS_UE)
 				elif action == 'Terminate_OAI_UE':
-					CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC)
+					CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE)
 				elif action == 'Initialize_CatM_module':
 					CiTestObj.InitializeCatM(HTML)
 				elif action == 'Terminate_CatM_module':
 					CiTestObj.TerminateCatM(HTML)
 				elif action == 'Attach_CatM_module':
-					CiTestObj.AttachCatM(HTML,RAN,COTS_UE,EPC)
+					CiTestObj.AttachCatM(HTML,RAN,COTS_UE)
 				elif action == 'Detach_CatM_module':
 					CiTestObj.TerminateCatM(HTML)
 				elif action == 'Ping_CatM_module':
-					CiTestObj.PingCatM(HTML,RAN,EPC,COTS_UE,EPC)
+					CiTestObj.PingCatM(HTML,RAN,EPC,COTS_UE)
 				elif action == 'Ping':
 					CiTestObj.Ping(HTML,RAN,EPC,COTS_UE)
 				elif action == 'Iperf':
@@ -707,21 +674,17 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				elif action == 'Reboot_UE':
 					CiTestObj.RebootUE(HTML,RAN,EPC)
 				elif action == 'Initialize_HSS':
-					EPC.InitializeHSS(HTML)
+					EPC.InitializeHSS()
 				elif action == 'Terminate_HSS':
-					EPC.TerminateHSS(HTML)
+					EPC.TerminateHSS()
 				elif action == 'Initialize_MME':
-					EPC.InitializeMME(HTML)
+					EPC.InitializeMME()
 				elif action == 'Terminate_MME':
-					EPC.TerminateMME(HTML)
+					EPC.TerminateMME()
 				elif action == 'Initialize_SPGW':
-					EPC.InitializeSPGW(HTML)
+					EPC.InitializeSPGW()
 				elif action == 'Terminate_SPGW':
-					EPC.TerminateSPGW(HTML)
-				elif action == 'Deploy_EPC':
-					EPC.DeployEpc(HTML)
-				elif action == 'Undeploy_EPC':
-					EPC.UndeployEpc(HTML)
+					EPC.TerminateSPGW()
 				elif action == 'Initialize_FlexranCtrl':
 					CiTestObj.InitializeFlexranCtrl(HTML,RAN,EPC)
 				elif action == 'Terminate_FlexranCtrl':
@@ -735,12 +698,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					if ldpc.exitStatus==1:sys.exit()
 				elif action == 'Run_PhySim':
 					HTML=ldpc.Run_PhySim(HTML,CONST,id)
-				elif action == 'Build_Image':
-					CONTAINERS.BuildImage(HTML)
-				elif action == 'Deploy_Object':
-					CONTAINERS.DeployObject(HTML, EPC)
-				elif action == 'Undeploy_Object':
-					CONTAINERS.UndeployObject(HTML, RAN)
 				else:
 					sys.exit('Invalid class (action) from xml')
 				if not RAN.prematureExit:
@@ -750,14 +707,14 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 						HTML.testStabilityPointReached = True
 		CiTestObj.FailReportCnt += 1
 	if CiTestObj.FailReportCnt == CiTestObj.repeatCounts[0] and RAN.prematureExit:
-		logging.debug('Scenario failed ' + str(CiTestObj.FailReportCnt) + ' time(s)')
+		logging.debug('Testsuite failed ' + str(CiTestObj.FailReportCnt) + ' time(s)')
 		HTML.CreateHtmlTabFooter(False)
 		if CiTestObj.testUnstable and (CiTestObj.testStabilityPointReached or CiTestObj.testMinStableId == '999999'):
 			logging.debug('Scenario has reached minimal stability point -- Not a Failure')
 		else:
 			sys.exit('Failed Scenario')
 	else:
-		logging.info('Scenario passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)')
+		logging.info('Testsuite passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)')
 		HTML.CreateHtmlTabFooter(True)
 elif re.match('^LoadParams$', mode, re.IGNORECASE):
 	pass

ci-scripts/ran.py

@@ -42,8 +42,10 @@ from multiprocessing import Process, Lock, SimpleQueue
 # OAI Testing modules
 #-----------------------------------------------------------
 import sshconnection as SSH
+import epc 
 import helpreadme as HELP
 import constants as CONST
+import html
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -75,20 +77,19 @@ class RANManagement():
 		self.backgroundBuildTestId = ['', '', '']
 		self.Build_eNB_forced_workspace_cleanup = False
 		self.Initialize_eNB_args = ''
-		self.imageKind = ''
 		self.air_interface = ['', '', ''] #changed from 'lte' to '' may lead to side effects in main
 		self.eNB_instance = 0
-		self.eNB_serverId = ['', '', '']
+		self.eNB_serverId = ''
 		self.eNBLogFiles = ['', '', '']
 		self.eNBOptions = ['', '', '']
 		self.eNBmbmsEnables = [False, False, False]
 		self.eNBstatuses = [-1, -1, -1]
 		self.flexranCtrlInstalled = False
 		self.flexranCtrlStarted = False
-		self.flexranCtrlDeployed = False
-		self.flexranCtrlIpAddress = ''
 		self.testCase_id = ''
 		self.epcPcapFile = ''
+		self.htmlObj = None
+		self.epcObj = None
 		self.runtime_stats= ''
 
 
@@ -97,21 +98,21 @@ class RANManagement():
 # RAN management functions
 #-----------------------------------------------------------
 
-	def BuildeNB(self, HTML):
+	def BuildeNB(self):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		if self.eNB_serverId[self.eNB_instance] == '0':
+		if self.eNB_serverId == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
 			lPassWord = self.eNBPassword
 			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
+		elif self.eNB_serverId == '1':
 			lIpAddr = self.eNB1IPAddress
 			lUserName = self.eNB1UserName
 			lPassWord = self.eNB1Password
 			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
+		elif self.eNB_serverId == '2':
 			lIpAddr = self.eNB2IPAddress
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
@@ -119,7 +120,6 @@ class RANManagement():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('Building on server: ' + lIpAddr)
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		
@@ -137,7 +137,10 @@ class RANManagement():
 		# Worakround for some servers, we need to erase completely the workspace
 		if self.Build_eNB_forced_workspace_cleanup:
 			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
-		self.testCase_id = HTML.testCase_id
+		if self.htmlObj is not None:
+			self.testCase_id = self.htmlObj.testCase_id
+		else:
+			self.testCase_id = '000000'
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
@@ -178,7 +181,8 @@ class RANManagement():
 						mismatch = True
 				if not mismatch:
 					mySSH.close()
-					HTML.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
+					if self.htmlObj is not None:
+						self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
 					return
 
 		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
@@ -205,25 +209,26 @@ class RANManagement():
 			mySSH.command('echo ' + lPassWord + ' | sudo -S ls', '\$', 5)
 			mySSH.command('echo $USER; nohup sudo -E ./my-lte-softmodem-build.sh' + ' > ' + lSourcePath + '/cmake_targets/compile_oai_enb.log ' + ' 2>&1 &', lUserName, 5)
 			mySSH.close()
-			HTML.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
+			if self.htmlObj is not None:
+				self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
 			self.backgroundBuildTestId[int(self.eNB_instance)] = self.testCase_id
 			return
 		mySSH.command('stdbuf -o0 ./build_oai ' + self.Build_eNB_args + ' 2>&1 | stdbuf -o0 tee compile_oai_enb.log', 'Bypassing the Tests|build have failed', 1500)
 		mySSH.close()
-		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id, HTML)
+		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id)
 
-	def WaitBuildeNBisFinished(self, HTML):
-		if self.eNB_serverId[self.eNB_instance] == '0':
+	def WaitBuildeNBisFinished(self):
+		if self.eNB_serverId == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
 			lPassWord = self.eNBPassword
 			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
+		elif self.eNB_serverId == '1':
 			lIpAddr = self.eNB1IPAddress
 			lUserName = self.eNB1UserName
 			lPassWord = self.eNB1Password
 			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
+		elif self.eNB_serverId == '2':
 			lIpAddr = self.eNB2IPAddress
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
@@ -231,7 +236,6 @@ class RANManagement():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('Waiting for end of build on server: ' + lIpAddr)
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		count = 40
@@ -245,10 +249,11 @@ class RANManagement():
 				count -= 1
 				time.sleep(30)
 		mySSH.close()
-		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML)
+		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)])
 
-	def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId, HTML):
-		HTML.testCase_id=testcaseId
+	def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId):
+		if self.htmlObj is not None:
+			self.htmlObj.testCase_id=testcaseId
 
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -279,7 +284,7 @@ class RANManagement():
 		mySSH.command('mkdir -p build_log_' + testcaseId, '\$', 5)
 		mySSH.command('mv log/* ' + 'build_log_' + testcaseId, '\$', 5)
 		mySSH.command('mv compile_oai_enb.log ' + 'build_log_' + testcaseId, '\$', 5)
-		if self.eNB_serverId[self.eNB_instance] != '0':
+		if self.eNB_serverId != '0':
 			mySSH.command('cd cmake_targets', '\$', 5)
 			mySSH.command('if [ -e tmp_build' + testcaseId + '.zip ]; then rm -f tmp_build' + testcaseId + '.zip; fi', '\$', 5)
 			mySSH.command('zip -r -qq tmp_build' + testcaseId + '.zip build_log_' + testcaseId, '\$', 5)
@@ -302,25 +307,27 @@ class RANManagement():
 		#generate logging info depending on buildStatus and air interface
 		if buildStatus:
 			logging.info('\u001B[1m Building OAI ' + self.air_interface[self.eNB_instance] + ' Pass\u001B[0m')
-			HTML.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
+			if self.htmlObj is not None:
+				self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)		
 		else:
 			logging.error('\u001B[1m Building OAI ' + self.air_interface[self.eNB_instance] + ' Failed\u001B[0m')
-			HTML.CreateHtmlTestRow(self.Build_eNB_args, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
+			if self.htmlObj is not None:
+				self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'KO', CONST.ALL_PROCESSES_OK)
+				self.htmlObj.CreateHtmlTabFooter(False)
 			sys.exit(1)
 
-	def InitializeeNB(self, HTML, EPC):
-		if self.eNB_serverId[self.eNB_instance] == '0':
+	def InitializeeNB(self):
+		if self.eNB_serverId == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
 			lPassWord = self.eNBPassword
 			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
+		elif self.eNB_serverId == '1':
 			lIpAddr = self.eNB1IPAddress
 			lUserName = self.eNB1UserName
 			lPassWord = self.eNB1Password
 			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
+		elif self.eNB_serverId == '2':
 			lIpAddr = self.eNB2IPAddress
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
@@ -328,21 +335,24 @@ class RANManagement():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('Starting eNB/gNB on server: ' + lIpAddr)
 
-		self.testCase_id = HTML.testCase_id
+		if self.htmlObj is not None:
+			self.testCase_id = self.htmlObj.testCase_id
+		else:
+			self.testCase_id = '000000'
 		mySSH = SSH.SSHConnection()
 		
 		if (self.pStatus < 0):
-			HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus)
-			HTML.CreateHtmlTabFooter(False)
+			if self.htmlObj is not None:
+				self.htmlObj.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus)
+				self.htmlObj.CreateHtmlTabFooter(False)
 			sys.exit(1)
 		# If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB
 		result = re.search('T_stdout', str(self.Initialize_eNB_args))
-		if (result is not None):
-			localEpcIpAddr = EPC.IPAddress
-			localEpcUserName = EPC.UserName
-			localEpcPassword = EPC.Password
+		if (result is not None) and (self.epcObj is not None):
+			localEpcIpAddr = self.epcObj.IPAddress
+			localEpcUserName = self.epcObj.UserName
+			localEpcPassword = self.epcObj.Password
 			mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
 			mySSH.command('ip addr show | awk -f /tmp/active_net_interfaces.awk | egrep -v "lo|tun"', '\$', 5)
 			result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', mySSH.getBefore())
@@ -390,17 +400,17 @@ class RANManagement():
 				mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
 		# Make a copy and adapt to EPC / eNB IP addresses
 		mySSH.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
-		localMmeIpAddr = EPC.MmeIPAddress
-		mySSH.command('sed -i -e \'s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
+		if self.epcObj is not None:
+			localMmeIpAddr = self.epcObj.MmeIPAddress
+			mySSH.command('sed -i -e \'s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_ENB_IP_ADDR/' + lIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_GNB_IP_ADDR/' + lIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_RCC_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_RRU1_IP_ADDR/' + self.eNB1IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_RRU2_IP_ADDR/' + self.eNB2IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_FR1_CTL_ENB_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
-		if (self.flexranCtrlInstalled and self.flexranCtrlStarted) or self.flexranCtrlDeployed:
+		if self.flexranCtrlInstalled and self.flexranCtrlStarted:
 			mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED        = "yes";/\' ' + ci_full_config_file, '\$', 2);
-			mySSH.command('sed -i -e \'s/CI_FLEXRAN_CTL_IP_ADDR/' + self.flexranCtrlIpAddress + '/\' ' + ci_full_config_file, '\$', 2);
 		else:
 			mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED        = "no";/\' ' + ci_full_config_file, '\$', 2);
 		self.eNBmbmsEnables[int(self.eNB_instance)] = False
@@ -442,13 +452,14 @@ class RANManagement():
 				mySSH.close()
 				doLoop = False
 				logging.error('\u001B[1;37;41m eNB/gNB/ocp-eNB logging system did not show got sync! \u001B[0m')
-				HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
+				if self.htmlObj is not None:
+					self.htmlObj.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
 				# In case of T tracer recording, we need to kill tshark on EPC side
 				result = re.search('T_stdout', str(self.Initialize_eNB_args))
-				if (result is not None):
-					localEpcIpAddr = EPC.IPAddress
-					localEpcUserName = EPC.UserName
-					localEpcPassword = EPC.Password
+				if (result is not None) and (self.epcObj is not None):
+					localEpcIpAddr = self.epcObj.IPAddress
+					localEpcUserName = self.epcObj.UserName
+					localEpcPassword = self.epcObj.Password
 					mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
 					logging.debug('\u001B[1m Stopping tshark \u001B[0m')
 					mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
@@ -496,10 +507,11 @@ class RANManagement():
 				else:
 					logging.error('\u001B[1m oaitun_enm1 interface is either NOT mounted or NOT configured\u001B[0m')
 		if enbDidSync:
-			self.eNBstatuses[int(self.eNB_instance)] = int(self.eNB_serverId[self.eNB_instance])
+			self.eNBstatuses[int(self.eNB_instance)] = int(self.eNB_serverId)
 
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'OK', CONST.ALL_PROCESSES_OK)
+		if self.htmlObj is not None:
+			self.htmlObj.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'OK', CONST.ALL_PROCESSES_OK)
 		logging.debug('\u001B[1m Initialize eNB/gNB/ocp-eNB Completed\u001B[0m')
 
 	def CheckeNBProcess(self, status_queue):
@@ -534,18 +546,18 @@ class RANManagement():
 		except:
 			os.kill(os.getppid(),signal.SIGUSR1)
 
-	def TerminateeNB(self, HTML, EPC):
-		if self.eNB_serverId[self.eNB_instance] == '0':
+	def TerminateeNB(self):
+		if self.eNB_serverId == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
 			lPassWord = self.eNBPassword
 			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
+		elif self.eNB_serverId == '1':
 			lIpAddr = self.eNB1IPAddress
 			lUserName = self.eNB1UserName
 			lPassWord = self.eNB1Password
 			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
+		elif self.eNB_serverId == '2':
 			lIpAddr = self.eNB2IPAddress
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
@@ -553,7 +565,6 @@ class RANManagement():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('Stopping eNB/gNB on server: ' + lIpAddr)
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
@@ -575,10 +586,10 @@ class RANManagement():
 		mySSH.close()
 		# If tracer options is on, stopping tshark on EPC side
 		result = re.search('T_stdout', str(self.Initialize_eNB_args))
-		if (result is not None):
-			localEpcIpAddr = EPC.IPAddress
-			localEpcUserName = EPC.UserName
-			localEpcPassword = EPC.Password
+		if (result is not None) and (self.epcObj is not None):
+			localEpcIpAddr = self.epcObj.IPAddress
+			localEpcUserName = self.epcObj.UserName
+			localEpcPassword = self.epcObj.Password
 			mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
 			logging.debug('\u001B[1m Stopping tshark \u001B[0m')
 			mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
@@ -602,8 +613,9 @@ class RANManagement():
 			mySSH.close()
 			mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + extracted_log_file, '.')
 			logging.debug('\u001B[1m Analyzing eNB replay logfile \u001B[0m')
-			logStatus = self.AnalyzeLogFile_eNB(extracted_log_file, HTML)
-			HTML.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+			logStatus = self.AnalyzeLogFile_eNB(extracted_log_file)
+			if self.htmlObj is not None:
+				self.htmlObj.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			self.eNBLogFiles[int(self.eNB_instance)] = ''
 		else:
 			analyzeFile = False
@@ -615,23 +627,27 @@ class RANManagement():
 				copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + fileToAnalyze, '.')
 				if (copyin_res == -1):
 					logging.debug('\u001B[1;37;41m Could not copy ' + nodeB_prefix + 'NB logfile to analyze it! \u001B[0m')
-					HTML.htmleNBFailureMsg='Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!'
-					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
+					if self.htmlObj is not None:
+						self.htmlObj.htmleNBFailureMsg='Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!'
+						self.htmlObj.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 					self.eNBmbmsEnables[int(self.eNB_instance)] = False
 					return
-				if self.eNB_serverId[self.eNB_instance] != '0':
+				if self.eNB_serverId != '0':
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')
 				logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + fileToAnalyze)
-				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze, HTML)
+				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze)
 				if (logStatus < 0):
-					HTML.CreateHtmlTestRow('N/A', 'KO', logStatus)
+					if self.htmlObj is not None:
+						self.htmlObj.CreateHtmlTestRow('N/A', 'KO', logStatus)
 					self.preamtureExit = True
 					self.eNBmbmsEnables[int(self.eNB_instance)] = False
 					return
 				else:
-					HTML.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+					if self.htmlObj is not None:
+						self.htmlObj.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			else:
-				HTML.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+				if self.htmlObj is not None:
+					self.htmlObj.CreateHtmlTestRow(self.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 		self.eNBmbmsEnables[int(self.eNB_instance)] = False
 		self.eNBstatuses[int(self.eNB_instance)] = -1
 
@@ -645,7 +661,7 @@ class RANManagement():
 		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm enb*.log core* enb_*record.raw enb_*.pcap enb_*txt', '\$', 5)
 		mySSH.close()
 
-	def AnalyzeLogFile_eNB(self, eNBlogFile, HTML):
+	def AnalyzeLogFile_eNB(self, eNBlogFile):
 		if (not os.path.isfile('./' + eNBlogFile)):
 			return -1
 		enb_log_file = open('./' + eNBlogFile, 'r')
@@ -693,11 +709,7 @@ class RANManagement():
 		NSA_RAPROC_PUSCH_check = 0
 		#dlsch and ulsch statistics (dictionary)
 		dlsch_ulsch_stats = {}
-		#count "L1 thread not ready" msg 	
-		L1_thread_not_ready_cnt = 0
-		#count "problem receiving samples" msg
-		pb_receiving_samples_cnt = 0
-	
+		
 		for line in enb_log_file.readlines():
 			# Runtime statistics
 			result = re.search('Run time:' ,str(line))
@@ -862,15 +874,6 @@ class RANManagement():
 				if result is not None:
 					#remove 1- all useless char before relevant info (ulsch or dlsch) 2- trailing char
 					dlsch_ulsch_stats[k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())
-			#count "L1 thread not ready" msg
-			result = re.search('\[PHY\]\s+L1_thread isn\'t ready', str(line))
-			if result is not None:
-				L1_thread_not_ready_cnt += 1	
-			#count "problem receiving samples" msg
-			result = re.search('\[PHY\]\s+problem receiving samples', str(line))
-			if result is not None:
-				pb_receiving_samples_cnt += 1				
-
 		enb_log_file.close()
 		logging.debug('   File analysis completed')
 		if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
@@ -900,17 +903,6 @@ class RANManagement():
 				htmlMsg = statMsg+'\n'
 			logging.debug(statMsg)
 			htmleNBFailureMsg += htmlMsg
-			#L1 thread not ready log
-			statMsg = '[PHY] L1 thread is not ready msg count =  '+str(L1_thread_not_ready_cnt)
-			htmlMsg = statMsg+'\n'
-			logging.debug(statMsg)
-			htmleNBFailureMsg += htmlMsg
-			#problem receiving samples log
-			statMsg = '[PHY] problem receiving samples msg count =  '+str(pb_receiving_samples_cnt)
-			htmlMsg = statMsg+'\n'
-			logging.debug(statMsg)
-			htmleNBFailureMsg += htmlMsg
-
 			#ulsch and dlsch statistics
 			if len(dlsch_ulsch_stats)!=0: #check if dictionary is not empty
 				statMsg=''
@@ -1026,7 +1018,8 @@ class RANManagement():
 			logging.debug('\u001B[1;37;41m ' + rlcMsg + ' \u001B[0m')
 			htmleNBFailureMsg += rlcMsg + '\n'
 			global_status = CONST.ENB_PROCESS_REALTIME_ISSUE
-		HTML.htmleNBFailureMsg=htmleNBFailureMsg
+		if self.htmlObj is not None:
+			self.htmlObj.htmleNBFailureMsg=htmleNBFailureMsg
 		# Runtime statistics for console output and HTML
 		if runTime != '':
 			logging.debug(runTime)

ci-scripts/runTestOnVM.sh

@@ -2200,7 +2200,7 @@ function run_test_on_vm {
             mkdir --parents $ARCHIVES_LOC
         fi
 
-        local try_cnt=0
+        local try_cnt="0"
         NR_STATUS=0
 
         ######### start of RA TEST loop
@@ -2232,7 +2232,7 @@ function run_test_on_vm {
                 scp -o StrictHostKeyChecking=no ubuntu@$GNB_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC
                 scp -o StrictHostKeyChecking=no ubuntu@$NR_UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC
                 SYNC_STATUS=-1
-                try_cnt=$((try_cnt+1))
+                try_cnt=$[$try_cnt+1]
                 continue
             fi
 
@@ -2255,10 +2255,9 @@ function run_test_on_vm {
             if [ $RA_STATUS -ne 0 ]
             then
                 echo "RA test NOT OK"
-                echo "try_cnt = " $try_cnt
-                try_cnt=$((try_cnt+1))
+                try_cnt=$[$try_cnt+1]
             else
-                try_cnt=$((try_cnt+10))
+                try_cnt=$[$try_cnt+10]
             fi
         done
         ########### end RA test
@@ -2267,7 +2266,7 @@ function run_test_on_vm {
 
 
         ######### start of PHY TEST loop
-        try_cnt=0
+        try_cnt="0"
         while [ $try_cnt -lt 4 ]
         do
 
@@ -2298,7 +2297,7 @@ function run_test_on_vm {
                 scp -o StrictHostKeyChecking=no ubuntu@$GNB_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC
                 scp -o StrictHostKeyChecking=no ubuntu@$NR_UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC
                 SYNC_STATUS=-1
-                try_cnt=$((try_cnt+1))
+                try_cnt=$[$try_cnt+1]
                 continue
             fi
 
@@ -2338,7 +2337,7 @@ function run_test_on_vm {
                 terminate_enb_ue_basic_sim $GNB_VM_CMDS $GNB_VM_IP_ADDR 1
                 scp -o StrictHostKeyChecking=no ubuntu@$GNB_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC
                 scp -o StrictHostKeyChecking=no ubuntu@$NR_UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC
-                try_cnt=$((try_cnt+1))
+                try_cnt=$[$try_cnt+1]
                 continue
             fi
 
@@ -2364,9 +2363,9 @@ function run_test_on_vm {
             if [ $IPERF_STATUS -ne 0 ]
             then
                 echo "UL test not OK"
-                try_cnt=$((try_cnt+1))
+                try_cnt=$[$try_cnt+1]
             else
-                try_cnt=$((try_cnt+10))
+                try_cnt=$[$try_cnt+10]
             fi
         done
         ######### end of loop

ci-scripts/sshconnection.py

@@ -52,11 +52,13 @@ class SSHConnection():
 		self.picocom_closure = True
 
 	def open(self, ipaddress, username, password):
+		extraSshOptions = ''
 		count = 0
 		connect_status = False
+		if ipaddress == '192.168.18.197':
+			extraSshOptions = ' -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
 		while count < 4:
-			self.ssh = pexpect.spawn('ssh -o PubkeyAuthentication=no {}@{}'.format(username,ipaddress))
-			self.ssh.timeout = 5
+			self.ssh = pexpect.spawn('ssh', [username + '@' + ipaddress + extraSshOptions], timeout = 5)
 			self.sshresponse = self.ssh.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', 'Last login', pexpect.EOF, pexpect.TIMEOUT])
 			if self.sshresponse == 0:
 				self.ssh.sendline('yes')

ci-scripts/tcp_iperf_stats.awk

@@ -21,11 +21,7 @@
 BEGIN{max=0;min=10000}
 {
     if ($0 ~/Mbits/) {
-        if ($0 ~/KBytes/) {
-            split($0,a,"KBytes")
-        } else {
-            split($0,a,"MBytes")
-        }
+        split($0,a,"MBytes")
         split(a[2],b)
         if (b[1]>max) {
             max=b[1]

ci-scripts/xml_class_list.yml

@@ -19,8 +19,6 @@
   - Reboot_UE
   - Initialize_FlexranCtrl
   - Terminate_FlexranCtrl
-  - Deploy_EPC
-  - Undeploy_EPC
   - Initialize_HSS
   - Terminate_HSS
   - Initialize_MME
@@ -34,6 +32,3 @@
   - Ping_CatM_module
   - IdleSleep
   - Perform_X2_Handover
-  - Build_Image
-  - Deploy_Object
-  - Undeploy_Object

ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml

@@ -32,7 +32,7 @@
 	<testCase id="090101">
 		<class>Build_OAI_UE</class>
 		<desc>Build OAI UE</desc>
-		<Build_OAI_UE_args>-w USRP --UE --ninja</Build_OAI_UE_args>
+		<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
 	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/fr1_image_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>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>Build_Image</class>
-		<desc>Build eNB Image</desc>
-		<kind>all</kind>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/fr1_oai_cn_deploy.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>epc-deploy-tab</htmlTabRef>
-	<htmlTabName>EPC-Deploy</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000100">
-		<class>Deploy_EPC</class>
-		<desc>Deploy all EPC containers</desc>
-		<parameters>yaml_files/fr1_epc_tim</parameters>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/fr1_oai_cn_undeploy.xml

@@ -1,38 +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-undeploy-tab</htmlTabRef>
-	<htmlTabName>EPC-Undeploy</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 000200
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000200">
-		<class>Undeploy_EPC</class>
-		<desc>Undeploy all EPC containers</desc>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/fr1_ran_ue_base.xml

@@ -1,150 +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-FR1-TM1</htmlTabRef>
-	<htmlTabName>FR1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 010000
- 030000
- 040000
- 010001
- 000001
- 050000
- 050001
- 050002
- 050002
- 000001
- 060000
- 060001
- 000001
- 010002
- 000001
- 070001
- 070000
- 010003
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="010003">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="010001">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="010002">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-
-	<testCase id="030000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-   </testCase>
-
-
-	<testCase id="040000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf -E</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="050001">
-		<class>Ping</class>
-		<desc>Ping: 5pings in 1sec</desc>
-		<ping_args>-c 5 -i 0.2</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="050002">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-
-	<testCase id="060000">
-		<class>Iperf</class>
-		<desc>iperf (DL/1Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="060001">
-		<class>Iperf</class>
-		<desc>iperf (UL/1Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="070000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-	<testCase id="070001">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-

ci-scripts/xml_files/fr1_ran_ue_proc.xml

@@ -31,9 +31,9 @@
  010001
  000001
  050000
- 000001
- 060000
- 060001
+ 050001
+ 050002
+ 050003
  000001
  010002
  000001
@@ -93,26 +93,30 @@
 		<class>Ping</class>
 		<desc>Ping: 20pings in 20sec</desc>
 		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+		<ping_packetloss_threshold>0</ping_packetloss_threshold>
 	</testCase>
 
-
-	<testCase id="060000">
-		<class>Iperf</class>
-		<desc>iperf (DL/2.5Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 2.5M -t 60 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
+	<testCase id="050001">
+		<class>Ping</class>
+		<desc>Ping: 5pings in 1sec</desc>
+		<ping_args>-c 5 -i 0.2</ping_args>
+		<ping_packetloss_threshold>0</ping_packetloss_threshold>
 	</testCase>
 
-	<testCase id="060001">
-		<class>Iperf</class>
-		<desc>iperf (UL/1.5Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 1.5M -t 60 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
+	<testCase id="050002">
+		<class>Ping</class>
+		<desc>Ping: 100pings in 20sec</desc>
+		<ping_args>-c 100 -i 0.2</ping_args>
+		<ping_packetloss_threshold>0</ping_packetloss_threshold>
 	</testCase>
 
+	<testCase id="050003">$
+	<class>Ping</class>$
+	<desc>Ping: 100pings in 20sec size 1000</desc>$
+	<ping_args>-c 100 -i 0.2 -s 1000</ping_args>$
+	<ping_packetloss_threshold>0</ping_packetloss_threshold>$
+	</testCase>$
+
 	<testCase id="070000">
 		<class>Terminate_eNB</class>
 		<desc>Terminate eNB</desc>

ci-scripts/xml_files/fr1_usrp210_band7_deploy_test_05mhz_tm1.xml

@@ -1,133 +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-deploy-enb-mono</htmlTabRef>
-	<htmlTabName>Test-Deploy-eNB-Mono</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 040101
- 030101 000020 040301 000021 040501 040601 040611 040641 040651 040401 040201 030201
-	</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="000020">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status before attachment</desc>
-        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-    </testCase>
-
-    <testCase id="000021">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status after attachment</desc>
-        <expectedNbOfConnectedUEs>1</expectedNbOfConnectedUEs>
-    </testCase>
-
-	<testCase id="030101">
-		<class>Deploy_Object</class>
-		<desc>Deploy eNB (FDD/Band7/5MHz) in a container</desc>
-		<yaml_path>ci-scripts/yaml_files/fr1_enb_mono_fdd_tim</yaml_path>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Undeploy_Object</class>
-		<desc>Undeploy eNB</desc>
-		<yaml_path>ci-scripts/yaml_files/fr1_enb_mono_fdd_tim</yaml_path>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</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="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040611">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-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/7.5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 7.5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040651">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml

@@ -52,7 +52,7 @@
         <testCase id="090102">
                 <class>Initialize_OAI_UE</class>
                 <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --rrc_config_path . --dlsch-parallel 4 </Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75 --threadoffset 16 --rrc_config_path .</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
         </testCase>
 

ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml

@@ -52,7 +52,7 @@
         <testCase id="090104">
                 <class>Initialize_OAI_UE</class>
                 <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75  --rrc_config_path . --dlsch-parallel 4 </Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75 --threadoffset 16 --rrc_config_path .</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
         </testCase>
 

ci-scripts/xml_files/ue_band20_build.xml

@@ -32,7 +32,7 @@
 	<testCase id="090101">
 		<class>Build_OAI_UE</class>
 		<desc>Build OAI UE</desc>
-		<Build_OAI_UE_args>-w USRP --UE --ninja</Build_OAI_UE_args>
+		<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
 	</testCase>
 
 </testCaseList>

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

@@ -1,49 +0,0 @@
-version: '3.8'
-
-services:
-    enb_mono_fdd:
-        image: oai-enb:latest
-        privileged: true
-        container_name: prod-enb-mono-fdd
-        environment:
-            USE_FDD_MONO: 'yes'
-            USE_B2XX: 'yes'
-            ENB_NAME: eNB-in-docker
-            MCC: '222'
-            MNC: '01'
-            MNC_LENGTH: 2
-            TAC: 1
-            UTRA_BAND_ID: 7
-            DL_FREQUENCY_IN_MHZ: 2680
-            UL_FREQUENCY_OFFSET_IN_MHZ: 120
-            NID_CELL: 10
-            NB_PRB: 25
-            MME_S1C_IP_ADDRESS: CI_MME_IP_ADDR
-            ENB_S1C_IF_NAME: eth0
-            ENB_S1C_IP_ADDRESS: 192.168.61.30
-            ENB_S1U_IF_NAME: eth0
-            ENB_S1U_IP_ADDRESS: 192.168.61.30
-            ENB_X2_IP_ADDRESS: 192.168.61.30
-            FLEXRAN_ENABLED: 'no'
-            FLEXRAN_INTERFACE_NAME: eth0
-            FLEXRAN_IPV4_ADDRESS: CI_FLEXRAN_CTL_IP_ADDR
-            USE_ADDITIONAL_OPTIONS: '--RUs.[0].max_rxgain 115 --RUs.[0].max_pdschReferenceSignalPower -27 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96'
-        volumes:
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.30
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    public_net:
-        name: prod-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.61.0/26
-

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

@@ -1,203 +0,0 @@
-version: '3.8'
-
-services:
-    cassandra:
-        image: cassandra:2.1
-        container_name: prod-cassandra
-        networks:
-            private_net:
-                ipv4_address: 192.168.68.2
-        environment:
-            CASSANDRA_CLUSTER_NAME: "OAI HSS Cluster"
-            CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch
-        healthcheck:
-            test: /bin/bash -c "nodetool status"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    db_init:
-        image: cassandra:2.1
-        container_name: prod-db-init
-        depends_on: [cassandra]
-        deploy:
-            restart_policy:
-                condition: on-failure
-                max_attempts: 10
-        networks:
-            private_net:
-                ipv4_address: 192.168.68.4
-        volumes:
-            - ./oai_db.cql:/home/oai_db.cql
-        entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
-
-    oai_hss:
-        image: oai-hss:production
-        container_name: prod-oai-hss
-        privileged: true
-        depends_on: [cassandra]
-        networks:
-            private_net:
-                ipv4_address: 192.168.68.3
-            public_net:
-                ipv4_address: 192.168.61.2
-        environment:
-            REALM: openairinterface.org
-            HSS_FQDN: hss.openairinterface.org
-            PREFIX: /openair-hss/etc
-            cassandra_Server_IP: 192.168.68.2
-            OP_KEY: 1006020f0a478bf6b699f15c062e42b3
-            LTE_K: fec86ba6eb707ed08905757b1bb44b8f
-            APN1: oai.ipv4
-            APN2: internet
-            FIRST_IMSI: 222010100001120
-            NB_USERS: 10
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_hss"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai_mme:
-        image: oai-mme:production
-        container_name: prod-oai-mme
-        privileged: true
-        depends_on: [oai_hss]
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.3
-        environment:
-            REALM: openairinterface.org
-            PREFIX: /openair-mme/etc
-            INSTANCE: 1
-            PID_DIRECTORY: /var/run
-            HSS_IP_ADDR: 192.168.61.2
-            HSS_HOSTNAME: hss
-            HSS_FQDN: hss.openairinterface.org
-            HSS_REALM: openairinterface.org
-            MCC: '222'
-            MNC: '01'
-            MME_GID: 32768
-            MME_CODE: 3
-            TAC_0: 1
-            TAC_1: 2
-            TAC_2: 3
-            MME_FQDN: mme.openairinterface.org
-            MME_S6A_IP_ADDR: 192.168.61.3
-            MME_INTERFACE_NAME_FOR_S1_MME: eth0
-            MME_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.3
-            MME_INTERFACE_NAME_FOR_S11: eth0
-            MME_IPV4_ADDRESS_FOR_S11: 192.168.61.3
-            MME_INTERFACE_NAME_FOR_S10: lo
-            MME_IPV4_ADDRESS_FOR_S10: 127.0.0.10
-            OUTPUT: CONSOLE
-            SGW_IPV4_ADDRESS_FOR_S11_0: 192.168.61.4
-            PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
-            PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
-            MCC_SGW_0: '222'
-            MNC3_SGW_0: '001'
-            TAC_LB_SGW_0: '01'
-            TAC_HB_SGW_0: '00'
-            MCC_MME_0: '222'
-            MNC3_MME_0: '001'
-            TAC_LB_MME_0: '02'
-            TAC_HB_MME_0: '00'
-            MCC_MME_1: '222'
-            MNC3_MME_1: '001'
-            TAC_LB_MME_1: '03'
-            TAC_HB_MME_1: '00'
-            TAC_LB_SGW_TEST_0: '03'
-            TAC_HB_SGW_TEST_0: '00'
-            SGW_IPV4_ADDRESS_FOR_S11_TEST_0: 0.0.0.0
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_mme"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai_spgwc:
-        image: oai-spgwc:production
-        privileged: true
-        depends_on: [oai_mme]
-        container_name: prod-oai-spgwc
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.4
-        environment:
-            PID_DIRECTORY: /var/run
-            SGW_INTERFACE_NAME_FOR_S11: eth0
-            SGW_IP_FOR_S5_S8_CP: 127.0.0.11/8
-            PGW_IP_FOR_S5_S8_CP: 127.0.0.12/8
-            PGW_INTERFACE_NAME_FOR_SX: eth0
-            DEFAULT_APN: oai.ipv4
-            DEFAULT_DNS_IPV4_ADDRESS: 192.168.18.129
-            DEFAULT_DNS_SEC_IPV4_ADDRESS: 8.8.4.4
-            UE_IP_ADDRESS_POOL: '12.1.1.2 - 12.1.1.254'
-            PUSH_PROTOCOL_OPTION: 'yes'
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_spgwc"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai_spgwu:
-        image: oai-spgwu-tiny:production
-        privileged: true
-        container_name: prod-oai-spgwu-tiny
-        depends_on: [oai_spgwc]
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.5
-        environment:
-            PID_DIRECTORY: /var/run
-            INSTANCE: 1
-            SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP: eth0
-            PGW_INTERFACE_NAME_FOR_SGI: eth0
-            SGW_INTERFACE_NAME_FOR_SX: eth0
-            SPGWC0_IP_ADDRESS: 192.168.61.4
-            NETWORK_UE_IP: '12.1.1.0/24'
-            NETWORK_UE_NAT_OPTION: 'yes'
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_spgwu"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    flexran_rtc:
-        image: flexran-rtc:production
-        privileged: true
-        container_name: prod-flexran-rtc
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.10
-        healthcheck:
-            test: /bin/bash -c "pgrep rt_controller"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    trf_gen:
-        image: trf-gen:production
-        privileged: true
-        container_name: prod-trf-gen
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.11
-        entrypoint: /bin/bash -c "ip route add 12.1.1.0/24 via 192.168.61.5 dev eth0; sleep infinity"
-        healthcheck:
-            test: /bin/bash -c "ping -c 2 192.168.61.5"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    private_net:
-        name: prod-oai-private-net
-        ipam:
-            config:
-                - subnet: 192.168.68.0/26
-    public_net:
-        name: prod-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.61.0/26

cmake_targets/CMakeLists.txt

@@ -485,6 +485,7 @@ add_custom_target (
 
 add_library(NR_RRC_LIB ${nr_rrc_h} ${nr_rrc_source} 
     ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c
+    ${OPENAIR2_DIR}/RRC/NR/nr_ngap_gNB.c
     )
 add_dependencies(NR_RRC_LIB nr_rrc_flag)
 include_directories ("${NR_RRC_FULL_DIR}")
@@ -1757,7 +1758,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_csi_rs.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
@@ -1968,7 +1968,6 @@ set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_entity.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
-  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
   )
 
 set(L2_SRC
@@ -2109,10 +2108,10 @@ set (MAC_NR_SRC_UE
   ${NR_UE_MAC_DIR}/mac_vars.c
   ${NR_UE_MAC_DIR}/main_ue_nr.c
   ${NR_UE_MAC_DIR}/nr_ue_procedures.c
-  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
   ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
   ${NR_UE_MAC_DIR}/nr_l1_helpers.c
   ${NR_UE_MAC_DIR}/nr_ra_procedures.c
+  ${NR_UE_MAC_DIR}/rar_tools_nrUE.c
 )
 
 set (ENB_APP_SRC
@@ -2132,23 +2131,7 @@ set (MCE_APP_SRC
   ${OPENAIR2_DIR}/MCE_APP/mce_app.c
   ${OPENAIR2_DIR}/MCE_APP/mce_config.c
   )
-set (MISC_NFAPI_LTE
- ${OPENAIR1_DIR}/SCHED/nfapi_lte_dummy.c
- )
 
-
-add_library(MISC_NFAPI_LTE_LIB
-  ${MISC_NFAPI_LTE}
- )
-
-set (MISC_NFAPI_NR
- ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
- )
-
-
-add_library(MISC_NFAPI_NR_LIB
-  ${MISC_NFAPI_NR}
- )
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -2603,13 +2586,6 @@ if(ITTI_SIM)
 
   set(libnrnas_emm_msg_OBJS
     ${NAS_SRC}COMMON/EMM/MSG/RegistrationRequest.c
-    ${NAS_SRC}COMMON/EMM/MSG/RegistrationAccept.c
-    ${NAS_SRC}COMMON/EMM/MSG/FGSIdentityResponse.c
-    ${NAS_SRC}COMMON/EMM/MSG/FGSAuthenticationResponse.c
-    ${NAS_SRC}COMMON/EMM/MSG/FGSNASSecurityModeComplete.c
-    ${NAS_SRC}COMMON/EMM/MSG/RegistrationComplete.c
-    ${NAS_SRC}COMMON/EMM/MSG/FGSUplinkNasTransport.c
-    ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishRequest.c
   )
 
   set(libnrnas_ies_OBJS
@@ -2617,11 +2593,8 @@ if(ITTI_SIM)
     ${NAS_SRC}COMMON/IES/FGSMobileIdentity.c
     ${NAS_SRC}COMMON/IES/FGSRegistrationType.c
     ${NAS_SRC}COMMON/IES/SpareHalfOctet.c
-    ${NAS_SRC}COMMON/IES/FGSRegistrationResult.c
     ${NAS_SRC}COMMON/IES/FGMMCapability.c
     ${NAS_SRC}COMMON/IES/NrUESecurityCapability.c
-    ${NAS_SRC}COMMON/IES/FGCNasMessageContainer.c
-    ${NAS_SRC}COMMON/IES/SORTransparentContainer.c
   )
 
   add_library(LIB_NAS_SIMUE
@@ -2890,6 +2863,8 @@ add_executable(lte-softmodem
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
+  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
+  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${GTPU_need_ITTI}
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}
@@ -2901,7 +2876,7 @@ add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag oai_iqplayer)
 target_link_libraries (lte-softmodem
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB 
-  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB LFDS7
+  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
   -Wl,--end-group z dl)
   
@@ -2931,6 +2906,8 @@ add_executable(ocp-enb
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
+  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
+  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${GTPU_need_ITTI}
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}
@@ -2942,7 +2919,7 @@ add_dependencies(ocp-enb rrc_flag s1ap_flag x2_flag oai_iqplayer coding params_l
 target_link_libraries (ocp-enb
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB 
-  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7 SIMU_COMMON
+  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7 SIMU_COMMON
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
   -Wl,--end-group z dl)
 target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
@@ -2997,6 +2974,8 @@ add_executable(lte-uesoftmodem
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
+  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
+  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}
   ${CONFIG_SOURCES}
@@ -3012,7 +2991,7 @@ target_link_libraries (lte-uesoftmodem
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP F1AP_LIB
   GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU LFDS L2_UE L2_LTE LFDS7 SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU LFDS L2_UE L2_LTE LFDS7 SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${ATLAS_LIBRARIES}
   -Wl,--end-group z dl)
 
@@ -3095,7 +3074,7 @@ target_link_libraries (ocp-gnb
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS NR_GTPV1U SECU_CN SECU_OSA
   ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB 
-  NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
+  S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB SIMU_COMMON
   -Wl,--end-group z dl)
 
@@ -3139,8 +3118,6 @@ target_link_libraries (nr-uesoftmodem
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB NGAP_LIB NGAP_GNB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
   PHY_COMMON PHY_NR_COMMON PHY_UE PHY_NR_UE PHY_RU LFDS NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
-  NFAPI_USER_LIB MISC_NFAPI_NR_LIB S1AP_LIB S1AP_ENB
-  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES} 
   NFAPI_USER_LIB S1AP_LIB S1AP_ENB
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES} LIB_5GNAS_GNB
   -Wl,--end-group z dl)
@@ -3260,7 +3237,6 @@ add_executable(nr_dlschsim
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/common/utils/utils.c
-  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
@@ -3275,7 +3251,6 @@ add_executable(nr_pbchsim
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/common/utils/utils.c
-  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
@@ -3292,7 +3267,6 @@ add_executable(nr_pucchsim
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/utils.c
-  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
@@ -3311,13 +3285,12 @@ add_executable(nr_dlsim
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${NFAPI_USER_DIR}/nfapi.c
-  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
   )   
 target_link_libraries(nr_dlsim
-  -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN NGAP_GNB -Wl,--end-group
+  -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB} dl
   )
 target_compile_definitions(nr_dlsim PUBLIC -DPHYSICAL_SIMULATOR)
@@ -3331,12 +3304,11 @@ add_executable(nr_prachsim
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${NFAPI_USER_DIR}/nfapi.c
-  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES})
 target_link_libraries(nr_prachsim  
-  -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN NGAP_GNB -Wl,--end-group
+  -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB} dl)
 
 add_executable(nr_ulschsim
@@ -3369,7 +3341,7 @@ add_executable(nr_ulsim
   ${SHLIB_LOADER_SOURCES}
   )
 target_link_libraries(nr_ulsim
-  -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN NGAP_GNB -Wl,--end-group
+  -Wl,--start-group UTIL SIMU_COMMON SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ${ITTI_LIB} dl
   )
 target_compile_definitions(nr_ulsim PUBLIC -DPHYSICAL_SIMULATOR)
@@ -3468,7 +3440,7 @@ if (${T_TRACER})
         SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
         NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
-        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR NGAP_GNB
+        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR
         CN_UTILS GTPV1U NR_GTPV1U SCTP_CLIENT MME_APP UDP LIB_NAS_UE NB_IoT LFDS LFDS7 SIMU_COMMON SIMU SIMU_ETH OPENAIR0_LIB
         ldpc_orig ldpc_optim ldpc_optim8seg ldpc PROTO_AGENT dfts)
     if (TARGET ${i})

cmake_targets/autotests/test_case_list.xml

@@ -1098,9 +1098,7 @@
                                  (Test13: HARQ test 50% TP (2 rounds),
                                  (Test14: 3 PTRS, 8 Interpolated Symbols),
                                  (Test15: 6 PTRS, 5 Interpolated Symbols),
-                                 (Test16: 11 PTRS, 0 Interpolated Symbols),
-                                 (Test17: 2 DMRS Symbols),
-                                 (Test18: 3 DMRS Symbols)</desc>
+                                 (Test16: 11 PTRS, 0 Interpolated Symbols)</desc>
       <pre_compile_prog></pre_compile_prog>
       <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
       <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1122,10 +1120,8 @@
                   -n100 -s1 -t50
                   -n100 -s5 -T 2 2 2
                   -n100 -s5 -T 2 1 2
-                  -n100 -s5 -T 2 0 4
-                  -n100 -s2 -U 2 0 1
-                  -n100 -s2 -U 2 0 2</main_exec_args>
-      <tags>nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3 nr_dlsim.test4 nr_dlsim.test5 nr_dlsim.test6 nr_dlsim.test7 nr_dlsim.test8 nr_dlsim.test9 nr_dlsim.test10 nr_dlsim.test11 nr_dlsim.test12 nr_dlsim.test13 nr_dlsim.test14 nr_dlsim.test15 nr_dlsim.test16 nr_dlsim.test17 nr_dlsim.test18</tags>
+                  -n100 -s5 -T 2 0 4</main_exec_args>
+      <tags>nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3 nr_dlsim.test4 nr_dlsim.test5 nr_dlsim.test6 nr_dlsim.test7 nr_dlsim.test8 nr_dlsim.test9 nr_dlsim.test10 nr_dlsim.test11 nr_dlsim.test12 nr_dlsim.test13 nr_dlsim.test14 nr_dlsim.test15 nr_dlsim.test16</tags>
       <search_expr_true>PDSCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
       <nruns>3</nruns>
@@ -1289,10 +1285,7 @@
                                  (Test5: MCS 9 273 PRBs),
                                  (Test6: DMRS Type A, 3 DMRS, 4 PTRS, 5 Interpolated Symbols),
                                  (Test7: DMRS Type B, 3 DMRS, 2 PTRS, 7 Interpolated Symbols),
-                                 (Test8: DMRS Type B, 3 DMRS, 2 PTRS, 3 Interpolated Symbols),
-                                 (Test9: SC-FDMA, 50 PRBs),
-                                 (Test10: SC-FDMA, 75 PRBs),
-                                 (Test11: SC-FDMA, 3 DMRS)</desc>
+                                 (Test8: DMRS Type B, 3 DMRS, 2 PTRS, 3 Interpolated Symbols)</desc>
       <pre_compile_prog></pre_compile_prog>
       <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
       <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1306,11 +1299,8 @@
                       -n100 -m9 -R273 -r273 -s5
                       -n100 -s5 -T 2 1 2 -U 2 0 2
                       -n100 -s5 -T 2 2 2 -U 2 1 2
-                      -n100 -s5 -a4 -b8 -T 2 1 2 -U 2 1 3
-                      -n100 -s20 -Z
-                      -n100 -s20 -Z -r75
-                      -n100 -s20 -Z -U 2 0 2</main_exec_args>
-      <tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11</tags>
+                      -n100 -s5 -a4 -b8 -T 2 1 2 -U 2 1 3</main_exec_args>
+      <tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8</tags>
       <search_expr_true>PUSCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
       <nruns>3</nruns>

cmake_targets/tools/build_helper

@@ -114,8 +114,6 @@ check_supported_distribution() {
         "rhel7.7")     return 0 ;;
         "rhel7.8")     return 0 ;;
         "rhel8.2")     return 0 ;;
-        "rhel8.3")     return 0 ;;
-        "rhel8.4")     return 0 ;;
         "centos7")     return 0 ;;
     esac
     return 1

common/config/config_load_configmodule.c

@@ -43,7 +43,7 @@
 #include "config_userapi.h"
 #include "../utils/LOG/log.h"
 #define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
-#include "nfapi/oai_integration/vendor_ext.h"
+
 
 int load_config_sharedlib(configmodule_interface_t *cfgptr) {
   void *lib_handle;

common/ran_context.h

@@ -47,7 +47,6 @@
 #include "NwGtpv1uMsg.h"
 #include "NwGtpv1uPrivate.h"
 #include "gtpv1u_eNB_defs.h"
-#include "gtpv1u_gNB_defs.h"
 
 #include "PHY/defs_L1_NB_IoT.h"
 #include "RRC/LTE/defs_NB_IoT.h"
@@ -110,8 +109,6 @@ typedef struct {
   struct gNB_MAC_INST_s **nrmac;
   /// GTPu descriptor 
   gtpv1u_data_t *gtpv1u_data_g;
-  /// NR GTPu descriptor 
-  nr_gtpv1u_data_t *nr_gtpv1u_data_g;
   /// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces
   struct RU_t_s **ru;
   /// Mask to indicate fronthaul setup status of RU (hard-limit to 64 RUs)

common/utils/LOG/log.h

@@ -148,7 +148,6 @@ extern "C" {
 #define DEBUG_SECURITY     (1<<11)
 #define DEBUG_NAS          (1<<12)
 #define DEBUG_RLC          (1<<13)
-#define DEBUG_DLSCH_DECOD  (1<<14)
 #define UE_TIMING          (1<<20)
 
 
@@ -167,7 +166,6 @@ extern "C" {
     {"SECURITY",    DEBUG_SECURITY},\
     {"NAS",         DEBUG_NAS},\
     {"RLC",         DEBUG_RLC},\
-    {"DLSCH_DECOD", DEBUG_DLSCH_DECOD},\
     {"UE_TIMING",   UE_TIMING},\
     {NULL,-1}\
   }

common/utils/T/.gitignore

@@ -4,7 +4,6 @@ T_IDs.h
 T_messages.txt.h
 genids
 tracer/enb
-tracer/gnb
 tracer/extract_config
 tracer/record
 tracer/replay

common/utils/T/T_defs.h

@@ -44,7 +44,7 @@
    /* let's have 100 RBs functional for the basic simulator */
 #  define T_BUFFER_MAX (1024*64*2)
 #else
-#  define T_BUFFER_MAX (1024*128)
+#  define T_BUFFER_MAX (1024*64*2)
 #endif
 
 /* size of the local cache for messages (must be pow(2,something)) */
@@ -52,7 +52,7 @@
    /* we don't need much space for the basic simulator */
 #  define T_CACHE_SIZE 1024
 #else
-#  define T_CACHE_SIZE (8192)
+#  define T_CACHE_SIZE (8192 )
 #endif
 
 /* maximum number of bytes a message can contain */

common/utils/T/T_messages.txt

@@ -1,7 +1,3 @@
-ID = BENETEL
-  GROUP = ALL
-  FORMAT = int,frame : int,slot : buffer,rxdataF
-
 #general logs
 ID = ENB_MASTER_TICK
     DESC = eNodeB master tick - one tick per ms, to be used as "reference clock", mostly for ticktime view
@@ -93,10 +89,6 @@ ID = GNB_PHY_MIB
     DESC = NR MIB data
     GROUP = ALL:PHY:GNB:WIRESHARK
     FORMAT = int,gNB_ID : int,frame : int,slot : buffer,data
-ID = GNB_PHY_PUCCH_PUSCH_IQ
-    DESC = gNodeB input data in the frequency domain for a slot where some PUCCH or PUSCH detection was done
-    GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : buffer,rxdataF
 
 #MAC logs
 ID = ENB_MAC_UE_DL_SDU
@@ -137,7 +129,7 @@ ID = ENB_MAC_UE_DL_PDU_WITH_DATA
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : buffer,data
 ID = ENB_MAC_SCHEDULING_REQUEST
     DESC = MAC scheduling request detected for an UE
-    GROUP = ALL:MAC:ENB:WIRESHARK
+    GROUP = ALL:MAC:ENB
     FORMAT = int,eNB_ID : int,CC_id : int,frame : int,subframe : int,rnti
 ID = ENB_MAC_UE_DL_RAR_PDU_WITH_DATA
     DESC = MAC downlink PDU for an UE

common/utils/T/tracer/Makefile

@@ -7,8 +7,7 @@ LIBS=-lm
 XLIBS=-lX11 -lpng -lXft
 
 all: record replay extract_config textlog enb ue vcd macpdu2wireshark \
-     extract_input_subframe extract_output_subframe to_vcd extract multi \
-     gnb
+     extract_input_subframe extract_output_subframe to_vcd extract multi
 
 record: utils.o record.o database.o config.o
 	$(CC) $(CFLAGS) -o record $^ $(LIBS)
@@ -61,11 +60,6 @@ macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
 multi: multi.o utils.o database.o config.o
 	$(CC) $(CFLAGS) -o multi $^ $(LIBS)
 
-gnb: utils.o gnb.o database.o event.o handler.o config.o \
-         view/view.a gui/gui.a logger/logger.a \
-         filter/filter.a
-	$(CC) $(CFLAGS) -o gnb $^ $(LIBS) $(XLIBS)
-
 multi.o: ../T_IDs.h
 
 ../T_IDs.h:
@@ -91,7 +85,7 @@ filter/filter.a:
 clean:
 	rm -f *.o core tracer_remote textlog enb ue vcd record replay
 	rm -f extract_config macpdu2wireshark extract_input_subframe
-	rm -f extract_output_subframe to_vcd extract multi gnb
+	rm -f extract_output_subframe to_vcd extract multi
 	cd gui && $(MAKE) clean
 	cd view && $(MAKE) clean
 	cd logger && $(MAKE) clean

common/utils/T/tracer/gnb.c

@@ -1,175 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <unistd.h>
-#include "database.h"
-#include "handler.h"
-#include "config.h"
-#include "logger/logger.h"
-#include "view/view.h"
-#include "gui/gui.h"
-
-typedef struct {
-  widget *pucch_pusch_iq_plot;
-  logger *pucch_pusch_iq_logger;
-} gnb_gui;
-
-typedef struct {
-  int socket;
-  int *is_on;
-  int nevents;
-  pthread_mutex_t lock;
-  gnb_gui *e;
-  void *database;
-} gnb_data;
-
-void is_on_changed(void *_d)
-{
-  gnb_data *d = _d;
-  char t;
-
-  if (pthread_mutex_lock(&d->lock)) abort();
-
-  if (d->socket == -1) goto no_connection;
-
-  t = 1;
-  if (socket_send(d->socket, &t, 1) == -1 ||
-      socket_send(d->socket, &d->nevents, sizeof(int)) == -1 ||
-      socket_send(d->socket, d->is_on, d->nevents * sizeof(int)) == -1)
-    goto connection_dies;
-
-no_connection:
-  if (pthread_mutex_unlock(&d->lock)) abort();
-  return;
-
-connection_dies:
-  close(d->socket);
-  d->socket = -1;
-  if (pthread_mutex_unlock(&d->lock)) abort();
-}
-
-void usage(void)
-{
-  printf(
-"options:\n"
-"    -d   <database file>      this option is mandatory\n"
-"    -ip <host>                connect to given IP address (default %s)\n"
-"    -p  <port>                connect to given port (default %d)\n",
-  DEFAULT_REMOTE_IP,
-  DEFAULT_REMOTE_PORT
-  );
-  exit(1);
-}
-
-static void *gui_thread(void *_g)
-{
-  gui *g = _g;
-  gui_loop(g);
-  return NULL;
-}
-
-static void gnb_main_gui(gnb_gui *e, gui *g, event_handler *h, void *database,
-    gnb_data *ed)
-{
-  widget *main_window;
-  widget *top_container;
-  widget *line;
-  widget *w;
-  logger *l;
-  view *v;
-
-  main_window = new_toplevel_window(g, 500, 300, "gNB tracer");
-
-  top_container = new_container(g, VERTICAL);
-  widget_add_child(g, main_window, top_container, -1);
-
-  line = new_container(g, HORIZONTAL);
-  widget_add_child(g, top_container, line, -1);
-
-  /* PUCCH/PUSCH IQ data */
-  w = new_xy_plot(g, 550, 550, "", 50);
-  e->pucch_pusch_iq_plot = w;
-  widget_add_child(g, line, w, -1);
-  xy_plot_set_range(g, w, -512, 512, -512, 512);
-  xy_plot_set_title(g, w, "rxdataF");
-  l = new_iqlog_full(h, database, "GNB_PHY_PUCCH_PUSCH_IQ", "rxdataF");
-  v = new_view_xy(300*12*14,10,g,w,new_color(g,"#000"),XY_FORCED_MODE);
-  logger_add_view(l, v);
-  e->pucch_pusch_iq_logger = l;
-}
-
-int main(int n, char **v)
-{
-  char *database_filename = NULL;
-  void *database;
-  char *ip = DEFAULT_REMOTE_IP;
-  int port = DEFAULT_REMOTE_PORT;
-  int *is_on;
-  int number_of_events;
-  int i;
-  event_handler *h;
-  gnb_data gnb_data;
-  gui *g;
-  gnb_gui eg;
-
-  for (i = 1; i < n; i++) {
-    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
-    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], "-d"))
-      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
-    usage();
-  }
-
-  if (database_filename == NULL) {
-    printf("ERROR: provide a database file (-d)\n");
-    exit(1);
-  }
-
-  database = parse_database(database_filename);
-
-  load_config_file(database_filename);
-
-  number_of_events = number_of_ids(database);
-  is_on = calloc(number_of_events, sizeof(int));
-  if (is_on == NULL) abort();
-
-  h = new_handler(database);
-
-  on_off(database, "GNB_PHY_PUCCH_PUSCH_IQ", is_on, 1);
-
-  gnb_data.database = database;
-  gnb_data.socket = -1;
-  gnb_data.is_on = is_on;
-  gnb_data.nevents = number_of_events;
-  if (pthread_mutex_init(&gnb_data.lock, NULL)) abort();
-
-  g = gui_init();
-  new_thread(gui_thread, g);
-
-  gnb_main_gui(&eg, g, h, database, &gnb_data);
-
-  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };
-
-restart:
-  clear_remote_config();
-  if (gnb_data.socket != -1) close(gnb_data.socket);
-  gnb_data.socket = connect_to(ip, port);
-
-  /* send the first message - activate selected traces */
-  is_on_changed(&gnb_data);
-
-  /* read messages */
-  while (1) {
-    event e;
-    e = get_event(gnb_data.socket, &ebuf, database);
-    if (e.type == -1) goto restart;
-    if (pthread_mutex_lock(&gnb_data.lock)) abort();
-    handle_event(h, e);
-    if (pthread_mutex_unlock(&gnb_data.lock)) abort();
-  }
-
-  return 0;
-}

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

@@ -74,44 +74,6 @@ static void _event(void *p, event e)
     l->common.v[i]->append(l->common.v[i], l->i, l->q, count);
 }
 
-static void _event_full(void *p, event e)
-{
-  struct iqlog *l = p;
-  int i;
-  void *buffer;
-  int bsize;
-  int nsamples;
-  float *idst, *qdst;
-
-  if (l->common.filter != NULL && filter_eval(l->common.filter, e) == 0)
-    return;
-
-  buffer = e.e[l->buffer_arg].b;
-  bsize = e.e[l->buffer_arg].bsize;
-
-  nsamples = bsize / 4;
-
-  if (nsamples > l->max_length) {
-    l->i = realloc(l->i, nsamples * sizeof(float));
-    if (l->i == NULL) abort();
-    l->q = realloc(l->q, nsamples * sizeof(float));
-    if (l->q == NULL) abort();
-    l->max_length = nsamples;
-  }
-
-  idst = l->i;
-  qdst = l->q;
-  for (i = 0; i < nsamples; i++) {
-    *idst = ((int16_t *)buffer)[i * 2];
-    *qdst = ((int16_t *)buffer)[i * 2 + 1];
-    idst++;
-    qdst++;
-  }
-
-  for (i = 0; i < l->common.vsize; i++)
-    l->common.v[i]->append(l->common.v[i], l->i, l->q, nsamples);
-}
-
 logger *new_iqlog(event_handler *h, void *database,
     char *event_name, char *nb_rb, char *N_RB_UL, char *symbols_per_tti,
     char *buffer_varname)
@@ -187,43 +149,3 @@ logger *new_iqlog(event_handler *h, void *database,
 
   return ret;
 }
-
-logger *new_iqlog_full(event_handler *h, void *database, char *event_name,
-    char *buffer_varname)
-{
-  struct iqlog *ret;
-  int event_id;
-  database_event_format f;
-  int i;
-
-  ret = calloc(1, sizeof(struct iqlog)); if (ret == NULL) abort();
-
-  ret->common.event_name = strdup(event_name);
-  if (ret->common.event_name == NULL) abort();
-  ret->database = database;
-
-  event_id = event_id_from_name(database, event_name);
-
-  ret->common.handler_id = register_handler_function(h, event_id, _event_full,
-                                                     ret);
-
-  f = get_format(database, event_id);
-
-  /* look for args */
-  ret->buffer_arg = -1;
-  for (i = 0; i < f.count; i++) {
-    if (!strcmp(f.name[i], buffer_varname)) ret->buffer_arg = i;
-  }
-  if (ret->buffer_arg == -1) {
-    printf("%s:%d: buffer argument '%s' not found in event '%s'\n",
-        __FILE__, __LINE__, buffer_varname, event_name);
-    abort();
-  }
-  if (strcmp(f.type[ret->buffer_arg], "buffer") != 0) {
-    printf("%s:%d: argument '%s' has wrong type (should be 'buffer')\n",
-        __FILE__, __LINE__, buffer_varname);
-    abort();
-  }
-
-  return ret;
-}

common/utils/T/tracer/logger/logger.h

@@ -23,8 +23,6 @@ logger *new_ticklog(void *event_handler, void *database,
 logger *new_iqlog(void *event_handler, void *database,
     char *event_name, char *nb_rb, char *N_RB_UL, char *symbols_per_tti,
     char *buffer_varname);
-logger *new_iqlog_full(void *event_handler, void *database, char *event_name,
-    char *buffer_varname);
 logger *new_iqdotlog(void *event_handler, void *database,
     char *event_name, char *I, char *Q);
 

common/utils/T/tracer/macpdu2wireshark.c

@@ -18,7 +18,6 @@
 #define DEFAULT_LIVE_PORT 2021
 
 #define NO_PREAMBLE -1
-#define NO_SR_RNTI -1
 
 typedef struct {
   int socket;
@@ -49,10 +48,6 @@ typedef struct {
   int rar_frame;
   int rar_subframe;
   int rar_data;
-  /* SR */
-  int sr_rnti;
-  int sr_frame;
-  int sr_subframe;
 
   /* NR traces */
   /* NR ul */
@@ -85,15 +80,6 @@ typedef struct {
   /* runtime vars */
   int cur_mib;
   int cur_sib;
-
-  /* hack to report UE id:
-   * each time we see a rnti, we allocate the next ue_id
-   * (two separate versions for lte and nr)
-   */
-  int lte_rnti_to_ueid[65536];
-  int lte_next_ue_id;
-  int nr_rnti_to_ueid[65536];
-  int nr_next_ue_id;
 } ev_data;
 
 /****************************************************************************/
@@ -101,8 +87,7 @@ typedef struct {
 /****************************************************************************/
 
 void trace_lte(ev_data *d, int direction, int rnti_type, int rnti,
-        int frame, int subframe, void *buf, int bufsize, int preamble,
-        int sr_rnti)
+        int frame, int subframe, void *buf, int bufsize, int preamble)
 {
   ssize_t ret;
   int fsf;
@@ -117,18 +102,6 @@ void trace_lte(ev_data *d, int direction, int rnti_type, int rnti,
     PUTC(&d->buf, MAC_LTE_RNTI_TAG);
     PUTC(&d->buf, (rnti>>8) & 255);
     PUTC(&d->buf, rnti & 255);
-
-    /* put UE id */
-    if (rnti < 0 || rnti > 65535) { printf("bad rnti!\n"); exit(1); }
-    /* if no UE id allocated for this rnti then allocate the next one */
-    if (d->lte_rnti_to_ueid[rnti] == -1) {
-      d->lte_rnti_to_ueid[rnti] = d->lte_next_ue_id;
-      d->lte_next_ue_id++;
-    }
-
-    PUTC(&d->buf, MAC_LTE_UEID_TAG);
-    PUTC(&d->buf, (d->lte_rnti_to_ueid[rnti]>>8) & 255);
-    PUTC(&d->buf, d->lte_rnti_to_ueid[rnti] & 255);
   }
 
   /* for newer version of wireshark? */
@@ -145,25 +118,6 @@ void trace_lte(ev_data *d, int direction, int rnti_type, int rnti,
     PUTC(&d->buf, 0); /* rach attempt - always 0 for us (not sure of this) */
   }
 
-  if (sr_rnti != NO_SR_RNTI) {
-    PUTC(&d->buf, MAC_LTE_SR_TAG);
-    PUTC(&d->buf, 0); /* number of items byte 1 */
-    PUTC(&d->buf, 1); /* number of items byte 2 */
-
-    /* put UE id */
-    if (sr_rnti < 0 || sr_rnti > 65535) { printf("bad sr rnti!\n"); exit(1); }
-    /* if no UE id allocated for this rnti then allocate the next one */
-    if (d->lte_rnti_to_ueid[sr_rnti] == -1) {
-      d->lte_rnti_to_ueid[sr_rnti] = d->lte_next_ue_id;
-      d->lte_next_ue_id++;
-    }
-    PUTC(&d->buf, (d->lte_rnti_to_ueid[sr_rnti]>>8) & 255);
-    PUTC(&d->buf, d->lte_rnti_to_ueid[sr_rnti] & 255);
-
-    PUTC(&d->buf, (sr_rnti>>8) & 255);
-    PUTC(&d->buf, sr_rnti & 255);
-  }
-
   PUTC(&d->buf, MAC_LTE_PAYLOAD_TAG);
 
   for (i = 0; i < bufsize; i++)
@@ -181,7 +135,7 @@ void ul(void *_d, event e)
   trace_lte(d, DIRECTION_UPLINK, C_RNTI, e.e[d->ul_rnti].i,
             e.e[d->ul_frame].i, e.e[d->ul_subframe].i,
             e.e[d->ul_data].b, e.e[d->ul_data].bsize,
-            NO_PREAMBLE, NO_SR_RNTI);
+            NO_PREAMBLE);
 }
 
 void dl(void *_d, event e)
@@ -200,7 +154,7 @@ void dl(void *_d, event e)
             e.e[d->dl_rnti].i != 0xffff ? C_RNTI : SI_RNTI, e.e[d->dl_rnti].i,
             e.e[d->dl_frame].i, e.e[d->dl_subframe].i,
             e.e[d->dl_data].b, e.e[d->dl_data].bsize,
-            NO_PREAMBLE, NO_SR_RNTI);
+            NO_PREAMBLE);
 }
 
 void mib(void *_d, event e)
@@ -215,7 +169,7 @@ void mib(void *_d, event e)
   trace_lte(d, DIRECTION_DOWNLINK, NO_RNTI, 0,
             e.e[d->mib_frame].i, e.e[d->mib_subframe].i,
             e.e[d->mib_data].b, e.e[d->mib_data].bsize,
-            NO_PREAMBLE, NO_SR_RNTI);
+            NO_PREAMBLE);
 }
 
 void preamble(void *_d, event e)
@@ -224,7 +178,7 @@ void preamble(void *_d, event e)
   trace_lte(d, DIRECTION_UPLINK, NO_RNTI, 0,
             e.e[d->preamble_frame].i, e.e[d->preamble_subframe].i,
             NULL, 0,
-            e.e[d->preamble_preamble].i, NO_SR_RNTI);
+            e.e[d->preamble_preamble].i);
 }
 
 void rar(void *_d, event e)
@@ -233,16 +187,7 @@ void rar(void *_d, event e)
   trace_lte(d, DIRECTION_DOWNLINK, RA_RNTI, e.e[d->rar_rnti].i,
             e.e[d->rar_frame].i, e.e[d->rar_subframe].i,
             e.e[d->rar_data].b, e.e[d->rar_data].bsize,
-            NO_PREAMBLE, NO_SR_RNTI);
-}
-
-void sr(void *_d, event e)
-{
-  ev_data *d = _d;
-  trace_lte(d, DIRECTION_UPLINK, NO_RNTI, 0,
-            e.e[d->sr_frame].i, e.e[d->sr_subframe].i,
-            NULL, 0,
-            NO_PREAMBLE, e.e[d->sr_rnti].i);
+            NO_PREAMBLE);
 }
 
 /****************************************************************************/
@@ -253,7 +198,6 @@ void sr(void *_d, event e)
 
 #define MAC_NR_PAYLOAD_TAG    0x01
 #define MAC_NR_RNTI_TAG       0x02
-#define MAC_NR_UEID_TAG       0x03
 #define MAC_NR_FRAME_SLOT_TAG 0x07
 
 #define NR_FDD_RADIO 1
@@ -281,18 +225,6 @@ void trace_nr(ev_data *d, int direction, int rnti_type, int rnti,
     PUTC(&d->buf, MAC_NR_RNTI_TAG);
     PUTC(&d->buf, (rnti>>8) & 255);
     PUTC(&d->buf, rnti & 255);
-
-    /* put UE id */
-    if (rnti < 0 || rnti > 65535) { printf("bad rnti!\n"); exit(1); }
-    /* if no UE id allocated for this rnti then allocate the next one */
-    if (d->nr_rnti_to_ueid[rnti] == -1) {
-      d->nr_rnti_to_ueid[rnti] = d->nr_next_ue_id;
-      d->nr_next_ue_id++;
-    }
-
-    PUTC(&d->buf, MAC_NR_UEID_TAG);
-    PUTC(&d->buf, (d->nr_rnti_to_ueid[rnti]>>8) & 255);
-    PUTC(&d->buf, d->nr_rnti_to_ueid[rnti] & 255);
   }
 
 #if 0
@@ -366,7 +298,7 @@ void nr_rar(void *_d, event e)
 /****************************************************************************/
 
 void setup_data(ev_data *d, void *database, int ul_id, int dl_id, int mib_id,
-                int preamble_id, int rar_id, int sr_id,
+                int preamble_id, int rar_id,
                 int nr_ul_id, int nr_dl_id, int nr_mib_id, int nr_rar_id)
 {
   database_event_format f;
@@ -389,9 +321,6 @@ void setup_data(ev_data *d, void *database, int ul_id, int dl_id, int mib_id,
   d->rar_frame         = -1;
   d->rar_subframe      = -1;
   d->rar_data          = -1;
-  d->sr_rnti           = -1;
-  d->sr_frame          = -1;
-  d->sr_subframe       = -1;
 
   d->nr_ul_rnti        = -1;
   d->nr_ul_frame       = -1;
@@ -478,18 +407,6 @@ void setup_data(ev_data *d, void *database, int ul_id, int dl_id, int mib_id,
   if (d->rar_rnti == -1 || d->rar_frame == -1 || d->rar_subframe == -1 ||
       d->rar_data == -1) goto error;
 
-  /* sr: rnti, frame, subframe */
-  f = get_format(database, sr_id);
-
-  for (i = 0; i < f.count; i++) {
-    G("rnti",     "int",    d->sr_rnti);
-    G("frame",    "int",    d->sr_frame);
-    G("subframe", "int",    d->sr_subframe);
-  }
-
-  if (d->sr_rnti == -1 || d->sr_frame == -1 || d->sr_subframe == -1)
-    goto error;
-
   /* NR ul: rnti, frame, slot, data */
   f = get_format(database, nr_ul_id);
 
@@ -613,7 +530,6 @@ int main(int n, char **v)
   int i;
   int ul_id, dl_id, mib_id, preamble_id, rar_id;
   int nr_ul_id, nr_dl_id, nr_mib_id, nr_rar_id;
-  int sr_id;
   ev_data d;
   char *ip = DEFAULT_IP;
   int port = DEFAULT_PORT;
@@ -622,11 +538,6 @@ int main(int n, char **v)
   int live = 0;
   memset(&d, 0, sizeof(ev_data));
 
-  for (i = 0; i < 65536; i++) {
-    d.lte_rnti_to_ueid[i] = -1;
-    d.nr_rnti_to_ueid[i] = -1;
-  }
-
   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; }
@@ -688,7 +599,6 @@ int main(int n, char **v)
     on_off(database, "ENB_PHY_MIB", is_on, 1);
     on_off(database, "ENB_PHY_INITIATE_RA_PROCEDURE", is_on, 1);
     on_off(database, "ENB_MAC_UE_DL_RAR_PDU_WITH_DATA", is_on, 1);
-    on_off(database, "ENB_MAC_SCHEDULING_REQUEST", is_on, 1);
 
     on_off(database, "GNB_MAC_UL_PDU_WITH_DATA", is_on, 1);
     on_off(database, "GNB_MAC_DL_PDU_WITH_DATA", is_on, 1);
@@ -711,14 +621,13 @@ int main(int n, char **v)
   mib_id = event_id_from_name(database, "ENB_PHY_MIB");
   preamble_id = event_id_from_name(database, "ENB_PHY_INITIATE_RA_PROCEDURE");
   rar_id = event_id_from_name(database, "ENB_MAC_UE_DL_RAR_PDU_WITH_DATA");
-  sr_id = event_id_from_name(database, "ENB_MAC_SCHEDULING_REQUEST");
 
   nr_ul_id = event_id_from_name(database, "GNB_MAC_UL_PDU_WITH_DATA");
   nr_dl_id = event_id_from_name(database, "GNB_MAC_DL_PDU_WITH_DATA");
   nr_mib_id = event_id_from_name(database, "GNB_PHY_MIB");
   nr_rar_id = event_id_from_name(database, "GNB_MAC_DL_RAR_PDU_WITH_DATA");
 
-  setup_data(&d, database, ul_id, dl_id, mib_id, preamble_id, rar_id, sr_id,
+  setup_data(&d, database, ul_id, dl_id, mib_id, preamble_id, rar_id,
              nr_ul_id, nr_dl_id, nr_mib_id, nr_rar_id);
 
   register_handler_function(h, ul_id, ul, &d);
@@ -726,7 +635,6 @@ int main(int n, char **v)
   register_handler_function(h, mib_id, mib, &d);
   register_handler_function(h, preamble_id, preamble, &d);
   register_handler_function(h, rar_id, rar, &d);
-  register_handler_function(h, sr_id, sr, &d);
 
   register_handler_function(h, nr_ul_id, nr_ul, &d);
   register_handler_function(h, nr_dl_id, nr_dl, &d);
@@ -754,7 +662,7 @@ int main(int n, char **v)
     if (e.type == -1) break;
 
     if (!(e.type == ul_id       || e.type == dl_id    || e.type == mib_id ||
-          e.type == preamble_id || e.type == rar_id   || e.type == sr_id  ||
+          e.type == preamble_id || e.type == rar_id   ||
           e.type == nr_ul_id    || e.type == nr_dl_id ||
           e.type == nr_mib_id   || e.type == nr_rar_id)) continue;
 

common/utils/T/tracer/packet-mac-lte.h

@@ -11,7 +11,26 @@
  *
  * Copyright (C) 2009 Martin Mathieson. All rights reserved.
  *
- * SPDX-License-Identifier: BSD-2-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
  */
 
 #ifndef __COMMON_UTILS_T_TRACER_PACKET_MAC_LTE__H__
@@ -48,9 +67,9 @@
 /* and implemented by this dissector, using the definitions      */
 /* below. A link to an example program showing you how to encode */
 /* these headers and send LTE MAC PDUs on a UDP socket is        */
-/* provided at https://wiki.wireshark.org/MAC-LTE                */
+/* provided at https://wiki.wireshark.org/MAC-LTE                 */
 /*                                                               */
-/* A heuristic dissector (enabled by a preference) will          */
+/* A heuristic dissecter (enabled by a preference) will          */
 /* recognise a signature at the beginning of these frames.       */
 /*****************************************************************/
 
@@ -107,25 +126,18 @@
           MCS index (1 byte), redundancy version (1 byte), resource block length (1 byte),
           HARQ id (1 byte), NDI (1 byte), TB (1 byte), DL reTx (1 byte) */
 
-#define MAC_LTE_SIMULT_PUCCH_PUSCH_PCELL_TAG  0x0C
+#define MAC_LTE_SIMULT_PUCCH_PUSCH_PCELL  0x0C
 /* 0 byte */
 
-#define MAC_LTE_SIMULT_PUCCH_PUSCH_PSCELL_TAG 0x0D
+#define MAC_LTE_SIMULT_PUCCH_PUSCH_PSCELL 0x0D
 /* 0 byte */
 
-#define MAC_LTE_CE_MODE_TAG         0x0E
+#define MAC_LTE_CE_MODE             0x0E
 /* 1 byte containing mac_lte_ce_mode enum value */
 
-#define MAC_LTE_NB_MODE_TAG         0x0F
+#define MAC_LTE_NB_MODE             0x0F
 /* 1 byte containing mac_lte_nb_mode enum value */
 
-#define MAC_LTE_N_UL_RB_TAG         0x10
-/* 1 byte containing the number of UL resource blocks: 6, 15, 25, 50, 75 or 100 */
-
-#define MAC_LTE_SR_TAG              0x11
-/* 2 bytes for the number of items, followed by that number of ueid, rnti (2 bytes each) */
-
-
 /* MAC PDU. Following this tag comes the actual MAC PDU (there is no length, the PDU
    continues until the end of the frame) */
 #define MAC_LTE_PAYLOAD_TAG 0x01

common/utils/itti_analyzer/INSTALL

@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.

common/utils/itti_analyzer/Makefile.am

@@ -0,0 +1,17 @@
+AM_CFLAGS =	\
+	@ADD_CFLAGS@	\
+	-I$(top_srcdir)/common	\
+	-I$(top_srcdir)/libparser	\
+	-I$(top_srcdir)/libresolver	\
+	-I$(top_srcdir)/libbuffers	\
+	-I$(top_srcdir)/libui
+
+SUBDIRS = libparser libresolver libbuffers libui .
+
+itti_analyzer_LDADD = \
+	$(top_builddir)/libui/libui.la	\
+	$(top_builddir)/libparser/libparser.la	\
+	$(top_builddir)/libresolver/libresolver.la	\
+	$(top_builddir)/libbuffers/libbuffers.la
+
+bin_PROGRAMS = itti_analyzer

common/utils/itti_analyzer/README

@@ -0,0 +1,14 @@
+
+To run itti_analyzer, please perform the following actions: 
+
+1) apt-get install autotools-dev automake libtool
+
+2) libtoolize
+
+3) ./autogen.sh
+
+4) ./configure
+
+5) make
+
+6) ./itti_analyzer

common/utils/itti_analyzer/autogen.sh

@@ -0,0 +1,6 @@
+#! /bin/sh
+
+aclocal \
+&& autoheader \
+&& automake --add-missing \
+&& autoconf

common/utils/itti_analyzer/common/itti_types.h

@@ -0,0 +1,73 @@
+/*
+ * 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
+ */
+
+/** @brief Intertask Interface common types
+ * Contains type definitions used for generating and parsing ITTI messages.
+ * @author Laurent Winckel <laurent.winckel@eurecom.fr>
+ */
+
+#ifndef _ITTI_TYPES_H_
+#define _ITTI_TYPES_H_
+
+#include <stdint.h>
+
+#define CHARS_TO_UINT32(c1, c2, c3, c4) (((c4) << 24) | ((c3) << 16) | ((c2) << 8) | (c1))
+
+#define MESSAGE_NUMBER_CHAR_FORMAT      "%11u"
+
+/* Intertask message types */
+enum itti_message_types_e
+{
+    ITTI_DUMP_XML_DEFINITION =        CHARS_TO_UINT32 ('\n', 'I', 'x', 'd'),
+    ITTI_DUMP_XML_DEFINITION_END =    CHARS_TO_UINT32 ('i', 'X', 'D', '\n'),
+
+    ITTI_DUMP_MESSAGE_TYPE =          CHARS_TO_UINT32 ('\n', 'I', 'm', 's'),
+    ITTI_DUMP_MESSAGE_TYPE_END =      CHARS_TO_UINT32 ('i', 'M', 'S', '\n'),
+
+    ITTI_STATISTIC_MESSAGE_TYPE =     CHARS_TO_UINT32 ('\n', 'I', 's', 't'),
+    ITTI_STATISTIC_MESSAGE_TYPE_END = CHARS_TO_UINT32 ('i', 'S', 'T', '\n'),
+
+    /* This signal is not meant to be used by remote analyzer */
+    ITTI_DUMP_EXIT_SIGNAL =           CHARS_TO_UINT32 ('e', 'X', 'I', 'T'),
+};
+
+typedef uint32_t itti_message_types_t;
+
+/* Message header is the common part that should never change between
+ * remote process and this one.
+ */
+typedef struct {
+    /* The size of this structure */
+    uint32_t              message_size;
+    itti_message_types_t  message_type;
+} itti_socket_header_t;
+
+typedef struct {
+    char message_number_char[12]; /* 9 chars are needed to store an unsigned 32 bits value in decimal, but must be a multiple of 32 bits to avoid alignment issues */
+} itti_signal_header_t;
+
+
+#define INSTANCE_DEFAULT    (UINT16_MAX - 1)
+#define INSTANCE_ALL        (UINT16_MAX)
+
+typedef uint16_t instance_t;
+
+#endif

common/utils/itti_analyzer/common/logs.h

@@ -19,31 +19,38 @@
  *      contact@openairinterface.org
  */
 
-/*! \file       nr_rlc_oai_api.h
- * \brief       Header file for nr_rlc_oai_api
- * \author      Guido Casati
- * \date        2020
- * \email:      guido.casati@iis.fraunhofe.de
- * \version     1.0
- * @ingroup     _rlc
-
+/*
+ * logs.h
+ *
+ *  Created on: Nov 22, 2013
+ *      Author: Laurent Winckel
  */
 
-#include "NR_RLC-BearerConfig.h"
-#include "NR_RLC-Config.h"
-#include "NR_LogicalChannelIdentity.h"
-#include "NR_RadioBearerConfig.h"
-#include "NR_CellGroupConfig.h"
-#include "openair2/RRC/NR/nr_rrc_proto.h"
+#ifndef LOGS_H_
+#define LOGS_H_
 
-/* from OAI */
-#include "pdcp.h"
+/* Added definition of the g_info log function to complete the set of log functions from "gmessages.h" */
 
-struct NR_RLC_Config;
-struct NR_LogicalChannelConfig;
+#include <glib/gmessages.h>
 
-void nr_rlc_bearer_init(NR_RLC_BearerConfig_t *RLC_BearerConfig);
+#ifdef G_HAVE_ISO_VARARGS
 
-void nr_drb_config(struct NR_RLC_Config *rlc_Config, NR_RLC_Config_PR rlc_config_pr);
+#define g_info(...)     g_log (G_LOG_DOMAIN,        \
+                               G_LOG_LEVEL_INFO,    \
+                               __VA_ARGS__)
 
-void nr_rlc_bearer_init_ul_spec(struct NR_LogicalChannelConfig *mac_LogicalChannelConfig);
+#else
+
+static void
+g_info (const gchar *format,
+        ...)
+{
+  va_list args;
+  va_start (args, format);
+  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format, args);
+  va_end (args);
+}
+
+#endif
+
+#endif /* LOGS_H_ */

common/utils/itti_analyzer/common/rc.h

@@ -0,0 +1,71 @@
+/*
+ * 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
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#ifndef RC_H_
+#define RC_H_
+
+#define RC_OK 0
+#define RC_FAIL         -1
+#define RC_BAD_PARAM    -2
+#define RC_NULL_POINTER -3
+
+static const char * const rc_strings[] =
+    {"Ok", "fail", "bad parameter", "null pointer"};
+
+#define CHECK_FCT(fCT)              \
+do {                                \
+    int rET;                        \
+    if ((rET = fCT) != RC_OK) {     \
+        fprintf(stderr, #fCT" has failed (%s:%d)\n", __FILE__, __LINE__);   \
+        return rET;                 \
+    }                               \
+} while(0)
+
+#define CHECK_FCT_POSIX(fCT)        \
+do {                                \
+    if (fCT == -1) {                \
+        fprintf(stderr, #fCT" has failed (%d:%s) (%s:%d)\n", errno, \
+                strerror(errno), __FILE__, __LINE__);               \
+        return RC_FAIL;             \
+    }                               \
+} while(0)
+
+#define CHECK_FCT_DO(fCT, dO)       \
+do {                                \
+    int rET;                        \
+    if ((rET = fCT) != RC_OK) {     \
+        fprintf(stderr, #fCT" has returned %d (%s:%d)\n", rET, __FILE__, __LINE__);   \
+        dO;                         \
+    }                               \
+} while(0)
+
+#define CHECK_BUFFER(bUFFER)        \
+do {                                \
+    if ((bUFFER) == NULL) {         \
+        fprintf(stderr, #bUFFER" is NULL (%s:%d)\n", __FILE__, __LINE__);   \
+        return RC_NULL_POINTER;     \
+    }                               \
+} while(0)
+
+#endif /* RC_H_ */

common/utils/itti_analyzer/configure.ac

@@ -0,0 +1,97 @@
+AC_PREREQ([2.68])
+
+define([svnversion], esyscmd([sh -c "svnversion ..|tr -d '\n'"]))
+
+AC_DEFINE(SVN_REVISION, "svnversion", [SVN Revision])
+
+AC_INIT([itti_analyzer], [0.2.svnversion], [openair_admin@eurecom.fr])
+AC_CANONICAL_BUILD
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE([1.11 silent-rules])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_CONFIG_HEADERS([config.h])
+
+AM_MAINTAINER_MODE
+
+AM_SILENT_RULES([yes])
+
+AM_PROG_LIBTOOL
+
+AC_PROG_RANLIB
+AC_PROG_CXX
+
+AC_FUNC_ALLOCA
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_INT8_T
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+
+AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([socket])
+AC_CHECK_FUNCS([strdup])
+AC_CHECK_FUNCS([strerror])
+AC_CHECK_FUNCS([select])
+AC_CHECK_FUNCS([strstr])
+
+AC_CHECK_HEADERS([arpa/inet.h])
+AC_CHECK_HEADERS([fcntl.h])
+AC_CHECK_HEADERS([libintl.h])
+AC_CHECK_HEADERS([malloc.h])
+AC_CHECK_HEADERS([stddef.h])
+AC_CHECK_HEADERS([netinet/in.h])
+
+AC_CHECK_LIB(m, log10)
+
+PKG_CHECK_MODULES(XML2, [libxml-2.0 >= 2.7.8], [HAVE_XML2=true], [AC_MSG_ERROR(lixml-2.0 not installed)])
+CFLAGS="$CFLAGS $XML2_CFLAGS"
+LIBS="$LIBS $XML2_LIBS"
+
+AM_PATH_GTK_3_0(3.0.0, [], AC_MSG_ERROR(Requirement not met: gtk >= 3.0.0))
+CFLAGS="$CFLAGS $GTK_CFLAGS"
+LIBS="$LIBS $GTK_LIBS"
+
+dnl Add these flags
+CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Wshadow"
+CFLAGS="$CFLAGS -Wcast-align"
+CFLAGS="$CFLAGS -Wchar-subscripts"
+CFLAGS="$CFLAGS -Wmissing-prototypes"
+CFLAGS="$CFLAGS -Wmissing-declarations"
+CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
+
+AC_SUBST([AM_CFLAGS])
+AC_SUBST(ADD_CFLAGS)
+
+dnl *** Autoconf support ***
+AC_ARG_ENABLE(autoconf,
+  [  --disable-autoconf      disable automatic generation of configure script ],
+  enable_autoconf=$enableval, enable_autoconf=yes
+)
+AC_PATH_PROG(AUTOCONF, autoconf, @echo autoconf not available)
+AC_PATH_PROG(AUTOHEADER, autoheader, @echo autoheader not available)
+if test -z "$AUTOCONF"; then enable_autoconf=no ; fi
+if test -z "$AUTOHEADER"; then enable_autoconf=no ; fi
+if test x$enable_autoconf = xyes; then
+  CONFIGURE_DEPENDS="configure.in aclocal.m4"
+fi
+AC_SUBST(CONFIGURE_DEPENDS)
+
+AC_CONFIG_FILES(
+    libbuffers/Makefile             \
+    libparser/Makefile              \
+    libresolver/Makefile            \
+    libui/Makefile                  \
+    Makefile                        \
+)
+AC_OUTPUT

common/utils/itti_analyzer/filters.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<filters>
+  <messages>
+    <INITIALIZE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <ACTIVATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <DEACTIVATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <TERMINATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <MESSAGE_TEST enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <ERROR_LOG enabled="1" foreground_color="#000000" background_color="#ff8080"/>
+    <WARNING_LOG enabled="1" foreground_color="#303030" background_color="#fff050"/>
+    <NOTICE_LOG enabled="0" foreground_color="#585858" background_color="#ffffa0"/>
+    <INFO_LOG enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <DEBUG_LOG enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <GENERIC_LOG enabled="1" foreground_color="#246b24" background_color="#ffffff"/>
+    <TIMER_HAS_EXPIRED enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <PHY_DEACTIVATE_REQ enabled="1" foreground_color="#000000" background_color="#bef2ff"/>
+    <PHY_FIND_CELL_REQ enabled="1" foreground_color="#000000" background_color="#bef2ff"/>
+    <PHY_FIND_NEXT_CELL_REQ enabled="1" foreground_color="#000000" background_color="#bef2ff"/>
+    <PHY_FIND_CELL_IND enabled="1" foreground_color="#585858" background_color="#bef2ff"/>
+    <RRC_MAC_IN_SYNC_IND enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_OUT_OF_SYNC_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_BCCH_DATA_REQ enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_BCCH_DATA_IND enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_CCCH_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_CCCH_DATA_CNF enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_CCCH_DATA_IND enabled="1" foreground_color="#585858" background_color="#dfb9fc"/>
+    <RRC_MAC_MCCH_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_MCCH_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_DCCH_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_DCCH_DATA_IND enabled="1" foreground_color="#585858" background_color="#a7b1de"/>
+    <RRC_STATE_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_CONFIGURATION_REQ enabled="1" foreground_color="#ffffff" background_color="#4d2a73"/>
+    <NAS_CELL_SELECTION_REQ enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_CONN_ESTABLI_REQ enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_UPLINK_DATA_REQ enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_RAB_ESTABLI_RSP enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_CELL_SELECTION_CNF enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_CELL_SELECTION_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_PAGING_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_CONN_ESTABLI_CNF enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_CONN_RELEASE_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_UPLINK_DATA_CNF enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_DOWNLINK_DATA_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <S1AP_REGISTER_ENB_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_REGISTER_ENB_CNF enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_DEREGISTERED_ENB_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_NAS_FIRST_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_UPLINK_NAS enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CAPABILITIES_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_RESP enabled="1" foreground_color="#19431e" background_color="#cbffb1"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_FAIL enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_NAS_NON_DELIVERY_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CONTEXT_RELEASE_RESP enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CTXT_MODIFICATION_RESP enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CTXT_MODIFICATION_FAIL enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_DOWNLINK_NAS enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_UE_CTXT_MODIFICATION_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_PAGING_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CONTEXT_RELEASE_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <SCTP_NEW_ASSOCIATION_REQ enabled="0" foreground_color="#000000" background_color="#aefeff"/>
+    <SCTP_NEW_ASSOCIATION_RESP enabled="0" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_NEW_ASSOCIATION_IND enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_REGISTER_UPPER_LAYER enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_DATA_REQ enabled="1" foreground_color="#000000" background_color="#aefeff"/>
+    <SCTP_DATA_IND enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <RRC_RAL_SYSTEM_CONFIGURATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SYSTEM_INFORMATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SCAN_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SCAN_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONFIGURE_THRESHOLD_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONFIGURE_THRESHOLD_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_MEASUREMENT_REPORT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_ESTABLISHMENT_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_ESTABLISHMENT_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_ESTABLISHMENT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_REESTABLISHMENT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RECONFIGURATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RECONFIGURATION_HO_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RELEASE_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RELEASE_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RELEASE_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_UPLINK_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+  </messages>
+  <origin_tasks>
+    <TASK_UNKNOWN enabled="1"/>
+    <TASK_TIMER enabled="1"/>
+    <TASK_L2L1 enabled="1"/>
+    <TASK_BM enabled="1"/>
+    <TASK_PHY_ENB enabled="1"/>
+    <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"/>
+    <TASK_X2AP enabled="1"/>
+    <TASK_SCTP enabled="1"/>
+    <TASK_ENB_APP enabled="1"/>
+    <TASK_PHY_UE enabled="1"/>
+    <TASK_MAC_UE enabled="1"/>
+    <TASK_RLC_UE enabled="1"/>
+    <TASK_PDCP_UE enabled="1"/>
+    <TASK_RRC_UE enabled="1"/>
+    <TASK_NAS_UE enabled="1"/>
+    <TASK_RAL_UE enabled="1"/>
+  </origin_tasks>
+  <destination_tasks>
+    <TASK_UNKNOWN enabled="1"/>
+    <TASK_TIMER enabled="1"/>
+    <TASK_L2L1 enabled="1"/>
+    <TASK_BM enabled="1"/>
+    <TASK_PHY_ENB enabled="1"/>
+    <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"/>
+    <TASK_X2AP enabled="1"/>
+    <TASK_SCTP enabled="1"/>
+    <TASK_ENB_APP enabled="1"/>
+    <TASK_PHY_UE enabled="1"/>
+    <TASK_MAC_UE enabled="1"/>
+    <TASK_RLC_UE enabled="1"/>
+    <TASK_PDCP_UE enabled="1"/>
+    <TASK_RRC_UE enabled="1"/>
+    <TASK_NAS_UE enabled="1"/>
+    <TASK_RAL_UE enabled="1"/>
+  </destination_tasks>
+</filters>

common/utils/itti_analyzer/filters_mme.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<filters>
+  <messages>
+    <ACTIVATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <DEACTIVATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <DEBUG_LOG enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <ERROR_LOG enabled="1" foreground_color="#000000" background_color="#ff8080"/>
+    <GENERIC_LOG enabled="1" foreground_color="#246b24" background_color="#ffffff"/>
+    <GTPV1U_CREATE_TUNNEL_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_CREATE_TUNNEL_RESP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_DELETE_TUNNEL_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_DELETE_TUNNEL_RESP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_TUNNEL_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_TUNNEL_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_UPDATE_TUNNEL_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <GTPV1U_UPDATE_TUNNEL_RESP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <INFO_LOG enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <INITIALIZE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <MESSAGE_TEST enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <MME_APP_CONNECTION_ESTABLISHMENT_IND enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <MME_APP_INITIAL_CONTEXT_SETUP_RSP enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_AUTHENTICATION_PARAM_FAIL enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_AUTHENTICATION_PARAM_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_AUTHENTICATION_PARAM_RSP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_BEARER_PARAM enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_CONNECTION_ESTABLISHMENT_CNF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_CONNECTION_ESTABLISHMENT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_CONNECTION_RELEASE_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_CONN_ESTABLI_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_DL_EMM_PLAIN_MSG enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_DL_EMM_PROTECTED_MSG enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_DL_EMM_RAW_MSG enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_DL_ESM_PLAIN_MSG enabled="1" foreground_color="#90ff40" background_color="#906010"/>
+    <NAS_DL_ESM_PROTECTED_MSG enabled="1" foreground_color="#90ff40" background_color="#906010"/>
+    <NAS_DL_ESM_RAW_MSG enabled="1" foreground_color="#90ff40" background_color="#906010"/>
+    <NAS_DOWNLINK_DATA_CNF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_DOWNLINK_DATA_REJ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_DOWNLINK_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_NON_DELIVERY_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_PAGING_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_PDN_CONNECTIVITY_REQ enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_RAB_ESTABLI_RSP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_RAB_ESTABLISHMENT_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_RAB_ESTABLISHMENT_RESP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_RAB_RELEASE_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_UL_EMM_PLAIN_MSG enabled="1" foreground_color="#ff8080" background_color="#805000"/>
+    <NAS_UL_EMM_PROTECTED_MSG enabled="1" foreground_color="#ff8080" background_color="#805000"/>
+    <NAS_UL_EMM_RAW_MSG enabled="1" foreground_color="#ff8080" background_color="#805000"/>
+    <NAS_UL_ESM_PLAIN_MSG enabled="1" foreground_color="#ff8080" background_color="#906010"/>
+    <NAS_UL_ESM_PROTECTED_MSG enabled="1" foreground_color="#ff8080" background_color="#906010"/>
+    <NAS_UL_ESM_RAW_MSG enabled="1" foreground_color="#ff8080" background_color="#906010"/>
+    <NAS_UPLINK_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_UPLINK_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NOTICE_LOG enabled="0" foreground_color="#585858" background_color="#ffffa0"/>
+    <S1AP_DEREGISTERED_ENB_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_DEREGISTER_UE_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_DOWNLINK_NAS_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_ENB_DEREGISTERED_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_INITIAL_UE_MESSAGE_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_NAS_NON_DELIVERY_IND_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_REGISTER_ENB_CNF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_S1_SETUP_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CAPABILITIES_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CAPABILITY_IND_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CONTEXT_RELEASE_COMMAND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CONTEXT_RELEASE_COMPLETE enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CONTEXT_RELEASE_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CONTEXT_RELEASE_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CONTEXT_RELEASE_REQ_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UPLINK_NAS_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S6A_AUTH_INFO_ANS enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S6A_AUTH_INFO_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S6A_UPDATE_LOCATION_ANS enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S6A_UPDATE_LOCATION_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SCTP_CLOSE_ASSOCIATION enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SCTP_DATA_IND enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_DATA_REQ enabled="1" foreground_color="#000000" background_color="#aefeff"/>
+    <SCTP_INIT_MSG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SCTP_NEW_ASSOCIATION enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SCTP_NEW_ASSOCIATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SCTP_NEW_ASSOCIATION_REQ enabled="1" foreground_color="#000000" background_color="#aefeff"/>
+    <SCTP_NEW_ASSOCIATION_RESP enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGI_CREATE_ENDPOINT_REQUEST enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGI_CREATE_ENDPOINT_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGI_DELETE_ENDPOINT_REQUEST enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGI_DELETE_ENDPOINT_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGI_UPDATE_ENDPOINT_REQUEST enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGI_UPDATE_ENDPOINT_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_CREATE_SESSION_REQUEST enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_CREATE_SESSION_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_DELETE_SESSION_REQUEST enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_DELETE_SESSION_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_MODIFY_BEARER_REQUEST enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_MODIFY_BEARER_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SGW_RELEASE_ACCESS_BEARERS_RESPONSE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <TERMINATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <TIMER_HAS_EXPIRED enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <UDP_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <UDP_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <UDP_INIT enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <WARNING_LOG enabled="1" foreground_color="#303030" background_color="#fff050"/>
+  </messages>
+  <origin_tasks>
+    <TASK_UNKNOWN enabled="1"/>
+    <TASK_TIMER enabled="0"/>
+    <TASK_GTPV1_U enabled="1"/>
+    <TASK_MME_APP enabled="1"/>
+    <TASK_NAS_MME enabled="1"/>
+    <TASK_S11 enabled="1"/>
+    <TASK_S1AP enabled="1"/>
+    <TASK_S6A enabled="1"/>
+    <TASK_SCTP enabled="1"/>
+    <TASK_SPGW_APP enabled="1"/>
+    <TASK_UDP enabled="1"/>
+  </origin_tasks>
+  <destination_tasks>
+    <TASK_UNKNOWN enabled="1"/>
+    <TASK_TIMER enabled="0"/>
+    <TASK_GTPV1_U enabled="1"/>
+    <TASK_MME_APP enabled="1"/>
+    <TASK_NAS_MME enabled="1"/>
+    <TASK_S11 enabled="1"/>
+    <TASK_S1AP enabled="1"/>
+    <TASK_S6A enabled="1"/>
+    <TASK_SCTP enabled="1"/>
+    <TASK_SPGW_APP enabled="1"/>
+    <TASK_UDP enabled="1"/>
+  </destination_tasks>
+</filters>

common/utils/itti_analyzer/filters_ue_enb.xml

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<filters>
+  <messages>
+    <INITIALIZE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <ACTIVATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <DEACTIVATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <TERMINATE_MESSAGE enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <MESSAGE_TEST enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <ERROR_LOG enabled="1" foreground_color="#000000" background_color="#ff8080"/>
+    <WARNING_LOG enabled="1" foreground_color="#303030" background_color="#fff050"/>
+    <NOTICE_LOG enabled="0" foreground_color="#585858" background_color="#ffffa0"/>
+    <INFO_LOG enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <DEBUG_LOG enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <GENERIC_LOG enabled="1" foreground_color="#246b24" background_color="#ffffff"/>
+    <TIMER_HAS_EXPIRED enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_CELL_SELECTION_CNF enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_CELL_SELECTION_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_CELL_SELECTION_REQ enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_CONN_ESTABLI_CNF enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_CONN_ESTABLI_REQ enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_CONN_RELEASE_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_DL_EMM_PLAIN_MSG enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_DL_EMM_PROTECTED_MSG enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_DL_EMM_RAW_MSG enabled="1" foreground_color="#90ff40" background_color="#805000"/>
+    <NAS_DL_ESM_PLAIN_MSG enabled="1" foreground_color="#90ff40" background_color="#906010"/>
+    <NAS_DL_ESM_PROTECTED_MSG enabled="1" foreground_color="#90ff40" background_color="#906010"/>
+    <NAS_DL_ESM_RAW_MSG enabled="1" foreground_color="#90ff40" background_color="#906010"/>
+    <NAS_DOWNLINK_DATA_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_PAGING_IND enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_RAB_ESTABLI_RSP enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <NAS_UL_EMM_PLAIN_MSG enabled="1" foreground_color="#ff8080" background_color="#805000"/>
+    <NAS_UL_EMM_PROTECTED_MSG enabled="1" foreground_color="#ff8080" background_color="#805000"/>
+    <NAS_UL_EMM_RAW_MSG enabled="1" foreground_color="#ff8080" background_color="#805000"/>
+    <NAS_UL_ESM_PLAIN_MSG enabled="1" foreground_color="#ff8080" background_color="#906010"/>
+    <NAS_UL_ESM_PROTECTED_MSG enabled="1" foreground_color="#ff8080" background_color="#906010"/>
+    <NAS_UL_ESM_RAW_MSG enabled="1" foreground_color="#ff8080" background_color="#906010"/>
+    <NAS_UPLINK_DATA_CNF enabled="1" foreground_color="#e0e0e0" background_color="#2d315c"/>
+    <NAS_UPLINK_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <NAS_UPLINK_DATA_REQ enabled="1" foreground_color="#ffffff" background_color="#2d315c"/>
+    <PHY_DEACTIVATE_REQ enabled="1" foreground_color="#000000" background_color="#bef2ff"/>
+    <PHY_FIND_CELL_IND enabled="1" foreground_color="#585858" background_color="#bef2ff"/>
+    <PHY_FIND_CELL_REQ enabled="1" foreground_color="#000000" background_color="#bef2ff"/>
+    <PHY_FIND_NEXT_CELL_REQ enabled="1" foreground_color="#000000" background_color="#bef2ff"/>
+    <PHY_MEAS_REPORT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <PHY_MEAS_THRESHOLD_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <PHY_MEAS_THRESHOLD_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_AM_DATA_PDU_IND enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_AM_DATA_PDU_REQ enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_AM_SDU_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_AM_SDU_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_AM_STATUS_PDU_IND enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_AM_STATUS_PDU_REQ enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_UM_DATA_PDU_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RLC_UM_DATA_PDU_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_CONFIGURATION_REQ enabled="1" foreground_color="#ffffff" background_color="#4d2a73"/>
+    <RRC_DCCH_DATA_IND enabled="1" foreground_color="#585858" background_color="#a7b1de"/>
+    <RRC_DCCH_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_DL_BCCH enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_DL_CCCH enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_DL_DCCH enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_DL_MCCH enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_BCCH_DATA_IND enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_BCCH_DATA_REQ enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_CCCH_DATA_CNF enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_CCCH_DATA_IND enabled="1" foreground_color="#585858" background_color="#dfb9fc"/>
+    <RRC_MAC_CCCH_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_IN_SYNC_IND enabled="0" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_MCCH_DATA_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_MCCH_DATA_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_MAC_OUT_OF_SYNC_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONFIGURE_THRESHOLD_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONFIGURE_THRESHOLD_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_ESTABLISHMENT_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_ESTABLISHMENT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_ESTABLISHMENT_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RECONFIGURATION_HO_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RECONFIGURATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_REESTABLISHMENT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RELEASE_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RELEASE_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_CONNECTION_RELEASE_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_MEASUREMENT_REPORT_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SCAN_CONF enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SCAN_REQ enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SYSTEM_CONFIGURATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_RAL_SYSTEM_INFORMATION_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_STATE_IND enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_UE_EUTRA_CAPABILITY enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_UL_CCCH enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <RRC_UL_DCCH enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_DEREGISTERED_ENB_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_DOWNLINK_NAS enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_DOWNLINK_NAS_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_FAIL enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_INITIAL_CONTEXT_SETUP_RESP enabled="1" foreground_color="#19431e" background_color="#cbffb1"/>
+    <S1AP_INITIAL_UE_MESSAGE_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_NAS_FIRST_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_NAS_NON_DELIVERY_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_NAS_NON_DELIVERY_IND_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_PAGING_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_REGISTER_ENB_CNF enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_REGISTER_ENB_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_S1_SETUP_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CAPABILITIES_IND enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CAPABILITY_IND_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CONTEXT_RELEASE_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CONTEXT_RELEASE_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_UE_CONTEXT_RELEASE_REQ_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <S1AP_UE_CONTEXT_RELEASE_RESP enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CTXT_MODIFICATION_FAIL enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UE_CTXT_MODIFICATION_REQ enabled="1" foreground_color="#000000" background_color="#cbffb1"/>
+    <S1AP_UE_CTXT_MODIFICATION_RESP enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UPLINK_NAS enabled="1" foreground_color="#585858" background_color="#cbffb1"/>
+    <S1AP_UPLINK_NAS_LOG enabled="1" foreground_color="#585858" background_color="#ffffff"/>
+    <SCTP_DATA_IND enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_DATA_REQ enabled="1" foreground_color="#000000" background_color="#aefeff"/>
+    <SCTP_NEW_ASSOCIATION_IND enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_NEW_ASSOCIATION_REQ enabled="1" foreground_color="#000000" background_color="#aefeff"/>
+    <SCTP_NEW_ASSOCIATION_RESP enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+    <SCTP_REGISTER_UPPER_LAYER enabled="1" foreground_color="#585858" background_color="#aefeff"/>
+  </messages>
+  <origin_tasks>
+    <TASK_UNKNOWN enabled="1"/>
+    <TASK_TIMER enabled="1"/>
+    <TASK_L2L1 enabled="1"/>
+    <TASK_BM enabled="1"/>
+    <TASK_PHY_ENB enabled="1"/>
+    <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"/>
+    <TASK_X2AP enabled="1"/>
+    <TASK_SCTP enabled="1"/>
+    <TASK_ENB_APP enabled="1"/>
+    <TASK_PHY_UE enabled="1"/>
+    <TASK_MAC_UE enabled="1"/>
+    <TASK_RLC_UE enabled="1"/>
+    <TASK_PDCP_UE enabled="1"/>
+    <TASK_RRC_UE enabled="1"/>
+    <TASK_NAS_UE enabled="1"/>
+    <TASK_RAL_UE enabled="1"/>
+  </origin_tasks>
+  <destination_tasks>
+    <TASK_UNKNOWN enabled="1"/>
+    <TASK_TIMER enabled="1"/>
+    <TASK_L2L1 enabled="1"/>
+    <TASK_BM enabled="1"/>
+    <TASK_PHY_ENB enabled="1"/>
+    <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"/>
+    <TASK_X2AP enabled="1"/>
+    <TASK_SCTP enabled="1"/>
+    <TASK_ENB_APP enabled="1"/>
+    <TASK_PHY_UE enabled="1"/>
+    <TASK_MAC_UE enabled="1"/>
+    <TASK_RLC_UE enabled="1"/>
+    <TASK_PDCP_UE enabled="1"/>
+    <TASK_RRC_UE enabled="1"/>
+    <TASK_NAS_UE enabled="1"/>
+    <TASK_RAL_UE enabled="1"/>
+  </destination_tasks>
+</filters>

common/utils/itti_analyzer/itti_analyzer.c

@@ -0,0 +1,145 @@
+/*
+ * 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
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include <libxml/parser.h>
+
+#include "xml_parse.h"
+#include "resolvers.h"
+#include "locate_root.h"
+#include "file.h"
+#include "ui_main_screen.h"
+
+#include "rc.h"
+
+#define G_LOG_LEVELS (G_LOG_LEVEL_ERROR     | \
+                      G_LOG_LEVEL_CRITICAL  | \
+                      G_LOG_LEVEL_WARNING   | \
+                      G_LOG_LEVEL_MESSAGE   | \
+                      G_LOG_LEVEL_INFO      | \
+                      G_LOG_LEVEL_DEBUG)
+
+int debug_buffers = 1;
+int debug_parser = 0;
+
+static void console_log_handler(const char *log_domain, GLogLevelFlags log_level,
+                                const char *message, gpointer user_data)
+{
+    GLogLevelFlags domain_log_level = (GLogLevelFlags) user_data;
+    time_t curr;
+    struct tm *today;
+    const char *level;
+
+    if (ui_main_data.log_flags & domain_log_level & log_level)
+    {
+        switch (log_level & G_LOG_LEVEL_MASK)
+        {
+        case G_LOG_LEVEL_ERROR:
+            level = "Err ";
+            break;
+        case G_LOG_LEVEL_CRITICAL:
+            level = "Crit";
+            break;
+        case G_LOG_LEVEL_WARNING:
+            level = "Warn";
+            break;
+        case G_LOG_LEVEL_MESSAGE:
+            level = "Msg ";
+            break;
+        case G_LOG_LEVEL_INFO:
+            level = "Info";
+            break;
+        case G_LOG_LEVEL_DEBUG:
+            level = "Dbg ";
+            break;
+        default:
+            fprintf(stderr, "unknown log_level %u\n", log_level);
+            level = NULL;
+            g_assert_not_reached();
+            break;
+        }
+
+        /* create a "timestamp" */
+        time(&curr);
+        today = localtime(&curr);
+
+        fprintf(stderr, "%02u:%02u:%02u %-9s %s %s\n", today->tm_hour, today->tm_min, today->tm_sec,
+                log_domain != NULL ? log_domain : "", level, message);
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    int ret = 0;
+
+    GLogLevelFlags log_flags;
+
+    log_flags = (GLogLevelFlags)
+        (G_LOG_LEVEL_ERROR      |
+        G_LOG_LEVEL_CRITICAL    |
+        G_LOG_LEVEL_WARNING     |
+        G_LOG_LEVEL_MESSAGE     |
+        G_LOG_LEVEL_INFO        |
+        G_LOG_LEVEL_DEBUG);
+
+    /* This initialize the library and check potential ABI mismatches
+     * between the version it was compiled for and the actual shared
+     * library used.
+     */
+    LIBXML_TEST_VERSION;
+    xmlInitParser();
+
+    /* Initialize the widget set */
+    gtk_init(&argc, &argv);
+
+    /* Parse command line options */
+    ui_gtk_parse_arg (argc, argv);
+
+    /* Set log handlers:
+     *                 Domain,      Levels,    Handler,             Domain enabled levels */
+    g_log_set_handler( NULL,        log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("BUFFERS",    log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("PARSER",     log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("RESOLVER",   log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("UI",         log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("UI_CB",      log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("UI_FILTER",  log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("UI_INTER",   log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("UI_TREE",    log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+
+    CHECK_FCT(ui_gtk_initialize(argc, argv));
+
+    /* Enter the main event loop, and wait for user interaction */
+    gtk_main ();
+
+    /* Free the global variables that may
+     * have been allocated by the parser.
+     */
+    xmlCleanupParser ();
+
+    return ret;
+}

common/utils/itti_analyzer/libbuffers/Makefile.am

@@ -0,0 +1,13 @@
+AM_CFLAGS =	\
+	@ADD_CFLAGS@	\
+	-I$(top_srcdir)/common	\
+	-I$(top_srcdir)/libparser	\
+	-I$(top_srcdir)/libui
+
+noinst_LTLIBRARIES = libbuffers.la
+
+libbuffers_la_LDFLAGS = -all-static
+libbuffers_la_SOURCES = \
+	buffers.c	buffers.h	\
+	file.c	file.h	\
+	socket.c	socket.h

common/utils/itti_analyzer/libbuffers/buffers.c

@@ -0,0 +1,241 @@
+/*
+ * 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
+ */
+
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define G_LOG_DOMAIN ("BUFFERS")
+
+#include <glib.h>
+
+#include "rc.h"
+#include "buffers.h"
+
+extern int debug_buffers;
+
+static
+int buffer_fetch(buffer_t *buffer, uint32_t offset, int size, void *value);
+
+/* Try to fetch 8 bits unsigned from the buffer */
+uint8_t buffer_get_uint8_t(buffer_t *buffer, uint32_t offset)
+{
+    uint8_t value;
+
+    buffer_fetch(buffer, offset, 1, &value);
+
+    return value;
+}
+
+/* Try to fetch 16 bits unsigned from the buffer */
+uint16_t buffer_get_uint16_t(buffer_t *buffer, uint32_t offset)
+{
+    uint16_t value;
+
+    buffer_fetch(buffer, offset, 2, &value);
+
+    return value;
+}
+
+/* Try to fetch 32 bits unsigned from the buffer */
+uint32_t buffer_get_uint32_t(buffer_t *buffer, uint32_t offset)
+{
+    uint32_t value;
+
+    buffer_fetch(buffer, offset, 4, &value);
+
+    return value;
+}
+
+/* Try to fetch 64 bits unsigned from the buffer */
+uint64_t buffer_get_uint64_t(buffer_t *buffer, uint32_t offset)
+{
+    uint64_t value;
+
+    buffer_fetch(buffer, offset, 8, &value);
+
+    return value;
+}
+
+static
+int buffer_fetch(buffer_t *buffer, uint32_t offset, int size, void *value)
+{
+    if (buffer == NULL || value == NULL)
+        return -1;
+    if (size <= 0)
+        return -1;
+
+    if (buffer->size_bytes < ((offset >> 3) + size)) {
+        g_warning("Not enough data to fetch");
+        return -1;
+    }
+
+    memcpy(value, &buffer->data[offset >> 3], size);
+    buffer->buffer_current = &buffer->data[(offset >> 3) + size];
+
+    return 0;
+}
+
+int buffer_fetch_nbytes(buffer_t *buffer, uint32_t offset, int n_bytes, uint8_t *value)
+{
+    if (buffer->size_bytes < ((offset >> 3) + n_bytes)) {
+        g_warning("Not enough data to fetch");
+        return -1;
+    }
+    memcpy(&value[0], &buffer->data[offset >> 3], n_bytes);
+
+    return 0;
+}
+
+int buffer_fetch_bits(buffer_t *buffer, uint32_t offset, int nbits, uint32_t *value)
+{
+    uint32_t temp = 0;
+    int i;
+
+    if (buffer == NULL || value == NULL)
+        return RC_BAD_PARAM;
+
+    /* We cannot fetch more than 32 bits */
+    if (nbits > 32)
+        return RC_BAD_PARAM;
+
+    for (i = 0; i < nbits; i++)
+    {
+        temp |= ((buffer->data[(offset + i) / 8] >> ((offset + i) % 8)) & 1) << i;
+    }
+
+    *value = temp;
+
+    return RC_OK;
+}
+
+/**
+ * @brief Create a new buffer from data
+ * @param buffer caller reference where created buffer will be stored
+ * @param data Data to attach to the new buffer
+ * @param length Length of data buffer
+ * @param data_static flag that indicates if data pointer has been statically (= 0) or not (!= 0)
+ */
+int buffer_new_from_data(buffer_t **buffer, uint8_t *data, const uint32_t length,
+                         int data_static)
+{
+    buffer_t *new;
+
+    if (!buffer)
+        return RC_BAD_PARAM;
+
+    new = malloc(sizeof(buffer_t));
+
+    new->size_bytes = length;
+    if (data && length > 0) {
+        if (data_static == 0) {
+            new->data = malloc(sizeof(uint8_t) * new->size_bytes);
+            memcpy(new->data, data, new->size_bytes);
+        } else {
+            new->data = data;
+        }
+        new->buffer_current = &new->data[0];
+    } else {
+        new->buffer_current = NULL;
+    }
+
+    *buffer = new;
+
+    return 0;
+}
+
+#define INDENTED(fILE, x, y)            \
+do {                                    \
+    int indentation = x;                \
+    while(indentation--) fprintf(fILE, " ");  \
+    y;                                  \
+} while(0)
+
+#define INDENT_BREAK    20
+
+void buffer_dump(buffer_t *buffer, FILE *to)
+{
+    FILE *file = to;
+    uint32_t i;
+
+    if (!buffer)
+        return;
+    if (!to)
+        to = stdout;
+
+    fprintf(file, "<Buffer>\n");
+    INDENTED(file, 4, fprintf(file, "<Length>%u<Length>\n", buffer->size_bytes));
+    INDENTED(file, 4, fprintf(file, "<Bytes>\n"));
+    for (i = 0; i < buffer->size_bytes; i++)
+    {
+        if ((i % INDENT_BREAK) == 0)
+            fprintf(file, "        ");
+        fprintf(file, "0x%02x ", buffer->data[i]);
+        if ((i % INDENT_BREAK) == (INDENT_BREAK - 1))
+            fprintf(file, "\n");
+    }
+    if ((i % INDENT_BREAK) != (INDENT_BREAK - 1))
+        fprintf(file, "\n");
+    INDENTED(file, 4, fprintf(file, "</Bytes>\n"));
+    fprintf(file, "</Buffer>\n");
+}
+
+int buffer_append_data(buffer_t *buffer, const uint8_t *data, const uint32_t length)
+{
+    if (!buffer)
+        return -1;
+
+    if (data && length > 0) {
+        if (!buffer->data) {
+            buffer->size_bytes = length;
+            buffer->data = malloc(sizeof(uint8_t) * buffer->size_bytes);
+            memcpy(buffer->data, data, buffer->size_bytes);
+        } else {
+            buffer->data = realloc(buffer->data, sizeof(uint8_t) * (buffer->size_bytes + length));
+            memcpy(&buffer->data[buffer->size_bytes], data, length);
+            buffer->size_bytes += length;
+        }
+        buffer->buffer_current = &buffer->data[0];
+    }
+
+    return 0;
+}
+
+int buffer_has_enouch_data(buffer_t *buffer, uint32_t offset, uint32_t to_get)
+{
+    int underflow;
+    if (!buffer)
+        return -1;
+    underflow = (buffer->size_bytes >= ((offset + to_get) / 8)) ? 0 : -1;
+    if (underflow && debug_buffers)
+        g_warning("Detected Underflow offset %u, to_get %u, buffer size %u\n",
+                  offset, to_get, buffer->size_bytes);
+    return underflow;
+}
+
+void *buffer_at_offset(buffer_t *buffer, uint32_t offset)
+{
+//     if (buffer_has_enouch_data(buffer, 0, offset) != 0) {
+//         return NULL;
+//     }
+    return &buffer->data[offset / 8];
+}

common/utils/itti_analyzer/libbuffers/buffers.h

@@ -0,0 +1,66 @@
+/*
+ * 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
+ */
+
+#include <stdint.h>
+
+#ifndef BUFFERS_H_
+#define BUFFERS_H_
+
+typedef struct buffer_s {
+    /* The size in bytes as read from socket */
+    uint32_t size_bytes;
+
+    /* Current position */
+    uint8_t *buffer_current;
+
+    /* The complete data */
+    uint8_t *data;
+
+    /* The message number as read from socket */
+    uint32_t message_number;
+
+    uint32_t message_id;
+} buffer_t;
+
+uint8_t buffer_get_uint8_t(buffer_t *buffer, uint32_t offset);
+
+uint16_t buffer_get_uint16_t(buffer_t *buffer, uint32_t offset);
+
+uint32_t buffer_get_uint32_t(buffer_t *buffer, uint32_t offset);
+
+uint64_t buffer_get_uint64_t(buffer_t *buffer, uint32_t offset);
+
+int buffer_fetch_bits(buffer_t *buffer, uint32_t offset, int nbits, uint32_t *value);
+
+int buffer_fetch_nbytes(buffer_t *buffer, uint32_t offset, int n_bytes, uint8_t *value);
+
+void buffer_dump(buffer_t *buffer, FILE *to);
+
+int buffer_append_data(buffer_t *buffer, const uint8_t *data, const uint32_t length);
+
+int buffer_new_from_data(buffer_t **buffer, uint8_t *data, const uint32_t length,
+                         int data_static);
+
+int buffer_has_enouch_data(buffer_t *buffer, uint32_t offset, uint32_t to_get);
+
+void *buffer_at_offset(buffer_t *buffer, uint32_t offset);
+
+#endif /* BUFFERS_H_ */

common/utils/itti_analyzer/libbuffers/file.c

@@ -0,0 +1,75 @@
+/*
+ * 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
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#define G_LOG_DOMAIN ("BUFFERS")
+
+#include <glib.h>
+
+#include "rc.h"
+#include "buffers.h"
+#include "file.h"
+
+#define READ_BUFFER_SIZE 1024
+
+int file_read_dump(buffer_t **buffer, const char *filename)
+{
+    int fd = -1;
+    buffer_t *new_buf = NULL;
+    uint8_t   data[READ_BUFFER_SIZE];
+    ssize_t   current_read;
+
+    if (!filename)
+        return RC_BAD_PARAM;
+
+    if ((fd = open(filename, O_RDONLY)) == -1) {
+        g_warning("Cannot open %s for reading, returned %d:%s\n",
+                  filename, errno, strerror(errno));
+        return RC_FAIL;
+    }
+
+    CHECK_FCT(buffer_new_from_data(&new_buf, NULL, 0, 0));
+
+    do {
+        current_read = read(fd, data, READ_BUFFER_SIZE);
+        if (current_read == -1)
+        {
+            g_warning("Failed to read data from file, returned %d:%s\n",
+                      errno, strerror(errno));
+            return RC_FAIL;
+        }
+        CHECK_FCT(buffer_append_data(new_buf, data, current_read));
+    } while(current_read == READ_BUFFER_SIZE);
+
+    *buffer = new_buf;
+
+    buffer_dump(new_buf, stdout);
+
+    close(fd);
+
+    return RC_OK;
+}

common/utils/itti_analyzer/libbuffers/file.h

@@ -19,12 +19,9 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _OPENAIR2_LAYER2_NR_PDCP_ASN1_UTILS_H_
-#define _OPENAIR2_LAYER2_NR_PDCP_ASN1_UTILS_H_
+#ifndef FILE_H_
+#define FILE_H_
 
-int decode_t_reordering(int v);
-int decode_sn_size_ul(long s);
-int decode_sn_size_dl(long s);
-int decode_discard_timer(long v);
+int file_read_dump(buffer_t **buffer, const char *filename);
 
-#endif /* _OPENAIR2_LAYER2_NR_PDCP_ASN1_UTILS_H_ */
+#endif /* FILE_H_ */

common/utils/itti_analyzer/libbuffers/socket.c

@@ -0,0 +1,444 @@
+/*
+ * 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
+ */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#define G_LOG_DOMAIN ("BUFFERS")
+
+#include <gtk/gtk.h>
+
+#include "logs.h"
+#include "itti_types.h"
+#include "rc.h"
+
+#include "ui_interface.h"
+#include "ui_notifications.h"
+#include "ui_notif_dlg.h"
+
+#include "socket.h"
+#include "buffers.h"
+
+#include "xml_parse.h"
+
+/* Retry connection after 100 ms */
+#define SOCKET_US_BEFORE_CONNECT_RETRY      (100 * 1000)
+/* About 10 minutes time-out for connecting to peer */
+#define SOCKET_NB_CONNECT_RETRY             ((10 * 60 * 1000 * 1000) / SOCKET_US_BEFORE_CONNECT_RETRY)
+
+#define SOCKET_NB_SIGNALS_BEFORE_SIGNALLING 10
+#define SOCKET_MS_BEFORE_SIGNALLING         100
+
+gboolean socket_abort_connection = FALSE;
+
+void *socket_thread_fct(void *arg);
+
+static ssize_t socket_read_data(socket_data_t *socket_data, void *buffer, size_t size, int flags)
+{
+    ssize_t recv_ret;
+
+    recv_ret = recv(socket_data->sd, buffer, size, flags);
+    if (recv_ret == -1) {
+        /* Failure case */
+        switch (errno) {
+//             case EWOULDBLOCK:
+            case EAGAIN:
+                return -1;
+            default:
+                g_info("recv failed: %s", g_strerror(errno));
+                pthread_exit(NULL);
+                break;
+        }
+    } else if (recv_ret == 0) {
+        /* We lost the connection with other peer or shutdown asked */
+        ui_pipe_write_message(socket_data->pipe_fd,
+                              UI_PIPE_CONNECTION_LOST, NULL, 0);
+        free(socket_data->ip_address);
+        free(socket_data);
+        pthread_exit(NULL);
+    }
+
+    return recv_ret;
+}
+
+static void socket_notify_gui_update(socket_data_t *socket_data)
+{
+    pipe_new_signals_list_message_t pipe_signal_list_message;
+
+    pipe_signal_list_message.signal_list = socket_data->signal_list;
+
+    socket_data->signal_list                  = NULL;
+    socket_data->nb_signals_since_last_update = 0;
+
+    /* Send an update notification */
+    ui_pipe_write_message(socket_data->pipe_fd,
+                          UI_PIPE_UPDATE_SIGNAL_LIST, &pipe_signal_list_message,
+                          sizeof(pipe_signal_list_message));
+
+    /* Acquire the last data notification */
+    socket_data->last_data_notification = g_get_monotonic_time();
+}
+
+static int socket_read_itti_message(socket_data_t        *socket_data,
+                                    itti_socket_header_t *message_header)
+{
+    itti_signal_header_t  itti_signal_header;
+    buffer_t             *buffer;
+    uint8_t              *data;
+    size_t                data_length;
+    ssize_t               data_read = 0;
+    ssize_t               total_data_read = 0;
+
+    g_assert(message_header != NULL);
+
+    g_debug("Attempting to read signal header from socket");
+
+    /* Read the sub-header of signal */
+    while (data_read != sizeof(itti_signal_header_t)) {
+        data_read = socket_read_data(socket_data, &itti_signal_header,
+                                       sizeof(itti_signal_header_t), 0);
+    }
+
+    data_length = message_header->message_size - sizeof(itti_socket_header_t) - sizeof(itti_signal_header_t);
+    data = malloc(sizeof(uint8_t) * data_length);
+
+    while (total_data_read < data_length) {
+        data_read = socket_read_data(socket_data, &data[total_data_read],
+                                     data_length - total_data_read, 0);
+        /* We are waiting for data */
+        if (data_read < 0) {
+            usleep(10);
+        } else {
+            total_data_read += data_read;
+        }
+    }
+
+    /* Create the new buffer */
+    if (buffer_new_from_data(&buffer, data, data_length - sizeof(itti_message_types_t), 1) != RC_OK) {
+        g_error("Failed to create new buffer");
+        g_assert_not_reached();
+    }
+
+    sscanf (itti_signal_header.message_number_char, MESSAGE_NUMBER_CHAR_FORMAT, &buffer->message_number);
+//     buffer_dump(buffer, stdout);
+
+    /* Update the number of signals received since last GUI update */
+    socket_data->nb_signals_since_last_update++;
+
+    socket_data->signal_list = g_list_append(socket_data->signal_list, (gpointer)buffer);
+
+    if (socket_data->nb_signals_since_last_update >= SOCKET_NB_SIGNALS_BEFORE_SIGNALLING) {
+        socket_notify_gui_update(socket_data);
+    }
+
+    g_debug("Successfully read new signal %u from socket", buffer->message_number);
+
+    return total_data_read + sizeof(itti_signal_header);
+}
+
+static int socket_read_xml_definition(socket_data_t *socket_data,
+                                      itti_socket_header_t *message_header)
+{
+    ssize_t                        data_read;
+    ssize_t                        total_data_read = 0;
+    char                          *xml_definition;
+    size_t                         xml_definition_length;
+    pipe_xml_definition_message_t  pipe_xml_definition_message;
+
+    xml_definition_length = message_header->message_size - sizeof(*message_header);
+    xml_definition        = malloc(xml_definition_length * sizeof(char));
+
+    g_debug("Attempting to read XML definition of size %zu from socket",
+            xml_definition_length);
+
+    /* XML definition is a long message... so function may take some time */
+
+    do {
+        data_read = socket_read_data(socket_data, &xml_definition[total_data_read],
+                                     xml_definition_length - total_data_read, 0);
+
+        /* We are waiting for data */
+        if (data_read < 0) {
+            usleep(10);
+        } else {
+            total_data_read += data_read;
+        }
+    } while (total_data_read != xml_definition_length);
+
+    pipe_xml_definition_message.xml_definition        = xml_definition;
+    pipe_xml_definition_message.xml_definition_length = xml_definition_length - sizeof(itti_message_types_t);
+
+    g_debug("Received XML definition of size %zu, effectively read %zu bytes",
+            xml_definition_length, total_data_read);
+
+    ui_pipe_write_message(socket_data->pipe_fd, UI_PIPE_XML_DEFINITION,
+                          &pipe_xml_definition_message, sizeof(pipe_xml_definition_message));
+
+    return total_data_read;
+}
+
+static int socket_read(socket_data_t *socket_data)
+{
+    int ret = 0;
+    itti_socket_header_t message_header;
+
+    while (ret >= 0) {
+        ret = socket_read_data(socket_data, &message_header, sizeof(message_header), 0);
+
+        if (ret == -1) {
+            return 0;
+        }
+
+        switch(message_header.message_type) {
+            case ITTI_DUMP_XML_DEFINITION:
+                socket_read_xml_definition(socket_data, &message_header);
+                break;
+
+            case ITTI_DUMP_MESSAGE_TYPE:
+                socket_read_itti_message(socket_data, &message_header);
+                break;
+
+            case ITTI_STATISTIC_MESSAGE_TYPE:
+            default:
+                g_warning("Received unknow (or not implemented) message from socket type: %d",
+                          message_header.message_type);
+                break;
+        }
+    }
+
+    return 0;
+}
+
+static int socket_handle_disconnect_evt(socket_data_t *socket_data)
+{
+    /* Send shutdown to remote host */
+    CHECK_FCT_POSIX(shutdown(socket_data->sd, SHUT_RDWR));
+    /* Close file descriptor */
+    CHECK_FCT_POSIX(close(socket_data->sd));
+
+    socket_data->sd = -1;
+
+    /* Close pipe */
+    close(socket_data->pipe_fd);
+
+    /* Leaving the thread */
+    pthread_exit(NULL);
+
+    return 0;
+}
+
+static int pipe_read_message(socket_data_t *socket_data)
+{
+    pipe_input_header_t  input_header;
+    uint8_t             *input_data = NULL;
+    size_t               input_data_length = 0;
+
+    /* Read the header */
+    if (read(socket_data->pipe_fd, &input_header, sizeof(input_header)) < 0) {
+        g_warning("Failed to read from pipe %d: %s", socket_data->pipe_fd,
+                  g_strerror(errno));
+        return -1;
+    }
+
+    input_data_length = input_header.message_size - sizeof(input_header);
+
+    /* Checking for non-header part */
+    if (input_data_length > 0) {
+        input_data = malloc(sizeof(uint8_t) * input_data_length);
+
+        if (read(socket_data->pipe_fd, input_data, input_data_length) < 0) {
+            g_warning("Failed to read from pipe %d: %s", socket_data->pipe_fd,
+                      g_strerror(errno));
+            return -1;
+        }
+    }
+
+    switch (input_header.message_type) {
+        case UI_PIPE_DISCONNECT_EVT:
+            return socket_handle_disconnect_evt(socket_data);
+        default:
+            g_warning("[socket] Unhandled message type %u", input_header.message_type);
+            g_assert_not_reached();
+    }
+    return 0;
+}
+
+void *socket_thread_fct(void *arg)
+{
+    int                 ret;
+    struct sockaddr_in  si_me;
+    socket_data_t      *socket_data;
+    int                 retry = SOCKET_NB_CONNECT_RETRY;
+
+    /* master file descriptor list */
+    fd_set              master_fds;
+    /* temp file descriptor list for select() */
+    fd_set              read_fds;
+    int                 fd_max = 0;
+    struct timeval      tv;
+
+    socket_data = (socket_data_t *)arg;
+
+    g_assert(socket_data != NULL);
+
+    /* Preparing the socket */
+    if ((socket_data->sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+        g_warning("socket failed: %s", g_strerror(errno));
+        free(socket_data->ip_address);
+        free(socket_data);
+        pthread_exit(NULL);
+    }
+    memset((void *)&si_me, 0, sizeof(si_me));
+
+    si_me.sin_family = AF_INET;
+    si_me.sin_port = htons(socket_data->port);
+    if (inet_aton(socket_data->ip_address, &si_me.sin_addr) == 0) {
+        g_warning("inet_aton() failed\n");
+        free(socket_data->ip_address);
+        free(socket_data);
+        pthread_exit(NULL);
+    }
+
+    /* clear the master and temp sets */
+    FD_ZERO(&master_fds);
+    FD_ZERO(&read_fds);
+
+    /* Add the GUI pipe to the list of sockets to monitor */
+    FD_SET(socket_data->pipe_fd, &master_fds);
+
+    /* Add the client socket to the list of sockets to monitor */
+    FD_SET(socket_data->sd, &master_fds);
+
+    /* Update the fd_max with the MAX of socket/pipe */
+    fd_max = MAX(socket_data->pipe_fd, socket_data->sd);
+
+    /* Setup the timeout for select.
+     * When a timeout is caught, check for new notifications to send to GUI.
+     */
+    tv.tv_sec = 0;
+    tv.tv_usec = 1000 * SOCKET_MS_BEFORE_SIGNALLING;
+
+    do {
+        /* Connecting to remote peer */
+        ret = connect(socket_data->sd, (struct sockaddr *) &si_me, sizeof(struct sockaddr_in));
+        if (ret < 0) {
+            if ((socket_abort_connection) || (retry < 0)) {
+                if (retry < 0) {
+                    g_warning("Failed to connect to peer %s:%d", socket_data->ip_address, socket_data->port);
+                    ui_pipe_write_message(socket_data->pipe_fd, UI_PIPE_CONNECTION_FAILED, NULL, 0);
+                }
+                free(socket_data->ip_address);
+                free(socket_data);
+                socket_abort_connection = FALSE;
+                /* Quit the thread */
+                pthread_exit(NULL);
+            }
+            usleep(SOCKET_US_BEFORE_CONNECT_RETRY);
+            retry--;
+        }
+    } while (ret < 0);
+
+    /* Set the socket as non-blocking */
+    fcntl(socket_data->sd, F_SETFL, O_NONBLOCK);
+
+    while (1) {
+        memcpy(&read_fds, &master_fds, sizeof(master_fds));
+
+        ret = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
+        if (ret < 0) {
+            g_warning("Error in select: %s", g_strerror(errno));
+            free(socket_data->ip_address);
+            free(socket_data);
+            /* Quit the thread */
+            pthread_exit(NULL);
+        } else if (ret == 0) {
+            /* Timeout for select: check if there is new incoming messages
+             * since last GUI update
+             */
+            if (socket_data->nb_signals_since_last_update > 0) {
+                g_debug("Timout on select and data new signal in list");
+                g_debug("-> notify GUI");
+                socket_notify_gui_update(socket_data);
+            }
+
+            /* Reset the timeval to the max value */
+            tv.tv_usec = 1000 * SOCKET_MS_BEFORE_SIGNALLING;
+        }
+
+        /* Checking if there is data to read from the pipe */
+        if (FD_ISSET(socket_data->pipe_fd, &read_fds)) {
+            FD_CLR(socket_data->pipe_fd, &read_fds);
+            pipe_read_message(socket_data);
+        }
+
+        /* Checking if there is data to read from the socket */
+        if (FD_ISSET(socket_data->sd, &read_fds)) {
+            FD_CLR(socket_data->sd, &read_fds);
+            socket_read(socket_data);
+
+            /* Update the timeout of select if there is data not notify to GUI */
+            if (socket_data->nb_signals_since_last_update > 0) {
+                gint64 current_time;
+
+                current_time = g_get_monotonic_time();
+
+                if ((current_time - socket_data->last_data_notification) > SOCKET_MS_BEFORE_SIGNALLING) {
+                    socket_notify_gui_update(socket_data);
+                    tv.tv_usec = 1000 * SOCKET_MS_BEFORE_SIGNALLING;
+                } else {
+                    /* Update tv */
+                    tv.tv_usec = (1000 * SOCKET_MS_BEFORE_SIGNALLING) - (current_time - socket_data->last_data_notification);
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+int socket_connect_to_remote_host(const char *remote_ip, const uint16_t port,
+                                  int pipe_fd)
+{
+    socket_data_t *socket_data;
+
+    socket_data = calloc(1, sizeof(*socket_data));
+
+    socket_data->ip_address = strdup(remote_ip);
+
+    socket_data->pipe_fd = pipe_fd;
+    socket_data->port    = port;
+    socket_data->sd      = -1;
+
+    if (pthread_create(&socket_data->thread, NULL, socket_thread_fct, socket_data) != 0) {
+        g_warning("Failed to create thread %d:%s", errno, strerror(errno));
+        free(socket_data->ip_address);
+        free(socket_data);
+        return RC_FAIL;
+    }
+
+    return RC_OK;
+}

common/utils/itti_analyzer/libbuffers/socket.h

@@ -19,27 +19,34 @@
  *      contact@openairinterface.org
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 
-#include "OctetString.h"
+#ifndef SOCKET_H_
+#define SOCKET_H_
 
-#ifndef SOR_TRANSPARENT_CONTAINER_H_
-#define SOR_TRANSPARENT_CONTAINER_H_
+typedef struct {
+    pthread_t thread;
+    int       sd;
+    char     *ip_address;
+    uint16_t  port;
 
-#define SOR_TRANSPARENT_CONTAINER_MINIMUM_LENGTH 2 // [length]+[length]
-#define SOR_TRANSPARENT_CONTAINER_MAXIMUM_LENGTH 65538 // [IEI]+[length]+[length]+[ESM msg]
+    /* The pipe used between main thread (running GTK) and the socket thread */
+    int       pipe_fd;
 
-typedef struct SORTransparentContainer_tag {
-  OctetString sortransparentcontainercontents;
-} SORTransparentContainer;
+    /* Time used to avoid refreshing UI every time a new signal is incoming */
+    gint64    last_data_notification;
+    uint8_t   nb_signals_since_last_update;
 
-int encode_sor_transparent_container(SORTransparentContainer *sortransparentcontainer, uint8_t iei, uint8_t *buffer, uint32_t len);
+    /* The last signals received which are not yet been updated in GUI */
+    GList    *signal_list;
+} socket_data_t;
 
-int decode_sor_transparent_container(SORTransparentContainer *sortransparentcontainer, uint8_t iei, uint8_t *buffer, uint32_t len);
+gboolean socket_abort_connection;
 
-void dump_sor_transparent_container_xml(SORTransparentContainer *sortransparentcontainer, uint8_t iei);
+int socket_connect_to_remote_host(const char *remote_ip, const uint16_t port,
+                                  int pipe_fd);
 
-#endif /* ESM MESSAGE CONTAINER_H_ */
+int socket_disconnect_from_remote_host(void);
 
+#endif /* SOCKET_H_ */

common/utils/itti_analyzer/libparser/Makefile.am

@@ -0,0 +1,23 @@
+AM_CFLAGS =	\
+	@ADD_CFLAGS@	\
+	-I$(top_srcdir)/common	\
+	-I$(top_srcdir)/libbuffers	\
+	-I$(top_srcdir)/libui
+
+noinst_LTLIBRARIES = libparser.la
+
+libparser_la_LDFLAGS = -all-static
+libparser_la_SOURCES = \
+	xml_parse.c	\
+	array_type.c array_type.h	\
+	enum_type.c enum_type.h	\
+	enum_value_type.c enum_value_type.h	\
+	file_type.c file_type.h	\
+	field_type.c field_type.h	\
+	fundamental_type.c fundamental_type.h	\
+	pointer_type.h	pointer_type.c	\
+	reference_type.c	reference_type.h	\
+	struct_type.c struct_type.h	\
+	typedef_type.c	typedef_type.h	\
+	types.h	types.c	\
+	union_type.c	union_type.h

common/utils/itti_analyzer/libparser/array_type.c

@@ -0,0 +1,180 @@
+/*
+ * 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
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <tgmath.h>
+
+#define G_LOG_DOMAIN ("PARSER")
+
+#include "array_type.h"
+#include "fundamental_type.h"
+#include "ui_interface.h"
+
+int array_dissect_from_buffer(
+    types_t *type, ui_set_signal_text_cb_t ui_set_signal_text_cb, gpointer user_data,
+    buffer_t *buffer, uint32_t offset, uint32_t parent_offset, int indent, gboolean new_line)
+{
+    types_t *type_child;
+    int  length = 0;
+    char cbuf[50];
+
+    DISPLAY_PARSE_INFO("array", type->name, offset, parent_offset);
+
+    /* Ignore TYPEDEF children */
+    for (type_child = type->child; type_child != NULL && type_child->type == TYPE_TYPEDEF;
+            type_child = type_child->child) {
+    }
+
+    if (type->name) {
+        INDENTED(stdout, indent, fprintf(stdout, "<%s>\n", type->name));
+    }
+    if (type->child != NULL) {
+        int items = type->size / type_child->size;
+        int i;
+        int zero_counter = 0;
+        gboolean is_string = FALSE;
+        char *string;
+        int nb_digits = 0;
+
+        /* Factorizes trailing 0 */
+        if ((items > 1) && (type_child->type == TYPE_FUNDAMENTAL))
+        {
+            for (i = items - 1; i >= 0; i--)
+            {
+                if (fundamental_read_from_buffer(type_child, buffer, parent_offset, offset + i * type_child->size) == 0)
+                {
+                    zero_counter ++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            /* Check if this is an array of 8 bits items and if at least the firsts ones are not null */
+            if ((type_child->size == 8) && (zero_counter >= 1) && ((items - zero_counter) >= 2))
+            {
+                int end = items - zero_counter;
+
+                /* check if this is a printable string */
+                is_string = TRUE;
+                string = malloc(end + 1);
+
+                for (i = 0; i < end; i++)
+                {
+                    string[i] = fundamental_read_from_buffer(type_child, buffer, parent_offset, offset + i * type_child->size);
+                    if (isprint(string[i]) == 0)
+                    {
+                        /* This is not a printable string */
+                        is_string = FALSE;
+                        break;
+                    }
+                }
+
+                if (is_string)
+                {
+                    string[i] = '\0';
+                    INDENTED_STRING(cbuf, indent, length = sprintf(cbuf, "[0 .. %d] \"%s\"\n", end - 1, string));
+                    ui_set_signal_text_cb(user_data, cbuf, length);
+                }
+            }
+
+            /* Do not factorize if there is only one null item */
+            if (zero_counter <= 1)
+            {
+                zero_counter = 0;
+            }
+        }
+
+        if (is_string == FALSE)
+        {
+            nb_digits = log10(items - zero_counter) + 1;
+
+            for (i = 0; i < (items - zero_counter); i++)
+            {
+                INDENTED_STRING(cbuf, indent, length = sprintf(cbuf, "[%*d] ", nb_digits, i));
+                ui_set_signal_text_cb(user_data, cbuf, length);
+
+                type->child->type_dissect_from_buffer (
+                    type->child, ui_set_signal_text_cb, user_data, buffer, parent_offset,
+                    offset + i * type_child->size, indent,
+                    FALSE);
+            }
+            if (zero_counter > 0)
+            {
+                INDENTED_STRING(cbuf, indent, length = sprintf(cbuf, "[%d .. %d] ", i, items -1));
+                ui_set_signal_text_cb(user_data, cbuf, length);
+
+                type->child->type_dissect_from_buffer (
+                    type->child, ui_set_signal_text_cb, user_data,
+                    buffer, parent_offset, offset + i * type_child->size, indent, FALSE);
+            }
+        }
+    }
+    if (type->name) {
+        INDENTED(stdout, indent, fprintf(stdout, "</%s>\n", type->name));
+    }
+
+    return 0;
+}
+
+int array_type_file_print(types_t *type, int indent, FILE *file) {
+    if (type == NULL)
+        return -1;
+    INDENTED(file, indent, fprintf(file, "<Array>\n"));
+    INDENTED(file, indent+4, fprintf(file, "Id .........: %d\n", type->id));
+    INDENTED(file, indent+4, fprintf(file, "Min ........: %d\n", type->min));
+    INDENTED(file, indent+4, fprintf(file, "Max ........: %d\n", type->max));
+    INDENTED(file, indent+4, fprintf(file, "Type .......: %d\n", type->type_xml));
+    INDENTED(file, indent+4, fprintf(file, "Size .......: %d\n", type->size));
+    INDENTED(file, indent+4, fprintf(file, "Align ......: %d\n", type->align));
+    if (type->file_ref != NULL)
+        type->file_ref->type_file_print (type->file_ref, indent + 4, file);
+    if (type->child != NULL)
+        type->child->type_file_print (type->child, indent + 4, file);
+    INDENTED(file, indent, fprintf(file, "</Array>\n"));
+
+    return 0;
+}
+
+int array_type_hr_display(types_t *type, int indent) {
+    if (type == NULL)
+        return -1;
+    INDENTED(stdout, indent, printf("<Array>\n"));
+    INDENTED(stdout, indent+4, printf("Id .........: %d\n", type->id));
+    INDENTED(stdout, indent+4, printf("Min ........: %d\n", type->min));
+    INDENTED(stdout, indent+4, printf("Max ........: %d\n", type->max));
+    INDENTED(stdout, indent+4, printf("Type .......: %d\n", type->type_xml));
+    INDENTED(stdout, indent+4, printf("Size .......: %d\n", type->size));
+    INDENTED(stdout, indent+4, printf("Align ......: %d\n", type->align));
+    if (type->file_ref != NULL)
+        type->file_ref->type_hr_display (type->file_ref, indent + 4);
+    if (type->child != NULL)
+        type->child->type_hr_display (type->child, indent + 4);
+    INDENTED(stdout, indent, printf("</Array>\n"));
+
+    return 0;
+}

common/utils/itti_analyzer/libparser/array_type.h

@@ -0,0 +1,35 @@
+/*
+ * 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
+ */
+
+#include "types.h"
+
+#ifndef ARRAY_TYPE_H_
+#define ARRAY_TYPE_H_
+
+int array_dissect_from_buffer(
+    types_t *type, ui_set_signal_text_cb_t ui_set_signal_text_cb, gpointer user_data,
+    buffer_t *buffer, uint32_t offset, uint32_t parent_offset, int indent, gboolean new_line);
+
+int array_type_hr_display(types_t *type, int indent);
+
+int array_type_file_print(types_t *type, int indent, FILE *file);
+
+#endif /* ARRAY_TYPE_H_ */