diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2018-08-02 14:48:53 +0800 |
---|---|---|
committer | Lianhao Lu <lianhao.lu@intel.com> | 2018-08-02 14:51:20 +0800 |
commit | 40f7a0f4634b48145335b4e95f57fca0afe39c53 (patch) | |
tree | 542daf984e5fb7b1e21ce19a375fe42bea6fb52f /vnfsdk_pkgtools | |
parent | 89649fc1d5fa2cfa73c04d53d6ff5e0a46cf2e1f (diff) |
Added new opnfv-toscaparser validation backends
Change-Id: Ic670ee5dd768e46c6d2398d036f9e8bb5f428475
Issue-ID: VNFSDK-292
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'vnfsdk_pkgtools')
-rw-r--r-- | vnfsdk_pkgtools/cli/__main__.py | 2 | ||||
-rw-r--r-- | vnfsdk_pkgtools/validator/toscaparser_validator.py | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/vnfsdk_pkgtools/cli/__main__.py b/vnfsdk_pkgtools/cli/__main__.py index 7cb4e54..fee321c 100644 --- a/vnfsdk_pkgtools/cli/__main__.py +++ b/vnfsdk_pkgtools/cli/__main__.py @@ -107,7 +107,7 @@ def parse_args(args_list): help='CSAR file location') csar_validate.add_argument( '-p', '--parser', - default='aria', + default='toscaparser', help='use which csar parser to validate') return parser.parse_args(args_list) diff --git a/vnfsdk_pkgtools/validator/toscaparser_validator.py b/vnfsdk_pkgtools/validator/toscaparser_validator.py new file mode 100644 index 0000000..bcb3e9e --- /dev/null +++ b/vnfsdk_pkgtools/validator/toscaparser_validator.py @@ -0,0 +1,42 @@ +# Copyright (c) 2018 Intel Corp. All rights reserved. +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +import logging +import os + +from toscaparser.common.exception import ValidationError +from toscaparser.tosca_template import ToscaTemplate + +from vnfsdk_pkgtools import validator + +LOG = logging.getLogger(__name__) + + +class ToscaparserValidator(validator.ValidatorBase): + def __init__(self): + super(ToscaparserValidator, self).__init__() + + def validate(self, reader): + entry_path = os.path.join(reader.destination, + reader.entry_definitions) + try: + #TODO set debug_mode due to upstream bug + # https://jira.opnfv.org/browse/PARSER-181 + self.tosca = ToscaTemplate(path=entry_path, + no_required_paras_check=True, + debug_mode=True) + except ValidationError as e: + LOG.error(e.message) + raise e |