Adding the mode in xml files.

Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>

ci-scripts/main.py

@@ -3021,6 +3021,9 @@ def Usage():
 	print('  --XMLTestFile=[XML Test File to be run]')
 	print('------------------------------------------------------------')
 
+def GetModeFromXML():
+	SSH.mode = test.findtext('mode')
+
 def CheckClassValidity(action,id):
 	if action != 'Build_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Build_OAI_UE' and action != 'Initialize_OAI_UE' and action != 'Terminate_OAI_UE' and action != 'Initialize_OAI_eNB' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and action != 'Terminate_SPGW'  and action != 'Initialize_CatM_module' and action != 'Terminate_CatM_module' and action != 'Attach_CatM_module' and action != 'Detach_CatM_module' and action != 'Ping_CatM_module' and action != 'IdleSleep':
 		logging.debug('ERROR: test-case ' + id + ' has wrong class ' + action)
@@ -3139,7 +3142,13 @@ while len(argvs) > 1:
 		Usage()
 		sys.exit(0)
 	elif re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
+		mode = GetModeFromXML()
+		print('mode: ' + mode)
 		matchReg = re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
+		if matchReg and mode is not None:
+			print('Warning: the mode is defined in both xml file and command line')
+			print('ignoring the mode defined in the xml file')
+		print('mode: ' + mode)
 		mode = matchReg.group(1)
 	elif re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
 		matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)

ci-scripts/test-boris-Jenkinsfile

@@ -223,8 +223,6 @@ pipeline {
         	    	    for (xmlFile in myXmlTestSuite) {
         	    	    if (fileExists(xmlFile)) {
         	    		try {
-        	    		    //echo "The test will be executed here. The command would be:"
-        	    		    //echo  "sh \"python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBBranch=${eNB_Branch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBCommitID=${eNB_CommitID} --ADBIPAddress=${ADB_IPAddress} --EPCIPAddress=${EPC_IPAddress} --XMLTestFile=${xmlFile}\""
         	    		    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBBranch=${eNB_Branch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBCommitID=${eNB_CommitID} --ADBIPAddress=${ADB_IPAddress} --EPCIPAddress=${EPC_IPAddress} --XMLTestFile=${xmlFile}"
         	    		} catch (Exception e) {
         	    		    currentBuild.result = 'FAILURE'

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -30,6 +30,7 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 
 	<testCase id="090101">
+		<mode>TesteNB</mode>	
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
 		<Build_eNB_args>--gNB -w USRP</Build_eNB_args>

ci-scripts/xml_files/nr_ue_usrp_build.xml

@@ -30,6 +30,7 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 
 	<testCase id="090102">
+		<mode>TestUE</mode>
 		<class>Build_OAI_UE</class>
 		<desc>Build NR UE (USRP)</desc>
 		<Build_OAI_UE_args>--nrUE -w USRP</Build_OAI_UE_args>