X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=b459bd3117de21be3c7d2b1cc2c9ae51ba8f8a02;hb=e19b6a5860556426663a11cbf6376893854618f3;hp=97662899e3b5113068872ce739fb4cd7b083ec7f;hpb=d1c1b27d17033799cd586a079820d708cc8a541c;p=csit.git

diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index 97662899e3..b459bd3117 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -370,7 +370,7 @@ class Specification(object):
 
         try:
             self._specification["environment"]["urls"] = \
-                self._replace_tags(self._cfg_yaml[idx]["urls"])
+                self._cfg_yaml[idx]["urls"]
         except KeyError:
             self._specification["environment"]["urls"] = None
 
@@ -420,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):
@@ -432,6 +434,21 @@ class Specification(object):
                         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"].\
@@ -602,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