aligning remote repository with local on starsky

ci-scripts/epc.py

@@ -55,7 +55,7 @@ class EPCManagement():
 
 	def __init__(self):
 		
-		self.IPAddress = ''
+		self.EPCIPAddress = ''
 		self.UserName = ''
 		self.Password = ''
 		self.SourceCodePath = ''
@@ -130,7 +130,8 @@ class EPCManagement():
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.EPCType, 'OK', CONST.ALL_PROCESSES_OK)
+		myHTML = HTML.HTMLManagement()
+		myHTML.CreateHtmlTestRow(self.EPCType, 'OK', CONST.ALL_PROCESSES_OK)
 
 	def InitializeMME(self):
 		if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '':
@@ -163,7 +164,8 @@ class EPCManagement():
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.EPCType, 'OK', ALL_PROCESSES_OK)
+		myHTML = HTML.HTMLManagement()
+		myHTML.CreateHtmlTestRow(self.EPCType, 'OK', CONST.ALL_PROCESSES_OK)
 
 	def InitializeSPGW(self):
 		if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '':
@@ -194,7 +196,8 @@ class EPCManagement():
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow(self.EPCType, 'OK', ALL_PROCESSES_OK)
+		myHTML = HTML.HTMLManagement()
+		myHTML.CreateHtmlTestRow(self.EPCType, 'OK', CONST.ALL_PROCESSES_OK)
 
 
 	def CheckHSSProcess(self, status_queue):
@@ -294,7 +297,8 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		myHTML = HTML.HTMLManagement()
+		myHTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
 	def TerminateMME(self):
 		mySSH = SSH.SSHConnection() 
@@ -313,7 +317,8 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+		myHTML = HTML.HTMLManagement()
+		myHTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
 	def TerminateSPGW(self):
 		mySSH = SSH.SSHConnection() 
@@ -344,7 +349,8 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		myHTML = HTML.HTMLManagement()
+		myHTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
 
 	def LogCollectHSS(self):

ci-scripts/html.py

@@ -45,7 +45,8 @@ from multiprocessing import Process, Lock, SimpleQueue
 class HTMLManagement():
 
 	def __init__(self):
-		
+	
+		self.htmlFile = ''
 		self.htmlHeaderCreated = False
 		self.htmlFooterCreated = False
 		self.ranAllowMerge = False
@@ -54,10 +55,18 @@ class HTMLManagement():
 		self.htmlTabNames = []
 		self.htmlTabIcons = []
 		self.testXMLfiles = []
+		self.htmleNBFailureMsg = ''
+		self.htmlUEFailureMsg = ''
 
 #-----------------------------------------------------------
 # Setters and Getters
 #-----------------------------------------------------------
+	def SethtmlUEFailureMsg(self,huefa):
+                self.htmlUEFailureMsg = huefa
+	def GethtmlUEFailureMsg(self):
+		return huefa
+
+
 	def SetreseNB(self,rsenb):
 		self.reseNB = rsenb
 	def SetresUE(self,rsue):

ci-scripts/ran.py

@@ -87,6 +87,9 @@ class RANManagement():
 		self.eNBLogFiles = ['', '', '']
 		self.eNBOptions = ['', '', '']
 		self.eNBmbmsEnables = [False, False, False]
+		self.eNBstatuses = [-1, -1, -1]
+		self.flexranCtrlInstalled = False
+		self.flexranCtrlStarted = False
 
 #-----------------------------------------------------------
 # Setters and Getters
@@ -97,8 +100,12 @@ class RANManagement():
 		self.testCase_id = tcid
 	def SetflexranCtrlInstalled(self,fxrctin):
 		self.flexranCtrlInstalled = fxrctin
+	def GetflexranCtrlInstalled(self):
+		return self.flexranCtrlInstalled
 	def SetflexranCtrlStarted(self,fxrctst):
 		self.flexranCtrlStarted = fxrctst
+	def GetflexranCtrlStarted(self):
+		return self.flexranCtrlStarted
 	def SetpStatus(self, pSt):
 		self.pStatus = pSt
 	def SetranRepository(self, repository):
@@ -175,21 +182,11 @@ class RANManagement():
 	def GeteNBLogFiles(self):
 		return self.eNBLogFiles
 
-	def SeteNBOptions(self, enbopt):
-		self.eNBOptions = enbopt
-	def GeteNBOptions(self):
-		return self.eNBOptions
-
 	def SeteNBmbmsEnables(self, enbmbms):
 		self.eNBmbmsEnables = enbmbms
 	def GeteNBmbmsEnables(self):
 		return self.eNBmbmsEnables
 
-	def SeteNBstatuses(self, enbstatus):
-		self.eNBstatuses = enbstatus
-	def GeteNBstatuses(self):
-		return self.eNBstatuses
-		self.eNB1IPAddress = enb1ip
 	def SeteNB1IPAddress(self,enb1ip):
 		self.eNB1IPAddress = enb1ip
 	def GeteNB1IPAddress(self):
@@ -339,6 +336,7 @@ class RANManagement():
 			self.backgroundBuildTestId[int(self.eNB_instance)] = self.testCase_id
 			return
 		mySSH.command('stdbuf -o0 ./build_oai ' + self.Build_eNB_args + ' 2>&1 | stdbuf -o0 tee compile_oai_enb.log', 'Bypassing the Tests|build have failed', 1500)
+		mySSH.close()
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id)
 
 
@@ -374,11 +372,13 @@ class RANManagement():
 			else:
 				count -= 1
 				time.sleep(30)
+		mySSH.close()
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)])
 
 	def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId):
 		myHTML = HTML.HTMLManagement()
 		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 3)
 		mySSH.command('ls ran_build/build', '\$', 3)
 		mySSH.command('ls ran_build/build', '\$', 3)
@@ -909,7 +909,7 @@ class RANManagement():
 		enb_log_file.close()
 		logging.debug('   File analysis completed')
 		self.htmleNBFailureMsg = ''
-		if self.air_interface() == 'lte':
+		if self.air_interface == 'lte':
 			nodeB_prefix = 'e'
 		else:
 			nodeB_prefix = 'g'