diff --git a/ci-scripts/cls_cots_ue.py b/ci-scripts/cls_cots_ue.py
index 23feba982b..6954aa3927 100644
--- a/ci-scripts/cls_cots_ue.py
+++ b/ci-scripts/cls_cots_ue.py
@@ -50,8 +50,7 @@ class CotsUe:
def Check_Airplane(self):
mySSH = sshconnection.SSHConnection()
mySSH.open(self.UEIPAddr, self.UEUserName, self.UEPassWord)
- mySSH.command('cd /home/oaici/remi/android-sdk-linux/platform-tools', '\$', 5)
- status=mySSH.cde_check_value('sudo ./adb shell settings get global airplane_mode_on ', ['0','1'],5)
+ status=mySSH.cde_check_value('sudo adb shell settings get global airplane_mode_on ', ['0','1'],5)
mySSH.close()
return status
@@ -59,8 +58,7 @@ class CotsUe:
def Set_Airplane(self,target_state_str):
mySSH = sshconnection.SSHConnection()
mySSH.open(self.UEIPAddr, self.UEUserName, self.UEPassWord)
- mySSH.command('cd /home/oaici/remi/android-sdk-linux/platform-tools', '\$', 5)
- mySSH.command('sudo ./adb start-server','$',5)
+ mySSH.command('sudo adb start-server','$',5)
logging.info("Toggling COTS UE Airplane mode to : "+target_state_str)
current_state = self.Check_Airplane()
if target_state_str.lower()=="on":
@@ -71,9 +69,9 @@ class CotsUe:
#toggle state
retry = 0
while (current_state!=target_state) and (retry < self.__SetAirplaneRetry):
- mySSH.command('sudo ./adb shell am start -a android.settings.AIRPLANE_MODE_SETTINGS', '\$', 5)
- mySSH.command('sudo ./adb shell input keyevent 20', '\$', 5)
- mySSH.command('sudo ./adb shell input tap 968 324', '\$', 5)
+ mySSH.command('sudo adb shell am start -a android.settings.AIRPLANE_MODE_SETTINGS', '\$', 5)
+ mySSH.command('sudo adb shell input keyevent 20', '\$', 5)
+ mySSH.command('sudo adb shell input tap 968 324', '\$', 5)
time.sleep(1)
current_state = self.Check_Airplane()
retry+=1
@@ -82,7 +80,7 @@ class CotsUe:
logging.error("Current state is : "+ str(current_state))
else:
print("Airplane mode is already "+ target_state_str)
- mySSH.command('sudo ./adb kill-server','$',5)
+ mySSH.command('sudo adb kill-server','$',5)
mySSH.close()
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 32742f3e88..d37f205f4e 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -330,7 +330,7 @@ class OaiCiTest():
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.air_interface + ' ' + self.Initialize_OAI_UE_args, 'KO', pStatus)
HTML.CreateHtmlTabFooter(False)
sys.exit(1)
UE_prefix = ''
@@ -522,7 +522,7 @@ class OaiCiTest():
SSH.close()
if fullSyncStatus and gotSyncStatus and tunnelInterfaceStatus:
- HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK, 'OAI UE')
+ HTML.CreateHtmlTestRow(self.air_interface + ' ' + self.Initialize_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK, 'OAI UE')
logging.debug('\u001B[1m Initialize OAI UE Completed\u001B[0m')
if (self.ADBIPAddress != 'none'):
self.UEDevices = []
@@ -535,10 +535,10 @@ class OaiCiTest():
HTML.htmlUEFailureMsg='oaitun_ue1/oaitun_uem1 interfaces are either NOT mounted or NOT configured'
else:
HTML.htmlUEFailureMsg='oaitun_ue1 interface is either NOT mounted or NOT configured'
- HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
+ HTML.CreateHtmlTestRow(self.air_interface + ' ' + self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
else:
HTML.htmlUEFailureMsg='nr-uesoftmodem did NOT synced'
- HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
+ HTML.CreateHtmlTestRow(self.air_interface + ' ' + self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
logging.error('\033[91mInitialize OAI UE Failed! \033[0m')
self.AutoTerminateUEandeNB()
@@ -1085,11 +1085,7 @@ class OaiCiTest():
sys.exit('Insufficient Parameter')
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
- if self.ADBIPAddress == '192.168.18.196':
- SSH.command('/home/oaici/remi/android-sdk-linux/platform-tools/adb devices', '\$', 15)
- else:
- SSH.command('adb devices', '\$', 15)
- #self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",SSH.getBefore())
+ SSH.command('adb devices', '\$', 15)
self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",SSH.getBefore())
SSH.close()
else:
@@ -2584,7 +2580,7 @@ class OaiCiTest():
freq = result.group('carrier_frequency')
new_freq = re.sub('/[0-9]+','',freq)
float_freq = float(new_freq) / 1000000
- HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz')
+ HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
logging.debug('\033[94m' + " DL Carrier Frequency is: " + str(freq) + '\033[0m')
except Exception as e:
logging.error('\033[91m' + " DL Carrier Frequency not found" + '\033[0m')
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 936eeb3227..35513493dc 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -343,7 +343,7 @@ class RANManagement():
if (self.pStatus < 0):
if self.htmlObj is not None:
- self.htmlObj.CreateHtmlTestRow(self.Initialize_eNB_args, 'KO', self.pStatus)
+ self.htmlObj.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus)
self.htmlObj.CreateHtmlTabFooter(False)
sys.exit(1)
# If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB
@@ -450,9 +450,9 @@ class RANManagement():
mySSH.command('killall --signal SIGKILL record', '\$', 5)
mySSH.close()
doLoop = False
- logging.error('\u001B[1;37;41m eNB logging system did not show got sync! \u001B[0m')
+ logging.error('\u001B[1;37;41m eNB/gNB/ocp-eNB logging system did not show got sync! \u001B[0m')
if self.htmlObj is not None:
- self.htmlObj.CreateHtmlTestRow('-O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
+ self.htmlObj.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
# In case of T tracer recording, we need to kill tshark on EPC side
result = re.search('T_stdout', str(self.Initialize_eNB_args))
if (result is not None) and (self.epcObj is not None):
@@ -510,8 +510,8 @@ class RANManagement():
mySSH.close()
if self.htmlObj is not None:
- self.htmlObj.CreateHtmlTestRow('-O ' + config_file + extra_options, 'OK', CONST.ALL_PROCESSES_OK)
- logging.debug('\u001B[1m Initialize eNB Completed\u001B[0m')
+ self.htmlObj.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'OK', CONST.ALL_PROCESSES_OK)
+ logging.debug('\u001B[1m Initialize eNB/gNB/ocp-eNB Completed\u001B[0m')
def CheckeNBProcess(self, status_queue):
try:
diff --git a/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
index 854fb8cb19..a4caa77075 100644
--- a/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
@@ -34,14 +34,14 @@
Initialize_eNB
- Initialize eNB (FDD/Band7/5MHz)
+ Initialize OCP-eNB (FDD/Band7/5MHz)
-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
ocp
Terminate_eNB
- Terminate eNB
+ Terminate OCP-eNB
ocp