X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=bf538836a9a64ce12d4248c368a5b7a4293aadd7;hb=9390233c8b3d9176e020976ecdf44eb99c1f58e3;hp=ebd84530a3d8b5e3b967e0428a95b92898afc7bc;hpb=5646509aea6b43ef1efb282aad908289cc005b26;p=csit.git

diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index ebd84530a3..bf538836a9 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -94,20 +94,32 @@ class Specification(object):
         return self._specification["static"]
 
     @property
-    def is_debug(self):
-        """Getter - debug mode
+    def mapping(self):
+        """Getter - Mapping.
 
-        :returns: True if debug mode is on, otherwise False.
-        :rtype: bool
+        :returns: Mapping of the old names of test cases to the new (actual)
+            one.
+        :rtype: dict
         """
+        return self._specification["configuration"]["mapping"]
 
-        try:
-            if self.environment["configuration"]["CFG[DEBUG]"] == 1:
-                return True
-            else:
-                return False
-        except KeyError:
-            return False
+    @property
+    def ignore(self):
+        """Getter - Ignore list.
+
+        :returns: List of ignored test cases.
+        :rtype: list
+        """
+        return self._specification["configuration"]["ignore"]
+
+    @property
+    def alerting(self):
+        """Getter - Alerting.
+
+        :returns: Specification of alerts.
+        :rtype: dict
+        """
+        return self._specification["configuration"]["alerting"]
 
     @property
     def input(self):
@@ -380,6 +392,12 @@ class Specification(object):
         except KeyError:
             self._specification["environment"]["build-dirs"] = None
 
+        try:
+            self._specification["environment"]["testbeds"] = \
+                self._cfg_yaml[idx]["testbeds"]
+        except KeyError:
+            self._specification["environment"]["testbeds"] = None
+
         logging.info("Done.")
 
     def _parse_configuration(self):
@@ -402,6 +420,8 @@ class Specification(object):
 
         # Data sets: Replace ranges by lists
         for set_name, data_set in self.configuration["data-sets"].items():
+            if not isinstance(data_set, dict):
+                continue
             for job, builds in data_set.items():
                 if builds:
                     if isinstance(builds, dict):
@@ -413,6 +433,66 @@ class Specification(object):
                             build_nr = self._get_build_number(job, build_nr)
                         builds = [x for x in range(builds["start"], build_nr+1)]
                         self.configuration["data-sets"][set_name][job] = builds
+
+        # Data sets: add sub-sets to sets (only one level):
+        for set_name, data_set in self.configuration["data-sets"].items():
+            if isinstance(data_set, list):
+                new_set = dict()
+                for item in data_set:
+                    try:
+                        for key, val in self.configuration["data-sets"][item].\
+                                items():
+                            new_set[key] = val
+                    except KeyError:
+                        raise PresentationError(
+                            "Data set {0} is not defined in "
+                            "the configuration section.".format(item))
+                self.configuration["data-sets"][set_name] = new_set
+
+        # Mapping table:
+        mapping = None
+        mapping_file_name = self._specification["configuration"].\
+            get("mapping-file", None)
+        if mapping_file_name:
+            logging.debug("Mapping file: '{0}'".format(mapping_file_name))
+            try:
+                with open(mapping_file_name, 'r') as mfile:
+                    mapping = load(mfile)
+                logging.debug("Loaded mapping table:\n{0}".format(mapping))
+            except (YAMLError, IOError) as err:
+                raise PresentationError(
+                    msg="An error occurred while parsing the mapping file "
+                        "'{0}'.".format(mapping_file_name),
+                    details=repr(err))
+        # Make sure everything is lowercase
+        if mapping:
+            self._specification["configuration"]["mapping"] = \
+                {key.lower(): val.lower() for key, val in mapping.iteritems()}
+        else:
+            self._specification["configuration"]["mapping"] = dict()
+
+        # Ignore list:
+        ignore = None
+        ignore_list_name = self._specification["configuration"].\
+            get("ignore-list", None)
+        if ignore_list_name:
+            logging.debug("Ignore list file: '{0}'".format(ignore_list_name))
+            try:
+                with open(ignore_list_name, 'r') as ifile:
+                    ignore = load(ifile)
+                logging.debug("Loaded ignore list:\n{0}".format(ignore))
+            except (YAMLError, IOError) as err:
+                raise PresentationError(
+                    msg="An error occurred while parsing the ignore list file "
+                        "'{0}'.".format(ignore_list_name),
+                    details=repr(err))
+        # Make sure everything is lowercase
+        if ignore:
+            self._specification["configuration"]["ignore"] = \
+                [item.lower() for item in ignore]
+        else:
+            self._specification["configuration"]["ignore"] = list()
+
         logging.info("Done.")
 
     def _parse_input(self):
@@ -539,6 +619,27 @@ class Specification(object):
                         self._specification["environment"]["paths"])
                 except KeyError:
                     pass
+
+                # add data sets
+                try:
+                    for item in ("reference", "compare"):
+                        if element.get(item, None):
+                            data_set = element[item].get("data", None)
+                            if isinstance(data_set, str):
+                                element[item]["data"] = \
+                                    self.configuration["data-sets"][data_set]
+
+                    if element.get("history", None):
+                        for i in range(len(element["history"])):
+                            data_set = element["history"][i].get("data", None)
+                            if isinstance(data_set, str):
+                                element["history"][i]["data"] = \
+                                    self.configuration["data-sets"][data_set]
+
+                except KeyError:
+                    raise PresentationError("Wrong data set used in {0}.".
+                                            format(element.get("title", "")))
+
                 self._specification["tables"].append(element)
                 count += 1