From c8201c119ec686e79797721156767685fe848aca Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 7 Apr 2016 14:08:49 -0400 Subject: Update tosca lib to version 0.5 Use tosca-parser and heat-translator to analyze to the basic nfv-tosca type definitions, and use simple tosca new feature such as policy, group and trigger, which are now supported by the latest version of tosca-parser and heat-translator. JIRA:PARSER-18 Change-Id: I797bcacbb5b32005d0aeb0f3f32851ac96e30f01 Signed--off-by: shangxdy Signed-off-by: shangxdy --- .../toscaparser/utils/yamlparser.py | 89 ---------------------- 1 file changed, 89 deletions(-) delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/utils/yamlparser.py (limited to 'tosca2heat/tosca-parser-0.3.0/toscaparser/utils/yamlparser.py') diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/utils/yamlparser.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/utils/yamlparser.py deleted file mode 100644 index a4794e7..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/utils/yamlparser.py +++ /dev/null @@ -1,89 +0,0 @@ -# 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 codecs -from collections import OrderedDict -from toscaparser.common.exception import ExceptionCollector -from toscaparser.common.exception import URLException -from toscaparser.utils.gettextutils import _ -import yaml - -try: - # Python 3.x - import urllib.request as urllib2 -except ImportError: - # Python 2.x - import urllib2 - -if hasattr(yaml, 'CSafeLoader'): - yaml_loader = yaml.CSafeLoader -else: - yaml_loader = yaml.SafeLoader - - -def load_yaml(path, a_file=True): - f = None - try: - f = codecs.open(path, encoding='utf-8', errors='strict') if a_file \ - else urllib2.urlopen(path) - except urllib2.URLError as e: - if hasattr(e, 'reason'): - msg = (_('Failed to reach server "%(path)s". Reason is: ' - '%(reason)s.') - % {'path': path, 'reason': e.reason}) - ExceptionCollector.appendException(URLException(what=msg)) - return - elif hasattr(e, 'code'): - msg = (_('The server "%(path)s" couldn\'t fulfill the request. ' - 'Error code: "%(code)s".') - % {'path': path, 'code': e.code}) - ExceptionCollector.appendException(URLException(what=msg)) - return - except Exception as e: - raise - return yaml.load(f.read(), Loader=yaml_loader) - - -def simple_parse(tmpl_str): - try: - tpl = yaml.load(tmpl_str, Loader=yaml_loader) - except yaml.YAMLError as yea: - ExceptionCollector.appendException(ValueError(yea)) - else: - if tpl is None: - tpl = {} - return tpl - - -def ordered_load(stream, Loader=yaml.Loader, object_pairs_hook=OrderedDict): - class OrderedLoader(Loader): - pass - - def construct_mapping(loader, node): - loader.flatten_mapping(node) - return object_pairs_hook(loader.construct_pairs(node)) - - OrderedLoader.add_constructor( - yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG, - construct_mapping) - return yaml.load(stream, OrderedLoader) - - -def simple_ordered_parse(tmpl_str): - try: - tpl = ordered_load(tmpl_str) - except yaml.YAMLError as yea: - ExceptionCollector.appendException(ValueError(yea)) - else: - if tpl is None: - tpl = {} - return tpl -- cgit 1.2.3-korg