summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-02 16:36:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-02 16:36:58 +0000
commit511ba774f11a6293d9f5635c08204c775bff583a (patch)
tree2a019f31681744d7833ba9a0c38076b32a7ea43b /config
parent87325878949d5a315535720828af5185ebaa7a9f (diff)
parent5653629d86100c4e22a0d402de19b6792d0ccfdb (diff)
Merge "config/utils: YAML: Use C bindings if available"
Diffstat (limited to 'config')
-rwxr-xr-xconfig/utils/generate_config.py9
-rwxr-xr-xconfig/utils/validate_schema.py18
2 files changed, 16 insertions, 11 deletions
diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py
index 1387ed1..f02acf5 100755
--- a/config/utils/generate_config.py
+++ b/config/utils/generate_config.py
@@ -23,6 +23,7 @@ PARSER.add_argument("--yaml", "-y", type=str, required=True)
PARSER.add_argument("--jinja2", "-j", type=str, required=True)
PARSER.add_argument("--includesdir", "-i", type=str, action='append')
ARGS = PARSER.parse_args()
+LOADER = yaml.CSafeLoader if yaml.__with_libyaml__ else yaml.SafeLoader
ENV = Environment(
loader=FileSystemLoader([os.path.dirname(ARGS.jinja2)] + ARGS.includesdir),
@@ -34,8 +35,8 @@ gen_config_lib.load_custom_filters(ENV)
# Note: eyaml return code is 0 even if keys are not available
try:
if os.path.isfile(ARGS.yaml) and 'ENC[PKCS7' in open(ARGS.yaml).read():
- DICT = yaml.safe_load(check_output(['eyaml', 'decrypt',
- '-f', ARGS.yaml]))
+ DICT = yaml.load(check_output(['eyaml', 'decrypt',
+ '-f', ARGS.yaml]), Loader=LOADER)
except CalledProcessError as ex:
logging.error('eyaml decryption failed! Fallback to raw data.')
except OSError as ex:
@@ -44,13 +45,13 @@ try:
DICT['details']
except (NameError, TypeError) as ex:
with open(ARGS.yaml) as _:
- DICT = yaml.safe_load(_)
+ DICT = yaml.load(_, Loader=LOADER)
# If an installer descriptor file (IDF) exists, include it (temporary)
IDF_PATH = '/idf-'.join(os.path.split(ARGS.yaml))
if os.path.exists(IDF_PATH):
with open(IDF_PATH) as _:
- IDF = yaml.safe_load(_)
+ IDF = yaml.load(_, Loader=LOADER)
DICT['idf'] = IDF['idf']
# Print dictionary generated from yaml (uncomment for debug)
diff --git a/config/utils/validate_schema.py b/config/utils/validate_schema.py
index 42f475d..1676e15 100755
--- a/config/utils/validate_schema.py
+++ b/config/utils/validate_schema.py
@@ -11,21 +11,20 @@ import argparse
import jsonschema
import yaml
+
PARSER = argparse.ArgumentParser()
PARSER.add_argument("--yaml", "-y", type=str, required=True)
PARSER.add_argument("--schema", "-s", type=str, required=True)
ARGS = PARSER.parse_args()
+LOADER = yaml.CSafeLoader if yaml.__with_libyaml__ else yaml.SafeLoader
with open(ARGS.yaml) as _:
- _DICT = yaml.safe_load(_)
+ _DICT = yaml.load(_, Loader=LOADER)
with open(ARGS.schema) as _:
- _SCHEMA = yaml.safe_load(_)
+ _SCHEMA = yaml.load(_, Loader=LOADER)
+
-# 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:
@@ -33,9 +32,14 @@ def schema_version_workaround(node):
for item in node.items():
if type(item) is dict:
schema_version_workaround(item)
+
+# 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'
schema_version_workaround(_DICT)
if 'idf' in _DICT:
- schema_version_workaround(_DICT['idf'])
+ schema_version_workaround(_DICT['idf'])
_VALIDATOR = jsonschema.Draft4Validator(_SCHEMA)
for error in _VALIDATOR.iter_errors(_DICT):