File handeling fixes

Robot_Resources/perftest.resource

@@ -1,4 +1,6 @@
 *** Settings ***
+Library           OperatingSystem
+Library           String
 
 *** Variables ***
 ${STT_MIN}			15
@@ -7,4 +9,48 @@ ${STT_MAX}			45
 *** Keywords ***
 Standard Think Time
 	${number}    Evaluate    random.randint(${STT_MIN}, ${STT_MAX})    random
+	Log      Standard Think Time (${number})
 	Sleep    ${number}
+
+Get Data Row
+	[Arguments]    ${FileName}    ${Row}="Random"
+	[Documentation]    This keyword gets a row of data from a CSV or TSV file,
+	...                takes 1-2 arguments:
+	...                 - FileName (Required)
+	...                 - Row (Optional) can be Random, Sequential or a number
+	...                   defaults to Random
+	# Log    Get Data Row: \tFileName: ${FileName} \tRow: ${Row}
+	${RAW_FILE} = 	Get File	${FileName}
+	@{FILE_LINES} = 	Split To Lines	${RAW_FILE}
+	${LINE_COUNT} = 	Get Length    ${FILE_LINES}
+
+	${FILE_SEQUENTIAL_NUM} =	Get Variable Value	${FILE_SEQUENTIAL_NUM}	0
+
+	@{delim_cols} = 	Split String	${FILE_LINES}[0]	,
+	${delim_cols_len} = 	Get Length    ${delim_cols}
+	${DELIMITER} =	Set Variable If	${delim_cols_len} > 1	,	\t
+	@{FILE_COLUMNS} = 	Split String	${FILE_LINES}[0]	${DELIMITER}
+	${COLUMNS_COUNT} = 	Get Length    ${FILE_COLUMNS}
+
+	${ROW_NUM} = 	Set Variable    ${Row}
+	${ROW_NUM} = 	Run Keyword If    ${Row}=="Random"	Evaluate    random.randint(1, ${LINE_COUNT}-1)    random
+					... 	ELSE	Set Variable    ${ROW_NUM}
+	${ROW_NUM} = 	Run Keyword If    ${Row}=="Sequential"    Evaluate    ${FILE_SEQUENTIAL_NUM} + 1
+					... 	ELSE	Set Variable    ${ROW_NUM}
+
+	Set Test Variable	\${FILE_SEQUENTIAL_NUM}	${FILE_SEQUENTIAL_NUM}
+
+	@{ROW_COLUMNS} = 	Split String	${FILE_LINES}[${ROW_NUM}]	${DELIMITER}
+	# :FOR ${I}	Input Text    locator    text
+	FOR	${I}	IN RANGE	${COLUMNS_COUNT}
+		# Log    \${I} ${I}
+		${VAR_NAME} = 	Set Variable    ${FILE_COLUMNS}[${I}]
+		${VAR_VALUE} = 	Set Variable    ${ROW_COLUMNS}[${I}]
+		# Log    \${VAR_NAME}: ${VAR_NAME}\t\${VAR_VALUE}: ${VAR_VALUE}
+		Set Test Variable	${${VAR_NAME}}	${VAR_VALUE}
+	END
+	# Log Variables
+
+Get File Dir
+	${FILE_DIR} = 	Evaluate	os.path.dirname("${SUITE_SOURCE}")	os
+	[Return] 	${FILE_DIR}

rfswarm.py

@@ -17,6 +17,7 @@
 
 import sys
 import os
+import glob
 import hashlib
 import lzma
 import base64
@@ -1414,12 +1415,12 @@ def find_dependancies(self, hash):
 					if checking:
 						# print("find_dependancies: line", line)
 						try:
-							if 'Resource' in line or 'Variables' in line:
+							if 'Resource' in line or 'Variables' in line or 'Metadata	File' in line:
 								linearr = line.strip().split()
 								# print("find_dependancies: linearr", linearr)
 								if len(linearr)>1:
 									# print("find_dependancies: linearr[1]", linearr[1])
-									resfile = linearr[1]
+									resfile = linearr[-1]
 									localrespath = os.path.join(localdir, resfile)
 									# print("find_dependancies: localrespath", localrespath)
 									if os.path.isfile(localrespath):
@@ -1431,7 +1432,20 @@ def find_dependancies(self, hash):
 												'relpath': resfile,
 												'type': linearr[0]
 											}
-
+									else:
+										filelst = glob.glob(localrespath)
+										for file in filelst:
+											print("find_dependancies: file", file)
+											relpath = file.replace(localdir, "")[1:]
+											print("find_dependancies: relpath", relpath)
+											newhash = self.hash_file(file)
+											print("find_dependancies: newhash", newhash)
+											self.scriptfiles[newhash] = {
+													'id': newhash,
+													'localpath': file,
+													'relpath': relpath,
+													'type': linearr[0]
+												}
 
 						except Exception as e:
 							print("find_dependancies: line", line)

rfswarm_agent.py

@@ -274,7 +274,7 @@ def getfile(self, hash):
 			# print("getfile: jsonresp:", jsonresp)
 
 			# print('scriptdir', self.scriptdir)
-			localfile = os.path.join(self.scriptdir, jsonresp['File'])
+			localfile = os.path.abspath(os.path.join(self.scriptdir, jsonresp['File']))
 			print('getfile: localfile', localfile)
 			self.scriptlist[hash]['localfile'] = localfile
 			self.scriptlist[hash]['file'] = jsonresp['File']
@@ -283,18 +283,28 @@ def getfile(self, hash):
 
 			filedata = jsonresp['FileData']
 			# print("filedata:", filedata)
+			# print("getfile: filedata:")
 
 			decoded = base64.b64decode(filedata)
 			# print("b64decode: decoded:", decoded)
+			# print("getfile: b64decode:")
 
 			uncompressed = lzma.decompress(decoded)
 			# print("uncompressed:", uncompressed)
+			# print("getfile: uncompressed:")
+
+			localfiledir = os.path.dirname(localfile)
+			# print("getfile: localfiledir:", localfiledir)
+			self.ensuredir(localfiledir)
+			# print("getfile: ensuredir:")
 
 			with open(localfile, 'wb') as afile:
-			    afile.write(uncompressed)
+				# print("getfile: afile:")
+				afile.write(uncompressed)
+				# print("getfile: write:")
 
 		except Exception as e:
-			print("getscripts: Exception:", e)
+			print("getfile: Exception:", e)
 
 	def getjobs(self):
 		# print("getjobs")
@@ -465,9 +475,10 @@ def run_process_output(self, outputFile, index, vuser, iter):
 		# print("root: '", root)
 		# .//kw/msg/..[not(@library='BuiltIn')]
 		for result in root.findall(".//kw/msg/..[@library]"):
-			# print("result: ", result)
+			# print("run_process_output: result: ", result)
 			library = result.get('library')
-			if library != "BuiltIn":
+			if library not in ["BuiltIn", "String", "OperatingSystem", "perftest"]:
+				# print("run_process_output: library: ", library)
 				seq += 1
 				# print("result: library:", library)
 				txn = result.find('msg').text
@@ -514,7 +525,7 @@ def run_process_output(self, outputFile, index, vuser, iter):
 					"Sequence": seq
 				}
 
-				print("run_proces_output: payload", payload)
+				# print("run_proces_output: payload", payload)
 				try:
 					r = requests.post(uri, json=payload)
 					# print("run_proces_output: ",r.status_code, r.text)
@@ -544,7 +555,8 @@ def ensuredir(self, dir):
 			os.mkdir(dir, mode=0o777)
 			# print("Directory Created: ", dir)
 		except FileExistsError:
-			print("Directory Exists: ", dir)
+			# print("Directory Exists: ", dir)
+			pass
 		except Exception as e:
 			print("Directory Create failed: ", dir)
 			print("with error: ", e)