diff options
| -rw-r--r-- | setup.py | 44 | ||||
| -rwxr-xr-x | tools/parser_install.sh (renamed from tests/parser_install.sh) | 4 | ||||
| -rw-r--r-- | tosca2heat/heat-translator/setup.cfg | 2 | ||||
| -rw-r--r-- | tosca2heat/heat-translator/setup.py | 47 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/setup.py | 49 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/shell.py | 47 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/tosca_template.py | 28 |
7 files changed, 194 insertions, 27 deletions
@@ -1,10 +1,54 @@ +import os import setuptools +from distutils.command.install_data import install_data +from setuptools.command.build_py import build_py +from setuptools.command.install import install + try: import multiprocessing # noqa except ImportError: pass + +class Parser_build_py(build_py): + """Override build_py to call customized build.""" + + def run(self): + print(" === Before nfv parser build === ") + # self.run_command('xxx') + super(Parser_build_py, self).run() + print(" === After nfv parser build === ") + + +class Parser_install(install): + """Override install to call customized install.""" + + def run(self): + print(" === Before nfv parser install === ") + super(Parser_install, self).run(self) + # Custom stuff here + # distutils.command.install actually has some nice helper methods + # and interfaces. I strongly suggest reading the docstrings. + print(" === After nfv parser install === ") + + +class Parser_post_install(install_data): + """Override install_data to call customized install_data.""" + + def run(self): + print(" === Before nfv parser post install data === ") + # Call parent + super(Parser_post_install, self).run(self) + # Execute commands + print(" === After nfv parser post install data ===") + + setuptools.setup( setup_requires=['pbr>=2.0.0'], + cmdclass={ + "build_py": Parser_build_py, + "install_data": Parser_install, + "post_install": Parser_post_install, + }, pbr=True) diff --git a/tests/parser_install.sh b/tools/parser_install.sh index 40b61d4..d03bbb8 100755 --- a/tests/parser_install.sh +++ b/tools/parser_install.sh @@ -33,9 +33,9 @@ pip uninstall -y heat-translator # install parser if [ -n "${OPNFV_REPO_DIR}" ]; then - cd ${OPNFV_REPO_DIR}/parser/tosca2heat/tosca-parser && python setup.py install cd ${OPNFV_REPO_DIR}/parser/tosca2heat/heat-translator && python setup.py install + cd ${OPNFV_REPO_DIR}/parser/tosca2heat/tosca-parser && python setup.py install else - cd ${BASE_WORK_DIR}/../tosca2heat/tosca-parser && python setup.py install cd ${BASE_WORK_DIR}/../tosca2heat/heat-translator && python setup.py install + cd ${BASE_WORK_DIR}/../tosca2heat/tosca-parser && python setup.py install fi
\ No newline at end of file diff --git a/tosca2heat/heat-translator/setup.cfg b/tosca2heat/heat-translator/setup.cfg index 863b97d..2a10811 100644 --- a/tosca2heat/heat-translator/setup.cfg +++ b/tosca2heat/heat-translator/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = heat-translator +name = nfv-heattranslator version = url = https://wiki.opnfv.org/display/parser summary = Tool to translate non-heat templates to Heat Orchestration Template in nfv. diff --git a/tosca2heat/heat-translator/setup.py b/tosca2heat/heat-translator/setup.py index 566d844..bf9aa00 100644 --- a/tosca2heat/heat-translator/setup.py +++ b/tosca2heat/heat-translator/setup.py @@ -14,8 +14,13 @@ # limitations under the License. # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT +import os import setuptools +from distutils.command.install_data import install_data +from setuptools.command.build_py import build_py +from setuptools.command.install import install + # In python < 2.7.4, a lazy loading of package `pbr` will break # setuptools if some other modules registered functions in `atexit`. # solution from: http://bugs.python.org/issue15881#msg170215 @@ -24,6 +29,48 @@ try: except ImportError: pass + +class HeatTranslator_build_py(build_py): + """Override build_py to call customized build.""" + + def run(self): + print(" === Before nfv heat translator build === ") + # self.run_command('xxx') + super(HeatTranslator_build_py, self).run() + print(" === After nfv heat heat translator build === ") + + +class HeatTranslator_install(install): + """Override install to call customized install.""" + + def run(self): + print(" === Before nfv heat translator install === ") + # Make sure uninstall toscaparser from openstack + os.system("pip uninstall -y heat-translator") + + super(HeatTranslator_install, self).run(self) + # Custom stuff here + # distutils.command.install actually has some nice helper methods + # and interfaces. I strongly suggest reading the docstrings. + print(" === After nfv heat translator install === ") + + +class HeatTranslator_post_install(install_data): + """Override install_data to call customized install_data.""" + + def run(self): + print(" === Before nfv heat translator post install data === ") + # Call parent + super(HeatTranslator_post_install, self).run(self) + # Execute commands + print(" === After nfv heat translator post install data ===") + + setuptools.setup( setup_requires=['pbr>=2.0.0'], + cmdclass={ + "build_py": HeatTranslator_build_py, + "install_data": HeatTranslator_install, + "post_install": HeatTranslator_post_install, + }, pbr=True) diff --git a/tosca2heat/tosca-parser/setup.py b/tosca2heat/tosca-parser/setup.py index 566d844..3d70b81 100644 --- a/tosca2heat/tosca-parser/setup.py +++ b/tosca2heat/tosca-parser/setup.py @@ -14,16 +14,65 @@ # limitations under the License. # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT +import os import setuptools +from distutils.command.install_data import install_data +from setuptools.command.build_py import build_py +from setuptools.command.install import install + # In python < 2.7.4, a lazy loading of package `pbr` will break # setuptools if some other modules registered functions in `atexit`. # solution from: http://bugs.python.org/issue15881#msg170215 + + try: import multiprocessing # noqa except ImportError: pass + +class Toscaparser_build_py(build_py): + """Override build_py to call customized build.""" + + def run(self): + print(" === Before nfv toscaparser build === ") + # self.run_command('xxx') + super(Toscaparser_build_py, self).run() + print(" === After nfv toscaparser build === ") + + +class Toscaparser_install(install): + """Override install to call customized install.""" + + def run(self): + print(" === Before nfv toscaparser install === ") + # Make sure uninstall toscaparser from openstack + os.system("pip uninstall -y tosca-parser") + + super(Toscaparser_install, self).run(self) + # Custom stuff here + # distutils.command.install actually has some nice helper methods + # and interfaces. I strongly suggest reading the docstrings. + print(" === After nfv toscaparser install === ") + + +class Toscaparser_post_install(install_data): + """Override install_data to call customized install_data.""" + + def run(self): + print(" === Before nfv toscaparser post install data === ") + # Call parent + super(Toscaparser_post_install, self).run(self) + # Execute commands + print(" === After nfv toscaparser post install data ===") + + setuptools.setup( setup_requires=['pbr>=2.0.0'], + cmdclass={ + "build_py": Toscaparser_build_py, + "install_data": Toscaparser_install, + "post_install": Toscaparser_post_install, + }, pbr=True) diff --git a/tosca2heat/tosca-parser/toscaparser/shell.py b/tosca2heat/tosca-parser/toscaparser/shell.py index f669e27..ba9c28f 100644 --- a/tosca2heat/tosca-parser/toscaparser/shell.py +++ b/tosca2heat/tosca-parser/toscaparser/shell.py @@ -53,55 +53,70 @@ class ParserShell(object): required=True, help=_('YAML template or CSAR file to parse.')) - parser.add_argument('-nrpv', dest='no_required_paras_valid', + parser.add_argument('-nrpv', dest='no_required_paras_check', action='store_true', default=False, help=_('Ignore input parameter validation ' 'when parse template.')) + parser.add_argument('--debug', dest='debug_mode', + action='store_true', default=False, + help=_('debug mode for print more details ' + 'other than raise exceptions when ' + 'errors happen as possible')) + return parser def main(self, argv): parser = self.get_parser(argv) (args, extra_args) = parser.parse_known_args(argv) path = args.template_file - nrpv = args.no_required_paras_valid + nrpv = args.no_required_paras_check + debug = args.debug_mode + if os.path.isfile(path): - self.parse(path, no_req_paras_valid=nrpv) + self.parse(path, no_required_paras_check=nrpv, debug_mode=debug) elif toscaparser.utils.urlutils.UrlUtils.validate_url(path): - self.parse(path, False, no_req_paras_valid=nrpv) + self.parse(path, False, + no_required_paras_check=nrpv, + debug_mode=debug) else: raise ValueError(_('"%(path)s" is not a valid file.') % {'path': path}) - def parse(self, path, a_file=True, no_req_paras_valid=False): - output = None - tosca = None + def parse(self, path, a_file=True, no_required_paras_check=False, + debug_mode=False): + nrpv = no_required_paras_check try: tosca = ToscaTemplate(path, None, a_file, - no_required_paras_valid=no_req_paras_valid) + no_required_paras_check=nrpv, + debug_mode=debug_mode) except ValidationError as e: msg = _(' ===== main service template ===== ') log.error(msg) log.error(e.message) - raise e - - version = tosca.version - if tosca.version: + if debug_mode: + print(msg) + print(e.message) + else: + raise e + + version = tosca.version if tosca else "unknown" + if tosca and tosca.version: print("\nversion: " + version) - if hasattr(tosca, 'description'): + if tosca and hasattr(tosca, 'description'): description = tosca.description if description: print("\ndescription: " + description) - if hasattr(tosca, 'inputs'): + if tosca and hasattr(tosca, 'inputs'): inputs = tosca.inputs if inputs: print("\ninputs:") for input in inputs: print("\t" + input.name) - if hasattr(tosca, 'nodetemplates'): + if tosca and hasattr(tosca, 'nodetemplates'): nodetemplates = tosca.nodetemplates if nodetemplates: print("\nnodetemplates:") @@ -120,7 +135,7 @@ class ParserShell(object): for trigger in policy.triggers: print("\ttrigger name:" + trigger.name)''' - if hasattr(tosca, 'outputs'): + if tosca and hasattr(tosca, 'outputs'): outputs = tosca.outputs if outputs: print("\noutputs:") diff --git a/tosca2heat/tosca-parser/toscaparser/tosca_template.py b/tosca2heat/tosca-parser/toscaparser/tosca_template.py index c961941..c9be9dd 100644 --- a/tosca2heat/tosca-parser/toscaparser/tosca_template.py +++ b/tosca2heat/tosca-parser/toscaparser/tosca_template.py @@ -69,7 +69,8 @@ class ToscaTemplate(object): '''Load the template data.''' def __init__(self, path=None, parsed_params=None, a_file=True, yaml_dict_tpl=None, sub_mapped_node_template=None, - no_required_paras_valid=False): + no_required_paras_check=False, + debug_mode=False): if sub_mapped_node_template is None: ExceptionCollector.start() self.a_file = a_file @@ -79,7 +80,9 @@ class ToscaTemplate(object): self.sub_mapped_node_template = sub_mapped_node_template self.nested_tosca_tpls_with_topology = {} self.nested_tosca_templates_with_topology = [] - self.no_required_paras_valid = no_required_paras_valid + self.no_required_paras_check = no_required_paras_check + self.debug_mode = debug_mode + if path: self.input_path = path self.path = self._get_path(path) @@ -244,16 +247,20 @@ class ToscaTemplate(object): deepcopy(ExceptionCollector.collecting) nested_template = None try: - nrpv = self.no_required_paras_valid + nrpv = self.no_required_paras_check nested_template = ToscaTemplate( path=fname, parsed_params=parsed_params, sub_mapped_node_template=nodetemplate, - no_required_paras_valid=nrpv) + no_required_paras_check=nrpv) except ValidationError as e: msg = _(' ===== nested service template ===== ') log.error(msg) log.error(e.message) - raise e + if self.debug_mode: + print(msg) + print(e.message) + else: + raise e ExceptionCollector.exceptions = deepcopy(cache_exeptions) ExceptionCollector.collecting = \ @@ -312,21 +319,26 @@ class ToscaTemplate(object): def verify_template(self): if ExceptionCollector.exceptionsCaught(): - if self.no_required_paras_valid: + if self.no_required_paras_check: ExceptionCollector.removeException( MissingRequiredParameterError) if self.input_path: - raise ValidationError( + exceptions = ValidationError( message=(_('\nThe input "%(path)s" failed validation with ' 'the following error(s): \n\n\t') % {'path': self.input_path}) + '\n\t'.join(ExceptionCollector.getExceptionsReport())) else: - raise ValidationError( + exceptions = ValidationError( message=_('\nThe pre-parsed input failed validation with ' 'the following error(s): \n\n\t') + '\n\t'.join(ExceptionCollector.getExceptionsReport())) + if not self.debug_mode: + raise exceptions + else: + print(exceptions.message) + log.error(exceptions.message) else: if self.input_path: msg = (_('The input "%(path)s" successfully passed ' |