This is an automated email from the ASF dual-hosted git repository. tnadeau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ariatosca.git
commit 36276ee4194d2dc2b8915c6fd92dae2e51af3731 Merge: 6dfe83e 4046905 Author: Thomas D. Nadeau <[email protected]> AuthorDate: Tue Mar 20 11:39:31 2018 +0000 Merge pull request #229 from djay87/master ARIA-438 : Support for storing the common TOSCA YAML files in the res… aria/__init__.py | 3 +- aria/cli/commands/__init__.py | 1 + aria/cli/commands/type_definitions.py | 136 ++++++++++++ aria/cli/core/aria.py | 11 + aria/cli/env.py | 15 +- aria/cli/main.py | 1 + aria/exceptions.py | 24 +++ aria/modeling/models.py | 20 ++ aria/modeling/type_definition.py | 65 ++++++ aria/type_definition_manager.py | 225 ++++++++++++++++++++ tests/cli/test_type_definitions.py | 228 +++++++++++++++++++++ tests/cli/utils.py | 9 + tests/fixtures.py | 14 ++ tests/helpers.py | 4 + tests/mock/models.py | 14 ++ tests/modeling/test_models.py | 13 ++ .../TOSCA-Metadata/TOSCA.meta | 4 + .../definitions/custom_types/type1.yaml | 12 ++ .../definitions/custom_types/type2.yaml | 12 ++ .../definitions/custom_types/type3.yaml | 12 ++ .../definitions/custom_types/type4.yaml | 12 ++ .../definitions/type_definitions_main.yaml | 23 +++ .../TOSCA-Metadata/TOSCA.meta | 4 + .../definitions/custom_types/type1.yaml | 12 ++ .../definitions/custom_types/type2.yaml | 12 ++ .../definitions/custom_types/type3.yaml | 12 ++ .../definitions/custom_types/type4.yaml | 12 ++ .../definitions/type_definitions_main.yaml | 24 +++ .../TOSCA-Metadata/TOSCA.meta | 5 + .../custom_inner_type/inner_type1.yaml | 17 ++ .../definitions/custom_types/type1.yaml | 12 ++ .../definitions/custom_types/type2.yaml | 12 ++ .../definitions/custom_types/type3.yaml | 12 ++ .../definitions/custom_types/type4.yaml | 15 ++ .../definitions/type_definitions_main.yaml | 24 +++ .../TOSCA-Metadata/TOSCA.meta | 4 + .../definitions/custom_types/type1.yaml | 12 ++ .../definitions/custom_types/type2.yaml | 12 ++ .../definitions/custom_types/type3.yaml | 12 ++ .../definitions/custom_types/type4.yaml | 12 ++ .../definitions/type_definitions_main.yaml | 24 +++ .../TOSCA-Metadata/TOSCA.meta | 4 + .../definitions/custom_types/type1.yaml | 12 ++ .../definitions/custom_types/type2.yaml | 12 ++ .../definitions/custom_types/type3.yaml | 12 ++ .../definitions/custom_types/type4.yaml | 12 ++ .../definitions/type_definitions_main.yaml | 24 +++ .../TOSCA-Metadata/TOSCA.meta | 4 + .../definitions/custom_types/type1.yaml | 12 ++ .../definitions/custom_types/type2.yaml | 12 ++ .../definitions/custom_types/type3.yaml | 12 ++ .../definitions/custom_types/type4.yaml | 12 ++ .../definitions/type_definitions_main.yaml | 24 +++ tests/storage/test_model_storage.py | 2 +- tests/test_type_definition_manager.py | 222 ++++++++++++++++++++ 55 files changed, 1480 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
