CI: final fixes on help functions

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/constants.py

@@ -31,7 +31,7 @@
 #-----------------------------------------------------------
 # Version
 #-----------------------------------------------------------
-Version = '0.1'
+Version = '0.2'
 
 #-----------------------------------------------------------
 # Constants

ci-scripts/epc.py

@@ -96,7 +96,7 @@ class EPCManagement():
 
 	def InitializeHSS(self):
 		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
 			sys.exit('Insufficient EPC Parameters')
 		mySSH = SSH.SSHConnection() 
@@ -134,7 +134,7 @@ class EPCManagement():
 
 	def InitializeMME(self):
 		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
 			sys.exit('Insufficient EPC Parameters')
 		mySSH = SSH.SSHConnection() 
@@ -168,7 +168,7 @@ class EPCManagement():
 
 	def InitializeSPGW(self):
 		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
 			sys.exit('Insufficient EPC Parameters')
 		mySSH = SSH.SSHConnection() 

ci-scripts/html.py

@@ -363,8 +363,8 @@ class HTMLManagement():
 	def CreateHtmlRetrySeparator(self, cntnumfails):
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile = open('test_results.html', 'a')
-			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '>Try Run #' + str(cntnumfails) + '</td>\n')
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 

ci-scripts/ran.py

@@ -232,7 +232,7 @@ class RANManagement():
 
 	def BuildeNB(self):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		if self.eNB_serverId == '0':
 			lIpAddr = self.eNBIPAddress
@@ -250,7 +250,7 @@ class RANManagement():
 			lPassWord = self.eNB2Password
 			lSourcePath = self.eNB2SourceCodePath
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -359,7 +359,7 @@ class RANManagement():
 			lPassWord = self.eNB2Password
 			lSourcePath = self.eNB2SourceCodePath
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -454,7 +454,7 @@ class RANManagement():
 			lPassWord = self.eNB2Password
 			lSourcePath = self.eNB2SourceCodePath
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 
 		if self.htmlObj is not None:
@@ -679,7 +679,7 @@ class RANManagement():
 			lPassWord = self.eNB2Password
 			lSourcePath = self.eNB2SourceCodePath
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			GenericHelp(Version)
+			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml

@@ -25,7 +25,7 @@
 	<htmlTabRef>test-05-tm2</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM2</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>3</repeatCount>
+	<repeatCount>2</repeatCount>
         <TestCaseRequestedList>
  030201
  040101