diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2018-01-23 16:03:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-23 16:03:37 +0000 |
| commit | 811ff5abc205d961d45ee00c0b449c47893433ae (patch) | |
| tree | 413ea2dee5f3ef9378a06d285b60008c401d6673 /config/utils | |
| parent | 7d2b744815ddbaf494872a0e9b82bdcf40b85ad5 (diff) | |
| parent | 9f61971b20d02c8d0fdbd8a7034f957a7fb9177a (diff) | |
Merge "[PDF] [SPEC] Add 'version: 1.0'"
Diffstat (limited to 'config/utils')
| -rwxr-xr-x | config/utils/check-schema.sh | 2 | ||||
| -rwxr-xr-x | config/utils/validate_schema.py | 13 |
2 files changed, 14 insertions, 1 deletions
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)) |