diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 37cf76444ada28a79c7ae72a2dab0bc8a6558811..96a288ebb5c6c40b8dd4f502cba26e77898e9896 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -56,6 +56,7 @@ OAI_UE_PROCESS_COULD_NOT_SYNC = -21
OAI_UE_PROCESS_ASSERTION = -22
OAI_UE_PROCESS_FAILED = -23
OAI_UE_PROCESS_NO_TUNNEL_INTERFACE = -24
+OAI_UE_PROCESS_SEG_FAULT = -25
OAI_UE_PROCESS_OK = +6
UE_STATUS_DETACHED = 0
@@ -1025,14 +1026,20 @@ class SSHConnection():
tunnelInterfaceStatus = False
else:
tunnelInterfaceStatus = True
+ else:
+ tunnelInterfaceStatus = True
self.close()
if fullSyncStatus and gotSyncStatus and tunnelInterfaceStatus:
self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'OK', ALL_PROCESSES_OK, 'OAI UE')
logging.debug('\u001B[1m Initialize OAI UE Completed\u001B[0m')
else:
- self.htmlUEFailureMsg = 'oaitun_ue1 interface is either NOT mounted or NOT configured'
- self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
+ if self.air_interface == 'lte':
+ self.htmlUEFailureMsg = 'oaitun_ue1 interface is either NOT mounted or NOT configured'
+ self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
+ else:
+ self.htmlUEFailureMsg = 'nr-uesoftmodem did NOT synced'
+ self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
logging.error('\033[91mInitialize OAI UE Failed! \033[0m')
self.AutoTerminateUEandeNB()
@@ -3177,6 +3184,10 @@ class SSHConnection():
statMsg = 'UE showed ' + str(nrCRCOK) + ' PDSCH decoding message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
self.htmlUEFailureMsg += statMsg + '\n'
+ if not frequency_found:
+ statMsg = 'NR-UE could NOT synch!'
+ logging.error('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ self.htmlUEFailureMsg += statMsg + '\n'
if uciStatMsgCount > 0:
statMsg = 'UE showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
@@ -3191,20 +3202,32 @@ class SSHConnection():
self.htmlUEFailureMsg += statMsg + '\n'
if foundSegFault:
logging.debug('\u001B[1;37;41m UE ended with a Segmentation Fault! \u001B[0m')
- return ENB_PROCESS_SEG_FAULT
+ if not nrUEFlag:
+ return OAI_UE_PROCESS_SEG_FAULT
+ else:
+ if not frequency_found:
+ return OAI_UE_PROCESS_SEG_FAULT
if foundAssertion:
logging.debug('\u001B[1;30;43m UE showed an assertion! \u001B[0m')
self.htmlUEFailureMsg += 'UE showed an assertion!\n'
- if not mib_found or not frequency_found:
- return OAI_UE_PROCESS_ASSERTION
+ if not nrUEFlag:
+ if not mib_found or not frequency_found:
+ return OAI_UE_PROCESS_ASSERTION
+ else:
+ if not frequency_found:
+ return OAI_UE_PROCESS_ASSERTION
if foundRealTimeIssue:
logging.debug('\u001B[1;37;41m UE faced real time issues! \u001B[0m')
self.htmlUEFailureMsg += 'UE faced real time issues!\n'
#return ENB_PROCESS_REALTIME_ISSUE
- if no_cell_sync_found and not mib_found:
- logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
- self.htmlUEFailureMsg += 'UE could not synchronize!\n'
- return OAI_UE_PROCESS_COULD_NOT_SYNC
+ if nrUEFlag:
+ if not frequency_found:
+ return OAI_UE_PROCESS_COULD_NOT_SYNC
+ else:
+ if no_cell_sync_found and not mib_found:
+ logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
+ self.htmlUEFailureMsg += 'UE could not synchronize!\n'
+ return OAI_UE_PROCESS_COULD_NOT_SYNC
return 0
def TerminateeNB(self):
@@ -3427,13 +3450,16 @@ class SSHConnection():
logging.debug('\u001B[1m' + ueAction + ' Failed \u001B[0m')
self.htmlUEFailureMsg = '<b>' + ueAction + ' Failed</b>\n' + self.htmlUEFailureMsg
self.CreateHtmlTestRow('N/A', 'KO', logStatus, 'UE')
- # for NR-UE at the moment keep running
if self.air_interface == 'lte':
# In case of sniffing on commercial eNBs we have random results
# Not an error then
if (logStatus != OAI_UE_PROCESS_COULD_NOT_SYNC) or (ueAction != 'Sniffing'):
self.Initialize_OAI_UE_args = ''
self.AutoTerminateUEandeNB()
+ else:
+ if (logStatus == OAI_UE_PROCESS_COULD_NOT_SYNC):
+ self.Initialize_OAI_UE_args = ''
+ self.AutoTerminateUEandeNB()
else:
logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
self.htmlUEFailureMsg = '<b>' + ueAction + ' Completed</b>\n' + self.htmlUEFailureMsg
@@ -3991,7 +4017,7 @@ class SSHConnection():
self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - eNB process not found</td>\n')
elif (processesStatus == OAI_UE_PROCESS_FAILED):
self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - OAI UE process not found</td>\n')
- elif (processesStatus == ENB_PROCESS_SEG_FAULT):
+ elif (processesStatus == ENB_PROCESS_SEG_FAULT) or (processesStatus == OAI_UE_PROCESS_SEG_FAULT):
self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Segmentation Fault</td>\n')
elif (processesStatus == ENB_PROCESS_ASSERTION) or (processesStatus == OAI_UE_PROCESS_ASSERTION):
self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Assertion</td>\n')
diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
index 3e3863c708e0f04551411b20ee7d27d51279f65d..ec63e11322eba6b8d08d823b98f1655498e56c1a 100644
--- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
@@ -24,8 +24,9 @@
<htmlTabRef>run-OAI-gNB-NR-UE-USRP</htmlTabRef>
<htmlTabName>run OAI gNB and OAI NR UE USRP</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
+ <repeatCount>4</repeatCount>
<TestCaseRequestedList>
-090101
+090101 000001 090102 000002 090108 090109
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_terminate.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_terminate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e7a6295b9ef1d758ea344af8ce9b5785dcce48f0
--- /dev/null
+++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_terminate.xml
@@ -0,0 +1,44 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>run-OAI-gNB-NR-UE-USRP</htmlTabRef>
+ <htmlTabName>run OAI gNB and OAI NR UE USRP</htmlTabName>
+ <htmlTabIcon>tasks</htmlTabIcon>
+ <TestCaseRequestedList>
+090108 090109
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="090108">
+ <class>Terminate_OAI_UE</class>
+ <desc>Terminate NR UE</desc>
+ <air_interface>NR</air_interface>
+ </testCase>
+
+ <testCase id="090109">
+ <class>Terminate_eNB</class>
+ <desc>Terminate gNB</desc>
+ <air_interface>NR</air_interface>
+ </testCase>
+
+</testCaseList>
diff --git a/nfapi/open-nFAPI/vnf/src/vnf_p7.c b/nfapi/open-nFAPI/vnf/src/vnf_p7.c
index 985a6f830a6835db67f38ff587c6e0d86f5a99b4..394bfc58ffa7c95a4be3c902e9d282ce005e49b1 100644
--- a/nfapi/open-nFAPI/vnf/src/vnf_p7.c
+++ b/nfapi/open-nFAPI/vnf/src/vnf_p7.c
@@ -376,9 +376,11 @@ int send_mac_subframe_indications(vnf_p7_t* vnf_p7)
if(curr->in_sync == 1)
{
// ask for subframes in the future
- uint16_t sfn_sf_adv = increment_sfn_sf_by(curr->sfn_sf, 2);
+ //uint16_t sfn_sf_adv = increment_sfn_sf_by(curr->sfn_sf, 2);
- vnf_p7->_public.subframe_indication(&(vnf_p7->_public), curr->phy_id, sfn_sf_adv);
+ //vnf_p7->_public.subframe_indication(&(vnf_p7->_public), curr->phy_id, sfn_sf_adv);
+ // suggestion fix by Haruki NAOI
+ vnf_p7->_public.subframe_indication(&(vnf_p7->_public), curr->phy_id, curr->sfn_sf);
}
curr = curr->next;