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 0A328200CE4 for ; Sun, 20 Aug 2017 15:20:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 08B091649F7; Sun, 20 Aug 2017 13:20:27 +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 4CDBF1649F6 for ; Sun, 20 Aug 2017 15:20:26 +0200 (CEST) Received: (qmail 8283 invoked by uid 500); 20 Aug 2017 13:20:25 -0000 Mailing-List: contact commits-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 commits@ariatosca.incubator.apache.org Received: (qmail 8274 invoked by uid 99); 20 Aug 2017 13:20:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Aug 2017 13:20:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id E5EDAC1E74 for ; Sun, 20 Aug 2017 13:20:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id icajpFvhNujC for ; Sun, 20 Aug 2017 13:20:23 +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 988055F6D3 for ; Sun, 20 Aug 2017 13:20:22 +0000 (UTC) Received: (qmail 8264 invoked by uid 99); 20 Aug 2017 13:20:21 -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, 20 Aug 2017 13:20:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C127FE0618; Sun, 20 Aug 2017 13:20:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: avia@apache.org To: commits@ariatosca.incubator.apache.org Date: Sun, 20 Aug 2017 13:20:21 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-ariatosca git commit: ARIA-349 get_attribute is not calculated at runtime [Forced Update!] archived-at: Sun, 20 Aug 2017 13:20:27 -0000 Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-348-validate-substitution-mapping 78e535a52 -> 8839eb375 (forced update) ARIA-349 get_attribute is not calculated at runtime Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8981791a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8981791a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8981791a Branch: refs/heads/ARIA-348-validate-substitution-mapping Commit: 8981791a10f91cb4f99ff8c01fd6b130b470ffae Parents: df2b916 Author: max-orlov Authored: Tue Aug 15 15:20:16 2017 +0300 Committer: max-orlov Committed: Tue Aug 15 15:20:16 2017 +0300 ---------------------------------------------------------------------- aria/cli/commands/executions.py | 2 +- aria/modeling/utils.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8981791a/aria/cli/commands/executions.py ---------------------------------------------------------------------- diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py index f130d95..cecbbc5 100644 --- a/aria/cli/commands/executions.py +++ b/aria/cli/commands/executions.py @@ -185,7 +185,7 @@ def resume(execution_id, logger.info("Can't resume execution {execution.id} - " "execution is in status {execution.status}. " "Can only resume executions in status {valid_status}" - .format(execution=execution, valid_status=execution.status.CANCELLED)) + .format(execution=execution, valid_status=execution.CANCELLED)) return workflow_runner = \ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8981791a/aria/modeling/utils.py ---------------------------------------------------------------------- diff --git a/aria/modeling/utils.py b/aria/modeling/utils.py index 305020b..6e851f2 100644 --- a/aria/modeling/utils.py +++ b/aria/modeling/utils.py @@ -131,7 +131,11 @@ def merge_parameter_values(provided_values, declared_parameters, model_cls=None) value=value) else: # Copy default value from declaration - model_parameters[declared_parameter_name] = model_cls(**declared_parameter.as_raw) + model_parameters[declared_parameter_name] = model_cls( + value=declared_parameter._value, + name=declared_parameter.name, + type_name=declared_parameter.type_name, + description=declared_parameter.description) if provided_values_of_wrong_type: error_message = StringIO()