X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=2659c29ca59a4a9350fa87e604c969ff7c52f333;hb=refs%2Fchanges%2F23%2F11323%2F1;hp=3404024a87f6039f2e014edbc9fa53043b325711;hpb=849e7756a138ff0b52767cb3cfea7aec9941ee91;p=csit.git

diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index 3404024a87..2659c29ca5 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -22,6 +22,7 @@ from yaml import load, YAMLError
 from pprint import pformat
 
 from errors import PresentationError
+from utils import get_last_build_number
 
 
 class Specification(object):
@@ -53,7 +54,8 @@ class Specification(object):
                                "output": dict(),
                                "tables": list(),
                                "plots": list(),
-                               "files": list()}
+                               "files": list(),
+                               "cpta": dict()}
 
     @property
     def specification(self):
@@ -173,6 +175,17 @@ class Specification(object):
         """
         return self._specification["files"]
 
+    @property
+    def cpta(self):
+        """Getter - Continuous Performance Trending and Analysis to be
+        generated.
+
+        :returns: List of specifications of Continuous Performance Trending and
+        Analysis to be generated.
+        :rtype: list
+        """
+        return self._specification["cpta"]
+
     def set_input_state(self, job, build_nr, state):
         """Set the state of input
 
@@ -354,9 +367,31 @@ class Specification(object):
 
         try:
             self._specification["configuration"] = self._cfg_yaml[idx]
+
         except KeyError:
             raise PresentationError("No configuration defined.")
 
+        # Data sets: Replace ranges by lists
+        for set_name, data_set in self.configuration["data-sets"].items():
+            for job, builds in data_set.items():
+                if builds:
+                    if isinstance(builds, dict):
+                        # defined as a range <start, end>
+                        if builds.get("end", None) == "lastSuccessfulBuild":
+                            # defined as a range <start, lastSuccessfulBuild>
+                            ret_code, build_nr, _ = get_last_build_number(
+                                self.environment["urls"]["URL[JENKINS,CSIT]"],
+                                job)
+                            if ret_code != 0:
+                                raise PresentationError(
+                                    "Not possible to get the number of the "
+                                    "last successful  build.")
+                        else:
+                            # defined as a range <start, end (build number)>
+                            build_nr = builds.get("end", None)
+                        builds = [x for x in range(1, int(build_nr)+1)]
+                        self.configuration["data-sets"][set_name][job] = builds
+
         logging.info("Done.")
 
     def _parse_debug(self):
@@ -412,8 +447,25 @@ class Specification(object):
             for key, value in self._cfg_yaml[idx]["general"].items():
                 self._specification["input"][key] = value
             self._specification["input"]["builds"] = dict()
+
             for job, builds in self._cfg_yaml[idx]["builds"].items():
                 if builds:
+                    if isinstance(builds, dict):
+                        # defined as a range <start, end>
+                        if builds.get("end", None) == "lastSuccessfulBuild":
+                            # defined as a range <start, lastSuccessfulBuild>
+                            ret_code, build_nr, _ = get_last_build_number(
+                                self.environment["urls"]["URL[JENKINS,CSIT]"],
+                                job)
+                            if ret_code != 0:
+                                raise PresentationError(
+                                    "Not possible to get the number of the "
+                                    "last successful  build.")
+                        else:
+                            # defined as a range <start, end (build number)>
+                            build_nr = builds.get("end", None)
+                        builds = [x for x in range(builds["start"],
+                                                   int(build_nr) + 1)]
                     self._specification["input"]["builds"][job] = list()
                     for build in builds:
                         self._specification["input"]["builds"][job].\
@@ -440,8 +492,8 @@ class Specification(object):
             raise PresentationError("No output defined.")
 
         try:
-            self._specification["output"] = self._cfg_yaml[idx]["format"]
-        except KeyError:
+            self._specification["output"] = self._cfg_yaml[idx]
+        except (KeyError, IndexError):
             raise PresentationError("No output defined.")
 
         logging.info("Done.")
@@ -535,6 +587,35 @@ class Specification(object):
                 self._specification["files"].append(element)
                 count += 1
 
+            elif element["type"] == "cpta":
+                logging.info("  {:3d} Processing Continuous Performance "
+                             "Trending and Analysis ...".format(count))
+
+                for plot in element["plots"]:
+                    # Add layout to the plots:
+                    layout = plot.get("layout", None)
+                    if layout is not None:
+                        try:
+                            plot["layout"] = \
+                                self.configuration["plot-layouts"][layout]
+                        except KeyError:
+                            raise PresentationError(
+                                "Layout {0} is not defined in the "
+                                "configuration section.".format(layout))
+                    # Add data sets:
+                    if isinstance(plot.get("data", None), str):
+                        data_set = plot["data"]
+                        try:
+                            plot["data"] = \
+                                self.configuration["data-sets"][data_set]
+                        except KeyError:
+                            raise PresentationError(
+                                "Data set {0} is not defined in "
+                                "the configuration section.".
+                                format(data_set))
+                self._specification["cpta"] = element
+                count += 1
+
         logging.info("Done.")
 
     def read_specification(self):
@@ -558,9 +639,6 @@ class Specification(object):
         self._parse_output()
         self._parse_static()
         self._parse_elements()
-        print(self.tables)
-        print(self.files)
-        print(self.plots)
 
         logging.debug("Specification: \n{}".
                       format(pformat(self._specification)))