maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted eNB auto terminate fix (not working)

Browse Source
This commit is contained in:
hardy
2020-09-09 10:26:58 +02:00
parent ef04e7e90d
commit 1c77b36ae9
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/main.py
+2 -5
View File
@@ -2847,11 +2847,8 @@ class OaiCiTest():
self.desc = 'Automatic Termination of eNB' self.desc = 'Automatic Termination of eNB'
HTML.desc='Automatic Termination of eNB' HTML.desc='Automatic Termination of eNB'
self.ShowTestID() self.ShowTestID()
#Terminate all instances on all servers, eNB, eNB1, eNB2 RAN.eNB_instance=0
#RAN.eNB_instance=0 RAN.TerminateeNB()
RAN.TerminateeNB(0)
RAN.TerminateeNB(1)
RAN.TermintateeNB(2)
if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted: if RAN.flexranCtrlInstalled and RAN.flexranCtrlStarted:
self.testCase_id = 'AUTO-KILL-flexran-ctl' self.testCase_id = 'AUTO-KILL-flexran-ctl'
HTML.testCase_id=self.testCase_id HTML.testCase_id=self.testCase_id
ci-scripts/ran.py
+6 -8
View File
@@ -546,27 +546,25 @@ class RANManagement():
except: except:
os.kill(os.getppid(),signal.SIGUSR1) os.kill(os.getppid(),signal.SIGUSR1)
def TerminateeNB(self,eNB_serverId): def TerminateeNB(self):
if eNB_serverId == '0': if self.eNB_serverId == '0':
lIpAddr = self.eNBIPAddress lIpAddr = self.eNBIPAddress
lUserName = self.eNBUserName lUserName = self.eNBUserName
lPassWord = self.eNBPassword lPassWord = self.eNBPassword
lSourcePath = self.eNBSourceCodePath lSourcePath = self.eNBSourceCodePath
elif eNB_serverId == '1': elif self.eNB_serverId == '1':
lIpAddr = self.eNB1IPAddress lIpAddr = self.eNB1IPAddress
lUserName = self.eNB1UserName lUserName = self.eNB1UserName
lPassWord = self.eNB1Password lPassWord = self.eNB1Password
lSourcePath = self.eNB1SourceCodePath lSourcePath = self.eNB1SourceCodePath
elif eNB_serverId == '2': elif self.eNB_serverId == '2':
lIpAddr = self.eNB2IPAddress lIpAddr = self.eNB2IPAddress
lUserName = self.eNB2UserName lUserName = self.eNB2UserName
lPassWord = self.eNB2Password lPassWord = self.eNB2Password
lSourcePath = self.eNB2SourceCodePath lSourcePath = self.eNB2SourceCodePath
if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '': if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
#HELP.GenericHelp(CONST.Version) HELP.GenericHelp(CONST.Version)
#sys.exit('Insufficient Parameter') sys.exit('Insufficient Parameter')
logging.debug('ATTENTION Cannot clean eNB_serverID='+eNB_serverID+' '+'@'+lIpAddr+' path:'+lSourcePath+' : No parameters')
return
mySSH = SSH.SSHConnection() mySSH = SSH.SSHConnection()
mySSH.open(lIpAddr, lUserName, lPassWord) mySSH.open(lIpAddr, lUserName, lPassWord)
mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5) mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)