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/osc/v1/translate.py | 94 ---------------------- 1 file changed, 94 deletions(-) delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/osc/v1/translate.py (limited to 'tosca2heat/heat-translator-0.3.0/translator/osc/v1/translate.py') diff --git a/tosca2heat/heat-translator-0.3.0/translator/osc/v1/translate.py b/tosca2heat/heat-translator-0.3.0/translator/osc/v1/translate.py deleted file mode 100644 index c356042..0000000 --- a/tosca2heat/heat-translator-0.3.0/translator/osc/v1/translate.py +++ /dev/null @@ -1,94 +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. - -"""Translate action implementations""" - -import logging.config -import os -import sys - -from cliff import command - -from toscaparser.tosca_template import ToscaTemplate -from translator.common.utils import UrlUtils -from translator.hot.tosca_translator import TOSCATranslator -from translator.osc import utils - - -class TranslateTemplate(command.Command): - """Translate a template""" - - log = logging.getLogger('heat-translator' + '.TranslateTemplate') - auth_required = False - - def get_parser(self, prog_name): - parser = super(TranslateTemplate, self).get_parser(prog_name) - parser.add_argument( - '--template-file', - metavar='', - required=True, - help='Path to the file that needs to be translated.') - parser.add_argument( - '--template-type', - metavar='', - required=True, - choices=['tosca'], - help='Format of the template file.') - parser.add_argument( - '--output-file', - metavar='', - help='Path to place the translated content.') - parser.add_argument( - '--parameter', - metavar='', - action=utils.KeyValueAction, - help='Set a property for this template ' - '(repeat option to set multiple properties)', - ) - parser.add_argument( - '--validate-only', - metavar='', - help='Set to true to only validate a template file.', - default='false') - return parser - - def take_action(self, parsed_args): - self.log.debug('take_action(%s)', parsed_args) - output = None - - if parsed_args.parameter: - parsed_params = parsed_args.parameter - else: - parsed_params = {} - - if parsed_args.template_type == "tosca": - path = parsed_args.template_file - a_file = os.path.isfile(path) - a_url = UrlUtils.validate_url(path) if not a_file else False - if a_file or a_url: - validate = parsed_args.validate_only - if validate and validate.lower() == "true": - ToscaTemplate(path, parsed_params, a_file) - else: - tosca = ToscaTemplate(path, parsed_params, a_file) - translator = TOSCATranslator(tosca, parsed_params) - output = translator.translate() - else: - sys.stdout.write('Could not find template file.') - raise SystemExit - - if output: - if parsed_args.output_file: - with open(parsed_args.output_file, 'w+') as f: - f.write(output) - else: - print(output) -- cgit 1.2.3-korg