Repository: incubator-ariatosca Updated Branches: refs/heads/master df2b916e6 -> 8981791a1
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/master Commit: 8981791a10f91cb4f99ff8c01fd6b130b470ffae Parents: df2b916 Author: max-orlov <[email protected]> Authored: Tue Aug 15 15:20:16 2017 +0300 Committer: max-orlov <[email protected]> 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()
