diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-02 09:24:57 +0100 |
---|---|---|
committer | Morgan Richomme <morgan.richomme@orange.com> | 2020-12-07 09:31:15 +0000 |
commit | 7bfda24804972692d0fb515e664d7990c50d1724 (patch) | |
tree | 8e948ec11a3a891afe6965d10950afefcd5e2ab0 | |
parent | d0be3bbd1e0f7f6ed8496aa7fe0eeb803d713f77 (diff) |
[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 <sylvain.desbureaux@orange.com>
Change-Id: I75adf11c636d6a524f8cd9ddba4f7edffd105f58
(cherry picked from commit 30f2fbe6b093183cf885626b03f10717cb0da391)
-rw-r--r-- | security/onap_security/security_tests.py | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/security/onap_security/security_tests.py b/security/onap_security/security_tests.py index d0b25ac..742a718 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.""" |