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 --- .../translator/conf/__init__.py | 36 ------------ .../translator/conf/config.py | 67 ---------------------- .../translator/conf/translator.conf | 4 -- 3 files changed, 107 deletions(-) delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/conf/__init__.py delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/conf/config.py delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/conf/translator.conf (limited to 'tosca2heat/heat-translator-0.3.0/translator/conf') diff --git a/tosca2heat/heat-translator-0.3.0/translator/conf/__init__.py b/tosca2heat/heat-translator-0.3.0/translator/conf/__init__.py deleted file mode 100644 index 2c61252..0000000 --- a/tosca2heat/heat-translator-0.3.0/translator/conf/__init__.py +++ /dev/null @@ -1,36 +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. - -''' Initialize the global configuration for the translator ''' - -import os - -from translator.conf.config import ConfigProvider - -CONF_FILENAME = 'translator.conf' - - -def init_global_conf(): - '''Initialize the configuration provider. - - Allows the configuration to be shared throughout the translator code. - The file used is translator.conf, and is within the conf/ directory. It - is a standard ini format, and is prcessed using the ConfigParser module. - - ''' - conf_path = os.path.dirname(os.path.abspath(__file__)) - conf_file = os.path.join(conf_path, CONF_FILENAME) - ConfigProvider._load_config(conf_file) - - -init_global_conf() diff --git a/tosca2heat/heat-translator-0.3.0/translator/conf/config.py b/tosca2heat/heat-translator-0.3.0/translator/conf/config.py deleted file mode 100644 index 4e8fe87..0000000 --- a/tosca2heat/heat-translator-0.3.0/translator/conf/config.py +++ /dev/null @@ -1,67 +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. - -''' Provide a global configuration for the TOSCA translator''' - -from six.moves import configparser - -from toscaparser.utils.gettextutils import _ -import translator.common.exception as exception - - -class ConfigProvider(object): - '''Global config proxy that wraps a ConfigParser object. - - Allows for class based access to config values. Should only be initialized - once using the corresponding translator.conf file in the conf directory. - - ''' - - # List that captures all of the conf file sections. - # Append any new sections to this list. - _sections = ['DEFAULT'] - _translator_config = None - - @classmethod - def _load_config(cls, conf_file): - '''Private method only to be called once from the __init__ module''' - - cls._translator_config = configparser.ConfigParser() - try: - cls._translator_config.read(conf_file) - except configparser.ParsingError: - msg = _('Unable to parse translator.conf file.' - 'Check to see that it exists in the conf directory.') - raise exception.ConfFileParseError(message=msg) - - @classmethod - def get_value(cls, section, key): - try: - value = cls._translator_config.get(section, key) - except configparser.NoOptionError: - raise exception.ConfOptionNotDefined(key=key, section=section) - except configparser.NoSectionError: - raise exception.ConfSectionNotDefined(section=section) - - return value - - @classmethod - def get_all_values(cls): - values = [] - for section in cls._sections: - try: - values.extend(cls._translator_config.items(section=section)) - except configparser.NoOptionError: - raise exception.ConfSectionNotDefined(section=section) - - return values diff --git a/tosca2heat/heat-translator-0.3.0/translator/conf/translator.conf b/tosca2heat/heat-translator-0.3.0/translator/conf/translator.conf deleted file mode 100644 index 6ebf292..0000000 --- a/tosca2heat/heat-translator-0.3.0/translator/conf/translator.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] - -# Relative path location for custom types -custom_types_location=translator/custom/hot \ No newline at end of file -- cgit 1.2.3-korg