diff options
Diffstat (limited to 'reporting/reporting')
| -rwxr-xr-x | reporting/reporting/functest/reporting-tempest.py | 26 | ||||
| -rwxr-xr-x | reporting/reporting/functest/reporting-vims.py | 2 | ||||
| -rw-r--r-- | reporting/reporting/reporting.yaml | 2 | ||||
| -rw-r--r-- | reporting/reporting/vsperf/reporting-status.py | 2 |
4 files changed, 21 insertions, 11 deletions
diff --git a/reporting/reporting/functest/reporting-tempest.py b/reporting/reporting/functest/reporting-tempest.py index d78d9a1..b82f96c 100755 --- a/reporting/reporting/functest/reporting-tempest.py +++ b/reporting/reporting/functest/reporting-tempest.py @@ -83,8 +83,16 @@ for version in rp_utils.get_config('general.versions'): # retrieve results # **************** - nb_tests_run = result['details']['tests'] - nb_tests_failed = result['details']['failures'] + try: + nb_tests_run = result['details']['success_number'] + nb_tests_failed = result['details']['failures_number'] + except KeyError: + try: + nb_tests_run = result['details']['tests'] + nb_tests_failed = result['details']['failures'] + except KeyError: + logger.error("Impossible to retrieve results") + logger.debug("nb_tests_run= %s", nb_tests_run) logger.debug("nb_tests_failed= %s", nb_tests_failed) @@ -140,12 +148,14 @@ for version in rp_utils.get_config('general.versions'): # Error management # **************** try: - errors = result['details']['errors'] - logger.info("errors: %s", errors) - result['errors'] = errors - except Exception: # pylint: disable=broad-except - logger.error("Error field not present (Brahamputra runs?)") - + errors = result['details']['failures'] + except KeyError: + try: + errors = result['details']['errors'] + except KeyError: + logger.error("Error field not present (old runs?)") + logger.info("errors: %s", errors) + result['errors'] = errors templateLoader = jinja2.FileSystemLoader(".") templateEnv = jinja2.Environment(loader=templateLoader, autoescape=True) diff --git a/reporting/reporting/functest/reporting-vims.py b/reporting/reporting/functest/reporting-vims.py index 3b25e91..bc9308c 100755 --- a/reporting/reporting/functest/reporting-vims.py +++ b/reporting/reporting/functest/reporting-vims.py @@ -120,7 +120,7 @@ for version in VERSIONS: LOGGER.debug("vIMS deployment: %ss", res_vnf) LOGGER.debug("VNF testing: %ss", res_test_vnf) LOGGER.debug("VNF testing results: %s", format_result) - except Exception as err: # pylint: disable=broad-except + except KeyError as err: # pylint: disable=broad-except LOGGER.error("Uncomplete data %s", err) LOGGER.debug("----------------------------------------") diff --git a/reporting/reporting/reporting.yaml b/reporting/reporting/reporting.yaml index 8123d01..b2f7d07 100644 --- a/reporting/reporting/reporting.yaml +++ b/reporting/reporting/reporting.yaml @@ -9,7 +9,7 @@ general: versions: - master - - euphrates + - fraser log: log_file: reporting.log diff --git a/reporting/reporting/vsperf/reporting-status.py b/reporting/reporting/vsperf/reporting-status.py index b307ef0..f1a437f 100644 --- a/reporting/reporting/vsperf/reporting-status.py +++ b/reporting/reporting/vsperf/reporting-status.py @@ -127,7 +127,7 @@ def main(): period=50) version_data = _get_version_data(data['vsperf']) - for version in {'master', 'danube', 'euphrates'}: + for version in {'master', 'danube', 'euphrates', 'fraser'}: _generate_reporting(version, version_data.get(version, [])) LOG.info("End") |