From de6a4b81ae64c0a6d7452719a9ad2541fe8449c1 Mon Sep 17 00:00:00 2001
From: Remi Hardy <remi.hardy@openairinterface.org>
Date: Tue, 8 Sep 2020 16:58:06 +0200
Subject: [PATCH] fixed eNB auto termination ; cleaned cots_ue_airplane action
(no longer needed)
---
ci-scripts/main.py | 13 +++++--------
ci-scripts/ran.py | 14 ++++++++------
ci-scripts/xml_class_list.yml | 1 -
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 847a07de5f..8a8e816556 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -2847,8 +2847,11 @@ class OaiCiTest():
self.desc = 'Automatic Termination of eNB'
HTML.desc='Automatic Termination of eNB'
self.ShowTestID()
- RAN.eNB_instance=0
- RAN.TerminateeNB()
+ #Terminate all instances on all servers, eNB, eNB1, eNB2
+ #RAN.eNB_instance=0
+ RAN.TerminateeNB(0)
+ RAN.TerminateeNB(1)
+ RAN.TermintateeNB(2)
if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
self.testCase_id = 'AUTO-KILL-flexran-ctl'
HTML.testCase_id=self.testCase_id
@@ -3332,9 +3335,6 @@ def GetParametersFromXML(action):
if action == 'Run_PhySim':
ldpc.runargs = test.findtext('physim_run_args')
- if action == 'COTS_UE_Airplane':
- COTS_UE.cots_id = test.findtext('cots_id')
- COTS_UE.cots_run_mode = test.findtext('cots_run_mode')
#check if given test is in list
#it is in list if one of the strings in 'list' is at the beginning of 'test'
@@ -3734,9 +3734,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
if ldpc.exitStatus==1:sys.exit()
elif action == 'Run_PhySim':
HTML=ldpc.Run_PhySim(HTML,CONST,id)
- elif action == 'COTS_UE_Airplane':
- #cots id and cots run mode were read from xml test file
- COTS_UE.Set_Airplane(COTS_UE.cots_id, COTS_UE.cots_run_mode)
else:
sys.exit('Invalid class (action) from xml')
CiTestObj.FailReportCnt += 1
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index d5906e9567..927941d029 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -546,25 +546,27 @@ class RANManagement():
except:
os.kill(os.getppid(),signal.SIGUSR1)
- def TerminateeNB(self):
- if self.eNB_serverId == '0':
+ def TerminateeNB(self,eNB_serverId):
+ if eNB_serverId == '0':
lIpAddr = self.eNBIPAddress
lUserName = self.eNBUserName
lPassWord = self.eNBPassword
lSourcePath = self.eNBSourceCodePath
- elif self.eNB_serverId == '1':
+ elif eNB_serverId == '1':
lIpAddr = self.eNB1IPAddress
lUserName = self.eNB1UserName
lPassWord = self.eNB1Password
lSourcePath = self.eNB1SourceCodePath
- elif self.eNB_serverId == '2':
+ elif eNB_serverId == '2':
lIpAddr = self.eNB2IPAddress
lUserName = self.eNB2UserName
lPassWord = self.eNB2Password
lSourcePath = self.eNB2SourceCodePath
if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
- HELP.GenericHelp(CONST.Version)
- sys.exit('Insufficient Parameter')
+ #HELP.GenericHelp(CONST.Version)
+ #sys.exit('Insufficient Parameter')
+ logging.debug('ATTENTION Cannot clean eNB_serverID='+eNB_serverID+' '+'@'+lIpAddr+' path:'+lSourcePath+' : No parameters')
+ return
mySSH = SSH.SSHConnection()
mySSH.open(lIpAddr, lUserName, lPassWord)
mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml
index e80063a120..2c20988851 100755
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -1,4 +1,3 @@
- - COTS_UE_Airplane
- Build_PhySim
- Run_PhySim
- Build_eNB
--
2.26.2