Rename CI Run_PhySim to Run_LDPCTest

ci-scripts/cls_physim.py

@@ -64,7 +64,7 @@ class PhySim:
 #PRIVATE Methods
 #-----------------
 
-	def __CheckResults_PhySim(self,HTML,CONST,testcase_id):
+	def __CheckResults_LDPCTest(self,HTML,CONST,testcase_id):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
@@ -173,7 +173,7 @@ class PhySim:
 		return lHTML
 
 
-	def Run_PhySim(self,htmlObj,constObj,testcase_id):
+	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
 		#create run logs folder locally
 		os.system('mkdir -p ./'+self.__runLogPath)
 		#log file is tc_<testcase_id>.log remotely
@@ -187,5 +187,5 @@ class PhySim:
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_PhySim(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
 		return lHTML

ci-scripts/main.py

@@ -457,8 +457,13 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.testSvrId = string_field
 
-	else: # ie action == 'Run_PhySim':
+	elif action == 'Run_LDPCTest':
 		ldpc.runargs = test.findtext('physim_run_args')
+
+	else:
+		logging.error(f"unknown action {action}, abort")
+		exit(1)
+
 		
 
 #check if given test is in list
@@ -914,8 +919,10 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					HTML=ldpc.Build_PhySim(HTML,CONST)
 					if ldpc.exitStatus==1:
 						RAN.prematureExit = True
-				elif action == 'Run_PhySim':
-					HTML=ldpc.Run_PhySim(HTML,CONST,id)
+				elif action == 'Run_LDPCTest':
+					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
 				elif action == 'Build_Image':
 					CONTAINERS.BuildImage(HTML)
 				elif action == 'Build_Proxy':

ci-scripts/xml_class_list.yml

@@ -1,6 +1,6 @@
   - Build_Proxy
   - Build_PhySim
-  - Run_PhySim
+  - Run_LDPCTest
   - Build_eNB
   - WaitEndBuild_eNB
   - Initialize_eNB

ci-scripts/xml_files/ldpc_gpu_test.xml

@@ -30,121 +30,121 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 
 	<testCase id="000002">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 3872 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000003">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 3872 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000004">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 4224 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000005">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 4224 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000006">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 4576 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000007">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 4576 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000008">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 4928 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000009">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 4928 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000010">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 5280 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000011">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 5280 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000012">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 5632 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000013">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 5632 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000014">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 6336 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000015">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 6336 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000016">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 7040 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000017">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 7040 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000018">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 7744 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000019">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 7744 -s10 -n100 -G 1</physim_run_args>
 	</testCase>
 
 	<testCase id="000020">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with CPU</desc>
 		<physim_run_args>-l 8448 -s10 -n100</physim_run_args>
 	</testCase>
 
 	<testCase id="000021">
-		<class>Run_PhySim</class>
+		<class>Run_LDPCTest</class>
 		<desc>Run LDPC Test with GPU</desc>
 		<physim_run_args>-l 8448 -s10 -n100 -G 1</physim_run_args>
 	</testCase>