diff --git a/framework/python/src/core/docker/docker_module.py b/framework/python/src/core/docker/docker_module.py index 854251c54..9d0cd937e 100644 --- a/framework/python/src/core/docker/docker_module.py +++ b/framework/python/src/core/docker/docker_module.py @@ -20,7 +20,7 @@ IMAGE_PREFIX = 'testrun/' CONTAINER_PREFIX = 'tr-ct' -DEFAULT_NETWORK = 'bridge' +DEFAULT_NETWORK = 'none' class Module: diff --git a/modules/test/base/python/src/test_module.py b/modules/test/base/python/src/test_module.py index ebff6b7f9..ee0fab1c5 100644 --- a/modules/test/base/python/src/test_module.py +++ b/modules/test/base/python/src/test_module.py @@ -162,6 +162,10 @@ def run_tests(self): # Check if details were provided if len(result)>2: test['details'] = result[2] + + # Check if tags were provided + if len(result)>3: + test['tags'] = result[3] else: LOGGER.debug('No result was returned from the test module') test['result'] = TestResult.ERROR diff --git a/modules/test/tls/python/src/tls_module.py b/modules/test/tls/python/src/tls_module.py index 9aab1b782..f5ae6cff6 100644 --- a/modules/test/tls/python/src/tls_module.py +++ b/modules/test/tls/python/src/tls_module.py @@ -289,7 +289,7 @@ def _security_tls_v1_2_client(self): else: description = 'TLS 1.2 client connections invalid' result = False - return result, description, results[1] + return result, description, results[1], results[2] else: LOGGER.error('Could not resolve device IP address. Skipping') return 'Error', 'Could not resolve device IP address' @@ -308,7 +308,7 @@ def _security_tls_v1_3_client(self): description = 'TLS 1.3 client connections valid' else: description = 'TLS 1.3 client connections invalid' - return results[0], description, results[1] + return results[0], description, results[1], results[2] else: LOGGER.error('Could not resolve device IP address') return 'Error', 'Could not resolve device IP address' @@ -324,7 +324,7 @@ def _validate_tls_client(self, client_ip, tls_version): # Generate results based on the state result_message = 'No outbound connections were found.' result_state = 'Feature Not Detected' - + result_tags = [] # If any of the packets detect failed client comms, fail the test if not client_results[0] and client_results[0] is not None: result_state = False @@ -333,7 +333,11 @@ def _validate_tls_client(self, client_ip, tls_version): if client_results[0]: result_state = True result_message = client_results[1] - return result_state, result_message + # Tag for a VSA requirement regardless if there + # are any connections detected regardless of validity + if client_results[0] is not None: + result_tags.append('VSA') + return result_state, result_message, result_tags def _resolve_device_ip(self): # If the ipv4 address wasn't resolved yet, try again