Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements

2022-01-24 19:08:21 +01:00
parent 533897605f 4d1bda01c6
commit e7f544e139
85 changed files with 2124 additions and 714 deletions
@@ -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 {
@@ -529,52 +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}
@@ -643,28 +597,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 {
@@ -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} "
              }
            }
          }
@@ -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
+                        commit = COMMIT_ID.replace("\"","")
-                        build job: "RAN-NSA-B200-Module-LTEBOX", wait : true, propagate : false, parameters: [
+                        GitPostArgs = MR + ' ' + commit + ' '
-                            string(name: 'eNB_MR', value: String.valueOf(MR)),                          
+                        echo GitPostArgs
                            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))
                        ]
                        //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}"
                        }                        
                    }
                }                                  
            }   
@@ -221,7 +221,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 +341,7 @@ 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()
@@ -586,11 +586,20 @@ 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)
@@ -603,20 +612,26 @@ class Containerize():
 		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])
+			if containerToKill:
-			logStatus = RAN.AnalyzeLogFile_eNB(self.eNB_logFile[self.eNB_instance], HTML)
+				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)
 			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')
@@ -689,7 +704,7 @@ class Containerize():
 	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"'
+		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 and not port 2152"'
 		for name in networkNames.split('\n'):
 			res = re.search('rfsim', name)
 			if res is not None:
@@ -700,7 +715,7 @@ class Containerize():
 		logging.debug(cmd)
 		networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
-	def UndeployGenObject(self, HTML):
+	def UndeployGenObject(self, HTML, RAN):
 		self.exitStatus = 0
 		ymlPath = self.yamlPath[0].split('/')
 		logPath = '../cmake_targets/log/' + ymlPath[1]
@@ -730,8 +745,36 @@ class Containerize():
 				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)
 		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!
 			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')
 				# For the moment just assume this exists
 				logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML)
 				if (logStatus < 0):
 					fullStatus = False
 					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
 				else:
 					HTML.CreateHtmlTestRow(RAN.runtime_stats, '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:
@@ -747,6 +790,7 @@ class Containerize():
 				logging.debug(cmd)
 				copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
 		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml down'
 		logging.debug(cmd)
 		try:
@@ -763,8 +807,12 @@ class Containerize():
 		logging.debug(cmd)
 		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
-		HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
+		if fullStatus:
-		logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m')
+			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):
 		self.exitStatus = 0
@@ -0,0 +1,281 @@
 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";
       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";
    };
@@ -232,7 +232,7 @@ L1s = (
      {
      num_cc = 1;
      tr_n_preference = "local_mac";
-      pusch_proc_threads = 2;
+      pusch_proc_threads = 8;
      prach_dtx_threshold = 120;
      pucch0_dtx_threshold = 150;
      }  
@@ -229,7 +229,7 @@ L1s = (
      {
      num_cc = 1;
      tr_n_preference = "local_mac";
-      pusch_proc_threads = 2;
+      pusch_proc_threads = 8;
      prach_dtx_threshold = 120;
        }  
 );
@@ -44,6 +44,7 @@ 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
 HSS_PROCESS_FAILED = -2
 HSS_PROCESS_OK = +2
 MME_PROCESS_FAILED = -3
@@ -0,0 +1,35 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
 Title : Processing Time (us)
 ColNames :
  - Metric
  - Average
  - Max
  - Average vs Reference Deviation (Reference Value ; Acceptability Threshold)
 Ref : 
  feprx : 120.0
  feptx_prec : 8.0
  feptx_ofdm : 50.0
  feptx_total : 75.0
  L1 Tx processing thread 0 : 300.0
  L1 Tx processing thread 1 : 300.0
  DLSCH encoding : 230.0
  L1 Rx processing : 175.0
  PUSCH inner-receiver : 100.0
  PUSCH decoding : 180.0 
  DL & UL scheduling timing stats : 37.0
  UL Indication : 38.0
 Threshold :
  feprx : 1.25
  feptx_prec : 1.25
  feptx_ofdm : 1.25
  feptx_total : 1.25
  L1 Tx processing thread 0 : 1.25
  L1 Tx processing thread 1 : 1.25
  DLSCH encoding : 1.25
  L1 Rx processing : 1.25
  PUSCH inner-receiver : 1.25
  PUSCH decoding : 1.25
  DL & UL scheduling timing stats : 1.25
  UL Indication : 1.25
@@ -133,7 +133,7 @@ class EPCManagement():
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
 			logging.debug('Using the OAI EPC Release 14 MME in Docker')
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-mme /bin/bash -c "nohup tshark -i eth0 -i lo:s10 -w /tmp/mme_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
+			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-mme /bin/bash -c "nohup tshark -i eth0 -i lo:s10 -f "not port 2152" -w /tmp/mme_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
 			time.sleep(5)
 			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-mme /bin/bash -c "nohup ./bin/oai_mme -c ./etc/' + self.mmeConfFile + ' > mme_check_run.log 2>&1"', '\$', 5)
 		elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
@@ -198,8 +198,8 @@ class EPCManagement():
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
 			logging.debug('Using the OAI EPC Release 14 SPGW-CUPS in Docker')
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "nohup tshark -i eth0 -i lo:p5c -i lo:s5c -w /tmp/spgwc_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
+			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "nohup tshark -i eth0 -i lo:p5c -i lo:s5c -f "not port 2152" -w /tmp/spgwc_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "nohup tshark -i eth0 -w /tmp/spgwu_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
+			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "nohup tshark -i eth0 -f "not port 2152" -w /tmp/spgwu_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
 			time.sleep(5)
 			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "nohup ./bin/oai_spgwc -o -c ./etc/spgw_c.conf > spgwc_check_run.log 2>&1"', '\$', 5)
 			time.sleep(5)
@@ -532,6 +532,7 @@ class EPCManagement():
 			logging.debug('Terminating OAI CN5G')
 			mySSH.command('cd /opt/oai-cn5g-fed/docker-compose', '\$', 5)
 			mySSH.command('./core-network.sh stop nrf spgwu', '\$', 60)
 			mySSH.command('docker volume prune --force || true', '\$', 60)
 			time.sleep(2)
 			mySSH.command('tshark -r /tmp/oai-cn5g.pcap | egrep --colour=never "Tracking area update" ','\$', 30)
 			result = re.search('Tracking area update request', mySSH.getBefore())
@@ -760,6 +761,7 @@ class EPCManagement():
 			nbContainers += 1
 		mySSH.command('docker-compose down', '\$', 60)
 		mySSH.command('docker volume prune --force || true', '\$', 60)
 		mySSH.command('docker inspect --format=\'{{.State.Health.Status}}\' ' + listOfContainers, '\$', 10)
 		noMoreContainerNb = mySSH.getBefore().count('No such object')
 		mySSH.command('docker inspect --format=\'{{.Name}}\' prod-oai-public-net prod-oai-private-net', '\$', 10)
@@ -155,6 +155,11 @@ def GetParametersFromXML(action):
 	elif action == 'Initialize_eNB':
 		RAN.eNB_Trace=test.findtext('eNB_Trace')
 		RAN.eNB_Stats=test.findtext('eNB_Stats')
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
 		if datalog_rt_stats_file is None:
 			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
 		else:
 			RAN.datalog_rt_stats_file=datalog_rt_stats_file
 		RAN.Initialize_eNB_args=test.findtext('Initialize_eNB_args')
 		eNB_instance=test.findtext('eNB_instance')
 		USRPIPAddress=test.findtext('USRP_IPAddress')
@@ -909,7 +914,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					if CONTAINERS.exitStatus==1:
 						RAN.prematureExit = True
 				elif action == 'UndeployGenObject':
-					CONTAINERS.UndeployGenObject(HTML)
+					CONTAINERS.UndeployGenObject(HTML, RAN)
 					if CONTAINERS.exitStatus==1:
 						RAN.prematureExit = True
 				elif action == 'PingFromContainer':
@@ -92,6 +92,7 @@ class RANManagement():
 		self.epcPcapFile = ''
 		self.runtime_stats= ''
 		self.datalog_rt_stats={}
 		self.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
 		self.eNB_Trace = '' #if 'yes', Tshark will be launched at initialization
 		self.eNB_Stats = '' #if 'yes', Statistics Monitor will be launched at initialization		
 		self.USRPIPAddress = ''
@@ -159,6 +160,7 @@ class RANManagement():
 		# Raphael: here add a check if git clone or git fetch went smoothly
 		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
 		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
 		mySSH.command('git advice.detachedHead false', '\$', 5)
 		# Checking the BUILD INFO file
 		if not self.backgroundBuild:
 			mySSH.command('ls *.txt', '\$', 5)
@@ -203,6 +205,7 @@ class RANManagement():
 			else:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
 				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
 		logging.debug(mySSH.getBefore()) # print what git said when merging/checking out
 		mySSH.command('source oaienv', '\$', 5)
 		mySSH.command('cd cmake_targets', '\$', 5)
 		mySSH.command('mkdir -p log', '\$', 5)
@@ -212,6 +215,7 @@ class RANManagement():
 			mySSH.command('echo "./build_oai ' + self.Build_eNB_args + '" > ./my-lte-softmodem-build.sh', '\$', 5)
 			mySSH.command('chmod 775 ./my-lte-softmodem-build.sh', '\$', 5)
 			mySSH.command('echo ' + lPassWord + ' | sudo -S ls', '\$', 5)
 			logging.debug(mySSH.getBefore()) # print current directory contents for verification
 			mySSH.command('echo $USER; nohup sudo -E ./my-lte-softmodem-build.sh' + ' > ' + lSourcePath + '/cmake_targets/compile_oai_enb.log ' + ' 2>&1 &', lUserName, 5)
 			mySSH.close()
 			HTML.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
@@ -371,10 +375,11 @@ class RANManagement():
 			result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', mySSH.getBefore())
 			if result is not None:
 				eth_interface = result.group('eth_interface')
-				logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + '\u001B[0m')
+				fltr = 'port 38412 or port 36412 or port 36422' # NGAP, S1AP, X2AP
 				logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
 				pcapfile = pcapfile_prefix + self.testCase_id + '_log.pcap'
 				mySSH.command('echo ' + lPassWord + ' | sudo -S rm -f /tmp/' + pcapfile , '\$', 5)
-				mySSH.command('echo $USER; nohup sudo -E tshark  -i ' + eth_interface + ' -w /tmp/' + pcapfile + ' > /dev/null 2>&1 &','\$', 5)
+				mySSH.command('echo $USER; nohup sudo -E tshark  -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + pcapfile + ' > /dev/null 2>&1 &','\$', 5)
 			mySSH.close()
@@ -390,10 +395,11 @@ class RANManagement():
 			result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', mySSH.getBefore())
 			if result is not None:
 				eth_interface = result.group('eth_interface')
-				logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + '\u001B[0m')
+				fltr = 'port 38412 or port 36412 or port 36422' # NGAP, S1AP, X2AP
 				logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
 				self.epcPcapFile = 'enb_' + self.testCase_id + '_s1log.pcap'
 				mySSH.command('echo ' + localEpcPassword + ' | sudo -S rm -f /tmp/' + self.epcPcapFile , '\$', 5)
-				mySSH.command('echo $USER; nohup sudo tshark -f "host ' + lIpAddr +'" -i ' + eth_interface + ' -w /tmp/' + self.epcPcapFile + ' > /tmp/tshark.log 2>&1 &', localEpcUserName, 5)
+				mySSH.command('echo $USER; nohup sudo tshark -f "host ' + lIpAddr +'" -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + self.epcPcapFile + ' > /tmp/tshark.log 2>&1 &', localEpcUserName, 5)
 			mySSH.close()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath, '\$', 5)
@@ -717,6 +723,9 @@ class RANManagement():
 				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze, HTML)
 				if (logStatus < 0):
 					HTML.CreateHtmlTestRow('N/A', 'KO', logStatus)
 					#display rt stats for gNB only
 					if len(self.datalog_rt_stats)!=0 and nodeB_prefix == 'g':
 						HTML.CreateHtmlDataLogTable(self.datalog_rt_stats)
 					self.prematureExit = True
 					self.eNBmbmsEnables[int(self.eNB_instance)] = False
 					return
@@ -738,7 +747,10 @@ class RANManagement():
 		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S mv /tmp/enb_*.pcap .','\$',20)
 		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S mv /tmp/gnb_*.pcap .','\$',20)
 		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm -f enb.log.zip', '\$', 5)
-		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S zip enb.log.zip enb*.log core* enb_*record.raw enb_*.pcap gnb_*.pcap enb_*txt physim_*.log *stats.log *monitor.pickle *monitor*.png ping*.log.png log/*/*.log log/*/*.pcap', '\$', 60)
+		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S zip enb.log.zip enb*.log enb_*record.raw enb_*.pcap gnb_*.pcap enb_*txt physim_*.log *stats.log *monitor.pickle *monitor*.png ping*.log.png log/*/*.log log/*/*.pcap', '\$', 60)
 		result = re.search('core.\d+', mySSH.getBefore())
 		if result is not None:
 			mySSH.command('echo ' + self.eNBPassword + ' | sudo -S zip enb.log.zip core* ran_build/build/{lte,nr}-softmodem', '\$', 60) # add core and executable to zip
 		mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm enb*.log core* enb_*record.raw enb_*.pcap gnb_*.pcap enb_*txt physim_*.log *stats.log *monitor.pickle *monitor*.png ping*.log.png log/*/*.log log/*/*.pcap', '\$', 15)
 		mySSH.close()
@@ -802,6 +814,7 @@ class RANManagement():
 		#NSA specific log markers
 		nsa_markers ={'SgNBReleaseRequestAcknowledge': [],'FAILURE': [], 'scgFailureInformationNR-r15': [], 'SgNBReleaseRequest': []}
 		nodeB_prefix_found = False
 		RealTimeProcessingIssue = False
 		line_cnt=0 #log file line counter
 		for line in enb_log_file.readlines():
@@ -1003,7 +1016,7 @@ class RANManagement():
 		#the following part takes the *_stats.log files as source (not the stdout log file)
 		#the datalog config file has to be loaded
-		datalog_rt_stats_file='datalog_rt_stats.yaml'
+		datalog_rt_stats_file=self.datalog_rt_stats_file
 		if (os.path.isfile(datalog_rt_stats_file)):
 			yaml_file=datalog_rt_stats_file
 		elif (os.path.isfile('ci-scripts/'+datalog_rt_stats_file)):
@@ -1016,12 +1029,9 @@ class RANManagement():
 			datalog_rt_stats = yaml.load(f,Loader=yaml.FullLoader)
 		rt_keys = datalog_rt_stats['Ref'] #we use the keys from the Ref field  
-		if (os.path.isfile('./nrL1_stats.log')) and (os.path.isfile('./nrL1_stats.log')):
+		if os.path.isfile('./nrL1_stats.log') and os.path.isfile('./nrMAC_stats.log'):
-			stat_files_present=True
+			# don't use CI-nrL1_stats.log, as this will increase the processing time for
-		else:
+			# no reason, we just need the last occurence
 			stat_files_present=False
 			logging.debug("NR Stats files for RT analysis not found")
 		if stat_files_present:
 			nrL1_stats = open('./nrL1_stats.log', 'r')
 			nrMAC_stats = open('./nrMAC_stats.log', 'r')
 			for line in nrL1_stats.readlines():
@@ -1042,6 +1052,8 @@ class RANManagement():
 							real_time_stats[k]=tmp.group(1)
 			nrL1_stats.close()
 			nrMAC_stats.close()
 		else:
 			logging.debug("NR Stats files for RT analysis not found")
 		#stdout log file and stat log files analysis completed
 		logging.debug('   File analysis (stdout, stats) completed')
@@ -1120,8 +1132,7 @@ class RANManagement():
 				#check if there is a fail => will render the test as failed
 				for k in datalog_rt_stats['Data']:
 					if float(datalog_rt_stats['Data'][k][2])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
-						#setting prematureExit is ok although not the best option
+						RealTimeProcessingIssue = True
 						self.prematureExit=False #temp for debug : do not stop the test if RT stats are excedeed
 			else:
 				statMsg = 'No real time stats found in the log file\n'
 				logging.debug('No real time stats found in the log file')
@@ -1155,7 +1166,10 @@ class RANManagement():
 			logging.debug(statMsg)
 			htmleNBFailureMsg += htmlMsg			
-
+		if RealTimeProcessingIssue:
 			logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with real time processing issue! \u001B[0m')
 			htmleNBFailureMsg += 'Fail due to real time processing issue\n'
 			global_status = CONST.ENB_REAL_TIME_PROCESSING_ISSUE
 		if uciStatMsgCount > 0:
 			statMsg = nodeB_prefix + 'NB showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
 			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
@@ -509,46 +509,87 @@ class Dashboard:
        s3.meta.client.copy(copy_source, 'oaitestdashboard', path+'/'+ 'test_styles.css')
-    def PostGitNote(self,mr,jobname,buildurl,buildid,status):
+    def PostGitNote(self,mr,commit,args):
-        gl = gitlab.Gitlab.from_config('OAI')
+        #current date and time to be posted with test results
-        project_id = 223
+        #now = datetime.now()
-        project = gl.projects.get(project_id)
+        #dt_string = now.strftime("%d/%m/%Y %H:%M")
-        editable_mr = project.mergerequests.get(int(mr))
+
-        mr_notes = editable_mr.notes.list()
+        if len(args)%4 != 0:
-        mr_note = editable_mr.notes.create({
+            print("Wrong Number of Arguments")
-            'body': 'Completed Test : '+jobname+', status: <b>'+status+'</b>, '+\
+            return
-            '(<a href="'+buildurl+'">'+buildid+'</a>)<br>'+\
+        else :
-            '<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'+mr+'/index.html">Consolidated Test Results</a>'
+            n_tests=len(args)//4
-        })
+
-        editable_mr.save()
+            gl = gitlab.Gitlab.from_config('OAI')
            project_id = 223
            project = gl.projects.get(project_id)
            #retrieve all the notes from the MR
            editable_mr = project.mergerequests.get(int(mr))
            mr_notes = editable_mr.notes.list(all=True)
            body = '<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/MR'+mr+'/index.html">Consolidated Test Results</a><br>'+\
                'Tested CommitID: ' + commit + '<br>'
            for i in range(0,n_tests):
                jobname = args[4*i]
                buildurl = args[4*i+1]
                buildid = args[4*i+2]
                status = args[4*i+3]
                body += jobname+', status is <b>'+status+'</b>, (<a href="'+buildurl+'">'+buildid+'</a>)<br>'
            #create new note
            mr_note = editable_mr.notes.create({
                'body': body
            })
            editable_mr.save()
 def main():
-    #call from Jenkinsfile : sh "python3 Hdashboard.py testevent ${params.eNB_MR} ${JOB_NAME} ${env.BUILD_URL} ${env.BUILD_ID} ${StatusForDb} "  
+    #call from slave Jenkinsfile : sh "python3 Hdashboard.py testevent ${params.eNB_MR} "  
    #call from master Jenkinsfile : sh "python3 Hdashboard.py gitpost ${GitPostArgs}"
    #individual MR test results + test dashboard, event based (end of jenkins pipeline)
    if len(sys.argv)>1:
        #individual MR test results + test dashboard, event based (end of slave jenkins pipeline)
        if sys.argv[1]=="testevent" :
            mr=sys.argv[2]
            jobname=sys.argv[3]
            buildurl=sys.argv[4]
            buildid=sys.argv[5]
            status=sys.argv[6]
            htmlDash=Dashboard()
            if mr in htmlDash.mr_list:
                #single MR test results
                htmlDash.Build('singleMR',mr,'/tmp/MR'+mr+'_index.html') 
                htmlDash.CopyToS3('/tmp/MR'+mr+'_index.html','oaitestdashboard','MR'+mr+'/index.html')
                #all MR test results
                htmlDash.Build('Tests','0000','/tmp/Tests_index.html') 
                htmlDash.CopyToS3('/tmp/Tests_index.html','oaitestdashboard','index.html')
-                htmlDash.PostGitNote(mr,jobname,buildurl,buildid,status)
+
        #git post with MR test results, event based (end of master jenkins pipeline)
        elif sys.argv[1]=="gitpost":
            mr=sys.argv[2]
            commit=sys.argv[3]
            args=[]
            for i in range (4, len(sys.argv)): #jobname, url, id , result
                args.append(sys.argv[i])
            htmlDash=Dashboard()
            if mr in htmlDash.mr_list:
                htmlDash.PostGitNote(mr,commit, args)
            else:
                print("Not a Merge Request => this build is for testing/debug purpose, no report to git")
-    #test and MR status dash boards, cron based
+        else:
            print("Wrong argument at position 1")
    #test and MR status dashboards, cron based
    else:
        htmlDash=Dashboard()
        #all MR status dashboard
        htmlDash.Build('MR','0000','/tmp/MR_index.html') 
        htmlDash.CopyToS3('/tmp/MR_index.html','oairandashboard','index.html') 
        #all MR test results
        htmlDash.Build('Tests','0000','/tmp/Tests_index.html') 
        htmlDash.CopyToS3('/tmp/Tests_index.html','oaitestdashboard','index.html') 
@@ -157,22 +157,24 @@ class SSHConnection():
 		if not silent:
 			logging.debug(commandline)
 		self.cmd2Results = ''
 		noHistoryCmd = 'unset HISTFILE; ' + commandline
 		myHost = self.username + '@' + self.ipaddress
 		# CAUTION: THIS METHOD IMPLIES THAT THERE ARE VALID SSH KEYS
 		# BETWEEN THE PYTHON EXECUTOR NODE AND THE REMOTE HOST
 		# OTHERWISE IT WON'T WORK
-		lSsh = subprocess.Popen(["ssh", "%s" % myHost, commandline],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		lSsh = subprocess.Popen(["ssh", "%s" % myHost, noHistoryCmd],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 		self.cmd2Results = str(lSsh.stdout.readlines())
 	def command3(self, commandline, timeout, silent=False):
 		if not silent:
 			logging.debug(commandline)
 		self.cmd2Results = ''
 		noHistoryCmd = 'unset HISTFILE; ' + commandline
 		myHost = self.username + '@' + self.ipaddress
 		# CAUTION: THIS METHOD IMPLIES THAT THERE ARE VALID SSH KEYS
 		# BETWEEN THE PYTHON EXECUTOR NODE AND THE REMOTE HOST
 		# OTHERWISE IT WON'T WORK
-		lSsh = subprocess.Popen(["ssh", "%s" % myHost, commandline],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		lSsh = subprocess.Popen(["ssh", "%s" % myHost, noHistoryCmd],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 		return lSsh.stdout.readlines()
@@ -61,9 +61,16 @@ class StatMonitor():
    def collect(self,node_type):
        if node_type=='enb':
-            cmd='cat L1_stats.log MAC_stats.log PDCP_stats.log RRC_stats.log'
+            files = ["L1_stats.log", "MAC_stats.log", "PDCP_stats.log", "RRC_stats.log"]
        else: #'gnb'
-            cmd='cat nrL1_stats.log nrMAC_stats.log nrPDCP_stats.log nrRRC_stats.log'
+            files = ["nrL1_stats.log", "nrMAC_stats.log", "nrPDCP_stats.log", "nrRRC_stats.log"]
        # append each file's contents to another file (prepended with CI-) for
        # post-mortem/debugging analysis
        for f in files:
            cmd = rf'cat {f} >> CI-{f}'
            subprocess.Popen(shlex.split(cmd))
        # join the files for further processing
        cmd = rf'cat {shlex.join(files)}'
        process=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE)
        output = process.stdout.readlines()
        if node_type=='enb':
@@ -1,94 +0,0 @@
 import subprocess
 import time
 import shlex
 import re
 import sys
 import matplotlib.pyplot as plt
 import pickle
 import numpy as np
 import os
 def collect(d, node_type):
    if node_type=='enb':
        cmd='cat L1_stats.log MAC_stats.log PDCP_stats.log RRC_stats.log'
    else: #'gnb'
        cmd='cat nrL1_stats.log nrMAC_stats.log nrPDCP_stats.log nrRRC_stats.log'
    process=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE)
    output = process.stdout.readlines()
    for l in output:
        tmp=l.decode("utf-8")
        result=re.match(rf'^.*\bPHR\b ([0-9]+).+\bbler\b ([0-9]+\.[0-9]+).+\bmcsoff\b ([0-9]+).+\bmcs\b ([0-9]+)',tmp)
        if result is not None:
            d['PHR'].append(int(result.group(1)))
            d['bler'].append(float(result.group(2)))
            d['mcsoff'].append(int(result.group(3)))
            d['mcs'].append(int(result.group(4)))
 def graph(d, node_type):
    figure, axis = plt.subplots(4, 1,figsize=(10, 10)) 
    major_ticks = np.arange(0, len(d['PHR'])+1, 1)
    axis[0].set_xticks(major_ticks)
    axis[0].set_xticklabels([])
    axis[0].plot(d['PHR'],marker='o')
    axis[0].set_xlabel('time')
    axis[0].set_ylabel('PHR')
    axis[0].set_title("PHR")
    major_ticks = np.arange(0, len(d['bler'])+1, 1)
    axis[1].set_xticks(major_ticks)
    axis[1].set_xticklabels([])
    axis[1].plot(d['bler'],marker='o')
    axis[1].set_xlabel('time')
    axis[1].set_ylabel('bler')
    axis[1].set_title("bler")
    major_ticks = np.arange(0, len(d['mcsoff'])+1, 1)
    axis[2].set_xticks(major_ticks)
    axis[2].set_xticklabels([])
    axis[2].plot(d['mcsoff'],marker='o')
    axis[2].set_xlabel('time')
    axis[2].set_ylabel('mcsoff')
    axis[2].set_title("mcsoff")
    major_ticks = np.arange(0, len(d['mcs'])+1, 1)
    axis[3].set_xticks(major_ticks)
    axis[3].set_xticklabels([])
    axis[3].plot(d['mcs'],marker='o')
    axis[3].set_xlabel('time')
    axis[3].set_ylabel('mcs')
    axis[3].set_title("mcs")
    plt.tight_layout()
    # Combine all the operations and display
    plt.savefig(node_type+'_stats_monitor.png')
    plt.show()
 if __name__ == "__main__":
    node_type = sys.argv[1]#enb or gnb
    d={}
    d['PHR']=[]
    d['bler']=[]
    d['mcsoff']=[]
    d['mcs']=[]
    cmd='ps aux | grep modem | grep -v grep'
    process=subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
    output = process.stdout.readlines()
    while len(output)!=0 :
        collect(d, node_type)
        process=subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
        output = process.stdout.readlines()
        time.sleep(1)
    print('process stopped')
    with open(node_type+'_stats_monitor.pickle', 'wb') as handle:
        pickle.dump(d, handle, protocol=pickle.HIGHEST_PROTOCOL)
    graph(d, node_type)
@@ -1,101 +0,0 @@
 """
 To create graphs and pickle from runtime statistics in L1,MAC,RRC,PDCP files
 """
 import subprocess
 import time
 import shlex
 import re
 import sys
 import pickle
 import matplotlib.pyplot as plt
 import numpy as np
 import yaml
 class StatMonitor():
    def __init__(self,):
        with open('stats_monitor_conf.yaml','r') as file:
            self.d = yaml.load(file)
        for node in self.d:
            for metric in self.d[node]:
                self.d[node][metric]=[]
    def process_gnb (self,node_type,output):
        for line in output:
            tmp=line.decode("utf-8")
            result=re.match(r'^.*\bdlsch_rounds\b ([0-9]+)\/([0-9]+).*\bdlsch_errors\b ([0-9]+)',tmp)
            if result is not None:
                self.d[node_type]['dlsch_err'].append(int(result.group(3)))
                percentage=float(result.group(2))/float(result.group(1))
                self.d[node_type]['dlsch_err_perc_round_1'].append(percentage)
            result=re.match(r'^.*\bulsch_rounds\b ([0-9]+)\/([0-9]+).*\bulsch_errors\b ([0-9]+)',tmp)
            if result is not None:
                self.d[node_type]['ulsch_err'].append(int(result.group(3)))
                percentage=float(result.group(2))/float(result.group(1))
                self.d[node_type]['ulsch_err_perc_round_1'].append(percentage)
    def process_enb (self,node_type,output):
        for line in output:
            tmp=line.decode("utf-8")
            result=re.match(r'^.*\bPHR\b ([0-9]+).+\bbler\b ([0-9]+\.[0-9]+).+\bmcsoff\b ([0-9]+).+\bmcs\b ([0-9]+)',tmp)
            if result is not None:
                self.d[node_type]['PHR'].append(int(result.group(1)))
                self.d[node_type]['bler'].append(float(result.group(2)))
                self.d[node_type]['mcsoff'].append(int(result.group(3)))
                self.d[node_type]['mcs'].append(int(result.group(4)))
    def collect(self,node_type):
        if node_type=='enb':
            cmd='cat L1_stats.log MAC_stats.log PDCP_stats.log RRC_stats.log'
        else: #'gnb'
            cmd='cat nrL1_stats.log nrMAC_stats.log nrPDCP_stats.log nrRRC_stats.log'
        process=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE)
        output = process.stdout.readlines()
        if node_type=='enb':
            self.process_enb(node_type,output)
        else: #'gnb'
            self.process_gnb(node_type,output)
    def graph(self,node_type):
        col = 1
        figure, axis = plt.subplots(len(self.d[node_type]), col ,figsize=(10, 10))
        i=0
        for metric in self.d[node_type]:
            major_ticks = np.arange(0, len(self.d[node_type][metric])+1, 1)
            axis[i].set_xticks(major_ticks)
            axis[i].set_xticklabels([])
            axis[i].plot(self.d[node_type][metric],marker='o')
            axis[i].set_xlabel('time')
            axis[i].set_ylabel(metric)
            axis[i].set_title(metric)
            i+=1
        plt.tight_layout()
        # Combine all the operations and display
        plt.savefig(node_type+'_stats_monitor.png')
        plt.show()
 if __name__ == "__main__":
    node = sys.argv[1]#enb or gnb
    mon=StatMonitor()
    #collecting stats when modem process is stopped
    CMD='ps aux | grep mode | grep -v grep'
    process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
    output = process.stdout.readlines()
    while len(output)!=0 :
        mon.collect(node)
        process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
        output = process.stdout.readlines()
        time.sleep(1)
    print('Process stopped')
    with open(node+'_stats_monitor.pickle', 'wb') as handle:
        pickle.dump(mon.d, handle, protocol=pickle.HIGHEST_PROTOCOL)
    mon.graph(node)
@@ -93,7 +93,7 @@
                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 400K</client_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
        </testCase>
        <testCase id="030002">
@@ -102,7 +102,7 @@
                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
                <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 20K</client_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>
        <testCase id="100001">
@@ -37,8 +37,8 @@
 000001
 050000
 050001
 070000
 070001
 070000
 050000
 050001
 010002
@@ -123,15 +123,15 @@
 		<iperf_args>-u -b 40M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
-		<iperf_packetloss_threshold>3</iperf_packetloss_threshold>
+		<iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+		<iperf_bitrate_threshold>85</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 	<testCase id="070001">
 		<class>Iperf</class>
-		<desc>iperf (UL/2Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 2M -t 60</iperf_args>
+		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>1</iperf_packetloss_threshold>
@@ -79,6 +79,7 @@
 		<eNB_serverId>1</eNB_serverId>
 		<air_interface>nr</air_interface>
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
 	</testCase>
@@ -99,6 +99,7 @@
 		<eNB_serverId>1</eNB_serverId>
 		<air_interface>nr</air_interface>
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
 	</testCase>
@@ -34,9 +34,8 @@
 050000
 050001
 000001
- 070000
+ 070003
- 000001
+ 070002
 070001
 000001
 050000
 050001
@@ -114,16 +113,38 @@
 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<desc>iperf (DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 60M -t 60</iperf_args>
+		<iperf_args>-u -b 30M -t 30</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
-		<iperf_packetloss_threshold>3</iperf_packetloss_threshold>
+		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 	<testCase id="070001">
 		<class>Iperf</class>
 		<desc>iperf (DL/40Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 40M -t 30</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 	<testCase id="070002">
 		<class>Iperf</class>
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 	<testCase id="070003">
 		<class>Iperf</class>
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
@@ -26,19 +26,19 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
- 040000
+ 041000
 000002
- 010000
+ 011000
 000002
- 050000
+ 051000
- 050001
+ 051001
 000001
 010002
 080000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-	<testCase id="010000">
+	<testCase id="011000">
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE (X300)</desc>
 		<air_interface>nr</air_interface>
@@ -51,7 +51,7 @@
 	</testCase>
-	<testCase id="040000">
+	<testCase id="041000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf --sa --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
@@ -76,14 +76,14 @@
 	</testCase>
-	<testCase id="050000">
+	<testCase id="051000">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 20pings in 20sec</desc>
 		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
-	<testCase id="050001">
+	<testCase id="051001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
 		<ping_args>-c 100 -i 0.2</ping_args>
@@ -64,6 +64,7 @@
 		<air_interface>nr</air_interface>
 		<eNB_Trace>yes</eNB_Trace>
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
 	</testCase>
@@ -64,6 +64,7 @@
 		<air_interface>nr</air_interface>
 		<eNB_Trace>yes</eNB_Trace>
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
 	</testCase>
@@ -71,6 +71,7 @@
 		<air_interface>nr</air_interface>
 		<eNB_Trace>yes</eNB_Trace>
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
 	</testCase>
@@ -73,6 +73,7 @@
 		<air_interface>nr</air_interface>
 		<eNB_Trace>yes</eNB_Trace>
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
 	</testCase>
@@ -21,8 +21,8 @@
 -->
 <testCaseList>
-	<htmlTabRef>TEST-LTE-TM2</htmlTabRef>
+	<htmlTabRef>TEST-LTE-TM1-Tab1</htmlTabRef>
-	<htmlTabName>LTE 2x2 Ping DL UL with QUECTEL</htmlTabName>
+	<htmlTabName>LTE 2x2 TM1 Ping DL UL with QUECTEL</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
@@ -0,0 +1,145 @@
 <!--
 Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The OpenAirInterface Software Alliance licenses this file to You under
 the OAI Public License, Version 1.1  (the "License"); you may not use this file
 except in compliance with the License.
 You may obtain a copy of the License at
      http://www.openairinterface.org/?page_id=698
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 For more information about the OpenAirInterface (OAI) Software Alliance:
      contact@openairinterface.org
 -->
 <testCaseList>
 	<htmlTabRef>TEST-LTE-TM2-Tab2</htmlTabRef>
 	<htmlTabName>LTE 2x2 TM2 Ping DL UL with QUECTEL</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030001
 000002
 010000
 000001
 050002
 050003
 000002
 070002
 070003
 000001
 010002
 080000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
 		<UE_Trace>yes</UE_Trace>
 	</testCase>
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
 	<testCase id="030001">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>lte</air_interface>
 		<eNB_Trace>yes</eNB_Trace>
 		<eNB_Stats>yes</eNB_Stats>
 		<USRP_IPAddress>192.168.18.241</USRP_IPAddress>
 	</testCase>
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
 		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
 	</testCase>
 	<testCase id="000002">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
 		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
 	</testCase>
 	<testCase id="050002">
 		<class>Ping</class>
 		<desc>Ping: 20 pings</desc>
 		<id>nrmodule2_quectel</id>
 		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>1</ping_packetloss_threshold>
 		<ping_rttavg_threshold>40</ping_rttavg_threshold>
 	</testCase>
 	<testCase id="050003">
 		<class>Ping</class>
 		<desc>Ping: 100 pings, size 1024</desc>
 		<id>nrmodule2_quectel</id>
 		<ping_args>-c 100 -s 1024 -i 0,2</ping_args>
 		<ping_packetloss_threshold>1</ping_packetloss_threshold>
 		<ping_rttavg_threshold>30</ping_rttavg_threshold>
 	</testCase>
 	<testCase id="070002">
 		<class>Iperf</class>
 		<desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 26M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 	<testCase id="070003">
 		<class>Iperf</class>
 		<desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 7M -t 60</iperf_args>
 		<direction>UL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 	<testCase id="080000">
 		<class>Terminate_eNB</class>
 		<desc>Terminate eNB</desc>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>lte</air_interface>
 	</testCase>
 	<testCase id="080001">
 		<class>Terminate_eNB</class>
 		<desc>Terminate gNB</desc>
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
 		<air_interface>nr</air_interface>
 	</testCase>
 </testCaseList>
@@ -99,25 +99,23 @@ Options
  Makes the LTE softmodem
 --eNBocp
  Makes the OCP LTE softmodem
-gNB
+--gNB
  Makes the NR softmodem
 --nrUE
  Makes the NR UE softmodem
 --RU
  Makes the OAI RRU
 --UE
   Makes the UE specific parts (ue_ip, usim, nvram) from the given configuration file
 --nrUE
  Makes the NR UE softmodem
 --UE-conf-nvram [configuration file]
   Specify conf_nvram_path (default \"$conf_nvram_path\")
 --UE-gen-nvram [output path]
   Specify gen_nvram_path (default \"$gen_nvram_path\")
 --HWLAT
    Makes test program for haw latency tests
 -a | --agent
   Enables agent for software-defined control of the eNB
 -w | --hardware
   EXMIMO, USRP, BLADERF, LMSSDR, IRIS, ADRV9371_ZC706, SIMU, AW2SORI, None (Default)
   Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g
 -P | --phy_simulators
   Makes the unitary tests Layer 1 simulators
 -S | --core_simulators
@@ -128,6 +126,14 @@ Options
   runs only specified test cases specified here. This flag is only valid with -s
 -V | --vcd
   Adds a debgging facility to the binary files: GUI with major internal synchronization events
 -x | --xforms
   Will compile with software oscilloscope features
 --HWLAT
    Makes test program for haw latency tests
 --HWLAT_TEST
  Compiles a hw latency test program
 --verbose-ci
  Compile with verbose instructions in CI Docker env
 --verbose-compile
   Shows detailed compilation instructions in makefile
 --cflags_processor
@@ -163,6 +169,10 @@ Options
   Build for I/Q record-playback modes
 -k | --skip-shared-libraries
   Skip build for shared libraries to reduce compilation time when building frequently for debugging purposes
 --ninja
  Tell cmake to use the Ninja build system. Without, will generate make files
 --sanitize-address | -fsanitize=address
   Enable the address sanitizer on all targets
 --ittiSIM
  Makes the itti simulator
 -h | --help
@@ -24,6 +24,7 @@
 # authors Laurent Thomas
 #
 #######################################
 if [ ! -f /etc/os-release ]; then
    echo "No /etc/os-release file found. You're likely on an unsupported distro."
    exit 1
@@ -472,7 +473,7 @@ if ! check_supported_distribution; then
    echo_error "Your distribution $(get_distribution_release) is not supported by oai !"
    exit 1
 fi
-
+set_openair_env
 echo_info "Installing packages"
 check_install_ubuntu_packages
@@ -756,6 +756,7 @@ check_install_oai_software() {
 	libidn11-dev \
 	libmysqlclient-dev  \
 	libpython2.7-dev \
        libreadline-dev \
 	libsctp1  \
 	libsctp-dev  \
 	libssl-dev  \
@@ -842,6 +843,7 @@ check_install_oai_software() {
      patch \
      psmisc \
      python \
      readline-devel \
      subversion \
      xmlstarlet \
      python-pip \
@@ -254,7 +254,7 @@ configmodule_interface_t *load_configmodule(int argc,
  cfgptr = calloc(sizeof(configmodule_interface_t),1);
  /* argv_info is used to memorize command line options which have been recognized */
  /* and to detect unrecognized command line options which might have been specified */
-  cfgptr->argv_info = calloc(sizeof(int32_t), argc);
+  cfgptr->argv_info = calloc(sizeof(int32_t), argc+10);
  /* argv[0] is the exec name, always Ok */
  cfgptr->argv_info[0] |= CONFIG_CMDLINEOPT_PROCESSED;
@@ -89,6 +89,8 @@ At the UE the --phy-test flag will
 ```bash sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test```
 In phy-test mode it is possible to mimic the reception of UE Capabilities at gNB by passing through the command line parameter `--uecap_file` the location and file name of the input UE Capability file, e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml`
 ### Launch UE in another window
 ```bash sudo ./nr-uesoftmodem --phy-test [--rrc_config_path ../../../ci-scripts/rrc-files]```
@@ -122,6 +124,8 @@ gNB on machine 1:
 `sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --do-ra`
 In do-ra mode it is possible to mimic the reception of UE Capabilities at gNB by passing through the command line parameter `--uecap_file` the location and file name of the input UE Capability file, e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml`
 UE on machine 2:
 `sudo ./nr-uesoftmodem --do-ra`
@@ -161,13 +165,17 @@ gNB on machine 1:
 UE on machine 2:
-`sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --sa`
+`sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 -s 516 --sa`
 With the RF simulator (on the same machine):
 `sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --rfsim --sa`
-`sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa`
+`sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 -s 516 --rfsim --sa`
 where `-r` sets the transmission bandwidth configuration in terms of RBs, `-C` sets the downlink carrier frequency and `-s` sets the SSB start subcarrier.
 Additionally, at UE side `--uecap_file` option can be used to pass the UE Capabilities input file (path location + filename), e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml`
 ## IF setup with OAI
@@ -0,0 +1,75 @@
 ```mermaid
 flowchart TB
    A[ru_thread] --> RFin>block rx_rf] --> feprx
    feprx --> half-slot --> end_feprx
    feprx --> second-thread -- block_end_feprx --> end_feprx>feprx]
    end_feprx --> rx_nr_prach_ru
 rx_nr_prach_ru -- block_queue_singleton --> resp_L1>resp L1]
 resp_L1 -- async launch --> rx_func
 resp_L1 -- immediate return --> RFin
 subgraph rxfunc
 rx_func_implem[rx_func] 
    subgraph rxfuncbeg
      handle_nr_slot_ind
      --> rnti_to_remove-mgmt
      --> L1_nr_prach_procedures
      --> apply_nr_rotation_ul
    end 
    subgraph phy_procedures_gNB_uespec_RX
      fill_ul_rb_mask
      --> pucch(decode each gNB->pucch)
      -->nr_fill_ul_indication
      --> nr_ulsch_procedures
      --> nr_ulsch_decoding
      --> segInParallel[[all segments decode in parallel]]
      --> barrier_end_of_ulsch_decoding
    end 
    subgraph NR_UL_indication
      handle_nr_rach
      --> handle_nr_uci
      --> handle_nr_ulsch
      subgraph gNB_dlsch_ulsch_scheduler
          run_pdcp
          --> nr_rrc_trigger
          --> schedule_xxxx
      end
      handle_nr_ulsch --> gNB_dlsch_ulsch_scheduler
      subgraph NR_Schedule_response
         L1_tx_free3>L1_tx_free]
         --> handle_nr_nfapi_xxx_pdu
         --> sendTxFilled((L1_tx_filled))
         --> nr_fill_ul_xxx
         --> nr_fill_prach
      end
      gNB_dlsch_ulsch_scheduler --> NR_Schedule_response
    end 
    rx_func_implem --> rxfuncbeg
    rxfuncbeg --> phy_procedures_gNB_uespec_RX
 phy_procedures_gNB_uespec_RX --> NR_UL_indication
 -- block_queue_block_PNF_monolithic --> L1_tx_free2>L1 tx filled]
 -- async launch --> tx_func
 L1_tx_free2 -- send_msg --> rsp((resp_L1))
 end 
 rx_func --> rxfunc
 subgraph tx_func
    direction LR
    subgraph phy_procedures_gNB_TX
       dcitop[nr_generate dci top]
       --> nr_generate_csi_rs
       --> apply_nr_rotation
       -- send_msg --> end_tx_func((L1_tx_out))
    end
    subgraph tx_reorder_thread
        L1_tx_out>L1_tx_out]
        --> reorder{re order} --> reorder
        reorder --> ru_tx_func
        reorder --> L1_tx_free((L1_tx_free))
        ru_tx_func --> feptx_prec
        --> feptx_ofdm
    end 
 end
 ```
@@ -17,6 +17,70 @@ body {
 </style>
 ```mermaid
 flowchart TB
    A[ru_thread] --> RFin>block rx_rf] --> feprx
    feprx --> half-slot --> end_feprx
    feprx --> second-thread -- block_end_feprx --> end_feprx>feprx]
    end_feprx --> rx_nr_prach_ru
 rx_nr_prach_ru -- block_queue --> resp_L1>resp L1]
 resp_L1 -- async launch --> rx_func
 resp_L1 -- immediate return --> RFin
 subgraph rxfunc
 rx_func_implem[rx_func] 
    subgraph rxfuncbeg
      handle_nr_slot_ind
      --> rnti_to_remove-mgmt
      --> L1_nr_prach_procedures
      --> apply_nr_rotation_ul
    end 
    subgraph phy_procedures_gNB_uespec_RX
      fill_ul_rb_mask
      --> pucch(decode each gNB->pucch)
      -->nr_fill_ul_indication
      --> nr_ulsch_procedures
      --> nr_ulsch_decoding
      --> segInParallel[[all segments decode in parallel]]
      --> barrier_end_of_ulsch_decoding
    end 
    subgraph NR_UL_indication
      handle_nr_rach
      --> handle_nr_uci
      --> handle_nr_ulsch
      --> gNB_dlsch_ulsch_scheduler
      --> NR_Schedule_response
    end 
    rx_func_implem --> rxfuncbeg
    rxfuncbeg --> phy_procedures_gNB_uespec_RX
 phy_procedures_gNB_uespec_RX --> NR_UL_indication
 -- block_queue --> L1_tx_free2>L1 tx free]
 -- async launch --> tx_func
 L1_tx_free2 -- send_msg --> rsp((resp_L1))
 end 
 rx_func --> rxfunc
 subgraph tx
    direction LR
    subgraph tx_func2
       phy_procedures_gNB_TX
       --> dcitop[nr_generate dci top]
       --> nr_generate_csi_rs
       --> apply_nr_rotation
       -- send_msg --> end_tx_func((L1_tx_out))
    end
    subgraph tx_reorder_thread
        L1_tx_out>L1_tx_out]
        --> reorder{re order} --> reorder
        reorder --> ru_tx_func
        reorder --> L1_tx_free((L1_tx_free))
        ru_tx_func --> feptx_prec
        --> feptx_ofdm
    end 
    tx_func2 --> tx_reorder_thread
 end
 ```
 This tuto for 5G gNB design, with Open Cells main
 {: .text-center}
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
    cd cmake_targets && \
    mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja -w USRP --verbose-ci
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib all -w USRP --verbose-ci
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \
    cd cmake_targets && \
    mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja -w USRP --verbose-ci
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib all -w USRP --verbose-ci
@@ -69,6 +69,8 @@ COPY --from=enb-build \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_enb.so \
    /usr/local/lib/
 COPY --from=enb-base \
@@ -76,6 +76,8 @@ COPY --from=enb-build \
     /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
     /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_enb.so \
     /usr/local/lib/
 # Now we are copying from builder-image the UHD files.
@@ -74,6 +74,7 @@ COPY --from=gnb-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/
 COPY --from=gnb-base \
@@ -78,6 +78,7 @@ COPY --from=gnb-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/
 # Now we are copying from builder-image the UHD files.
@@ -73,6 +73,7 @@ COPY --from=lte-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
    /oai-ran/cmake_targets/ran_build/build/libSIMU.so \
    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/
 COPY --from=lte-ue-base \
@@ -80,6 +80,7 @@ COPY --from=lte-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
    /oai-ran/cmake_targets/ran_build/build/libSIMU.so \
    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/
 # Now we are copying from builder-image the UHD files.
@@ -76,6 +76,8 @@ COPY --from=nr-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \
    /usr/local/lib/
 COPY --from=nr-ue-base \
@@ -81,6 +81,8 @@ COPY --from=nr-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \
    /usr/local/lib/
 # Now we are copying from builder-image the UHD files.
@@ -87,7 +87,6 @@
 #include <openair1/PHY/NR_TRANSPORT/nr_ulsch.h>
 #include <openair1/PHY/NR_TRANSPORT/nr_dlsch.h>
 #include <PHY/NR_ESTIMATION/nr_ul_estimation.h>
 //#define DEBUG_THREADS 1
 //#define USRP_DEBUG 1
 // Fix per CC openair rf/if device update
@@ -114,7 +113,6 @@ time_stats_t softmodem_stats_rx_sf; // total rx time
 void tx_func(void *param) {
  processingData_L1tx_t *info = (processingData_L1tx_t *) param;
  PHY_VARS_gNB *gNB = info->gNB;
  int frame_tx = info->frame;
  int slot_tx = info->slot;
@@ -122,35 +120,9 @@ void tx_func(void *param) {
                        frame_tx,
                        slot_tx,
                        1);
  info->slot = -1;
  //if ((frame_tx&127) == 0) dump_pdsch_stats(fd,gNB);
  // If the later of the 2 L1 tx thread finishes first,
  // we wait for the earlier one to finish and start the RU thread
  // to avoid realtime issues with USRP
  // Start RU TX processing.
  notifiedFIFO_elt_t *res;
  res = pullTpool(gNB->resp_RU_tx, gNB->threadPool);
  processingData_RU_t *syncMsg = (processingData_RU_t *)NotifiedFifoData(res);
  LOG_D(PHY,"waiting for previous tx to finish, next slot %d,%d\n",syncMsg->next_slot,slot_tx);
  while (syncMsg->next_slot != slot_tx) {
    pushNotifiedFIFO(gNB->resp_RU_tx, res);
    res = pullTpool(gNB->resp_RU_tx, gNB->threadPool);
    syncMsg = (processingData_RU_t *)NotifiedFifoData(res);
  }
  LOG_D(PHY,"previous tx finished, next slot %d,%d\n",syncMsg->next_slot,slot_tx);
  syncMsg->frame_tx = frame_tx;
  syncMsg->slot_tx = slot_tx;
  syncMsg->next_slot = get_next_downlink_slot(gNB, &gNB->gNB_config, frame_tx, slot_tx);
  syncMsg->timestamp_tx = info->timestamp_tx;
  syncMsg->ru = gNB->RU_list[0];
  res->key = slot_tx;
  pushTpool(gNB->threadPool, res);
 }
 void rx_func(void *param) {
  processingData_L1_t *info = (processingData_L1_t *) param;
  PHY_VARS_gNB *gNB = info->gNB;
  int frame_rx = info->frame_rx;
@@ -275,15 +247,12 @@ void rx_func(void *param) {
  if (tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT) {
    notifiedFIFO_elt_t *res;
-    res = pullTpool(gNB->resp_L1_tx, gNB->threadPool);
+    processingData_L1tx_t *syncMsg;
-    processingData_L1tx_t *syncMsg = (processingData_L1tx_t *)NotifiedFifoData(res);
+    // Its a FIFO so it maitains the order in which the MAC fills the messages
-    while (syncMsg->slot != slot_tx) {
+    // so no need for checking for right slot
-      pushNotifiedFIFO(gNB->resp_L1_tx, res);
+    res = pullTpool(gNB->L1_tx_filled, gNB->threadPool);
-      res = pullTpool(gNB->resp_L1_tx, gNB->threadPool);
+    syncMsg = (processingData_L1tx_t *)NotifiedFifoData(res);
      syncMsg = (processingData_L1tx_t *)NotifiedFifoData(res);
    }
    syncMsg->gNB = gNB;
    AssertFatal(syncMsg->slot == slot_tx, "Thread message slot and logical slot number do not match\n");
    syncMsg->timestamp_tx = info->timestamp_tx;
    res->key = slot_tx;
    pushTpool(gNB->threadPool, res);
@@ -331,8 +300,8 @@ void rx_func(void *param) {
 }
 static void dump_L1_meas_stats(PHY_VARS_gNB *gNB, RU_t *ru, char *output) {
  int stroff = 0;
-  stroff += print_meas_log(gNB->phy_proc_tx_0, "L1 Tx processing thread 0", NULL, NULL, output);
+  stroff += print_meas_log(gNB->phy_proc_tx[0], "L1 Tx processing thread 0", NULL, NULL, output);
-  stroff += print_meas_log(gNB->phy_proc_tx_1, "L1 Tx processing thread 1", NULL, NULL, output+stroff);
+  //stroff += print_meas_log(gNB->phy_proc_tx[1], "L1 Tx processing thread 1", NULL, NULL, output+stroff);
  stroff += print_meas_log(&gNB->dlsch_encoding_stats, "DLSCH encoding", NULL, NULL, output+stroff);
  stroff += print_meas_log(&gNB->phy_proc_rx, "L1 Rx processing", NULL, NULL, output+stroff);
  stroff += print_meas_log(&gNB->ul_indication_stats, "UL Indication", NULL, NULL, output+stroff);
@@ -367,8 +336,8 @@ void *nrL1_stats_thread(void *param) {
  fd=fopen("nrL1_stats.log","w");
  AssertFatal(fd!=NULL,"Cannot open nrL1_stats.log\n");
-  reset_meas(gNB->phy_proc_tx_0);
+  reset_meas(gNB->phy_proc_tx[0]);
-  reset_meas(gNB->phy_proc_tx_1);
+  //reset_meas(gNB->phy_proc_tx[1]);
  reset_meas(&gNB->dlsch_encoding_stats);
  reset_meas(&gNB->phy_proc_rx);
  reset_meas(&gNB->ul_indication_stats);
@@ -389,6 +358,52 @@ void *nrL1_stats_thread(void *param) {
  return(NULL);
 }
 // This thread reads the finished L1 tx jobs from threaPool
 // and pushes RU tx thread in the right order. It works only
 // two parallel L1 tx threads.
 void *tx_reorder_thread(void* param) {
  PHY_VARS_gNB *gNB = (PHY_VARS_gNB *)param;
    notifiedFIFO_elt_t *resL1Reserve = NULL;
  resL1Reserve=pullTpool(gNB->L1_tx_out, gNB->threadPool);
  int next_tx_slot=((processingData_L1tx_t *)NotifiedFifoData(resL1Reserve))->slot;
  while (!oai_exit) {
    notifiedFIFO_elt_t *resL1;
    if (resL1Reserve) {
       resL1=resL1Reserve;
       if (((processingData_L1tx_t *)NotifiedFifoData(resL1))->slot != next_tx_slot) {
         LOG_E(PHY,"order mistake");
 	 resL1Reserve=NULL;
 	 resL1 = pullTpool(gNB->L1_tx_out, gNB->threadPool);
       }
     } else { 
       resL1 = pullTpool(gNB->L1_tx_out, gNB->threadPool);
       if (((processingData_L1tx_t *)NotifiedFifoData(resL1))->slot != next_tx_slot) {
          if (resL1Reserve)
              LOG_E(PHY,"error, have a stored packet, then a second one\n");
 	  resL1Reserve=resL1;
          resL1 = pullTpool(gNB->L1_tx_out, gNB->threadPool);
          if (((processingData_L1tx_t *)NotifiedFifoData(resL1))->slot != next_tx_slot)
 	    LOG_E(PHY,"error, pull two msg, none is good\n");
       }
    }
    processingData_L1tx_t *syncMsgL1= (processingData_L1tx_t *)NotifiedFifoData(resL1);
    processingData_RU_t syncMsgRU;
    syncMsgRU.frame_tx = syncMsgL1->frame;
    syncMsgRU.slot_tx = syncMsgL1->slot;
    syncMsgRU.timestamp_tx = syncMsgL1->timestamp_tx;
    syncMsgRU.ru = gNB->RU_list[0];
    next_tx_slot = get_next_downlink_slot(gNB, &gNB->gNB_config, syncMsgRU.frame_tx, syncMsgRU.slot_tx);
    pushNotifiedFIFO(gNB->L1_tx_free, resL1);
    if (resL1==resL1Reserve)
       resL1Reserve=NULL;
    ru_tx_func((void*)&syncMsgRU);
  }
  return(NULL);
 }
 void init_gNB_Tpool(int inst) {
  PHY_VARS_gNB *gNB;
  gNB = RC.gNB[inst];
@@ -420,40 +435,29 @@ void init_gNB_Tpool(int inst) {
  pushNotifiedFIFO(gNB->resp_L1,msg); // to unblock the process in the beginning
  // L1 TX result FIFO 
-  gNB->resp_L1_tx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+  gNB->L1_tx_free = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-  initNotifiedFIFO(gNB->resp_L1_tx);
+  gNB->L1_tx_filled = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
  gNB->L1_tx_out = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
  initNotifiedFIFO(gNB->L1_tx_free);
  initNotifiedFIFO(gNB->L1_tx_filled);
  initNotifiedFIFO(gNB->L1_tx_out);
  // we create 2 threads for L1 tx processing
-  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->resp_L1_tx,tx_func);
+  for (int i=0; i < 1; i++) {
-  processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
+    notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->L1_tx_out,tx_func);
-  init_DLSCH_struct(gNB, msgDataTx);
+    processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
-  msgDataTx->slot = -1;
+    init_DLSCH_struct(gNB, msgDataTx);
-  memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
+    memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
-  reset_meas(&msgDataTx->phy_proc_tx);
+    reset_meas(&msgDataTx->phy_proc_tx);
-  gNB->phy_proc_tx_0 = &msgDataTx->phy_proc_tx;
+    gNB->phy_proc_tx[i] = &msgDataTx->phy_proc_tx;
-  pushNotifiedFIFO(gNB->resp_L1_tx,msgL1Tx); // to unblock the process in the beginning
+    pushNotifiedFIFO(gNB->L1_tx_free,msgL1Tx); // to unblock the process in the beginning
  msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->resp_L1_tx,tx_func);
  msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
  init_DLSCH_struct(gNB, msgDataTx);
  msgDataTx->slot = -1;
  memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
  reset_meas(&msgDataTx->phy_proc_tx);
  gNB->phy_proc_tx_1 = &msgDataTx->phy_proc_tx;
  pushNotifiedFIFO(gNB->resp_L1_tx,msgL1Tx); // to unblock the process in the beginning
  // RU TX result FIFO 
  gNB->resp_RU_tx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
  initNotifiedFIFO(gNB->resp_RU_tx);
  notifiedFIFO_elt_t *msgRUTx = newNotifiedFIFO_elt(sizeof(processingData_RU_t),0,gNB->resp_RU_tx,ru_tx_func);
  processingData_RU_t *msgData = (processingData_RU_t*)msgRUTx->msgData;
  int first_tx_slot = sf_ahead*gNB->frame_parms.slots_per_subframe;
  msgData->next_slot = get_next_downlink_slot(gNB, &gNB->gNB_config, 0, first_tx_slot-1);
  pushNotifiedFIFO(gNB->resp_RU_tx,msgRUTx); // to unblock the process in the beginning
  if (!get_softmodem_params()->emulate_l1) {
    threadCreate(&proc->L1_stats_thread,nrL1_stats_thread,(void*)gNB,"L1_stats",-1,OAI_PRIORITY_RT_LOW);
  }
  if (!get_softmodem_params()->emulate_l1) 
     threadCreate(&proc->L1_stats_thread,nrL1_stats_thread,(void*)gNB,"L1_stats",-1,OAI_PRIORITY_RT_LOW);
  threadCreate(&proc->pthread_tx_reorder, tx_reorder_thread, (void *)gNB, "thread_tx_reorder", -1, OAI_PRIORITY_RT_MAX);
 }
@@ -1471,11 +1471,9 @@ void *ru_thread( void *param ) {
  res = pullNotifiedFIFO(gNB->resp_L1);
  delNotifiedFIFO_elt(res);
-  res = pullNotifiedFIFO(gNB->resp_L1_tx);
+  res = pullNotifiedFIFO(gNB->L1_tx_free);
  delNotifiedFIFO_elt(res);
-  res = pullNotifiedFIFO(gNB->resp_L1_tx);
+  res = pullNotifiedFIFO(gNB->L1_tx_free);
  delNotifiedFIFO_elt(res);
  res = pullNotifiedFIFO(gNB->resp_RU_tx);
  delNotifiedFIFO_elt(res);
  ru_thread_status = 0;
@@ -87,8 +87,9 @@
 #define CONFIG_HLP_NOTWAIT       "don't wait for tracer, start immediately\n"
 #define CONFIG_HLP_TNOFORK       "to ease debugging with gdb\n"
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
-#define CONFIG_HLP_DISABLETIMECORR   "disable UE timing correction\n"
+#define CONFIG_HLP_DISABLETIMECORR "disable UE timing correction\n"
-#define CONFIG_HLP_RRC_CFG_PATH   "path for RRC configuration\n"
+#define CONFIG_HLP_RRC_CFG_PATH  "path for RRC configuration\n"
 #define CONFIG_HLP_UECAP_FILE    "path for UE Capabilities file\n"
 #define CONFIG_HLP_NUMEROLOGY    "adding numerology for 5G\n"
 #define CONFIG_HLP_EMULATE_RF    "Emulated RF enabled(disable by defult)\n"
@@ -111,16 +111,11 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
 //Temp fix for inexistent NR upper layer
 unsigned char NB_gNB_INST = 1;
 char *uecap_file;
 int UE_scan = 1;
 int UE_scan_carrier = 0;
 runmode_t mode = normal_txrx;
 static double snr_dB=20;
 FILE *input_fd=NULL;
 #if MAX_NUM_CCs == 1
 rx_gain_t rx_gain_mode[MAX_NUM_CCs][4] = {{max_gain,max_gain,max_gain,max_gain}};
 double tx_gain[MAX_NUM_CCs][4] = {{20,0,0,0}};
@@ -193,8 +188,6 @@ openair0_config_t openair0_cfg[MAX_CARDS];
 double cpuf;
 extern char uecap_xer[1024];
 char uecap_xer_in=0;
 /* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
 * this is very hackish - find a proper solution
@@ -710,6 +703,7 @@ int main( int argc, char **argv ) {
  // don't create if node doesn't connect to RRC/S1/GTP
  int ret=create_gNB_tasks(1);
  AssertFatal(ret==0,"cannot create ITTI tasks\n");
  /* Start the agent. If it is turned off in the configuration, it won't start */
  /*
  RCconfig_nr_flexran();
@@ -29,6 +29,7 @@
    {"D" ,                    CONFIG_HLP_DLBM_PHYTEST,0,                u64ptr:&dlsch_slot_bitmap,          defintval:0,                   TYPE_UINT64, 0},        \
    {"U" ,                    CONFIG_HLP_ULBM_PHYTEST,0,                u64ptr:&ulsch_slot_bitmap,          defintval:0,                   TYPE_UINT64, 0},        \
    {"usrp-tx-thread-config", CONFIG_HLP_USRP_THREAD, 0,                iptr:&usrp_tx_thread,               defstrval:0,                   TYPE_INT,    0},        \
    {"uecap_file",            CONFIG_HLP_UECAP_FILE,  0,                strptr:(char **)&uecap_file,        defstrval:"./uecap.xml",       TYPE_STRING, 0},        \
    {"s" ,                    CONFIG_HLP_SNR,         0,                dblptr:&snr_dB,                     defdblval:25,                  TYPE_DOUBLE, 0},        \
  }
@@ -41,6 +42,7 @@ extern uint32_t target_dl_bw;
 extern uint32_t target_ul_bw;
 extern uint64_t dlsch_slot_bitmap;
 extern uint64_t ulsch_slot_bitmap;
 extern char *uecap_file;
 // In nr-gnb.c
 extern void init_gNB(int single_thread_flag,int wait_for_sync);
@@ -1140,13 +1140,15 @@ void *UE_thread(void *arg) {
  return NULL;
 }
-void init_NR_UE(int nb_inst, char* rrc_config_path) {
+void init_NR_UE(int nb_inst,
                char* uecap_file,
                char* rrc_config_path) {
  int inst;
  NR_UE_MAC_INST_t *mac_inst;
  NR_UE_RRC_INST_t* rrc_inst;
  for (inst=0; inst < nb_inst; inst++) {
-    AssertFatal((rrc_inst = nr_l3_init_ue(rrc_config_path)) != NULL, "can not initialize RRC module\n");
+    AssertFatal((rrc_inst = nr_l3_init_ue(uecap_file,rrc_config_path)) != NULL, "can not initialize RRC module\n");
    AssertFatal((mac_inst = nr_l2_init_ue(rrc_inst)) != NULL, "can not initialize L2 module\n");
    AssertFatal((mac_inst->if_module = nr_ue_if_module_init(inst)) != NULL, "can not initialize IF module\n");
  }
@@ -118,6 +118,7 @@ int                 vcdflag = 0;
 double          rx_gain_off = 0.0;
 char             *usrp_args = NULL;
 char       *rrc_config_path = NULL;
 char            *uecap_file = NULL;
 int               dumpframe = 0;
 uint64_t        downlink_frequency[MAX_NUM_CCs][4];
@@ -150,8 +151,6 @@ int            numerology = 0;
 int           oaisim_flag = 0;
 int            emulate_rf = 0;
 uint32_t       N_RB_DL    = 106;
 char         uecap_xer_in = 0;
 char         uecap_xer[1024];
 /* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
 * this is very hackish - find a proper solution
@@ -264,14 +263,6 @@ static void get_options(void) {
  if (vcdflag > 0)
    ouput_vcd = 1;
  if ( !(CONFIG_ISFLAGSET(CONFIG_ABORT))  && (!(CONFIG_ISFLAGSET(CONFIG_NOOOPT))) ) {
    // Here the configuration file is the XER encoded UE capabilities
    // Read it in and store in asn1c data structures
    sprintf(uecap_xer,"%stargets/PROJECTS/GENERIC-LTE-EPC/CONF/UE_config.xml",getenv("OPENAIR_HOME"));
    printf("%s\n",uecap_xer);
    uecap_xer_in=1;
  } /* UE with config file  */
 }
 // set PHY vars from command line
@@ -454,7 +445,7 @@ int main( int argc, char **argv ) {
 #endif
  LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
-  init_NR_UE(1,rrc_config_path);
+  init_NR_UE(1,uecap_file,rrc_config_path);
  int mode_offset = get_softmodem_params()->nsa ? NUMBER_OF_UE_MAX : 1;
  uint16_t node_number = get_softmodem_params()->node_number;
@@ -33,8 +33,9 @@
    {"dlsch-parallel",           CONFIG_HLP_DLSCH_PARA,  0,               iptr:(int32_t *)&nrUE_params.nr_dlsch_parallel,       defintval:0,           TYPE_UINT8,  0}, \
    {"offset-divisor",           CONFIG_HLP_OFFSET_DIV,  0,               uptr:(uint32_t *)&nrUE_params.ofdm_offset_divisor,    defuintval:UINT_MAX,           TYPE_UINT32,  0}, \
    {"nr-dlsch-demod-shift",     CONFIG_HLP_DLSHIFT,     0,               iptr:(int32_t *)&nr_dlsch_demod_shift,    defintval:0,     TYPE_INT,    0}, \
-    {"V" ,                       CONFIG_HLP_VCD,         PARAMFLAG_BOOL,  iptr:&vcdflag,                            defintval:0,     TYPE_INT,    0}, \
+    {"V" ,                       CONFIG_HLP_VCD,         PARAMFLAG_BOOL,  iptr:&vcdflag,                      defintval:0,     TYPE_INT,    0}, \
-    {"rrc_config_path",          CONFIG_HLP_RRC_CFG_PATH,0,               strptr:(char **)&rrc_config_path,         defstrval:"./",  TYPE_STRING, 0}, \
+    {"uecap_file",               CONFIG_HLP_UECAP_FILE,  0,               strptr:(char **)&uecap_file,        defstrval:"./uecap.xml", TYPE_STRING, 0}, \
    {"rrc_config_path",          CONFIG_HLP_RRC_CFG_PATH,0,               strptr:(char **)&rrc_config_path,   defstrval:"./",  TYPE_STRING, 0}, \
    {"ue-idx-standalone",        NULL,                   0,               u16ptr:&ue_idx_standalone,          defuintval:0xFFFF,    TYPE_UINT16,   0} \
 }
@@ -85,7 +86,7 @@ extern nrUE_params_t *get_nrUE_params(void);
 // In nr-ue.c
 extern int setup_nr_ue_buffers(PHY_VARS_NR_UE **phy_vars_ue, openair0_config_t *openair0_cfg);
 extern void fill_ue_band_info(void);
-extern void init_NR_UE(int, char*);
+extern void init_NR_UE(int, char*, char*);
 extern void init_NR_UE_threads(int);
 extern void reset_opp_meas(void);
 extern void print_opp_meas(void);
@@ -1101,41 +1101,10 @@ void pnf_phy_deallocate_p7_vendor_ext(nfapi_p7_message_header_t *header) {
 notifiedFIFO_elt_t *l1tx_message_extract(PHY_VARS_gNB *gNB, int frame, int slot) {
  notifiedFIFO_elt_t *res;
  notifiedFIFO_elt_t *freeRes = NULL;
-  // check first message
+  //TODO: This needs to be reworked for nfapi to work
-  res = pullTpool(gNB->resp_L1_tx, gNB->threadPool);
+  res = pullTpool(gNB->L1_tx_free, gNB->threadPool);
-  processingData_L1tx_t *msgTx = (processingData_L1tx_t *)NotifiedFifoData(res);
+  return res;
  if (msgTx->slot == slot) {
    return res;
  }
  if (msgTx->slot == -1) {
    freeRes = res;
  }
  // check second message
  pushNotifiedFIFO(gNB->resp_L1_tx,res);
  res = pullTpool(gNB->resp_L1_tx, gNB->threadPool);
  msgTx = (processingData_L1tx_t *)NotifiedFifoData(res);
  if (msgTx->slot == slot) {
    return res;
  }
  if (msgTx->slot == -1) {
    freeRes = res;
  }
  if (freeRes) {
    msgTx = (processingData_L1tx_t *)NotifiedFifoData(res);
    msgTx->num_pdsch_slot=0;
    msgTx->num_dl_pdcch = 0;
    msgTx->num_ul_pdcch = 0;
    msgTx->slot = slot;
    msgTx->frame = frame;
    return freeRes;
  }
  pushNotifiedFIFO(gNB->resp_L1_tx,res);
  AssertFatal(1==0, "It means both L1 Tx messages are still waiting to be processed. This happens when L1 Tx processing is too slow. Message slot %d, scheduled slot %d\n",
    msgTx->slot, slot);
 }
 int pnf_phy_ul_dci_req(gNB_L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_nr_ul_dci_request_t *req) {
@@ -1161,7 +1130,7 @@ int pnf_phy_ul_dci_req(gNB_L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7,
    }
  }
-  pushNotifiedFIFO(gNB->resp_L1_tx,res);
+  pushNotifiedFIFO(gNB->L1_tx_filled,res);
  return 0;
 }
@@ -1268,7 +1237,7 @@ int pnf_phy_dl_tti_req(gNB_L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7,
    else {
      NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s() UNKNOWN:%d\n", __FUNCTION__, dl_tti_pdu_list[i].PDUType);
    }
-    pushNotifiedFIFO(gNB->resp_L1_tx,res);
+    pushNotifiedFIFO(gNB->L1_tx_filled,res);
  }
  if(req->vendor_extension)
@@ -353,6 +353,8 @@ typedef struct {
 } fapi_nr_ul_config_request_pdu_t;
 typedef struct {
  //uint16_t sfn;
  //uint16_t slot;
  uint16_t sfn;
  uint16_t slot;
  uint8_t number_pdus;
@@ -105,10 +105,9 @@ void set_ptrs_symb_idx(uint16_t *ptrs_symbols,
                       uint8_t L_ptrs,
                       uint16_t ul_dmrs_symb_pos) {
-  uint i = 0, last_symbol, l_ref;
+  int i = 0;
-  int l_counter;
+  int l_ref = start_symbol;
-  l_ref         = start_symbol;
+  const int last_symbol   = start_symbol + duration_in_symbols - 1;
  last_symbol   = start_symbol + duration_in_symbols - 1;
  if (L_ptrs==0) {
    LOG_E(PHY,"bug: impossible L_ptrs\n");
    *ptrs_symbols = 0;
@@ -117,7 +116,7 @@ void set_ptrs_symb_idx(uint16_t *ptrs_symbols,
  while ( (l_ref + i*L_ptrs) <= last_symbol) {
-    int is_dmrs_symbol = 0;
+    int is_dmrs_symbol = 0, l_counter;
    for(l_counter = l_ref + i*L_ptrs; l_counter >= max(l_ref + (i-1)*L_ptrs + 1, l_ref); l_counter--) {
@@ -269,8 +268,8 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
    return;
  }
  uint16_t              sc_per_symbol    = (nb_rb + K_ptrs - 1)/K_ptrs;
-  int16_t              *ptrs_p           = (int16_t *)malloc(sizeof(int32_t)*((1 + sc_per_symbol/4)*4));
+  struct complex16      ptrs_p[(1 + sc_per_symbol/4)*4];
-  int16_t              *dmrs_comp_p      = (int16_t *)malloc(sizeof(int32_t)*((1 + sc_per_symbol/4)*4));
+  struct complex16      dmrs_comp_p[(1 + sc_per_symbol/4)*4];
  double                abs              = 0.0;
  double                real             = 0.0;
  double                imag             = 0.0;
@@ -278,7 +277,7 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
  double                alpha            = 0;
 #endif
  /* generate PTRS RE for the symbol */
-  nr_gen_ref_conj_symbols(gold_seq,sc_per_symbol*2,ptrs_p, NR_MOD_TABLE_QPSK_OFFSET,2);// 2 for QPSK
+  nr_gen_ref_conj_symbols(gold_seq,sc_per_symbol*2,(int16_t*)ptrs_p, NR_MOD_TABLE_QPSK_OFFSET,2);// 2 for QPSK
  /* loop over all sub carriers to get compensated RE on ptrs symbols*/
  for (int re = 0; re < nb_re_pdsch; re++) {
@@ -292,8 +291,8 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
                                    0,// start_re is 0 here
                                    ofdm_symbol_size);
    if(is_ptrs_re) {
-      dmrs_comp_p[re_cnt*2]     = rxF_comp[re *2];
+      dmrs_comp_p[re_cnt].r = rxF_comp[re *2];
-      dmrs_comp_p[(re_cnt*2)+1] = rxF_comp[(re *2)+1];
+      dmrs_comp_p[re_cnt].i = rxF_comp[(re *2)+1];
      re_cnt++;
    }
    else {
@@ -307,7 +306,7 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
  *ptrs_sc = re_cnt;
  /*Multiple compensated data with conj of PTRS */
-  mult_cpx_vector(dmrs_comp_p, ptrs_p, ptrs_ch_p,(1 + sc_per_symbol/4)*4,15); // 2^15 shifted
+  mult_cpx_vector((int16_t*)dmrs_comp_p, (int16_t*)ptrs_p, ptrs_ch_p,(1 + sc_per_symbol/4)*4,15); // 2^15 shifted
  /* loop over all ptrs sub carriers in a symbol */
  /* sum the error vector */
@@ -331,9 +330,6 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
 #ifdef DEBUG_PTRS
  printf("[PHY][PTRS]: Estimated Symbol  %d -> %d + j* %d \n",symbol, error_est[0], error_est[1] );
 #endif
  /* free vectors */
  free(ptrs_p);
  free(dmrs_comp_p);
 }
@@ -426,9 +422,10 @@ void get_slope_from_estimates(uint8_t start, uint8_t end, int16_t *est_p, double
 /* estimate from slope */
 void ptrs_estimate_from_slope(int16_t *error_est, double *slope_p, uint8_t start, uint8_t end)
 {
  struct complex16 *error=(struct complex16 *) error_est;
  for(uint8_t i = 1; i< (end -start);i++) {
-    error_est[(start+i)*2]      = (error_est[start*2]   + (int16_t)(i * slope_p[0]));// real
+    error[start+i].r = error[start].r + (int16_t)(i * slope_p[0]);// real
-    error_est[((start +i)*2)+1] = (error_est[(start*2)+1] + (int16_t)( i * slope_p[1])); //imag
+    error[start+i].i = error[start].i + (int16_t)(i * slope_p[1]); //imag
 #ifdef DEBUG_PTRS
    printf("[PHY][PTRS]: Estimated Symbol %2d -> %4d %4d from Slope (%4f %4f)\n", start+i,error_est[(start+i)*2],error_est[((start +i)*2)+1],
           slope_p[0],slope_p[1]);
@@ -294,8 +294,8 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_DLSCH_ENCODING, VCD_FUNCTION_IN);
  uint32_t A = rel15->TBSize[0]<<3;
-  if ( dlsch->rnti != SI_RNTI )
+  if ( rel15->rnti != SI_RNTI)
-    trace_NRpdu(DIRECTION_DOWNLINK, a, rel15->TBSize[0], 0, WS_C_RNTI, dlsch->rnti, frame, slot,0, 0);
+    trace_NRpdu(DIRECTION_DOWNLINK, a, rel15->TBSize[0], 0, WS_C_RNTI, rel15->rnti, frame, slot,0, 0);
  NR_gNB_SCH_STATS_t *stats=NULL;
  int first_free=-1;
@@ -33,7 +33,6 @@
 #define ScaleZone 4
 #define localBuff(NaMe,SiZe) float NaMe[SiZe]; memset(NaMe,0,sizeof(NaMe));
 int otg_enabled;
 const FL_COLOR rx_antenna_colors[4] = {FL_RED,FL_BLUE,FL_GREEN,FL_YELLOW};
 const FL_COLOR water_colors[4] = {FL_BLUE,FL_GREEN,FL_YELLOW,FL_RED};
@@ -594,6 +594,8 @@ typedef struct gNB_L1_proc_t_s {
  pthread_t L1_stats_thread;
  /// pthread structure for printing time meas
  pthread_t process_stats_thread;
  /// pthread structure for reordering L1 tx thread messages
  pthread_t pthread_tx_reorder;
  /// flag to indicate first RX acquisition
  int first_rx;
  /// flag to indicate first TX transmission
@@ -844,8 +846,7 @@ typedef struct PHY_VARS_gNB_s {
  /*
  time_stats_t phy_proc;
  */
-  time_stats_t *phy_proc_tx_0;
+  time_stats_t *phy_proc_tx[2];
  time_stats_t *phy_proc_tx_1;
  time_stats_t phy_proc_rx;
  time_stats_t rx_prach;
  /*
@@ -886,7 +887,9 @@ typedef struct PHY_VARS_gNB_s {
  */
  notifiedFIFO_t *respDecode;
  notifiedFIFO_t *resp_L1;
-  notifiedFIFO_t *resp_L1_tx;
+  notifiedFIFO_t *L1_tx_free;
  notifiedFIFO_t *L1_tx_filled;
  notifiedFIFO_t *L1_tx_out;
  notifiedFIFO_t *resp_RU_tx;
  tpool_t *threadPool;
  int nbDecode;
@@ -82,8 +82,7 @@ const double sinr_to_cqi[4][16]= { {-2.5051, -2.5051, -1.7451, -0.3655, 1.0812,
  { -4.1057, -4.1057, -3.3768, -2.2916, -1.1392, 0.1236, 1.2849, 3.1933, 5.9298, 6.4052, 9.6245, 10.9414, 13.5166, 14.9545, 14.9545, 14.9545}
 };
-//int cqi_to_mcs[16]={0, 0, 1, 3, 5, 7, 9, 13, 15, 16, 20, 23, 25, 27, 27, 27};
+const int cqi_to_mcs[16]= {0, 0, 1, 2, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 27, 28};
 const int cqi_to_mcs[16]= {0, 0, 1, 2, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 27, 27};
 //for SNR to MI conversion 7 th order Polynomial coeff
 const double q_qam16[8]= {3.21151853033897e-10,5.55435952230651e-09,-2.30760065362117e-07,-6.25587743817859e-06,4.62251036452795e-06,0.00224150813158937,0.0393723140344367,0.245486379182639};
@@ -83,9 +83,6 @@ const double sinr_to_cqi[4][16]= { {-2.5051, -2.5051, -1.7451, -0.3655, 1.0812,
  { -4.1057, -4.1057, -3.3768, -2.2916, -1.1392, 0.1236, 1.2849, 3.1933, 5.9298, 6.4052, 9.6245, 10.9414, 13.5166, 14.9545, 14.9545, 14.9545}
 };
 //int cqi_to_mcs[16]={0, 0, 1, 3, 5, 7, 9, 13, 15, 16, 20, 23, 25, 27, 27, 27};
 const int cqi_to_mcs[16]= {0, 0, 1, 2, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 27, 27};
 //for SNR to MI conversion 7 th order Polynomial coeff
 const double q_qam16[8]= {3.21151853033897e-10,5.55435952230651e-09,-2.30760065362117e-07,-6.25587743817859e-06,4.62251036452795e-06,0.00224150813158937,0.0393723140344367,0.245486379182639};
 const double q_qpsk[8]= {1.94491167814437e-09,8.40494123817774e-08,4.75527131198034e-07,-2.48946285301621e-05,-0.000347614016158364,0.00209252225437100,0.0742986115462510,0.488297879889425};
@@ -72,8 +72,7 @@ const double sinr_to_cqi[4][16]= { {-2.5051, -2.5051, -1.7451, -0.3655, 1.0812,
  { -4.1057, -4.1057, -3.3768, -2.2916, -1.1392, 0.1236, 1.2849, 3.1933, 5.9298, 6.4052, 9.6245, 10.9414, 13.5166, 14.9545, 14.9545, 14.9545}
 };
-//int cqi_to_mcs[16]={0, 0, 1, 3, 5, 7, 9, 13, 15, 16, 20, 23, 25, 27, 27, 27};
+const int cqi_to_mcs[16]= {0, 0, 1, 2, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 27, 28};
 const int cqi_to_mcs[16]= {0, 0, 1, 2, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 27, 27};
 //for SNR to MI conversion 7 th order Polynomial coeff
 const double q_qam16[8]= {3.21151853033897e-10,5.55435952230651e-09,-2.30760065362117e-07,-6.25587743817859e-06,4.62251036452795e-06,0.00224150813158937,0.0393723140344367,0.245486379182639};
@@ -148,6 +148,9 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
  AssertFatal(RC.gNB[Mod_id]!=NULL,"RC.gNB[%d] is null\n",Mod_id);
  gNB = RC.gNB[Mod_id];
  nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
  int slot_type = nr_slot_select(cfg,frame,slot);
  uint8_t number_dl_pdu             = (DL_req==NULL) ? 0 : DL_req->dl_tti_request_body.nPDUs;
  uint8_t number_ul_dci_pdu         = (UL_dci_req==NULL) ? 0 : UL_dci_req->numPdus;
@@ -155,61 +158,56 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
  uint8_t number_tx_data_pdu        = (TX_req == NULL) ? 0 : TX_req->Number_of_PDUs;
  if (NFAPI_MODE == NFAPI_MONOLITHIC){
    notifiedFIFO_elt_t *res;
    res = pullTpool(gNB->resp_L1_tx, gNB->threadPool);
    processingData_L1tx_t *msgTx = (processingData_L1tx_t *)NotifiedFifoData(res);
    if (DL_req != NULL && TX_req!=NULL && (number_dl_pdu > 0 || number_ul_dci_pdu > 0 || number_ul_tti_pdu > 0))
      LOG_D(PHY,"NFAPI: Sched_INFO:SFN/SLOT:%04d/%d DL_req:SFN/SLO:%04d/%d:dl_pdu:%d tx_req:SFN/SLOT:%04d/%d:pdus:%d;ul_dci %d ul_tti %d\n",
      frame,slot,
      DL_req->SFN,DL_req->Slot,number_dl_pdu,
      TX_req->SFN,TX_req->Slot,TX_req->Number_of_PDUs,
      number_ul_dci_pdu,number_ul_tti_pdu);
-    msgTx->num_pdsch_slot=0;
+    if (slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT) {
-    msgTx->num_dl_pdcch=0;
+      notifiedFIFO_elt_t *res;
-    msgTx->num_ul_pdcch=number_ul_dci_pdu;
+      res = pullTpool(gNB->L1_tx_free, gNB->threadPool);
-    msgTx->slot = slot;
+      processingData_L1tx_t *msgTx = (processingData_L1tx_t *)NotifiedFifoData(res);
    msgTx->frame = frame;
-    for (int i=0;i<number_dl_pdu;i++) {
+      msgTx->num_pdsch_slot=0;
-      nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu = &DL_req->dl_tti_request_body.dl_tti_pdu_list[i];
+      msgTx->num_dl_pdcch=0;
-      LOG_D(PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_tti_pdu->PDUType);
+      msgTx->num_ul_pdcch=number_ul_dci_pdu;
-      switch (dl_tti_pdu->PDUType) {
+      msgTx->slot = slot;
-        case NFAPI_NR_DL_TTI_SSB_PDU_TYPE:
+      msgTx->frame = frame;
          handle_nr_nfapi_ssb_pdu(msgTx,frame,slot,
                                  dl_tti_pdu);
          break;
-        case NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE:
+      for (int i=0;i<number_dl_pdu;i++) {
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+        nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu = &DL_req->dl_tti_request_body.dl_tti_pdu_list[i];
-          msgTx->pdcch_pdu[msgTx->num_dl_pdcch] = dl_tti_pdu->pdcch_pdu;
+        LOG_D(PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_tti_pdu->PDUType);
-          msgTx->num_dl_pdcch++;
+        switch (dl_tti_pdu->PDUType) {
-          break;
+          case NFAPI_NR_DL_TTI_SSB_PDU_TYPE:
            handle_nr_nfapi_ssb_pdu(msgTx,frame,slot,
                                    dl_tti_pdu);
            break;
-        case NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE:
+          case NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE:
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+            LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
-          handle_nfapi_nr_csirs_pdu(msgTx,frame,slot,
+            msgTx->pdcch_pdu[msgTx->num_dl_pdcch] = dl_tti_pdu->pdcch_pdu;
-            &dl_tti_pdu->csi_rs_pdu);
+            msgTx->num_dl_pdcch++;
-          break;
+            break;
-        case NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE:
+          case NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE:
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+            LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
-          nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_pdu_rel15 = &dl_tti_pdu->pdsch_pdu.pdsch_pdu_rel15;
+            handle_nfapi_nr_csirs_pdu(msgTx,frame,slot,&dl_tti_pdu->csi_rs_pdu);
-          uint16_t pduIndex = pdsch_pdu_rel15->pduIndex;
+            break;
-          AssertFatal(TX_req->pdu_list[pduIndex].num_TLV == 1, "TX_req->pdu_list[%d].num_TLV %d != 1\n",
+
-          pduIndex,TX_req->pdu_list[pduIndex].num_TLV);
+          case NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE:
-          uint8_t *sdu = (uint8_t *)TX_req->pdu_list[pduIndex].TLVs[0].value.direct;
+            LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
-          AssertFatal(msgTx->num_pdsch_slot < gNB->number_of_nr_dlsch_max,"Number of PDSCH PDUs %d exceeded the limit %d\n",
+            nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_pdu_rel15 = &dl_tti_pdu->pdsch_pdu.pdsch_pdu_rel15;
-            msgTx->num_pdsch_slot,gNB->number_of_nr_dlsch_max);
+            uint16_t pduIndex = pdsch_pdu_rel15->pduIndex;
-          handle_nr_nfapi_pdsch_pdu(msgTx,&dl_tti_pdu->pdsch_pdu, sdu);
+            AssertFatal(TX_req->pdu_list[pduIndex].num_TLV == 1, "TX_req->pdu_list[%d].num_TLV %d != 1\n",
            pduIndex,TX_req->pdu_list[pduIndex].num_TLV);
            uint8_t *sdu = (uint8_t *)TX_req->pdu_list[pduIndex].TLVs[0].value.direct;
            AssertFatal(msgTx->num_pdsch_slot < gNB->number_of_nr_dlsch_max,"Number of PDSCH PDUs %d exceeded the limit %d\n",
                        msgTx->num_pdsch_slot,gNB->number_of_nr_dlsch_max);
            handle_nr_nfapi_pdsch_pdu(msgTx,&dl_tti_pdu->pdsch_pdu, sdu);
        }
      }
    }
-    for (int i=0; i<number_ul_dci_pdu; i++) {
+      for (int i=0; i<number_ul_dci_pdu; i++)
-      msgTx->ul_pdcch_pdu[i] = UL_dci_req->ul_dci_pdu_list[i];
+        msgTx->ul_pdcch_pdu[i] = UL_dci_req->ul_dci_pdu_list[i];
    }
-    pushNotifiedFIFO(gNB->resp_L1_tx,res);
+      pushNotifiedFIFO(gNB->L1_tx_filled,res);
    }
    for (int i = 0; i < number_ul_tti_pdu; i++) {
      switch (UL_tti_req->pdus_list[i].pdu_type) {
@@ -128,6 +128,7 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
                           int frame,
                           int slot,
                           int do_meas) {
  int aa;
  PHY_VARS_gNB *gNB = msgTx->gNB;
  NR_DL_FRAME_PARMS *fp=&gNB->frame_parms;
@@ -202,6 +203,8 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
  }
  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_TX+offset,0);
  //pthread_mutex_unlock(&mutextest);
 }
@@ -419,6 +419,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
        }
      }
      //Clear the fields when all the config pdu are done
      if (pdu_done == ul_config->number_pdus) {
        if (scheduled_response->tx_request)
@@ -429,6 +430,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
        LOG_D(PHY, "%d.%d clear ul_config %p\n", scheduled_response->frame, slot, ul_config);
        memset(ul_config->ul_config_list, 0, sizeof(ul_config->ul_config_list));
      }
      pthread_mutex_unlock(&ul_config->mutex_ul_config);
    }
  }
@@ -82,6 +82,7 @@ RAN_CONTEXT_t RC;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
 double cpuf;
 char *uecap_file;
 uint16_t sf_ahead=4 ;
 uint16_t sl_ahead=0;
@@ -983,18 +984,21 @@ int main(int argc, char **argv)
  gNB->threadPool = (tpool_t*)malloc(sizeof(tpool_t));
  initTpool(gNBthreads, gNB->threadPool, true);
-  gNB->resp_L1_tx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+  gNB->L1_tx_free = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-  initNotifiedFIFO(gNB->resp_L1_tx);
+  gNB->L1_tx_filled = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
  gNB->L1_tx_out = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
  initNotifiedFIFO(gNB->L1_tx_free);
  initNotifiedFIFO(gNB->L1_tx_filled);
  initNotifiedFIFO(gNB->L1_tx_out);
  // we create 2 threads for L1 tx processing
-  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->resp_L1_tx,processSlotTX);
+  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->L1_tx_free,processSlotTX);
  processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
  init_DLSCH_struct(gNB, msgDataTx);
  msgDataTx->slot = slot;
  msgDataTx->frame = frame;
  memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
  reset_meas(&msgDataTx->phy_proc_tx);
-  gNB->phy_proc_tx_0 = &msgDataTx->phy_proc_tx;
+  gNB->phy_proc_tx[0] = &msgDataTx->phy_proc_tx;
  pushTpool(gNB->threadPool,msgL1Tx);
  for (SNR = snr0; SNR < snr1; SNR += .2) {
@@ -1071,6 +1075,7 @@ int main(int argc, char **argv)
        Sched_INFO.UL_tti_req    = gNB_mac->UL_tti_req_ahead[slot];
        Sched_INFO.UL_dci_req  = NULL;
        Sched_INFO.TX_req    = &gNB_mac->TX_req[0];
        pushNotifiedFIFO(gNB->L1_tx_free,msgL1Tx);
        nr_schedule_response(&Sched_INFO);
        /* PTRS values for DLSIM calculations   */
@@ -1304,10 +1309,10 @@ int main(int argc, char **argv)
    printf("\n");
    if (print_perf==1) {
-      printf("\ngNB TX function statistics (per %d us slot, NPRB %d, mcs %d, TBS %d)\n",
+      printf("\ngNB TX function statistics (per %d us slot, NPRB %d, mcs %d, block %d)\n",
 	     1000>>*scc->ssbSubcarrierSpacing, g_rbSize, g_mcsIndex,
 	     msgDataTx->dlsch[0][0]->harq_process.pdsch_pdu.pdsch_pdu_rel15.TBSize[0]<<3);
-      printDistribution(gNB->phy_proc_tx_0,table_tx,"PHY proc tx");
+      printDistribution(gNB->phy_proc_tx[0],table_tx,"PHY proc tx");
      printStatIndent2(&gNB->dlsch_encoding_stats,"DLSCH encoding time");
      printStatIndent3(&gNB->dlsch_segmentation_stats,"DLSCH segmentation time");
      printStatIndent3(&gNB->tinput,"DLSCH LDPC input processing time");
@@ -60,6 +60,7 @@
 LCHAN_DESC DCCH_LCHAN_DESC,DTCH_DL_LCHAN_DESC,DTCH_UL_LCHAN_DESC;
 rlc_info_t Rlc_info_um,Rlc_info_am_config;
 char *uecap_file;
 PHY_VARS_gNB *gNB;
 PHY_VARS_NR_UE *UE;
 RAN_CONTEXT_t RC;
@@ -74,6 +74,7 @@ rlc_info_t Rlc_info_um,Rlc_info_am_config;
 PHY_VARS_gNB *gNB;
 PHY_VARS_NR_UE *UE;
 RAN_CONTEXT_t RC;
 char *uecap_file;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
 uint16_t sf_ahead=4 ;
@@ -669,13 +670,16 @@ int main(int argc, char **argv)
  char tp_param[] = "n";
  initTpool(tp_param, gNB->threadPool, false);
  initNotifiedFIFO(gNB->respDecode);
-  gNB->resp_L1_tx = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+  gNB->L1_tx_free = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-  initNotifiedFIFO(gNB->resp_L1_tx);
+  gNB->L1_tx_filled = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->resp_L1_tx,NULL);
+  gNB->L1_tx_out = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
  initNotifiedFIFO(gNB->L1_tx_free);
  initNotifiedFIFO(gNB->L1_tx_filled);
  initNotifiedFIFO(gNB->L1_tx_out);
  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0,gNB->L1_tx_free,NULL);
  processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
  msgDataTx->slot = -1;
-  gNB->phy_proc_tx_0 = &msgDataTx->phy_proc_tx;
+  gNB->phy_proc_tx[0] = &msgDataTx->phy_proc_tx;
  pushNotifiedFIFO(gNB->resp_L1_tx,msgL1Tx); // to unblock the process in the beginning
  //gNB_config = &gNB->gNB_config;
  //memset((void *)&gNB->UL_INFO,0,sizeof(gNB->UL_INFO));
@@ -1117,6 +1121,7 @@ int main(int argc, char **argv)
      }
      // prepare ULSCH/PUSCH reception
      pushNotifiedFIFO(gNB->L1_tx_free,msgL1Tx); // to unblock the process in the beginning
      nr_schedule_response(Sched_INFO);
      // --------- setting parameters for UE --------
@@ -65,7 +65,7 @@
 {CONFIG_STRING_L1_REMOTE_N_PORTC,                    NULL,      0,         uptr:NULL,           defintval:50030,           TYPE_UINT,     0},         \
 {CONFIG_STRING_L1_LOCAL_N_PORTD,                     NULL,      0,         uptr:NULL,           defintval:50031,           TYPE_UINT,     0},         \
 {CONFIG_STRING_L1_REMOTE_N_PORTD,                    NULL,      0,         uptr:NULL,           defintval:50031,           TYPE_UINT,     0},         \
-{CONFIG_STRING_L1_PUSCH_PROC_THREADS,                NULL,      0,         uptr:NULL,           defintval:3,               TYPE_UINT,     0}, \
+{CONFIG_STRING_L1_PUSCH_PROC_THREADS,                NULL,      0,         uptr:NULL,           defintval:4,               TYPE_UINT,     0}, \
 {CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR,               NULL,      0,         uptr:NULL,           defuintval:8,              TYPE_UINT,     0}, \
 {CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD,              NULL,      0,         uptr:NULL,           defintval:100,             TYPE_UINT,     0},         \
 {CONFIG_STRING_L1_PRACH_DTX_THRESHOLD,               NULL,      0,         uptr:NULL,           defintval:150,             TYPE_UINT,     0},         \
@@ -1510,7 +1510,7 @@ void NRRCConfig(void) {
  config_get( GNBSParams,sizeof(GNBSParams)/sizeof(paramdef_t),NULL); 
  RC.nb_nr_inst = GNBSParams[GNB_ACTIVE_GNBS_IDX].numelt;
-	// Get num MACRLC instances
+  // Get num MACRLC instances
  config_getlist( &MACRLCParamList,NULL,0, NULL);
  RC.nb_nr_macrlc_inst  = MACRLCParamList.numelt;
  // Get num L1 instances
@@ -73,6 +73,8 @@ void fill_ul_config(fapi_nr_ul_config_request_t *ul_config, frame_t frame_tx, in
    memset(ul_config->ul_config_list, 0, sizeof(ul_config->ul_config_list)); 
  }
  ul_config->ul_config_list[ul_config->number_pdus].pdu_type = pdu_type;
  //ul_config->slot = slot_tx;
  //ul_config->sfn = frame_tx;
  ul_config->slot = slot_tx;
  ul_config->sfn = frame_tx;
  ul_config->number_pdus++;
@@ -971,6 +973,8 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
        uint8_t ulsch_input_buffer_array[NFAPI_MAX_NUM_UL_PDU][MAX_ULSCH_PAYLOAD_BYTES];
        nr_scheduled_response_t scheduled_response;
        fapi_nr_tx_request_t tx_req;
        //tx_req.slot = slot_tx;
        //tx_req.sfn = frame_tx;
        tx_req.slot = slot_tx;
        tx_req.sfn = frame_tx;
        tx_req.number_of_pdus = 0;
@@ -272,6 +272,7 @@ bool is_xlsch_in_slot(uint64_t bitmap, sub_frame_t slot) {
 void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
                               frame_t frame,
                               sub_frame_t slot){
  //pthread_mutex_lock(&mutextest);
  protocol_ctxt_t   ctxt={0};
  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, ENB_FLAG_YES, NOT_A_RNTI, frame, slot,module_idP);
@@ -4293,7 +4293,7 @@ ssize_t do_nrMeasurementReport(uint8_t *buffer,
  LTE_MeasResultListEUTRA_t  *measResultListEUTRA2=&measResultNeighCells->choice.measResultListEUTRA;
  asn1cSequenceAdd(measResultListEUTRA2->list, struct LTE_MeasResultEUTRA, measresulteutra_list);
  measresulteutra_list->physCellId = phy_id;
-  asn1cCalloc(measresulteutra_list->cgi_Info, measresult_cgi2);
+  //asn1cCalloc(measresulteutra_list->cgi_Info, measresult_cgi2);
  //measresult_cgi2->cellGlobalId= {0};
  //measresult_cgi2->trackingAreaCode= {0};
  struct LTE_MeasResultEUTRA__measResult* measResult= &measresulteutra_list->measResult;
@@ -522,6 +522,8 @@ typedef struct gNB_RRC_INST_s {
  int cell_info_configured;
  pthread_mutex_t cell_info_mutex;
  char *uecap_file;
  // security configuration (preferred algorithms)
  nr_security_configuration_t security;
 } gNB_RRC_INST;
@@ -202,56 +202,12 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
  pthread_mutex_unlock(&rrc->cell_info_mutex);
  if (get_softmodem_params()->phy_test > 0 || get_softmodem_params()->do_ra > 0) {
-    // This is for phytest only, emulate first X2 message if uecap.raw file is present
+    struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_allocate_new_UE_context(rrc);
-    FILE *fd;
+    ue_context_p->ue_context.spCellConfig = calloc(1, sizeof(struct NR_SpCellConfig));
-    fd = fopen("uecap.raw","r");
+    ue_context_p->ue_context.spCellConfig->spCellConfigDedicated = configuration->scd;
-
+    LOG_I(NR_RRC,"Adding new user (%p)\n",ue_context_p);
-    if (fd != NULL) {
+    if (!NODE_IS_CU(RC.nrrrc[0]->node_type)) {
-      char buffer[4096];
+      rrc_add_nsa_user(rrc,ue_context_p,NULL);
      int msg_len=fread(buffer,1,4096,fd);
      LOG_I(RRC,"Read in %d bytes for uecap\n",msg_len);
      LTE_UL_DCCH_Message_t *LTE_UL_DCCH_Message;
      asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
                                &asn_DEF_LTE_UL_DCCH_Message,
                                (void **)&LTE_UL_DCCH_Message,
                                (uint8_t *)buffer,
                                msg_len);
      if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
        AssertFatal(1==0,"NR_UL_DCCH_MESSAGE decode error\n");
        // free the memory
        SEQUENCE_free( &asn_DEF_LTE_UL_DCCH_Message, LTE_UL_DCCH_Message, 1 );
        return;
      }
      fclose(fd);
      xer_fprint(stdout,&asn_DEF_LTE_UL_DCCH_Message, LTE_UL_DCCH_Message);
      // recreate enough of X2 EN-DC Container
      AssertFatal(LTE_UL_DCCH_Message->message.choice.c1.present == LTE_UL_DCCH_MessageType__c1_PR_ueCapabilityInformation,
                  "ueCapabilityInformation not present\n");
      NR_CG_ConfigInfo_t *CG_ConfigInfo = calloc(1,sizeof(*CG_ConfigInfo));
      CG_ConfigInfo->criticalExtensions.present = NR_CG_ConfigInfo__criticalExtensions_PR_c1;
      CG_ConfigInfo->criticalExtensions.choice.c1 = calloc(1,sizeof(*CG_ConfigInfo->criticalExtensions.choice.c1));
      CG_ConfigInfo->criticalExtensions.choice.c1->present = NR_CG_ConfigInfo__criticalExtensions__c1_PR_cg_ConfigInfo;
      CG_ConfigInfo->criticalExtensions.choice.c1->choice.cg_ConfigInfo = calloc(1,sizeof(*CG_ConfigInfo->criticalExtensions.choice.c1->choice.cg_ConfigInfo));
      NR_CG_ConfigInfo_IEs_t *cg_ConfigInfo = CG_ConfigInfo->criticalExtensions.choice.c1->choice.cg_ConfigInfo;
      cg_ConfigInfo->ue_CapabilityInfo = calloc(1,sizeof(*cg_ConfigInfo->ue_CapabilityInfo));
      asn_enc_rval_t enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_UE_CapabilityRAT_ContainerList,NULL,
                                (void *)&LTE_UL_DCCH_Message->message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList,buffer,4096);
      AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %jd)!\n",
                   enc_rval.failed_type->name, enc_rval.encoded);
      OCTET_STRING_fromBuf(cg_ConfigInfo->ue_CapabilityInfo,
                           (const char *)buffer,
                           (enc_rval.encoded+7)>>3);
      parse_CG_ConfigInfo(rrc,CG_ConfigInfo,NULL);
    } else {
      struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_allocate_new_UE_context(rrc);
      ue_context_p->ue_context.spCellConfig = calloc(1, sizeof(struct NR_SpCellConfig));
      ue_context_p->ue_context.spCellConfig->spCellConfigDedicated = configuration->scd;
      LOG_I(NR_RRC,"Adding new user (%p)\n",ue_context_p);
      if (!NODE_IS_CU(RC.nrrrc[0]->node_type)) {
        rrc_add_nsa_user(rrc,ue_context_p,NULL);
      }
    }
  }
 }
@@ -38,6 +38,7 @@
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/RRC/LTE/rrc_eNB_GTPV1U.h"
 #include "executables/softmodem-common.h"
 #include "executables/nr-softmodem.h"
 #include <openair2/RRC/NR/rrc_gNB_UE_context.h>
 #include <openair3/ocp-gtpu/gtp_itf.h>
 #include "UTIL/OSA/osa_defs.h"
@@ -143,6 +144,30 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
  unsigned char *kUPenc = NULL;
  unsigned char *kUPint = NULL;
  int i;
  // In case of phy-test and do-ra mode, read UE capabilities directly from file
  if (get_softmodem_params()->phy_test == 1 || get_softmodem_params()->do_ra == 1) {
    NR_UE_NR_Capability_t* UE_Capability_nr = NULL;
    char UE_NR_Capability_xer[65536];
    FILE *f = NULL;
    if (uecap_file)
      f = fopen(uecap_file, "r");
    if(f){
      size_t size = fread(UE_NR_Capability_xer, 1, sizeof UE_NR_Capability_xer, f);
      if (size == 0 || size == sizeof UE_NR_Capability_xer)
        LOG_E(NR_RRC,"UE Capabilities XER file %s is too large (%ld)\n", uecap_file, size);
      else {
        UE_Capability_nr = CALLOC(1,sizeof(NR_UE_NR_Capability_t));
        asn_dec_rval_t dec_rval = xer_decode(0, &asn_DEF_NR_UE_NR_Capability, (void *)&UE_Capability_nr, UE_NR_Capability_xer, size);
        assert(dec_rval.code == RC_OK);
        xer_fprint(stdout,&asn_DEF_NR_UE_NR_Capability,(void *)UE_Capability_nr);
      }
    }
    else
      LOG_E(NR_RRC,"Could not open UE Capabilities input file. Not handling OAI UE Capabilities.\n");
    ue_context_p->ue_context.UE_Capability_nr = UE_Capability_nr;
  }
  // NR RRCReconfiguration
  AssertFatal(rrc->Nb_ue < MAX_NR_RRC_UE_CONTEXTS,"cannot add another UE\n");
  ue_context_p->ue_context.reconfig = calloc(1,sizeof(NR_RRCReconfiguration_t));
@@ -34,8 +34,8 @@
 #include "rrc_proto.h"
 #include "common/utils/LOG/log.h"
-NR_UE_RRC_INST_t* nr_l3_init_ue(char* rrc_config_path){
+NR_UE_RRC_INST_t* nr_l3_init_ue(char* uecap, char* rrc_config_path){
    //LOG_I(RRC, "[MAIN] NR UE MAC initialization...\n");
-    return openair_rrc_top_init_ue_nr(rrc_config_path); 
+    return openair_rrc_top_init_ue_nr(uecap,rrc_config_path);
 }
@@ -422,7 +422,7 @@ void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type,
 }
-NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* rrc_config_path){
+NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* uecap_file, char* rrc_config_path){
  int nr_ue;
  if(NB_NR_UE_INST > 0){
    NR_UE_rrc_inst = (NR_UE_RRC_INST_t *)calloc(NB_NR_UE_INST , sizeof(NR_UE_RRC_INST_t));
@@ -496,6 +496,8 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* rrc_config_path){
      RRC_LIST_INIT(NR_UE_rrc_inst[nr_ue].CSI_ReportConfig_list, NR_maxNrofCSI_ReportConfigurations);
    }
    NR_UE_rrc_inst->uecap_file = uecap_file;
    if (get_softmodem_params()->phy_test==1 || get_softmodem_params()->do_ra==1) {
      // read in files for RRCReconfiguration and RBconfig
      FILE *fd;
@@ -505,7 +507,7 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* rrc_config_path){
      else
        sprintf(filename,"reconfig.raw");
      fd = fopen(filename,"r");
-          char buffer[1024];
+      char buffer[1024];
      AssertFatal(fd,
                  "cannot read file %s: errno %d, %s\n",
                  filename,
@@ -2634,14 +2636,18 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
 //-----------------------------------------------------------------------------
 {
  asn_enc_rval_t enc_rval;
  asn_dec_rval_t dec_rval;
  NR_UL_DCCH_Message_t ul_dcch_msg;
  NR_UE_CapabilityRAT_Container_t ue_CapabilityRAT_Container;
  char UE_NR_Capability_xer[65536];
  size_t size;
  uint8_t buffer[200];
  int i;
  LOG_I(NR_RRC,"[UE %d] Frame %d: Receiving from SRB1 (DL-DCCH), Processing UECapabilityEnquiry (gNB %d)\n",
        ctxt_pP->module_id,
        ctxt_pP->frame,
        gNB_index);
  memset((void *)&ul_dcch_msg,0,sizeof(NR_UL_DCCH_Message_t));
  memset((void *)&ue_CapabilityRAT_Container,0,sizeof(NR_UE_CapabilityRAT_Container_t));
  ul_dcch_msg.message.present            = NR_UL_DCCH_MessageType_PR_c1;
@@ -2650,20 +2656,35 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
  ul_dcch_msg.message.choice.c1->choice.ueCapabilityInformation                            = CALLOC(1, sizeof(struct NR_UECapabilityInformation));
  ul_dcch_msg.message.choice.c1->choice.ueCapabilityInformation->rrc_TransactionIdentifier = UECapabilityEnquiry->rrc_TransactionIdentifier;
  ue_CapabilityRAT_Container.rat_Type = NR_RAT_Type_nr;
-  NR_UE_NR_Capability_t*             UE_Capability_nr;
+  NR_UE_NR_Capability_t* UE_Capability_nr = NULL;
-  UE_Capability_nr = CALLOC(1,sizeof(NR_UE_NR_Capability_t));
+
-  NR_BandNR_t *nr_bandnr;
+  char *file_path = NR_UE_rrc_inst[ctxt_pP->module_id].uecap_file;
-  nr_bandnr  = CALLOC(1,sizeof(NR_BandNR_t));
+
-  nr_bandnr->bandNR = 1;
+  FILE *f = NULL;
-  ASN_SEQUENCE_ADD(
+  if (file_path)
-    &UE_Capability_nr->rf_Parameters.supportedBandListNR.list,
+    f = fopen(file_path, "r");
-    nr_bandnr);
+  if(f){
    size = fread(UE_NR_Capability_xer, 1, sizeof UE_NR_Capability_xer, f);
    if (size == 0 || size == sizeof UE_NR_Capability_xer) {
      LOG_E(NR_RRC,"UE Capabilities XER file %s is too large (%ld)\n", file_path,size);
      free(UE_Capability_nr);
      return;
    }
    dec_rval = xer_decode(0, &asn_DEF_NR_UE_NR_Capability, (void *)&UE_Capability_nr, UE_NR_Capability_xer, size);
    assert(dec_rval.code == RC_OK);
  }
  else {
    UE_Capability_nr = CALLOC(1,sizeof(NR_UE_NR_Capability_t));
    NR_BandNR_t *nr_bandnr;
    nr_bandnr  = CALLOC(1,sizeof(NR_BandNR_t));
    nr_bandnr->bandNR = 1;
    ASN_SEQUENCE_ADD(&UE_Capability_nr->rf_Parameters.supportedBandListNR.list,
                     nr_bandnr);
  }
  OAI_NR_UECapability_t *UECap;
  UECap = CALLOC(1,sizeof(OAI_NR_UECapability_t));
  UECap->UE_NR_Capability = UE_Capability_nr;
-  if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
+  xer_fprint(stdout,&asn_DEF_NR_UE_NR_Capability,(void *)UE_Capability_nr);
    xer_fprint(stdout,&asn_DEF_NR_UE_NR_Capability,(void *)UE_Capability_nr);
  }
  enc_rval = uper_encode_to_buffer(&asn_DEF_NR_UE_NR_Capability,
                                   NULL,
@@ -70,7 +70,7 @@ typedef enum {
  nr_RadioBearerConfigX_r15=1
 } nsa_message_t;
-#define MAX_UE_NR_CAPABILITY_SIZE 255
+#define MAX_UE_NR_CAPABILITY_SIZE 2048
 typedef struct OAI_NR_UECapability_s {
  uint8_t sdu[MAX_UE_NR_CAPABILITY_SIZE];
  uint8_t sdu_size;
@@ -120,13 +120,15 @@ typedef struct NR_UE_RRC_INST_s {
    NR_DRB_ToAddMod_t              *DRB_config[NB_CNX_UE][8];
    rb_id_t                        *defaultDRB; // remember the ID of the default DRB
-    NR_SRB_INFO Srb0[NB_SIG_CNX_UE];
+    char                           *uecap_file;
    NR_SRB_INFO                    Srb0[NB_SIG_CNX_UE];
    NR_SRB_INFO_TABLE_ENTRY        Srb1[NB_CNX_UE];
    NR_SRB_INFO_TABLE_ENTRY        Srb2[NB_CNX_UE];
    uint8_t                        MBMS_flag;
    OAI_NR_UECapability_t          *UECap;
-    uint8_t 					             *UECapability;
+    uint8_t 			   *UECapability;
    uint8_t                        UECapability_size;
    RA_trigger_t                   ra_trigger;
@@ -56,14 +56,14 @@ extern queue_t nr_wait_ul_tti_req_queue;
 //  main_rrc.c
 //
 /**\brief Layer 3 initialization*/
-NR_UE_RRC_INST_t* nr_l3_init_ue(char*);
+NR_UE_RRC_INST_t* nr_l3_init_ue(char*,char*);
 //
 //  UE_rrc.c
 //
 /**\brief Initial the top level RRC structure instance*/
-NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char*);
+NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char*,char*);
@@ -213,7 +213,7 @@ L1s = (
    	{
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-        pusch_proc_threads = 2;
+        pusch_proc_threads = 8;
        }  
 );
@@ -0,0 +1,862 @@
 <UE-NR-Capability>
    <accessStratumRelease><rel15/></accessStratumRelease>
    <pdcp-Parameters>
        <supportedROHC-Profiles>
            <profile0x0000><false/></profile0x0000>
            <profile0x0001><false/></profile0x0001>
            <profile0x0002><false/></profile0x0002>
            <profile0x0003><false/></profile0x0003>
            <profile0x0004><false/></profile0x0004>
            <profile0x0006><false/></profile0x0006>
            <profile0x0101><false/></profile0x0101>
            <profile0x0102><false/></profile0x0102>
            <profile0x0103><false/></profile0x0103>
            <profile0x0104><false/></profile0x0104>
        </supportedROHC-Profiles>
        <maxNumberROHC-ContextSessions><cs2/></maxNumberROHC-ContextSessions>
        <shortSN><supported/></shortSN>
    </pdcp-Parameters>
    <rlc-Parameters>
        <am-WithShortSN><supported/></am-WithShortSN>
        <um-WithShortSN><supported/></um-WithShortSN>
        <um-WithLongSN><supported/></um-WithLongSN>
    </rlc-Parameters>
    <mac-Parameters>
        <mac-ParametersXDD-Diff>
            <logicalChannelSR-DelayTimer><supported/></logicalChannelSR-DelayTimer>
            <longDRX-Cycle><supported/></longDRX-Cycle>
            <shortDRX-Cycle><supported/></shortDRX-Cycle>
            <multipleSR-Configurations><supported/></multipleSR-Configurations>
        </mac-ParametersXDD-Diff>
    </mac-Parameters>
    <phy-Parameters>
        <phy-ParametersCommon>
            <nzp-CSI-RS-IntefMgmt><supported/></nzp-CSI-RS-IntefMgmt>
            <dynamicHARQ-ACK-Codebook><supported/></dynamicHARQ-ACK-Codebook>
            <semiStaticHARQ-ACK-Codebook><supported/></semiStaticHARQ-ACK-Codebook>
            <pdsch-MappingTypeA><supported/></pdsch-MappingTypeA>
            <rateMatchingResrcSetSemi-Static><supported/></rateMatchingResrcSetSemi-Static>
            <ext2>
                <maxLayersMIMO-Indication><supported/></maxLayersMIMO-Indication>
            </ext2>
        </phy-ParametersCommon>
        <phy-ParametersFRX-Diff>
            <twoFL-DMRS>
                11
            </twoFL-DMRS>
            <supportedDMRS-TypeDL><type1/></supportedDMRS-TypeDL>
            <supportedDMRS-TypeUL><type1And2/></supportedDMRS-TypeUL>
            <onePortsPTRS>
                01
            </onePortsPTRS>
            <pucch-F2-WithFH><supported/></pucch-F2-WithFH>
            <pucch-F3-WithFH><supported/></pucch-F3-WithFH>
            <absoluteTPC-Command><supported/></absoluteTPC-Command>
            <pusch-HalfPi-BPSK><supported/></pusch-HalfPi-BPSK>
            <pucch-F3-4-HalfPi-BPSK><supported/></pucch-F3-4-HalfPi-BPSK>
            <ext1>
                <csi-RS-IM-ReceptionForFeedback>
                    <maxConfigNumberNZP-CSI-RS-PerCC>8</maxConfigNumberNZP-CSI-RS-PerCC>
                    <maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>64</maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>
                    <maxConfigNumberCSI-IM-PerCC><n8/></maxConfigNumberCSI-IM-PerCC>
                    <maxNumberSimultaneousNZP-CSI-RS-PerCC>4</maxNumberSimultaneousNZP-CSI-RS-PerCC>
                    <totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>32</totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>
                </csi-RS-IM-ReceptionForFeedback>
                <csi-ReportFramework>
                    <maxNumberPeriodicCSI-PerBWP-ForCSI-Report>2</maxNumberPeriodicCSI-PerBWP-ForCSI-Report>
                    <maxNumberAperiodicCSI-PerBWP-ForCSI-Report>2</maxNumberAperiodicCSI-PerBWP-ForCSI-Report>
                    <maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>0</maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>
                    <maxNumberPeriodicCSI-PerBWP-ForBeamReport>2</maxNumberPeriodicCSI-PerBWP-ForBeamReport>
                    <maxNumberAperiodicCSI-PerBWP-ForBeamReport>2</maxNumberAperiodicCSI-PerBWP-ForBeamReport>
                    <maxNumberAperiodicCSI-triggeringStatePerCC><n63/></maxNumberAperiodicCSI-triggeringStatePerCC>
                    <maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>0</maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>
                    <simultaneousCSI-ReportsPerCC>4</simultaneousCSI-ReportsPerCC>
                </csi-ReportFramework>
                <mux-SR-HARQ-ACK-CSI-PUCCH-OncePerSlot>
                    <sameSymbol><supported/></sameSymbol>
                </mux-SR-HARQ-ACK-CSI-PUCCH-OncePerSlot>
                <oneFL-DMRS-TwoAdditionalDMRS-UL><supported/></oneFL-DMRS-TwoAdditionalDMRS-UL>
                <twoFL-DMRS-TwoAdditionalDMRS-UL><supported/></twoFL-DMRS-TwoAdditionalDMRS-UL>
            </ext1>
        </phy-ParametersFRX-Diff>
        <phy-ParametersFR1>
            <pdsch-256QAM-FR1><supported/></pdsch-256QAM-FR1>
            <pdsch-RE-MappingFR1-PerSymbol><n10/></pdsch-RE-MappingFR1-PerSymbol>
            <ext1>
                <pdsch-RE-MappingFR1-PerSlot><n32/></pdsch-RE-MappingFR1-PerSlot>
            </ext1>
        </phy-ParametersFR1>
    </phy-Parameters>
    <rf-Parameters>
        <supportedBandListNR>
            <BandNR>
                <bandNR>78</bandNR>
                <mimo-ParametersPerBand>
                    <tci-StatePDSCH>
                        <maxNumberConfiguredTCIstatesPerCC><n16/></maxNumberConfiguredTCIstatesPerCC>
                        <maxNumberActiveTCI-PerBWP><n1/></maxNumberActiveTCI-PerBWP>
                    </tci-StatePDSCH>
                    <pusch-TransCoherence><nonCoherent/></pusch-TransCoherence>
                    <periodicBeamReport><supported/></periodicBeamReport>
                    <aperiodicBeamReport><supported/></aperiodicBeamReport>
                    <maxNumberNonGroupBeamReporting><n4/></maxNumberNonGroupBeamReporting>
                    <maxNumberSSB-BFD>2</maxNumberSSB-BFD>
                    <maxNumberCSI-RS-SSB-CBD>8</maxNumberCSI-RS-SSB-CBD>
                    <beamReportTiming>
                        <scs-15kHz><sym8/></scs-15kHz>
                        <scs-30kHz><sym14/></scs-30kHz>
                    </beamReportTiming>
                    <ext1>
                        <beamManagementSSB-CSI-RS>
                            <maxNumberSSB-CSI-RS-ResourceOneTx><n8/></maxNumberSSB-CSI-RS-ResourceOneTx>
                            <maxNumberCSI-RS-Resource><n32/></maxNumberCSI-RS-Resource>
                            <maxNumberCSI-RS-ResourceTwoTx><n8/></maxNumberCSI-RS-ResourceTwoTx>
                            <supportedCSI-RS-Density><oneAndThree/></supportedCSI-RS-Density>
                            <maxNumberAperiodicCSI-RS-Resource><n32/></maxNumberAperiodicCSI-RS-Resource>
                        </beamManagementSSB-CSI-RS>
                        <codebookParameters>
                            <type1>
                                <singlePanel>
                                    <supportedCSI-RS-ResourceList>
                                        <SupportedCSI-RS-Resource>
                                            <maxNumberTxPortsPerResource><p8/></maxNumberTxPortsPerResource>
                                            <maxNumberResourcesPerBand>8</maxNumberResourcesPerBand>
                                            <totalNumberTxPortsPerBand>64</totalNumberTxPortsPerBand>
                                        </SupportedCSI-RS-Resource>
                                        <SupportedCSI-RS-Resource>
                                            <maxNumberTxPortsPerResource><p4/></maxNumberTxPortsPerResource>
                                            <maxNumberResourcesPerBand>8</maxNumberResourcesPerBand>
                                            <totalNumberTxPortsPerBand>32</totalNumberTxPortsPerBand>
                                        </SupportedCSI-RS-Resource>
                                        <SupportedCSI-RS-Resource>
                                            <maxNumberTxPortsPerResource><p16/></maxNumberTxPortsPerResource>
                                            <maxNumberResourcesPerBand>4</maxNumberResourcesPerBand>
                                            <totalNumberTxPortsPerBand>64</totalNumberTxPortsPerBand>
                                        </SupportedCSI-RS-Resource>
                                        <SupportedCSI-RS-Resource>
                                            <maxNumberTxPortsPerResource><p32/></maxNumberTxPortsPerResource>
                                            <maxNumberResourcesPerBand>2</maxNumberResourcesPerBand>
                                            <totalNumberTxPortsPerBand>64</totalNumberTxPortsPerBand>
                                        </SupportedCSI-RS-Resource>
                                    </supportedCSI-RS-ResourceList>
                                    <modes><mode1/></modes>
                                    <maxNumberCSI-RS-PerResourceSet>4</maxNumberCSI-RS-PerResourceSet>
                                </singlePanel>
                            </type1>
                        </codebookParameters>
                        <csi-RS-IM-ReceptionForFeedback>
                            <maxConfigNumberNZP-CSI-RS-PerCC>8</maxConfigNumberNZP-CSI-RS-PerCC>
                            <maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>64</maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>
                            <maxConfigNumberCSI-IM-PerCC><n8/></maxConfigNumberCSI-IM-PerCC>
                            <maxNumberSimultaneousNZP-CSI-RS-PerCC>4</maxNumberSimultaneousNZP-CSI-RS-PerCC>
                            <totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>32</totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>
                        </csi-RS-IM-ReceptionForFeedback>
                        <csi-ReportFramework>
                            <maxNumberPeriodicCSI-PerBWP-ForCSI-Report>2</maxNumberPeriodicCSI-PerBWP-ForCSI-Report>
                            <maxNumberAperiodicCSI-PerBWP-ForCSI-Report>2</maxNumberAperiodicCSI-PerBWP-ForCSI-Report>
                            <maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>0</maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>
                            <maxNumberPeriodicCSI-PerBWP-ForBeamReport>2</maxNumberPeriodicCSI-PerBWP-ForBeamReport>
                            <maxNumberAperiodicCSI-PerBWP-ForBeamReport>2</maxNumberAperiodicCSI-PerBWP-ForBeamReport>
                            <maxNumberAperiodicCSI-triggeringStatePerCC><n63/></maxNumberAperiodicCSI-triggeringStatePerCC>
                            <maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>0</maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>
                            <simultaneousCSI-ReportsPerCC>4</simultaneousCSI-ReportsPerCC>
                        </csi-ReportFramework>
                        <csi-RS-ForTracking>
                            <maxBurstLength>2</maxBurstLength>
                            <maxSimultaneousResourceSetsPerCC>1</maxSimultaneousResourceSetsPerCC>
                            <maxConfiguredResourceSetsPerCC>8</maxConfiguredResourceSetsPerCC>
                            <maxConfiguredResourceSetsAllCC>16</maxConfiguredResourceSetsAllCC>
                        </csi-RS-ForTracking>
                    </ext1>
                </mimo-ParametersPerBand>
                <multipleTCI><supported/></multipleTCI>
                <pusch-256QAM><supported/></pusch-256QAM>
                <ue-PowerClass><pc2/></ue-PowerClass>
                <channelBWs-DL>
                    <fr1>
                        <scs-15kHz>
                            0000000000
                        </scs-15kHz>
                        <scs-30kHz>
                            0001011111
                        </scs-30kHz>
                        <scs-60kHz>
                            0000000000
                        </scs-60kHz>
                    </fr1>
                </channelBWs-DL>
                <channelBWs-UL>
                    <fr1>
                        <scs-15kHz>
                            0000000000
                        </scs-15kHz>
                        <scs-30kHz>
                            0001011111
                        </scs-30kHz>
                        <scs-60kHz>
                            0000000000
                        </scs-60kHz>
                    </fr1>
                </channelBWs-UL>
                <ext1>
                    <maxUplinkDutyCycle-PC2-FR1><n100/></maxUplinkDutyCycle-PC2-FR1>
                </ext1>
                <ext4>
                    <channelBWs-DL-v1590>
                        <fr1>
                            <scs-30kHz>
                                1000000000000000
                            </scs-30kHz>
                        </fr1>
                    </channelBWs-DL-v1590>
                    <channelBWs-UL-v1590>
                        <fr1>
                            <scs-30kHz>
                                1000000000000000
                            </scs-30kHz>
                        </fr1>
                    </channelBWs-UL-v1590>
                </ext4>
            </BandNR>
        </supportedBandListNR>
        <supportedBandCombinationList>
            <BandCombination>
                <bandList>
                        <nr>
                            <bandNR>78</bandNR>
                            <ca-BandwidthClassDL-NR><a/></ca-BandwidthClassDL-NR>
                            <ca-BandwidthClassUL-NR><a/></ca-BandwidthClassUL-NR>
                        </nr>
                </bandList>
                <featureSetCombination>0</featureSetCombination>
                <powerClass-v1530><pc2/></powerClass-v1530>
            </BandCombination>
        </supportedBandCombinationList>
        <appliedFreqBandListFilter>
                <bandInformationNR>
                    <bandNR>78</bandNR>
                </bandInformationNR>
        </appliedFreqBandListFilter>
        <ext1>
            <supportedBandCombinationList-v1540>
                <BandCombination-v1540>
                    <bandList-v1540>
                        <BandParameters-v1540>
                            <srs-TxSwitch>
                                <supportedSRS-TxPortSwitch><t2r4/></supportedSRS-TxPortSwitch>
                            </srs-TxSwitch>
                        </BandParameters-v1540>
                    </bandList-v1540>
                    <ca-ParametersNR-v1540>
                        <csi-RS-IM-ReceptionForFeedbackPerBandComb>
                            <maxNumberSimultaneousNZP-CSI-RS-ActBWP-AllCC>8</maxNumberSimultaneousNZP-CSI-RS-ActBWP-AllCC>
                            <totalNumberPortsSimultaneousNZP-CSI-RS-ActBWP-AllCC>64</totalNumberPortsSimultaneousNZP-CSI-RS-ActBWP-AllCC>
                        </csi-RS-IM-ReceptionForFeedbackPerBandComb>
                        <simultaneousCSI-ReportsAllCC>8</simultaneousCSI-ReportsAllCC>
                    </ca-ParametersNR-v1540>
                </BandCombination-v1540>
            </supportedBandCombinationList-v1540>
        </ext1>
    </rf-Parameters>
    <measAndMobParameters>
        <measAndMobParametersCommon>
            <ssb-RLM><supported/></ssb-RLM>
            <ext1>
                <eventB-MeasAndReport><supported/></eventB-MeasAndReport>
                <handoverFDD-TDD><supported/></handoverFDD-TDD>
            </ext1>
            <ext2>
                <periodicEUTRA-MeasAndReport><supported/></periodicEUTRA-MeasAndReport>
            </ext2>
        </measAndMobParametersCommon>
        <measAndMobParametersXDD-Diff>
            <intraAndInterF-MeasAndReport><supported/></intraAndInterF-MeasAndReport>
            <eventA-MeasAndReport><supported/></eventA-MeasAndReport>
            <ext1>
                <handoverInterF><supported/></handoverInterF>
                <handoverLTE-EPC><supported/></handoverLTE-EPC>
            </ext1>
        </measAndMobParametersXDD-Diff>
        <measAndMobParametersFRX-Diff>
            <ss-SINR-Meas><supported/></ss-SINR-Meas>
            <ext1>
                <handoverInterF><supported/></handoverInterF>
                <handoverLTE-EPC><supported/></handoverLTE-EPC>
            </ext1>
            <ext3>
                <simultaneousRxDataSSB-DiffNumerology><supported/></simultaneousRxDataSSB-DiffNumerology>
            </ext3>
        </measAndMobParametersFRX-Diff>
    </measAndMobParameters>
    <featureSets>
        <featureSetsDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>1</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>2</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>3</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>4</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>5</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>6</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>7</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>8</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>9</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>10</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>11</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
            <FeatureSetDownlink>
                <featureSetListPerDownlinkCC>
                    <FeatureSetDownlinkPerCC-Id>12</FeatureSetDownlinkPerCC-Id>
                </featureSetListPerDownlinkCC>
                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
            </FeatureSetDownlink>
        </featureSetsDownlink>
        <featureSetsDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz100/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz100/></fr1>
                </supportedBandwidthDL>
                <channelBW-90mhz><supported/></channelBW-90mhz>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz20/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><twoLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz40/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz40/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz80/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz20/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz30/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><twoLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz20/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz15/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><twoLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz30/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
            <FeatureSetDownlinkPerCC>
                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
                <supportedBandwidthDL>
                    <fr1><mhz60/></fr1>
                </supportedBandwidthDL>
                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
            </FeatureSetDownlinkPerCC>
        </featureSetsDownlinkPerCC>
        <featureSetsUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>1</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n2/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>2</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n2/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>3</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>4</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>5</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>6</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>7</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>8</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>9</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>10</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>11</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>12</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
            <FeatureSetUplink>
                <featureSetListPerUplinkCC>
                    <FeatureSetUplinkPerCC-Id>11</FeatureSetUplinkPerCC-Id>
                </featureSetListPerUplinkCC>
                <supportedSRS-Resources>
                    <maxNumberAperiodicSRS-PerBWP><n1/></maxNumberAperiodicSRS-PerBWP>
                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
                </supportedSRS-Resources>
            </FeatureSetUplink>
        </featureSetsUplink>
        <featureSetsUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz100/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><twoLayers/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz100/></fr1>
                </supportedBandwidthUL>
                <channelBW-90mhz><supported/></channelBW-90mhz>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><twoLayers/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz20/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz40/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz40/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz80/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz20/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz30/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz15/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz100/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz100/></fr1>
                </supportedBandwidthUL>
                <channelBW-90mhz><supported/></channelBW-90mhz>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
            <FeatureSetUplinkPerCC>
                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
                <supportedBandwidthUL>
                    <fr1><mhz60/></fr1>
                </supportedBandwidthUL>
                <mimo-CB-PUSCH>
                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
                </mimo-CB-PUSCH>
                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
            </FeatureSetUplinkPerCC>
        </featureSetsUplinkPerCC>
        <ext1>
            <featureSetsDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
                <FeatureSetDownlink-v1540>
                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
                </FeatureSetDownlink-v1540>
            </featureSetsDownlink-v1540>
        </ext1>
    </featureSets>
    <featureSetCombinations>
        <FeatureSetCombination>
            <FeatureSetsPerBand>
                    <nr>
                        <downlinkSetNR>2</downlinkSetNR>
                        <uplinkSetNR>2</uplinkSetNR>
                    </nr>
            </FeatureSetsPerBand>
        </FeatureSetCombination>
    </featureSetCombinations>
    <nonCriticalExtension>
        <interRAT-Parameters>
            <eutra>
                <supportedBandListEUTRA>
                    <FreqBandIndicatorEUTRA>7</FreqBandIndicatorEUTRA>
                    <FreqBandIndicatorEUTRA>38</FreqBandIndicatorEUTRA>
                </supportedBandListEUTRA>
                <eutra-ParametersCommon>
                    <mfbi-EUTRA><supported/></mfbi-EUTRA>
                </eutra-ParametersCommon>
            </eutra>
        </interRAT-Parameters>
        <inactiveState><supported/></inactiveState>
    </nonCriticalExtension>
 </UE-NR-Capability>