X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_parser.py;h=7ee6dbb4868dc9933ec35ec92bd08b48eaebba7b;hp=ec663f99d9aa4ba69d358e6f1428163a2aa8b741;hb=6c1043c843b4fcd33e7004876cbced565c222f58;hpb=56dd61dee872da788e578129eed48a3158a5b566

diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index ec663f99d9..7ee6dbb486 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -46,6 +46,7 @@ class Specification(object):
         self._cfg_yaml = None
 
         self._specification = {"environment": dict(),
+                               "configuration": dict(),
                                "debug": dict(),
                                "static": dict(),
                                "input": dict(),
@@ -72,6 +73,15 @@ class Specification(object):
         """
         return self._specification["environment"]
 
+    @property
+    def configuration(self):
+        """Getter - configuration.
+
+        :returns: Configuration of PAL.
+        :rtype: dict
+        """
+        return self._specification["configuration"]
+
     @property
     def static(self):
         """Getter - static content.
@@ -330,6 +340,25 @@ class Specification(object):
 
         logging.info("Done.")
 
+    def _parse_configuration(self):
+        """Parse configuration of PAL in the specification YAML file.
+        """
+
+        logging.info("Parsing specification file: configuration ...")
+
+        idx = self._get_type_index("configuration")
+        if idx is None:
+            logging.warning("No configuration information in the specification "
+                            "file.")
+            return None
+
+        try:
+            self._specification["configuration"] = self._cfg_yaml[idx]
+        except KeyError:
+            raise PresentationError("No configuration defined.")
+
+        logging.info("Done.")
+
     def _parse_debug(self):
         """Parse debug specification in the specification YAML file.
         """
@@ -455,6 +484,17 @@ class Specification(object):
                     self._specification["environment"]["paths"])
             except KeyError:
                 pass
+
+            # add data sets to the elements:
+            if isinstance(element["data"], str):
+                data_set = element["data"]
+                try:
+                    element["data"] = self.configuration["data-sets"][data_set]
+                except KeyError:
+                    raise PresentationError("Data set {0} is not defined in "
+                                            "the configuration section.".
+                                            format(data_set))
+
             if element["type"] == "table":
                 logging.info("  {:3d} Processing a table ...".format(count))
                 try:
@@ -465,10 +505,25 @@ class Specification(object):
                     pass
                 self._specification["tables"].append(element)
                 count += 1
+
             elif element["type"] == "plot":
                 logging.info("  {:3d} Processing a plot ...".format(count))
+
+                # Add layout to the plots:
+                layout = element["layout"].get("layout", None)
+                if layout is not None:
+                    element["layout"].pop("layout")
+                    try:
+                        for key, val in (self.configuration["plot-layouts"]
+                                         [layout]):
+                            element["layout"][key] = val
+                    except KeyError:
+                        raise PresentationError("Layout {0} is not defined in "
+                                                "the configuration section.".
+                                                format(layout))
                 self._specification["plots"].append(element)
                 count += 1
+
             elif element["type"] == "file":
                 logging.info("  {:3d} Processing a file ...".format(count))
                 try:
@@ -496,12 +551,16 @@ class Specification(object):
                                     details=str(err))
 
         self._parse_env()
+        self._parse_configuration()
         self._parse_debug()
         if not self.debug:
             self._parse_input()
         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)))