-# 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:
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
# 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
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]. \
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]
+ data_set = element[item].get("data-replacement",
+ None)
+ if isinstance(data_set, str):
+ element[item]["data-replacement"] = \
+ 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]
+ data_set = element["history"][i].get(
+ "data-replacement", None)
+ if isinstance(data_set, str):
+ element["history"][i]["data-replacement"] = \
+ 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