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/common/__init__.py | 0 .../toscaparser/common/exception.py | 180 --------------------- 2 files changed, 180 deletions(-) delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/common/__init__.py delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/common/exception.py (limited to 'tosca2heat/tosca-parser-0.3.0/toscaparser/common') diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/common/__init__.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/common/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/common/exception.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/common/exception.py deleted file mode 100644 index f41b65c..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/common/exception.py +++ /dev/null @@ -1,180 +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. - -''' -TOSCA exception classes -''' -import logging -import sys -import traceback - -from toscaparser.utils.gettextutils import _ - - -log = logging.getLogger(__name__) - - -class TOSCAException(Exception): - '''Base exception class for TOSCA - - To correctly use this class, inherit from it and define - a 'msg_fmt' property. - - ''' - - _FATAL_EXCEPTION_FORMAT_ERRORS = False - - message = _('An unknown exception occurred.') - - def __init__(self, **kwargs): - try: - self.message = self.msg_fmt % kwargs - except KeyError: - exc_info = sys.exc_info() - log.exception(_('Exception in string format operation: %s') - % exc_info[1]) - - if TOSCAException._FATAL_EXCEPTION_FORMAT_ERRORS: - raise exc_info[0] - - def __str__(self): - return self.message - - @staticmethod - def set_fatal_format_exception(flag): - if isinstance(flag, bool): - TOSCAException._FATAL_EXCEPTION_FORMAT_ERRORS = flag - - -class MissingRequiredFieldError(TOSCAException): - msg_fmt = _('%(what)s is missing required field "%(required)s".') - - -class UnknownFieldError(TOSCAException): - msg_fmt = _('%(what)s contains unknown field "%(field)s". Refer to the ' - 'definition to verify valid values.') - - -class TypeMismatchError(TOSCAException): - msg_fmt = _('%(what)s must be of type "%(type)s".') - - -class InvalidNodeTypeError(TOSCAException): - msg_fmt = _('Node type "%(what)s" is not a valid type.') - - -class InvalidTypeError(TOSCAException): - msg_fmt = _('Type "%(what)s" is not a valid type.') - - -class InvalidSchemaError(TOSCAException): - msg_fmt = _('%(message)s') - - -class ValidationError(TOSCAException): - msg_fmt = _('%(message)s') - - -class UnknownInputError(TOSCAException): - msg_fmt = _('Unknown input "%(input_name)s".') - - -class InvalidPropertyValueError(TOSCAException): - msg_fmt = _('Value of property "%(what)s" is invalid.') - - -class InvalidTemplateVersion(TOSCAException): - msg_fmt = _('The template version "%(what)s" is invalid. ' - 'Valid versions are "%(valid_versions)s".') - - -class InvalidTOSCAVersionPropertyException(TOSCAException): - msg_fmt = _('Value of TOSCA version property "%(what)s" is invalid.') - - -class URLException(TOSCAException): - msg_fmt = _('%(what)s') - - -class ExceptionCollector(object): - - exceptions = [] - collecting = False - - @staticmethod - def clear(): - del ExceptionCollector.exceptions[:] - - @staticmethod - def start(): - ExceptionCollector.clear() - ExceptionCollector.collecting = True - - @staticmethod - def stop(): - ExceptionCollector.collecting = False - - @staticmethod - def contains(exception): - for ex in ExceptionCollector.exceptions: - if str(ex) == str(exception): - return True - return False - - @staticmethod - def appendException(exception): - if ExceptionCollector.collecting: - if not ExceptionCollector.contains(exception): - exception.trace = traceback.extract_stack()[:-1] - ExceptionCollector.exceptions.append(exception) - else: - raise exception - - @staticmethod - def exceptionsCaught(): - return len(ExceptionCollector.exceptions) > 0 - - @staticmethod - def getTraceString(traceList): - traceString = '' - for entry in traceList: - f, l, m, c = entry[0], entry[1], entry[2], entry[3] - traceString += (_('\t\tFile %(file)s, line %(line)s, in ' - '%(method)s\n\t\t\t%(call)s\n') - % {'file': f, 'line': l, 'method': m, 'call': c}) - return traceString - - @staticmethod - def getExceptionReportEntry(exception, full=True): - entry = exception.__class__.__name__ + ': ' + str(exception) - if full: - entry += '\n' + ExceptionCollector.getTraceString(exception.trace) - return entry - - @staticmethod - def getExceptions(): - return ExceptionCollector.exceptions - - @staticmethod - def getExceptionsReport(full=True): - report = [] - for exception in ExceptionCollector.exceptions: - report.append( - ExceptionCollector.getExceptionReportEntry(exception, full)) - return report - - @staticmethod - def assertExceptionMessage(exception, message): - err_msg = exception.__name__ + ': ' + message - report = ExceptionCollector.getExceptionsReport(False) - assert err_msg in report, (_('Could not find "%(msg)s" in "%(rep)s".') - % {'rep': report.__str__(), 'msg': err_msg}) -- cgit 1.2.3-korg