X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=53649609dd81cd0a2b0b646d392218582e32d654;hp=c149e3e51c20b22e7d05d37105e3a994a309dcfa;hb=d45c3f997201a6f17b39b3e5ceb82b332852149f;hpb=6c3d971c8b529d094f7c7355e685ea5ab63904e5

diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index c149e3e51c..53649609dd 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:
@@ -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,17 +420,42 @@ 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):
-                        build_nr = builds.get("end", None)
+                        build_end = builds.get("end", None)
                         try:
-                            build_nr = int(build_nr)
+                            build_end = int(build_end)
                         except ValueError:
                             # defined as a range <start, build_type>
-                            build_nr = self._get_build_number(job, build_nr)
-                        builds = [x for x in range(builds["start"], build_nr+1)]
+                            build_end = self._get_build_number(job, build_end)
+                        builds = [x for x in range(builds["start"], build_end+1)
+                                  if x not in builds.get("skip", list())]
                         self.configuration["data-sets"][set_name][job] = builds
+                    elif isinstance(builds, list):
+                        for idx, item in enumerate(builds):
+                            try:
+                                builds[idx] = int(item)
+                            except ValueError:
+                                # defined as a range <build_type>
+                                builds[idx] = self._get_build_number(job, item)
+
+        # 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
@@ -498,13 +523,14 @@ class Specification(object):
             for job, builds in self._cfg_yaml[idx]["builds"].items():
                 if builds:
                     if isinstance(builds, dict):
-                        build_nr = builds.get("end", None)
+                        build_end = builds.get("end", None)
                         try:
-                            build_nr = int(build_nr)
+                            build_end = int(build_end)
                         except ValueError:
                             # defined as a range <start, build_type>
-                            build_nr = self._get_build_number(job, build_nr)
-                        builds = [x for x in range(builds["start"], build_nr+1)]
+                            build_end = self._get_build_number(job, build_end)
+                        builds = [x for x in range(builds["start"], build_end+1)
+                                  if x not in builds.get("skip", list())]
                     self._specification["input"]["builds"][job] = list()
                     for build in builds:
                         self._specification["input"]["builds"][job]. \
@@ -602,6 +628,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