Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E9710200BF9 for ; Sun, 8 Jan 2017 22:13:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E7FFB160B36; Sun, 8 Jan 2017 21:13:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3A386160B1F for ; Sun, 8 Jan 2017 22:13:01 +0100 (CET) Received: (qmail 74463 invoked by uid 500); 8 Jan 2017 21:13:00 -0000 Mailing-List: contact dev-help@ariatosca.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ariatosca.incubator.apache.org Delivered-To: mailing list dev@ariatosca.incubator.apache.org Received: (qmail 74452 invoked by uid 99); 8 Jan 2017 21:13:00 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2017 21:13:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id D07621A000D for ; Sun, 8 Jan 2017 21:12:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id L_szLlXvm5OT for ; Sun, 8 Jan 2017 21:12:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7570D5F30B for ; Sun, 8 Jan 2017 21:12:57 +0000 (UTC) Received: (qmail 74231 invoked by uid 99); 8 Jan 2017 21:12:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2017 21:12:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31558DFA22; Sun, 8 Jan 2017 21:12:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ran@apache.org To: dev@ariatosca.incubator.apache.org Message-Id: <6bd52d003d0e48d1bcbbfbdb61f2b273@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ariatosca git commit: ARIA-59 Inherit default interfaces in relationships Date: Sun, 8 Jan 2017 21:12:56 +0000 (UTC) archived-at: Sun, 08 Jan 2017 21:13:02 -0000 Repository: incubator-ariatosca Updated Branches: refs/heads/master 17d07ed97 -> dac4da7f6 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/master Commit: dac4da7f616fa34d15e13e7162c706b9c3bd02a6 Parents: 17d07ed Author: Tal Liron Authored: Sun Jan 8 23:12:12 2017 +0200 Committer: Ran Ziv 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), \