From 30f2fbe6b093183cf885626b03f10717cb0da391 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Wed, 2 Dec 2020 09:24:57 +0100 Subject: [SECURITY] S3 Support If we want to use S3 in order to store results, `details` attribute of test class must be a dictionnary and not a string. Also, everything we want to upload must be put in `res_dir`. Issue-ID: REQ-442 Signed-off-by: Sylvain Desbureaux Change-Id: I75adf11c636d6a524f8cd9ddba4f7edffd105f58 --- security/onap_security/security_tests.py | 33 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'security') diff --git a/security/onap_security/security_tests.py b/security/onap_security/security_tests.py index 4c7af29..cdfafcd 100644 --- a/security/onap_security/security_tests.py +++ b/security/onap_security/security_tests.py @@ -50,32 +50,29 @@ class SecurityTesting(testcase.TestCase): raise Exception(output) # create a log file - file_name = "/var/lib/xtesting/results/" + self.case_name + ".log" - log_file = open(file_name, "w") - log_file.write(output) - log_file.close() + file_name = "{0}/{1}.log".format(self.res_dir, self.case_name) + try: + with open(file_name, 'w') as log_file: + log_file.write(output) + except Exception as exc: + print(exc) + # we consider the command return code for success criteria if process.returncode is None: - success = False - details = self.error_string + self.result = 0 if (self.case_name == 'kube_hunter' and "No vulnerabilities were found" in output): - success = True + self.result = 100 + else: + self.details = {'error': self.error_string} elif process.returncode != 0: - success = False - details = self.error_string + self.result = 0 + self.details = {'error': self.error_string} else: - success = True - details = "Test PASS" - - self.details = details - self.__logger.info("details: %s", details) - - if success: self.result = 100 - else: - self.result = 0 + + self.__logger.info("details: %s", self.details) def run(self, **kwargs): """Generic Run.""" -- cgit 1.2.3-korg