ARIA-59 Inherit default interfaces in relationships
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/dac4da7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/dac4da7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/dac4da7f Branch: refs/heads/ARIA-46-execution-plugin Commit: dac4da7f616fa34d15e13e7162c706b9c3bd02a6 Parents: 17d07ed Author: Tal Liron <tli...@gmail.com> Authored: Sun Jan 8 23:12:12 2017 +0200 Committer: Ran Ziv <r...@gigaspaces.com> Committed: Sun Jan 8 23:12:35 2017 +0200 ---------------------------------------------------------------------- extensions/aria_extension_tosca/__init__.py | 3 +-- .../simple_v1_0/modeling/requirements.py | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dac4da7f/extensions/aria_extension_tosca/__init__.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/__init__.py b/extensions/aria_extension_tosca/__init__.py index d93dce2..ff4fa7d 100644 --- a/extensions/aria_extension_tosca/__init__.py +++ b/extensions/aria_extension_tosca/__init__.py @@ -53,5 +53,4 @@ MODULES = ( 'simple_nfv_v1_0') __all__ = ( - 'MODULES', - 'install_aria_extension') + 'MODULES',) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dac4da7f/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py index 9dea874..8f6c38f 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py @@ -192,6 +192,12 @@ def convert_requirement_from_definition_to_assignment(context, requirement_defin # InterfaceDefinition: relationship_interface_definitions = OrderedDict(relationship_type._get_interfaces(context)) + # Convert interface definitions to templates + convert_requirement_interface_definitions_from_type_to_raw_template( + context, + raw['relationship'], + relationship_interface_definitions) + if relationship_definition: # Merge extra interface definitions # InterfaceDefinition: @@ -207,12 +213,6 @@ def convert_requirement_from_definition_to_assignment(context, requirement_defin raw['relationship']['interfaces'] = OrderedDict() for interface_name, interface in interfaces.iteritems(): raw['relationship']['interfaces'][interface_name] = interface._raw - else: - # Convert interface definitions to templates - convert_requirement_interface_definitions_from_type_to_raw_template( - context, - raw['relationship'], - relationship_interface_definitions) return \ RequirementAssignment(name=requirement_definition._name, raw=raw, container=container), \
