setParam$

Integration 2022 wk09 b

See merge request oai/openairinterface5g!1483

.vscode/launch.json

@@ -10,7 +10,8 @@
             "request": "launch",
             "program": "${workspaceFolder}/cmake_targets/ran_build/build/lte-softmodem",
             "args": [
-                "-O", "../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf",
+                "-O",
+                "../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf",
                 "--noS1"
             ],
             "stopAtEntry": false,
@@ -26,6 +27,31 @@
                     "ignoreFailures": true
                 }
             ]
+        },
+        {
+            "name": "Launch Chrome (4200 ng serve)",
+            "type": "chrome",
+            "request": "launch",
+            "url": "http://localhost:4200",
+            "webRoot": "${workspaceFolder}/common/utils/websrv/frontend"
+        },
+        {
+            "name": "Launch Chrome (localhost)",
+            "type": "chrome",
+            "request": "launch",
+            "url": "http://localhost",
+            "webRoot": "${workspaceFolder}",
+            "sourceMapPathOverrides": {
+                "webpack:/*": "${webRoot}/*",
+                "/./*": "${webRoot}/*",
+                "/src/*": "${webRoot}/*",
+                "/*": "*",
+                "/./~/*": "${webRoot}/node_modules/*"
+            },
+            "trace": true,
+            "runtimeArgs": [
+                "--remote-debugging-port=9222"
+            ]
         }
     ]
-}
+}

charts/physims/charts/dlsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/ldpctest/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-dlschsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-dlsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-pbchsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-prachsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-pucchsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-ulschsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/nr-ulsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/polartest/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/smallblocktest/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

charts/physims/charts/ulsim/values.yaml

@@ -33,7 +33,9 @@ podSecurityContext:
 
 securityContext:
   privileged: true
-  # capabilities:
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true

ci-scripts/Jenkinsfile-GitLab-Container

@@ -198,17 +198,37 @@ pipeline {
             }
           }
         }
-        stage ("RF Simulators") {
+        stage ("4G RF Simulators") {
           when { expression {doMandatoryTests} }
           steps {
             script {
-              triggerSlaveJob ('RAN-RF-Sim-Test', 'Test-RF-Sim-Container')
+              triggerSlaveJob ('RAN-RF-Sim-Test-4G', 'Test-RF-Sim-Container-4G')
             }
           }
           post {
             always {
               script {
-                finalizeSlaveJob('RAN-RF-Sim-Test')
+                finalizeSlaveJob('RAN-RF-Sim-Test-4G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
+        stage ("5G RF Simulators") {
+          when { expression {doMandatoryTests} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'Test-RF-Sim-Container-4G')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-RF-Sim-Test-5G')
               }
             }
             failure {

ci-scripts/Jenkinsfile-gitlab

@@ -529,74 +529,6 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13-LTE-M')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-MONO-FDD-Band13-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test X2 Handover - FDD - Band 13 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-X2HO-B210', 'Test-Mono-FDD-Band13-X2-HO')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-MONO-FDD-Band13-X2HO-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test 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')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-IF4p5-TDD-Band38-MultiRRU-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
                 stage ("Test OAI UE - FDD - Band 20 - B200") {
                     when {
                         expression {doFullTestsuite}
@@ -643,28 +575,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')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('OCPeNB-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
             }
             post {
                 always {

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

@@ -390,7 +390,7 @@ pipeline {
           steps {
             script {
               dir ('ci-scripts/ran_dashboard') {
-                sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${env.BUILD_ID} ${StatusForDb} "   
+                sh "python3 Hdashboard.py testevent ${params.eNB_MR} "
               }
             }
           }

ci-scripts/Jenkinsfile-trig-nsa

@@ -27,6 +27,8 @@ def pythonExecutor = params.pythonExecutor
 
 def TARGET_BRANCH = "develop"
 def ALLOW_MERGE = true
+def GitPostArgs = ''
+def jobStatus
 
 pipeline {
     agent {
@@ -47,63 +49,89 @@ pipeline {
                         COMMIT_ID=sh returnStdout: true, script:  """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".sha" || true """
                         COMMIT_ID=COMMIT_ID.trim()
                         echo "Testing NSA on : ${MR} ${SRC_BRANCH} ${COMMIT_ID}"
-                        //calling NSA B200
-                        build job: "RAN-NSA-B200-Module-LTEBOX", wait : true, propagate : false, parameters: [
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),                          
-                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        ]
-                        //calling NSA 2x2
-                        build job: "RAN-NSA-2x2-Module-OAIEPC", wait : true, propagate : false, parameters: [
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),
-                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        ]
-                        //calling LTE 2x2
-                        build job: "RAN-LTE-2x2-Module-OAIEPC", wait : true, propagate : false, parameters: [
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),
-                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        ]
-                        //calling SA 
-                        build job: "RAN-SA-Module-CN5G", wait : true, propagate : false, parameters: [
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),
-                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        ]
-                        //calling OAIUE B200
-                        //build job: "RAN-SA-OAIUE-B200-CN5G", wait : true, propagate : false, parameters: [
-                        //    string(name: 'eNB_MR', value: String.valueOf(MR)),
-                        //    string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                        //    string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                        //    string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                        //    booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        //]
-                        //calling OAIUE N310
-                        //build job: "RAN-SA-OAIUE-N310-CN5G", wait : true, propagate : false, parameters: [
-                        //    string(name: 'eNB_MR', value: String.valueOf(MR)),
-                        //    string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                        //    string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                        //    string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                        //    booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        //]
-                        //calling OAIUE N310-X300
-                        build job: "RAN-SA-OAIUE-N310-X300-CN5G", wait : true, propagate : false, parameters: [
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),
-                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
-                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
-                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
-                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
-                        ]
+                        commit = COMMIT_ID.replace("\"","")
+                        GitPostArgs = MR + ' ' + commit + ' '
+                        echo GitPostArgs
 
+                        //calling LTE 2x2
+                        jobName = "RAN-LTE-2x2-Module-OAIEPC"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling NSA B200
+                        jobName = "RAN-NSA-B200-Module-LTEBOX"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling NSA 2x2
+                        jobName = "RAN-NSA-2x2-Module-OAIEPC"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling SA 
+                        jobName = "RAN-SA-Module-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling OAIUE N310-X300
+                        jobName = "RAN-SA-OAIUE-N310-X300-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //git report the test results in 1 block, at the end of the test sequence of one MR
+                        dir ('ci-scripts/ran_dashboard') {
+                            sh "python3 Hdashboard.py gitpost ${GitPostArgs}"
+                        }                        
                     }
                 }                                  
             }   

ci-scripts/cls_containerize.py

@@ -106,6 +106,9 @@ class Containerize():
 		self.registrySvrId = ''
 		self.testSvrId = ''
 
+		#checkers from xml
+		self.ran_checkers={}
+
 #-----------------------------------------------------------
 # Container management functions
 #-----------------------------------------------------------
@@ -221,7 +224,7 @@ class Containerize():
 		if (self.ranAllowMerge):
 			imageTag = 'ci-temp'
 			if self.ranTargetBranch == 'develop':
-				mySSH.command('git diff HEAD..origin/develop -- docker/Dockerfile.base' + self.dockerfileprefix + ' | grep --colour=never -i INDEX', '\$', 5)
+				mySSH.command('git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base' + self.dockerfileprefix + ' | grep --colour=never -i INDEX', '\$', 5)
 				result = re.search('index', mySSH.getBefore())
 				if result is not None:
 					forceBaseImageBuild = True
@@ -341,7 +344,9 @@ class Containerize():
 		# Remove all intermediate build images
 		if self.ranAllowMerge and forceBaseImageBuild:
 			mySSH.command(self.cli + ' image rm ' + baseImage + ':' + baseTag + ' || true', '\$', 30)
-		mySSH.command(self.cli + ' image rm ran-build:' + imageTag + ' || true','\$', 5)
+		mySSH.command(self.cli + ' image rm ran-build:' + imageTag + ' || true','\$', 30)
+		# Cleaning any created tmp volume
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
 		mySSH.close()
 		ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
 
@@ -504,6 +509,7 @@ class Containerize():
 #			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('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 15)
 		mySSH.command('docker-compose --file ci-docker-compose.yml config --services | sed -e "s@^@service=@" 2>&1', '\$', 10)
 		result = re.search('service=(?P<svc_name>[a-zA-Z0-9\_]+)', mySSH.getBefore())
 		if result is not None:
@@ -584,39 +590,56 @@ class Containerize():
 		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)
+		containerName = ''
+		containerToKill = False
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		if self.eNB_logFile[self.eNB_instance] == '':
 			self.eNB_logFile[self.eNB_instance] = 'enb_' + HTML.testCase_id + '.log'
 		if result is not None:
 			containerName = result.group('container_name')
+			containerToKill = True
+		if containerToKill:
+			mySSH.command('docker inspect ' + containerName, '\$', 30)
+			result = re.search('Error: No such object: ' + containerName, mySSH.getBefore())
+			if result is not None:
+				containerToKill = False
+		if containerToKill:
 			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)
 		# Forcing the down now to remove the networks and any artifacts
 		mySSH.command('docker-compose --file ci-docker-compose.yml down', '\$', 5)
+		# Cleaning any created tmp volume
+		mySSH.command('docker volume prune --force || true', '\$', 20)
 
 		mySSH.close()
 
 		# Analyzing log file!
-		copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + self.eNB_logFile[self.eNB_instance], '.')
+		if containerToKill:
+			copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + self.eNB_logFile[self.eNB_instance], '.')
+		else:
+			copyin_res = 0
 		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 containerToKill:
+				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, self.ran_checkers)
+			else:
+				logStatus = 0
 			if (logStatus < 0):
 				HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
 			else:
 				HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			# all the xNB run logs shall be on the server 0 for logCollecting
-			if self.eNB_serverId[self.eNB_instance] != '0':
+			if containerToKill and self.eNB_serverId[self.eNB_instance] != '0':
 				mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + self.eNB_logFile[self.eNB_instance], self.eNBSourceCodePath + '/cmake_targets/')
 		logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 
-	def DeployGenObject(self, HTML):
+	def DeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0
 		logging.info('\u001B[1m Checking Services to deploy\u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose config --services'
@@ -659,12 +682,15 @@ class Containerize():
 		healthy = 0
 		while (count < 10):
 			count += 1
+			containerStatus = []
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
 			healthy = 0
 			for state in deployStatus.split('\n'):
-				res = re.search('Up \(healthy\)', state)
-				if res is not None:
+				if re.search('Up \(healthy\)', state) is not None:
 					healthy += 1
+				if re.search('rfsim4g-db-init.*Exit 0', state) is not None:
+					subprocess.check_output('docker rm -f rfsim4g-db-init || true', shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+				containerStatus.append(state)
 			if healthy == self.nb_healthy[0]:
 				count = 100
 			else:
@@ -674,29 +700,43 @@ class Containerize():
 			if self.tsharkStarted == False:
 				logging.debug('Starting tshark on public network')
 				self.CaptureOnDockerNetworks()
-				self.tsharkStarted = True
 			HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
+			for cState in containerStatus:
+				logging.debug(cState)
 			logging.info('\u001B[1m Deploying OAI Object(s) PASS\u001B[0m')
 		else:
-			self.exitStatus = 1
 			HTML.CreateHtmlTestRow('Could not deploy in time', 'KO', CONST.ALL_PROCESSES_OK)
+			for cState in containerStatus:
+				logging.debug(cState)
 			logging.error('\u001B[1m Deploying OAI Object(s) FAILED\u001B[0m')
+			HTML.testCase_id = 'AUTO-UNDEPLOY'
+			UE.testCase_id = 'AUTO-UNDEPLOY'
+			HTML.desc = 'Automatic Undeployment'
+			UE.desc = 'Automatic Undeployment'
+			UE.ShowTestID()
+			self.UndeployGenObject(HTML, RAN, UE)
+			self.exitStatus = 1
 
 	def CaptureOnDockerNetworks(self):
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml config | grep com.docker.network.bridge.name | sed -e "s@^.*name: @@"'
 		networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
-		cmd = 'sudo nohup tshark -f "not tcp and not arp and not port 53 and not host archive.ubuntu.com and not host security.ubuntu.com"'
+		if re.search('4g.*rfsimulator', self.yamlPath[0]) is not None:
+			cmd = 'sudo nohup tshark -f "(host 192.168.61.11 and icmp) or (not host 192.168.61.11 and not host 192.168.61.30 and not arp and not port 53 and not port 2152)"'
+		elif re.search('5g.*rfsimulator', self.yamlPath[0]) is not None:
+			cmd = 'sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135 and not host 192.168.71.150 and not arp and not port 53 and not port 2152 and not port 2153)"'
+		else:
+			return
 		for name in networkNames.split('\n'):
-			res = re.search('rfsim', name)
-			if res is not None:
+			if re.search('rfsim', name) is not None:
 				cmd += ' -i ' + name
 		cmd += ' -w /tmp/capture_'
 		ymlPath = self.yamlPath[0].split('/')
 		cmd += ymlPath[1] + '.pcap > /tmp/tshark.log 2>&1 &'
 		logging.debug(cmd)
 		networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
+		self.tsharkStarted = True
 
-	def UndeployGenObject(self, HTML):
+	def UndeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0
 		ymlPath = self.yamlPath[0].split('/')
 		logPath = '../cmake_targets/log/' + ymlPath[1]
@@ -725,9 +765,62 @@ class Containerize():
 				cName = res.group('container_name')
 				cmd = 'cd ' + self.yamlPath[0] + ' && docker logs ' + cName + ' > ' + cName + '.log 2>&1'
 				logging.debug(cmd)
-				deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+				subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+				if re.search('magma-mme', cName) is not None:
+					cmd = 'cd ' + self.yamlPath[0] + ' && docker cp -L ' + cName + ':/var/log/mme.log ' + cName + '-full.log'
+					logging.debug(cmd)
+					subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+		fullStatus = True
 		if anyLogs:
-			cmd = 'mkdir -p '+ logPath + ' && mv ' + self.yamlPath[0] + '/*.log ' + logPath
+			cmd = 'mkdir -p '+ logPath + ' && cp ' + self.yamlPath[0] + '/*.log ' + logPath
+			logging.debug(cmd)
+			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
+
+			# Analyzing log file(s)!
+			listOfPossibleRanContainers = ['enb', 'gnb', 'cu', 'du']
+			for container in listOfPossibleRanContainers:
+				filename = self.yamlPath[0] + '/rfsim?g-oai-' + container + '.log'
+				cmd = 'ls ' + filename
+				containerStatus = True
+				try:
+					lsStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
+					filename = str(lsStatus).strip()
+				except:
+					containerStatus = False
+				if not containerStatus:
+					continue
+
+				logging.debug('\u001B[1m Analyzing xNB logfile ' + filename + ' \u001B[0m')
+				logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
+				if (logStatus < 0):
+					fullStatus = False
+					self.exitStatus = 1
+					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
+				else:
+					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+
+			listOfPossibleUeContainers = ['lte-ue*', 'nr-ue*']
+			for container in listOfPossibleUeContainers:
+				filename = self.yamlPath[0] + '/rfsim?g-oai-' + container + '.log'
+				cmd = 'ls ' + filename
+				containerStatus = True
+				try:
+					lsStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
+					filename = str(lsStatus).strip()
+				except:
+					containerStatus = False
+				if not containerStatus:
+					continue
+
+				logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
+				logStatus = UE.AnalyzeLogFile_UE(filename, HTML, RAN)
+				if (logStatus < 0):
+					fullStatus = False
+					HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
+				else:
+					HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
+
+			cmd = 'rm ' + self.yamlPath[0] + '/*.log'
 			logging.debug(cmd)
 			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 			if self.tsharkStarted:
@@ -742,7 +835,9 @@ class Containerize():
 				cmd = 'sudo rm /tmp/capture_' + ymlPath[1] + '.pcap'
 				logging.debug(cmd)
 				copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
+				self.tsharkStarted = False
 
+		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml down'
 		logging.debug(cmd)
 		try:
@@ -754,10 +849,19 @@ class Containerize():
 			logging.error('\u001B[1m Undeploying OAI Object(s) FAILED\u001B[0m')
 			return
 
-		HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
-		logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m')
+		# Cleaning any created tmp volume
+		cmd = 'docker volume prune --force || true'
+		logging.debug(cmd)
+		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
 
-	def PingFromContainer(self, HTML):
+		if fullStatus:
+			HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
+			logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m')
+		else:
+			HTML.CreateHtmlTestRow('n/a', 'KO', CONST.ALL_PROCESSES_OK)
+			logging.info('\u001B[1m Undeploying OAI Object(s) FAIL\u001B[0m')
+
+	def PingFromContainer(self, HTML, RAN, UE):
 		self.exitStatus = 0
 		ymlPath = self.yamlPath[0].split('/')
 		logPath = '../cmake_targets/log/' + ymlPath[1]
@@ -771,17 +875,17 @@ class Containerize():
 
 		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', deployStatus)
 		if result is None:
-			self.PingExit(HTML, False, 'Packet Loss Not Found')
+			self.PingExit(HTML, RAN, UE, False, 'Packet Loss Not Found')
 			return
 
 		packetloss = result.group('packetloss')
 		if float(packetloss) == 100:
-			self.PingExit(HTML, False, 'Packet Loss is 100%')
+			self.PingExit(HTML, RAN, UE, False, 'Packet Loss is 100%')
 			return
 
 		result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', deployStatus)
 		if result is None:
-			self.PingExit(HTML, False, 'Ping RTT_Min RTT_Avg RTT_Max Not Found!')
+			self.PingExit(HTML, RAN, UE, False, 'Ping RTT_Min RTT_Avg RTT_Max Not Found!')
 			return
 
 		rtt_min = result.group('rtt_min')
@@ -803,7 +907,7 @@ class Containerize():
 			packetLossOK = False
 		elif float(packetloss) > 0:
 			message += '\nPacket Loss is not 0%'
-		self.PingExit(HTML, packetLossOK, message)
+		self.PingExit(HTML, RAN, UE, packetLossOK, message)
 
 		if packetLossOK:
 			logging.debug('\u001B[1;37;44m ping result \u001B[0m')
@@ -813,7 +917,7 @@ class Containerize():
 			logging.debug('\u001B[1;34m    ' + max_msg + '\u001B[0m')
 			logging.info('\u001B[1m Ping Test PASS\u001B[0m')
 
-	def PingExit(self, HTML, status, message):
+	def PingExit(self, HTML, RAN, UE, status, message):
 		html_queue = SimpleQueue()
 		html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>'
 		html_queue.put(html_cell)
@@ -828,10 +932,10 @@ class Containerize():
 			logging.debug('----------------------------------------')
 			HTML.testCase_id = 'AUTO-UNDEPLOY'
 			HTML.desc = 'Automatic Un-Deployment'
-			self.UndeployGenObject(HTML)
+			self.UndeployGenObject(HTML, RAN, UE)
 			self.exitStatus = 1
 
-	def IperfFromContainer(self, HTML):
+	def IperfFromContainer(self, HTML, RAN):
 		self.exitStatus = 0
 
 		ymlPath = self.yamlPath[0].split('/')

ci-scripts/cls_log_mgt.py

@@ -30,11 +30,15 @@
 
 
 
-
+import logging
 import re
 import subprocess
-import logging
-import math
+import sshconnection
+
+logging.basicConfig(
+	level=logging.DEBUG,
+	format="[%(asctime)s] %(name)s:%(levelname)s: %(message)s"
+)
 
 class Log_Mgt:
 
@@ -49,40 +53,25 @@ class Log_Mgt:
 #-----------------$
 
 
-	def __CheckAvailSpace(self):
+	def __CheckUsedSpace(self):
 		HOST=self.Username+'@'+self.IPAddress
 		COMMAND="df "+ self.path
 		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 		result = ssh.stdout.readlines()
 		s=result[1].decode('utf-8').rstrip()#result[1] is the second line with the results we are looking for
-		tmp=s.split()
-		return tmp[3] #return avail space from the line
+		used=s.split()[4] #get 4th field ex: 70%
+		m = re.match('^(\d+)\%',used)
+		if m is not None:
+			return int(m.group(1))
 
-	def __GetOldestFile(self):
-		HOST=self.Username+'@'+self.IPAddress
-		COMMAND="ls -rtl "+ self.path #-rtl will bring oldest file on top
-		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		result = ssh.stdout.readlines()
-		s=result[1].decode('utf-8').rstrip()
-		tmp=s.split()
-		return tmp[8]#return filename from the line
+	def __RemoveOldest(self):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.IPAddress, self.Username, self.Password)
+		COMMAND='echo ' + self.Password + ' | sudo -S find ' + self.path + ' -type f -mtime +14 -delete'
+		mySSH.command(COMMAND,'\$',20)
+		mySSH.close()
 
 
-	def __AvgSize(self):
-		HOST=self.Username+'@'+self.IPAddress
-		COMMAND="ls -rtl "+ self.path
-		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		result = ssh.stdout.readlines()
-		if len(result)>1: #at least 1 file present
-			total_size=0
-			for i in range(1,len(result)):
-				s=result[i].decode('utf-8').rstrip()
-				tmp=s.split()
-				total_size+=int(tmp[4]) #get filesize
-			return math.floor(total_size/(len(result)-1)) #compute average file/artifact size
-		else:#empty,no files
-			return 0
-
 
 #-----------------$
 #PUBLIC Methods$
@@ -90,17 +79,15 @@ class Log_Mgt:
 
 
 	def LogRotation(self):
-		avail_space =int(self.__CheckAvailSpace())*1000 #avail space in target folder, initially displayed in Gb
-		avg_size=self.__AvgSize() #average size of artifacts in the target folder
-		logging.debug("Avail Space : " + str(avail_space) + " / Artifact Avg Size : " + str(avg_size))
-		if avail_space < 2*avg_size: #reserved space is 2x artifact file ; oldest file will be deleted
-			oldestfile=self.__GetOldestFile()
-			HOST=self.Username+'@'+self.IPAddress
-			COMMAND="echo " + self.Password + " | sudo -S rm "+ self.path + "/" + oldestfile
-			logging.debug(COMMAND)
-			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		used_space = self.__CheckUsedSpace() #avail space in target folder
+		if used_space > 80 :
+			logging.debug('\u001B[1;37;41m  Used Disk > 80%, on '  + self.Username+'@'+self.IPAddress + '\u001B[0m')
+			logging.debug('\u001B[1;37;41m  Removing Artifacts older than 14 days \u001B[0m')
+			self.__RemoveOldest()
 		else:
-			logging.debug("Still some space left for artifacts storage")
+			logging.debug('Used Disk < 80%, on '  + self.Username+'@'+self.IPAddress +', no cleaning required')
+
+
 			
 
 

ci-scripts/cls_oaicitest.py

@@ -2045,6 +2045,52 @@ class OaiCiTest():
 		else:
 			return -2
 
+
+	def Iperf_analyzeV2BIDIR(self, lock, UE_IPAddress, device_id, statusQueue,server_filename,client_filename):
+
+		#check the 2 files are here 
+		if (not os.path.isfile(client_filename)) or (not os.path.isfile(server_filename)):
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client or Server Log File not present')
+			return
+		#check the 2 files size
+		if (os.path.getsize(client_filename)==0) and (os.path.getsize(server_filename)==0):
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client and Server Log File are empty')
+			return
+
+		report_msg='TCP BIDIR Report:\n'
+		#if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
+		client_filesize = os.path.getsize(client_filename)
+		if client_filesize == 0:
+			report_msg+="Client file (UE) present but !!! EMPTY !!!\n"
+			report_msg+="Partial report from server file\n"
+			filename = server_filename
+		else :		
+			report_msg+="Report from client file (UE)\n"
+			filename = client_filename
+
+		report=[] #used to check if relevant lines were found
+
+		with open(filename, 'r') as f_client:
+			for line in f_client.readlines():
+				result = re.search(rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)', str(line))
+				if result is not None:
+					report.append(str(line))
+					report_msg+=result.group('role') + ' ' + result.group('direction')+ '\t = ' +result.group('bitrate')+'\n'
+
+		if len(report)>0:
+			lock.acquire()
+			statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(report_msg)
+			logging.debug('\u001B[1;37;45m TCP Bidir Iperf Result (' + UE_IPAddress + ') \u001B[0m')
+			logging.debug('\u001B[1;35m    ' + report_msg + '\u001B[0m')
+			lock.release()
+		else:
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from Log file')
+
+
+
 	def Iperf_analyzeV2Server(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, filename,type):
 		if (not os.path.isfile(filename)):
 			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
@@ -2342,17 +2388,22 @@ class OaiCiTest():
 			result = re.search('TRF_IP_ADDR = (?P<trf_ip_addr>[0-9\.]+)', SSH.getBefore())
 			if result is not None:
 				trf_gen_IP = result.group('trf_ip_addr')
+			#kill iperf processes on EPC side
+			SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
+			SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf3"', '\$', 5)
 			SSH.close()
 			#kill iperf processes on UE side before (in case there are still some remaining)
 			SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
 			cmd = 'killall --signal=SIGKILL iperf'
 			SSH.command(cmd,'\$',5)
+			cmd = 'killall --signal=SIGKILL iperf3'
+			SSH.command(cmd,'\$',5)
 			SSH.close()
 
-			iperf_time = self.Iperf_ComputeTime()	
+			iperf_time = self.Iperf_ComputeTime()
 			if self.iperf_direction=="DL":
 				logging.debug("Iperf for Module in DL mode detected")
-				#server side UE
+				##server side UE
 				server_filename='iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
 				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
 				cmd = 'rm ' + server_filename
@@ -2360,20 +2411,21 @@ class OaiCiTest():
 				cmd = 'echo $USER; nohup iperf -s -B ' + UE_IPAddress + ' -u 2>&1 > ' + server_filename + ' &'
 				SSH.command(cmd,'\$',5)
 				SSH.close()
-				#client side EPC
+				##client side EPC
 				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 				client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
-				SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
+				#remove old client file in EPC.SourceCodePath
+				cmd = 'rm ' + EPC.SourceCodePath + '/' + client_filename 
+				SSH.command(cmd,'\$',5)
 				iperf_cmd = 'bin/iperf -c ' + UE_IPAddress + ' ' + self.iperf_args + ' 2>&1 > ' + client_filename
-				cmd = 'docker exec -it prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
+				cmd = 'docker exec -w /iperf-2.0.13 -it prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
 				SSH.command(cmd,'\$',int(iperf_time)*5.0)
 				SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/'+ client_filename + ' ' + EPC.SourceCodePath, '\$', 5)
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + client_filename, '.')
 				SSH.close()
 
-				#copy the 2 resulting files locally
+				#copy the 2 resulting files locally (python executor)
 				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, server_filename, '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, client_filename, '.')
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + client_filename, '.')
 				#send for analysis
 				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,server_filename,1)	
 
@@ -2382,9 +2434,9 @@ class OaiCiTest():
 				#server side EPC
 				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 				server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
-				SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
+
 				iperf_cmd = 'echo $USER; nohup bin/iperf -s -u 2>&1 > ' + server_filename
-				cmd = 'docker exec -d prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
+				cmd = 'docker exec -d -w /iperf-2.0.13 prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
 				SSH.command(cmd,'\$',5)
 				SSH.close()
 
@@ -2399,14 +2451,49 @@ class OaiCiTest():
 				#once client is done, retrieve the server file from container to EPC Host
 				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 				SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/' + server_filename + ' ' + EPC.SourceCodePath, '\$', 5)
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
 				SSH.close()
 
 				#copy the 2 resulting files locally 
 				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, server_filename, '.')
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
 				#send for analysis
 				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,server_filename,1)
+
+			elif self.iperf_direction=="BIDIR":
+				logging.debug("Iperf for Module in BIDIR mode detected")
+				server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
+				client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
+
+				#server side EPC
+				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+				iperf_cmd = 'echo $USER; nohup /usr/local/bin/iperf3 -s 2>&1 > ' + server_filename
+				cmd = 'docker exec -d -w /iperf-2.0.13 prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
+				SSH.command(cmd,'\$',5)
+				SSH.close()
+
+				#client side UE
+				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
+				cmd = 'rm '+ client_filename
+				SSH.command(cmd,'\$',5)
+				SSH.command('iperf3 -B ' + UE_IPAddress + ' -c ' +  trf_gen_IP + ' '  + self.iperf_args + ' 2>&1 > ' + client_filename, '\$', int(iperf_time)*5.0)
+				SSH.close()
+
+				#once client is done, retrieve the server file from container to EPC Host
+				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+				#remove old server file in EPC.SourceCodePath
+				cmd = 'rm ' + EPC.SourceCodePath + '/' + server_filename 
+				SSH.command(cmd,'\$',5)
+				#copy from docker container to EPC.SourceCodePath
+				SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/' + server_filename + ' ' + EPC.SourceCodePath, '\$', 5)
+				SSH.close()
+
+				#copy the 2 resulting files locally 
+				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
+
+				#send for analysis
+				self.Iperf_analyzeV2BIDIR(lock, UE_IPAddress, device_id, statusQueue, server_filename, client_filename)
+
 			else :
 				logging.debug("Incorrect or missing IPERF direction in XML")
 
@@ -2418,10 +2505,15 @@ class OaiCiTest():
 			SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
 			cmd = 'killall --signal=SIGKILL iperf'
 			SSH.command(cmd,'\$',5)
+			cmd = 'killall --signal=SIGKILL iperf3'
+			SSH.command(cmd,'\$',5)
 			SSH.close()
 			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 			cmd = 'killall --signal=SIGKILL iperf'
 			SSH.command(cmd,'\$',5)
+			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+			cmd = 'killall --signal=SIGKILL iperf3'
+			SSH.command(cmd,'\$',5)
 			SSH.close()
 
 
@@ -2472,6 +2564,32 @@ class OaiCiTest():
 				#send for analysis
 				filename='iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
 				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,filename,1)
+			elif self.iperf_direction=="BIDIR":
+				logging.debug("Iperf for Module in BIDIR mode detected")
+				server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
+				client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
+
+
+				#server side EPC
+				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+				cmd = 'rm ' + server_filename
+				SSH.command(cmd,'\$',5)
+				cmd = 'echo $USER; nohup iperf3 -s 2>&1 > '+server_filename+' &'
+				SSH.command(cmd,'\$',5)
+				SSH.close()
+
+				#client side UE
+				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
+				cmd = 'rm ' + client_filename
+				SSH.command(cmd,'\$',5)
+				SSH.command('iperf3 -c 192.172.0.1 ' + self.iperf_args + ' 2>&1 > '+client_filename, '\$', int(iperf_time)*5.0)
+				SSH.close()
+
+				#copy the 2 resulting files locally
+				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, server_filename, '.')
+				#send for analysis
+				self.Iperf_analyzeV2BIDIR(lock, UE_IPAddress, device_id, statusQueue, server_filename, client_filename)
 			else :
 				logging.debug("Incorrect or missing IPERF direction in XML")
 
@@ -2479,10 +2597,14 @@ class OaiCiTest():
 			SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
 			cmd = 'killall --signal=SIGKILL iperf'
 			SSH.command(cmd,'\$',5)
+			cmd = 'killall --signal=SIGKILL iperf3'
+			SSH.command(cmd,'\$',5)
 			SSH.close()
 			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 			cmd = 'killall --signal=SIGKILL iperf'
 			SSH.command(cmd,'\$',5)
+			cmd = 'killall --signal=SIGKILL iperf3'
+			SSH.command(cmd,'\$',5)
 			SSH.close()
 			return
 

ci-scripts/cls_physim.py

@@ -183,7 +183,7 @@ class PhySim:
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		mySSH.command('cd '+self.__workSpacePath,'\$',5)
 		#run and redirect the results to a log file
-		mySSH.command(self.__workSpacePath+'phy_simulators/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
+		mySSH.command(self.__workSpacePath+'ran_build/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = html.HTMLManagement()

ci-scripts/cls_physim1.py

@@ -246,7 +246,7 @@ class PhySim:
 		isFinished = False
 		# doing a deep copy!
 		tmpPodNames = podNames.copy()
-		while(count < 32 and isFinished == False):
+		while(count < 50 and isFinished == False):
 			time.sleep(60)
 			for podName in tmpPodNames:
 				mySSH.command2(f'oc logs --tail=1 {podName} 2>&1', 6, silent=True)

ci-scripts/cls_static_code_analysis.py

@@ -121,7 +121,7 @@ class StaticCodeAnalysis():
 		mySSH.command('docker build --tag oai-cppcheck:xenial --file ci-scripts/docker/Dockerfile.cppcheck.xenial . > cmake_targets/log/cppcheck-xenial.txt 2>&1', '\$', 600)
 		mySSH.command('sed -e "s@xenial@bionic@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.bionic', '\$', 6)
 		mySSH.command('docker build --tag oai-cppcheck:bionic --file ci-scripts/docker/Dockerfile.cppcheck.bionic . > cmake_targets/log/cppcheck-bionic.txt 2>&1', '\$', 600)
-		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:xenial || true', '\$', 60)
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:xenial || true', '\$', 30)
 
 		# Analyzing the logs
 		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)

ci-scripts/conf_files/benetel-4g.conf

@@ -269,17 +269,10 @@ NETWORK_CONTROLLER :
      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/benetel-5g.conf

@@ -215,11 +215,11 @@ MACRLCs = (
 );
 
 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-	pusch_proc_threads = 8;
-        }  
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+}
 );
 
 RUs = (
@@ -262,18 +262,11 @@ THREAD_STRUCT = (
      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/cu.band7.tm1.100PRB.conf

@@ -201,15 +201,10 @@ eNBs = (
 
 log_config = {
   global_log_level            = "info";
-  global_log_verbosity        = "medium";
   pdcp_log_level              = "info";
-  pdcp_log_verbosity          = "high";
   rrc_log_level               = "info";
-  rrc_log_verbosity           = "medium";
   flexran_agent_log_level     = "info";
-  flexran_agent_log_verbosity = "medium";
   gtp_log_level               = "info";
-  gtp_log_verbosity           = "medium";
 };
 
 NETWORK_CONTROLLER : {

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

@@ -201,15 +201,10 @@ eNBs = (
 
 log_config = {
   global_log_level            = "info";
-  global_log_verbosity        = "medium";
   pdcp_log_level              = "info";
-  pdcp_log_verbosity          = "high";
   rrc_log_level               = "info";
-  rrc_log_verbosity           = "medium";
   flexran_agent_log_level     = "info";
-  flexran_agent_log_verbosity = "medium";
   gtp_log_level               = "info";
-  gtp_log_verbosity           = "medium";
 };
 
 NETWORK_CONTROLLER : {

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

@@ -201,15 +201,10 @@ eNBs = (
 
 log_config = {
   global_log_level            = "info";
-  global_log_verbosity        = "medium";
   pdcp_log_level              = "info";
-  pdcp_log_verbosity          = "high";
   rrc_log_level               = "info";
-  rrc_log_verbosity           = "medium";
   flexran_agent_log_level     = "info";
-  flexran_agent_log_verbosity = "medium";
   gtp_log_level               = "info";
-  gtp_log_verbosity           = "medium";
 };
 
 NETWORK_CONTROLLER : {

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

@@ -96,17 +96,11 @@ RUs = (
 
 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";
   flexran_agent_log_level     = "info";
-  flexran_agent_log_verbosity = "medium";
 };
 
 NETWORK_CONTROLLER : {

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

@@ -96,17 +96,11 @@ RUs = (
 
 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";
   flexran_agent_log_level     = "info";
-  flexran_agent_log_verbosity = "medium";
 };
 
 NETWORK_CONTROLLER : {

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

@@ -96,17 +96,11 @@ RUs = (
 
 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";
   flexran_agent_log_level     = "info";
-  flexran_agent_log_verbosity = "medium";
 };
 
 NETWORK_CONTROLLER : {

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

@@ -257,18 +257,11 @@ THREAD_STRUCT = (
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };
 

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

@@ -385,19 +385,12 @@ eNBs =
     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";
    };
   }
 );
@@ -457,17 +450,10 @@ NETWORK_CONTROLLER :
 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.band17.tm1.25PRB.usrpb210.conf

@@ -260,18 +260,11 @@ NETWORK_CONTROLLER :
      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.band17.tm1.mbms.25PRB.usrpb210.conf

@@ -404,18 +404,11 @@ NETWORK_CONTROLLER :
      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.band38.lte_2x2.100PRB.usrpn310.conf

@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
      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.band38.lte_2x2_tm2.100PRB.usrpn310.conf

@@ -0,0 +1,274 @@
+Active_eNBs = ( "eNB-Eurecom-B38");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe02;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB-Eurecom-B38";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 97; mnc_length = 2; } );
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function             = "3GPP_eNODEB";
+      node_timing               = "synch_to_ext_device";
+      node_synch_ref            = 0;
+      frame_type					      = "TDD";
+      tdd_config 					      = 1;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 38;
+      downlink_frequency      			      = 2605000000L;
+      nr_scg_ssb_freq                                 = 624608;
+      uplink_frequency_offset 			      = 0;
+      Nid_cell					      = 0;
+      N_RB_DL                 			      = 100;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports                                = 2;
+      nb_antennas_tx          			      = 2;
+      nb_antennas_rx          			      = 2;
+      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 			      = -29;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -96;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -104;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode                                    = 2;
+
+      //Parameters for SIB18
+      rxPool_sc_CP_Len                                       = "normal";
+      rxPool_sc_Period                                       = "sf40";
+      rxPool_data_CP_Len                                     = "normal";
+      rxPool_ResourceConfig_prb_Num                          = 20;
+      rxPool_ResourceConfig_prb_Start                        = 5;
+      rxPool_ResourceConfig_prb_End                          = 44;
+      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+      rxPool_dataHoppingConfig_rbOffset                               = 0;
+      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+*/
+      // Parameters for SIB19
+      discRxPool_cp_Len                                               = "normal"
+      discRxPool_discPeriod                                           = "rf32"
+      discRxPool_numRetx                                              = 1;
+      discRxPool_numRepetition                                        = 2;
+      discRxPool_ResourceConfig_prb_Num                               = 5;
+      discRxPool_ResourceConfig_prb_Start                             = 3;
+      discRxPool_ResourceConfig_prb_End                               = 21;
+      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "no";
+
+    ///X2
+    enable_x2 = "yes";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	tr_s_preference = "local_L1";
+	tr_n_preference = "local_RRC";
+	phy_test_mode = 0;
+        scheduler_mode = "fairRR";
+        bler_target_upper = 20.0;
+        bler_target_lower = 10.0;
+        max_ul_rb_index   = 27;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  150;
+        }  
+);
+
+L1s = (
+    	{
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+        prach_dtx_threshold = 200;
+        pucch1_dtx_threshold = 5
+        pucch1ab_dtx_threshold =0;
+        }  
+);
+
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 2
+         nb_rx          = 2
+         att_tx         = 0
+         att_rx         = 0;
+         bands          = [38];
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 75;
+         eNB_instances  = [0];
+         sdr_addrs      = "mgmt_addr=192.168.18.241,addr=192.168.20.2,second_addr=192.168.10.2";
+
+    }
+);  
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+NETWORK_CONTROLLER :
+{
+    FLEXRAN_ENABLED        = "no";
+    FLEXRAN_INTERFACE_NAME = "lo";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
+    FLEXRAN_PORT           = 2210;
+    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
+    FLEXRAN_AWAIT_RECONF   = "no";
+};
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+    };
+

ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf

@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
      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.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -165,19 +165,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      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.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -165,19 +165,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      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.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -165,19 +165,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      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.band40.tm2.25PRB.FairScheduler.usrpb210.conf

@@ -163,19 +163,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      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.100PRB.usrpb210.conf

@@ -256,18 +256,11 @@ NETWORK_CONTROLLER :
      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.25PRB.slave.usrpb210.conf

@@ -265,18 +265,11 @@ NETWORK_CONTROLLER :
      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.25PRB.usrpb210.conf

@@ -263,18 +263,11 @@ NETWORK_CONTROLLER :
 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

@@ -263,19 +263,12 @@ NETWORK_CONTROLLER :
      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";
     };
 
 @include "channelmod_rfsimu.conf"

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

@@ -264,18 +264,11 @@ NETWORK_CONTROLLER :
 log_config : 
   {
      global_log_level                      ="info"; 
-     global_log_verbosity                  ="high";
      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                     ="high";
      pdcp_log_level                        ="info"; 
-     pdcp_log_verbosity                    ="high";
      rrc_log_level                         ="info"; 
-     rrc_log_verbosity                     ="medium";
 };
 

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

@@ -258,17 +258,10 @@ NETWORK_CONTROLLER :
 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.slave.band13.tm1.25PRB.usrpb210.conf

@@ -262,18 +262,11 @@ THREAD_STRUCT = (
      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/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -36,7 +36,7 @@ gNBs =
     pdsch_AntennaPorts                                        = 1;
     pusch_AntennaPorts                                        = 1;
     ul_prbblacklist                                           = "51,52,53,54"
-    min_rxtxtime_pdsch = 6;
+    min_rxtxtime = 6;
      pdcch_ConfigSIB1 = (
       {
         controlResourceSetZero = 12;
@@ -241,13 +241,13 @@ MACRLCs = (
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 8;
-      prach_dtx_threshold = 120;
-      pucch0_dtx_threshold = 150;
-      }
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+  pucch0_dtx_threshold = 150;
+}
 );
 
 RUs = (
@@ -306,20 +306,12 @@ security = {
      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";
        ngap_log_level                         ="debug";
-       ngap_log_verbosity                     ="medium";
     };
 

ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 uicc0 = {

ci-scripts/conf_files/episci/episci_nr-ue0.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 uicc0 = {

ci-scripts/conf_files/episci/episci_nr-ue1.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 uicc0 = {

ci-scripts/conf_files/episci/episci_nr-ue2.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 uicc0 = {

ci-scripts/conf_files/episci/episci_nr-ue3.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 uicc0 = {

ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf

@@ -231,17 +231,10 @@ THREAD_STRUCT = (
 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/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf

@@ -248,18 +248,11 @@ THREAD_STRUCT = (
 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/episci/episci_ue.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 

ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -36,7 +36,7 @@ gNBs =
     pdsch_AntennaPorts                                        = 1;
     pusch_AntennaPorts                                        = 1;
     ul_prbblacklist                                           = "51,52,53,54"
-    min_rxtxtime_pdsch = 6;
+    min_rxtxtime = 6;
 
      pdcch_ConfigSIB1 = (
       {
@@ -242,13 +242,13 @@ MACRLCs = (
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 8;
-      prach_dtx_threshold = 120;
-      pucch0_dtx_threshold = 150;
-      }
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+  pucch0_dtx_threshold = 150;
+}
 );
 
 RUs = (
@@ -307,20 +307,12 @@ security = {
      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";
        ngap_log_level                         ="debug";
-       ngap_log_verbosity                     ="medium";
     };
 

ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 uicc0 = {

ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf

@@ -231,17 +231,10 @@ THREAD_STRUCT = (
 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/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf

@@ -288,18 +288,11 @@ THREAD_STRUCT = (
 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/episci/proxy_ue.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 

ci-scripts/conf_files/gNB_SA_CU.conf

@@ -254,22 +254,13 @@ security = {
      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                         ="debug";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
        ngap_log_level                         ="debug";
-       ngap_log_verbosity                     ="medium";
     };
 

ci-scripts/conf_files/gNB_SA_DU.conf

@@ -227,14 +227,14 @@ MACRLCs = (
 );
 
 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-	pusch_proc_threads = 8;
-	prach_dtx_threshold = 120;
-    pucch0_dtx_threshold = 150;
-    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-        }  
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+  pucch0_dtx_threshold = 150;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+}
 );
 
 RUs = (
@@ -273,22 +273,13 @@ serveraddr = "server";
      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                         ="debug";
-       rlc_log_verbosity                     ="medium";
+       rlc_log_level                         ="info";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
        ngap_log_level                         ="debug";
-       ngap_log_verbosity                     ="medium";
     };
 

ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf

@@ -229,13 +229,13 @@ MACRLCs = (
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 2;
-      prach_dtx_threshold = 120;
-      pucch0_dtx_threshold = 150;
-      }  
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+  pucch0_dtx_threshold = 150;
+}
 );
 
 RUs = (
@@ -291,19 +291,11 @@ security = {
      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";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
     };

ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf

@@ -226,12 +226,12 @@ MACRLCs = (
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 2;
-      prach_dtx_threshold = 120;
-        }  
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+}
 );
 
 RUs = (
@@ -287,19 +287,11 @@ security = {
      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";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
     };

ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf

@@ -211,12 +211,12 @@ MACRLCs = (
 );
 
 L1s = (
-    	{
+{
   num_cc = 1;
   tr_n_preference = "local_mac";
-  pusch_proc_threads = 8;
+  thread_pool_size = 8;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-        }  
+}
 );
 
 RUs = (
@@ -266,18 +266,11 @@ security = {
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };
 

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

@@ -137,20 +137,6 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       subcarrierSpacing                                             = 1;
 
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
       ssPBCH_BlockPower                                             = -25;
   }
 
@@ -195,12 +181,12 @@ MACRLCs = (
 );
 
 L1s = (
-  {
+{
   num_cc = 1;
   tr_n_preference = "local_mac";
-  pusch_proc_threads = 8;
+  thread_pool_size = 8;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-  }
+}
 );
 
 RUs = (
@@ -259,18 +245,11 @@ security = {
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };
 

ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf

@@ -210,12 +210,12 @@ MACRLCs = (
 );
 
 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-	pusch_proc_threads = 8;
-        prach_dtx_threshold = 120;
-        }  
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+}
 );
 
 RUs = (
@@ -266,18 +266,11 @@ security = {
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };
 

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf

@@ -41,6 +41,7 @@ gNBs =
     pdsch_AntennaPorts                                        = 1;
     pusch_AntennaPorts                                        = 2;
     ul_prbblacklist                                           = "51,52,53,54"
+    do_SRS                                                    = 1;
 
     pdcch_ConfigSIB1 = (
       {
@@ -226,18 +227,18 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
 #    pucch_TargetSNRx10 = 150;
-     ulsch_max_frame_inactivity = 1;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 4;
-      prach_dtx_threshold = 120;
-#      pucch0_dtx_threshold = 150;
-      }
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+#  pucch0_dtx_threshold = 150;
+}
 );
 
 RUs = (
@@ -293,19 +294,11 @@ security = {
      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";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
     };

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -44,6 +44,7 @@ gNBs =
     #pucch_TargetSNRx10                                        = 200;
     ul_prbblacklist                                           = "51,52,53,54"
     min_rxtxtime = 6;
+    do_SRS                                                    = 1;
 
     pdcch_ConfigSIB1 = (
       {
@@ -236,13 +237,12 @@ MACRLCs = (
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 4;
-      prach_dtx_threshold = 120;
-#      pucch0_dtx_threshold = 150;
-      }
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 120;
+#  pucch0_dtx_threshold = 150;
+}
 );
 
 RUs = (
@@ -298,19 +298,11 @@ security = {
      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";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
     };

ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf

@@ -39,11 +39,8 @@ gNBs =
 
     ssb_SubcarrierOffset                                      = 0;
     pdsch_AntennaPorts                                        = 1;
-    pusch_AntennaPorts                                        = 1;
-    #pusch_TargetSNRx10                                        = 200;
-    #pucch_TargetSNRx10                                        = 200;
-    ul_prbblacklist                                           = "51,52,53,54"
-    min_rxtxtime = 6;
+    pusch_AntennaPorts                                        = 2;
+    ul_prbblacklist                                           = "79,80,81,82"
 
     pdcch_ConfigSIB1 = (
       {
@@ -82,11 +79,11 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
+        dl_carrierBandwidth                                            = 162;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
+        initialDLBWPlocationAndBandwidth                                        = 31899;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -94,8 +91,6 @@ gNBs =
         initialDLBWPcontrolResourceSetZero                                      = 11;
         initialDLBWPsearchSpaceZero                                             = 0;
 
-
-
   #uplinkConfigCommon
      #frequencyInfoUL
       ul_frequencyBand                                                 = 78;
@@ -104,11 +99,11 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
+      ul_carrierBandwidth                                            = 162;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
+        initialULBWPlocationAndBandwidth                                        = 31899;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;
@@ -229,27 +224,27 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "local_RRC";
-    pusch_TargetSNRx10 = 200;
-    pucch_TargetSNRx10 = 200;
-     ulsch_max_frame_inactivity = 1;
+#    pusch_TargetSNRx10 = 200;
+#    pucch_TargetSNRx10 = 150;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 
 L1s = (
-      {
-      num_cc = 1;
-      tr_n_preference = "local_mac";
-      pusch_proc_threads = 4;
-      prach_dtx_threshold = 120;
-#      pucch0_dtx_threshold = 150;
-      }
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+  prach_dtx_threshold = 120;
+#  pucch0_dtx_threshold = 150;
+}
 );
 
 RUs = (
     {
        local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
+         nb_tx          = 2
+         nb_rx          = 2
          att_tx         = 0
          att_rx         = 0;
          bands          = [78];
@@ -298,19 +293,11 @@ security = {
      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";
        f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
     };

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

@@ -194,11 +194,11 @@ MACRLCs = (
 );
 
 L1s = (
-	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-	pusch_proc_threads = 8;
-	}
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 8;
+}
 );
 
 RUs = (
@@ -255,18 +255,11 @@ security = {
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };
 

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

@@ -210,12 +210,12 @@ MACRLCs = (
 );
 
 L1s = (
-  {
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-    pusch_proc_threads = 6;
-    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-  }  
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  thread_pool_size = 6;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+}
 );
 
 RUs = (
@@ -263,19 +263,12 @@ security = {
 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";
 };
 
 uicc: {

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

@@ -211,11 +211,11 @@ MACRLCs = (
 );
 
 L1s = (
-      {
+{
   num_cc = 1;
   tr_n_preference = "local_mac";
-  pusch_proc_threads = 6;
-        }  
+  thread_pool_size = 6;
+}
 );
 
 RUs = (
@@ -265,19 +265,12 @@ security = {
      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";
     };
 
 uicc: {

ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -0,0 +1,291 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 95;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                      sd  = 0x1; // 0 false, else true
+                    },
+                    {
+                      sst = 2;
+                      sd  = 2; // 0 false, else true
+                    }
+                  );
+
+                  });
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+    ssb_SubcarrierOffset                                      = 0;
+    pdsch_AntennaPorts                                        = 1;
+    pusch_AntennaPorts                                        = 1;
+    min_rxtxtime                                              = 6;
+    sib1_tda                                                  = 0;
+
+     pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+      );
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 433096;
+      dl_frequencyBand                                                 = 66;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 430000;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 13475; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 66;
+      ul_absoluteFrequencyPointA                                    = 350000;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 13475;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+    {
+        num_cc                      = 1;
+        tr_s_preference             = "local_L1";
+        tr_n_preference             = "local_RRC";
+        ulsch_max_slots_inactivity  = 100;
+        pusch_TargetSNRx10          = 200;
+        pucch_TargetSNRx10          = 200;
+    }
+);
+
+L1s = (
+    {
+        num_cc = 1;
+        tr_n_preference = "local_mac";
+        pusch_proc_threads = 8;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+    }
+);
+
+RUs = (
+    {
+       local_rf       = "yes"
+         nb_tx          = 1
+         nb_rx          = 1
+         att_tx         = 0
+         att_rx         = 0;
+         bands          = [7];
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 75;
+         eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+         clock_src = "internal";
+    }
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+rfsimulator :
+{
+    serveraddr = "server";
+    serverport = "4043";
+    options = (); #("saviq"); or/and "chanmod"
+    modelname = "AWGN";
+    IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       ngap_log_level                        ="debug";
+    };
+

ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf

@@ -0,0 +1,301 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 99;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                      sd  = 0x1; // 0 false, else true
+                    },
+                    {
+                      sst = 1;
+                      sd  = 0x112233; // 0 false, else true
+                    }
+                  );
+
+                  });
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+    ssb_SubcarrierOffset                                      = 0;
+    pdsch_AntennaPorts                                        = 1;
+    pusch_AntennaPorts                                        = 1;
+    sib1_tda                                                  = 15;
+    min_rxtxtime = 6;
+
+     pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 2;
+        searchSpaceZero = 0;
+      }
+      );
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 12 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 640288;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640000;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 24;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 6325;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 2;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 24;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 6325;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 150;
+  pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 1;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference       = "local_mac";
+  pusch_proc_threads    = 8;
+  prach_dtx_threshold   = 120;
+  pucch0_dtx_threshold  = 150;
+  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 1
+  nb_rx          = 1
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 114;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+  clock_src = "internal";
+}
+);
+
+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);
+
+rfsimulator :
+{
+  serveraddr = "server";
+  serverport = "4043";
+  options = (); #("saviq"); or/and "chanmod"
+  modelname = "AWGN";
+  IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "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";
+  ngap_log_level                        ="debug";
+  ngap_log_verbosity                    ="medium";
+};
+

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

@@ -257,17 +257,10 @@ NETWORK_CONTROLLER :
      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/lte-fdd-fembms-basic-sim.conf

@@ -406,19 +406,12 @@ NETWORK_CONTROLLER :
      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";
     };
 
 //rfsimulator :

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

@@ -406,19 +406,12 @@ NETWORK_CONTROLLER :
      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";
     };
 
 //rfsimulator :

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

@@ -165,19 +165,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      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/nr-ue.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 

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

@@ -227,17 +227,10 @@ THREAD_STRUCT = (
 
 log_config = { 
       global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
 };

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

@@ -168,19 +168,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
    };
 
   }

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

@@ -168,19 +168,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
    };
 
   }

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

@@ -168,19 +168,12 @@ eNBs =
     log_config :
     {
       global_log_level                      ="debug";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
    };
 
   }

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

@@ -263,17 +263,10 @@ NETWORK_CONTROLLER :
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };

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

@@ -263,17 +263,10 @@ NETWORK_CONTROLLER :
 log_config :
 {
   global_log_level         ="info";
-  global_log_verbosity     ="medium";
   hw_log_level             ="info";
-  hw_log_verbosity         ="medium";
   phy_log_level            ="info";
-  phy_log_verbosity        ="medium";
   mac_log_level            ="info";
-  mac_log_verbosity        ="high";
   rlc_log_level            ="info";
-  rlc_log_verbosity        ="medium";
   pdcp_log_level           ="info";
-  pdcp_log_verbosity       ="medium";
   rrc_log_level            ="info";
-  rrc_log_verbosity        ="medium";
 };

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

@@ -263,17 +263,10 @@ NETWORK_CONTROLLER :
      log_config :
      {
        global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
        hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
        mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
        rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
        pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
        rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
     };

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

@@ -365,17 +365,10 @@ THREAD_STRUCT = (
 
 log_config = { 
       global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
 };

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

@@ -365,17 +365,10 @@ THREAD_STRUCT = (
 
 log_config = { 
       global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
 };

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

@@ -230,17 +230,10 @@ THREAD_STRUCT = (
 log_config =
     {
       global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
    };

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

@@ -30,18 +30,11 @@ THREAD_STRUCT = (
 
 log_config = { 
       global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
 };
 

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

@@ -30,18 +30,11 @@ THREAD_STRUCT = (
 
 log_config = { 
       global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
       phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
       mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
       pdcp_log_level                        ="info";
-      pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
-      rrc_log_verbosity                     ="medium";
 };
 

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

@@ -31,17 +31,10 @@ 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";
 };

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

@@ -31,17 +31,10 @@ 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";
 };

ci-scripts/conf_files/ue.nfapi.conf

@@ -1,18 +1,11 @@
 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                     ="medium";
   rlc_log_level                         ="info";
-  rlc_log_verbosity                     ="medium";
   pdcp_log_level                        ="info";
-  pdcp_log_verbosity                    ="medium";
   rrc_log_level                         ="info";
-  rrc_log_verbosity                     ="full";
 };
 
 

ci-scripts/constants.py

@@ -44,6 +44,8 @@ ENB_PROCESS_ASSERTION = -12
 ENB_PROCESS_REALTIME_ISSUE = -13
 ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
 ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
+ENB_REAL_TIME_PROCESSING_ISSUE = -16
+ENB_RETX_ISSUE = -17
 HSS_PROCESS_FAILED = -2
 HSS_PROCESS_OK = +2
 MME_PROCESS_FAILED = -3

ci-scripts/cppcheck_suppressions.list

@@ -50,10 +50,6 @@ memleak:openair1/PHY/CODING/TESTBENCH/ltetest.c
 invalidPrintfArgType_sint:openair1/PHY/CODING/TESTBENCH/pdcch_test.c
 //
 //-----------------------------------------------------------------------------
-// oaisim deprecated, remove?
-doubleFree:openair3/TEST/oaisim_mme_list_benchmark.c
-//
-//-----------------------------------------------------------------------------
 // is itti analyzer deprecated
 nullPointer:common/utils/itti_analyzer/itti_analyzer.c
 nullPointerRedundantCheck:common/utils/itti_analyzer/libbuffers/buffers.c