From 9f61971b20d02c8d0fdbd8a7034f957a7fb9177a Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 15 Jan 2018 04:32:31 +0100
Subject: [PDF] [SPEC] Add 'version: 1.0'

- add 'version: 1.0' to PDF spec;
- add 'version: 1.0' to all existing lab PDFs;
- extend schema with new property;
- add workaround for value-based decision-making in schema version
  selection via `validate-template.py`;
- add support for multiple schema versions;
- add versions for all schema blocks defined so far;
- fix PDF schema pattern for disk size decimals (e.g. '1.8T');

Change-Id: Ie8f768803ec19f1f9a7982fe5ca59df80764fc4a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 config/utils/check-schema.sh    |  2 +-
 config/utils/validate_schema.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'config/utils')

diff --git a/config/utils/check-schema.sh b/config/utils/check-schema.sh
index 321c5ced..61bdec22 100755
--- a/config/utils/check-schema.sh
+++ b/config/utils/check-schema.sh
@@ -16,7 +16,7 @@ RC=0
 while IFS= read -r lab_config; do
     pdf_cmd="${VALIDATE_SCHEMA} -s ${PDF_SCHEMA} -y ${lab_config}"
     echo "###################### ${lab_config} ######################"
-    pdf_out=$(${pdf_cmd} |& sed 's|ENC\[PKCS.*\]|opnfv|g')
+    pdf_out=$(${pdf_cmd} |& sed 's|ENC\[PKCS.*\][\\n]*|opnfv|g')
     if [ -z "${pdf_out}" ]; then
         SUMMARY+=";${lab_config#labs/};OK;\n"
         echo "[PDF] [OK] ${pdf_cmd}"
diff --git a/config/utils/validate_schema.py b/config/utils/validate_schema.py
index cb404554..6bdc3bdb 100755
--- a/config/utils/validate_schema.py
+++ b/config/utils/validate_schema.py
@@ -22,6 +22,19 @@ with open(ARGS.yaml) as _:
 with open(ARGS.schema) as _:
     _SCHEMA = yaml.safe_load(_)
 
+# Draft 4 (latest supported by py-jsonschema) does not support value-based
+# decisions properly, see related github issue:
+# https://github.com/json-schema-org/json-schema-spec/issues/64
+# Workaround: build 'version_x.y: true' on the fly based on 'version: x.y'
+def schema_version_workaround(node):
+    """Traverse nested dictionaries and handle 'version' key where found."""
+    if 'version' in node:
+        node['version_{0}'.format(node['version'])] = True
+    for item in node.items():
+        if type(item) is dict:
+            schema_version_workaround(item)
+schema_version_workaround(_DICT)
+
 _VALIDATOR = jsonschema.Draft4Validator(_SCHEMA)
 for error in _VALIDATOR.iter_errors(_DICT):
     raise RuntimeError(str(error))
-- 
cgit 1.2.3-korg