[1/2] incubator-ariatosca git commit: Fixes [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-149-functions-in-operation-configuration b86cf82a6 -> dc2d69c98 (forced update) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dc2d69c9/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml -- diff --git a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml index ee9e094..4d53f9b 100644 --- a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml +++ b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml @@ -311,7 +311,7 @@ policy_types: client connections cleanly and shut down services. derived_from: aria.Workflow properties: - function: + implementation: type: string default: workflows.maintenance enabled:
[2/2] incubator-ariatosca git commit: Fixes
Fixes * Rename implementation/inputs to function/arguments in Task API * Rename "create_parameters" to "merge_parameter_values" and improve * Change workflow "function" back to "implementation" Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/dc2d69c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/dc2d69c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/dc2d69c9 Branch: refs/heads/ARIA-149-functions-in-operation-configuration Commit: dc2d69c98a9c83f98ccec4b1f33a9c3d7fe484a0 Parents: f6ee65a Author: Tal Liron Authored: Wed May 24 14:54:07 2017 -0500 Committer: Tal Liron Committed: Tue May 30 13:00:27 2017 -0500 -- aria/cli/execution_logging.py | 4 +- aria/modeling/exceptions.py | 6 + aria/modeling/orchestration.py | 14 +-- aria/modeling/service_instance.py | 11 +- aria/modeling/service_template.py | 25 ++-- aria/modeling/utils.py | 126 ++- aria/orchestrator/context/operation.py | 4 +- .../execution_plugin/instantiation.py | 12 +- aria/orchestrator/workflow_runner.py| 20 +-- aria/orchestrator/workflows/api/task.py | 89 + .../workflows/builtin/execute_operation.py | 2 +- aria/orchestrator/workflows/core/task.py| 4 +- aria/orchestrator/workflows/events_logging.py | 8 +- aria/orchestrator/workflows/executor/base.py| 4 +- aria/orchestrator/workflows/executor/celery.py | 6 +- aria/orchestrator/workflows/executor/dry.py | 6 +- aria/orchestrator/workflows/executor/process.py | 12 +- aria/orchestrator/workflows/executor/thread.py | 6 +- aria/utils/formatting.py| 4 +- aria/utils/validation.py| 8 +- .../profiles/aria-1.0/aria-1.0.yaml | 8 +- .../simple_v1_0/modeling/__init__.py| 22 ++-- .../simple_v1_0/modeling/functions.py | 6 +- tests/modeling/test_models.py | 12 +- tests/orchestrator/context/test_operation.py| 47 --- tests/orchestrator/context/test_serialize.py| 4 +- tests/orchestrator/context/test_toolbelt.py | 4 +- .../orchestrator/execution_plugin/test_local.py | 8 +- tests/orchestrator/execution_plugin/test_ssh.py | 6 +- tests/orchestrator/test_workflow_runner.py | 8 +- tests/orchestrator/workflows/api/test_task.py | 20 +-- .../orchestrator/workflows/core/test_engine.py | 40 +++--- tests/orchestrator/workflows/core/test_task.py | 4 +- .../test_task_graph_into_execution_graph.py | 4 +- .../orchestrator/workflows/executor/__init__.py | 6 +- .../workflows/executor/test_executor.py | 10 +- .../workflows/executor/test_process_executor.py | 2 +- ...process_executor_concurrent_modifications.py | 4 +- .../executor/test_process_executor_extension.py | 18 +-- .../test_process_executor_tracked_changes.py| 14 +-- .../node-cellar/node-cellar.yaml| 2 +- 41 files changed, 340 insertions(+), 280 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dc2d69c9/aria/cli/execution_logging.py -- diff --git a/aria/cli/execution_logging.py b/aria/cli/execution_logging.py index b23165f..b3252f0 100644 --- a/aria/cli/execution_logging.py +++ b/aria/cli/execution_logging.py @@ -105,8 +105,8 @@ def stylize_log(item, mark_pattern): # implementation if item.task: # operation task -implementation = item.task.implementation -inputs = dict(i.unwrap() for i in item.task.inputs.values()) +implementation = item.task.function +inputs = dict(arg.unwrap() for arg in item.task.arguments.values()) else: # execution task implementation = item.execution.workflow_name http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dc2d69c9/aria/modeling/exceptions.py -- diff --git a/aria/modeling/exceptions.py b/aria/modeling/exceptions.py index d0e3e22..e784d1a 100644 --- a/aria/modeling/exceptions.py +++ b/aria/modeling/exceptions.py @@ -57,3 +57,9 @@ class UndeclaredParametersException(ParameterException): """ ARIA modeling exception: Undeclared parameters have been provided. """ + + +class ForbiddenParameterNamesException(ParameterException): +""" +ARIA modeling exception: Forbidden parameter names have been used. +""" http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dc2d69c9/aria/modeling/orchestration.py ---
[4/5] incubator-ariatosca git commit: Fixes
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fdec01ab/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml -- diff --git a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml index ee9e094..4d53f9b 100644 --- a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml +++ b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml @@ -311,7 +311,7 @@ policy_types: client connections cleanly and shut down services. derived_from: aria.Workflow properties: - function: + implementation: type: string default: workflows.maintenance enabled:
[1/5] incubator-ariatosca git commit: ARIA-268 Add NOTICE file [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-149-functions-in-operation-configuration dc2d69c98 -> fdec01ab0 (forced update) ARIA-268 Add NOTICE file Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/07d79513 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/07d79513 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/07d79513 Branch: refs/heads/ARIA-149-functions-in-operation-configuration Commit: 07d79513a4ac41ba66d84f2922a17fd0ab7ec39c Parents: adf7607 Author: Ran Ziv Authored: Mon May 29 17:11:04 2017 +0300 Committer: Ran Ziv Committed: Mon May 29 17:11:04 2017 +0300 -- NOTICE | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/07d79513/NOTICE -- diff --git a/NOTICE b/NOTICE new file mode 100644 index 000..bf03ab5 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache AriaTosca +Copyright 2016-2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file
[5/5] incubator-ariatosca git commit: Fixes
Fixes * Rename implementation/inputs to function/arguments in Task API * Rename "create_parameters" to "merge_parameter_values" and improve * Change workflow "function" back to "implementation" Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/fdec01ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/fdec01ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/fdec01ab Branch: refs/heads/ARIA-149-functions-in-operation-configuration Commit: fdec01ab0f28152d1e8fb9cd8f73b6a063f556f5 Parents: 8fe7f4b Author: Tal Liron Authored: Wed May 24 14:54:07 2017 -0500 Committer: Tal Liron Committed: Tue May 30 13:03:05 2017 -0500 -- aria/cli/execution_logging.py | 4 +- aria/modeling/exceptions.py | 6 + aria/modeling/orchestration.py | 14 +-- aria/modeling/service_instance.py | 11 +- aria/modeling/service_template.py | 25 ++-- aria/modeling/utils.py | 126 ++- aria/orchestrator/context/operation.py | 4 +- .../execution_plugin/instantiation.py | 12 +- aria/orchestrator/workflow_runner.py| 20 +-- aria/orchestrator/workflows/api/task.py | 89 + .../workflows/builtin/execute_operation.py | 2 +- aria/orchestrator/workflows/core/task.py| 4 +- aria/orchestrator/workflows/events_logging.py | 8 +- aria/orchestrator/workflows/executor/base.py| 4 +- aria/orchestrator/workflows/executor/celery.py | 6 +- aria/orchestrator/workflows/executor/dry.py | 6 +- aria/orchestrator/workflows/executor/process.py | 12 +- aria/orchestrator/workflows/executor/thread.py | 6 +- aria/utils/formatting.py| 4 +- aria/utils/validation.py| 8 +- .../profiles/aria-1.0/aria-1.0.yaml | 8 +- .../simple_v1_0/modeling/__init__.py| 22 ++-- .../simple_v1_0/modeling/functions.py | 6 +- tests/modeling/test_models.py | 12 +- tests/orchestrator/context/test_operation.py| 47 --- tests/orchestrator/context/test_serialize.py| 4 +- tests/orchestrator/context/test_toolbelt.py | 4 +- .../orchestrator/execution_plugin/test_local.py | 8 +- tests/orchestrator/execution_plugin/test_ssh.py | 6 +- tests/orchestrator/test_workflow_runner.py | 8 +- tests/orchestrator/workflows/api/test_task.py | 20 +-- .../orchestrator/workflows/core/test_engine.py | 40 +++--- tests/orchestrator/workflows/core/test_task.py | 4 +- .../test_task_graph_into_execution_graph.py | 4 +- .../orchestrator/workflows/executor/__init__.py | 6 +- .../workflows/executor/test_executor.py | 10 +- .../workflows/executor/test_process_executor.py | 2 +- ...process_executor_concurrent_modifications.py | 4 +- .../executor/test_process_executor_extension.py | 18 +-- .../test_process_executor_tracked_changes.py| 14 +-- .../node-cellar/node-cellar.yaml| 2 +- 41 files changed, 340 insertions(+), 280 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fdec01ab/aria/cli/execution_logging.py -- diff --git a/aria/cli/execution_logging.py b/aria/cli/execution_logging.py index b23165f..b3252f0 100644 --- a/aria/cli/execution_logging.py +++ b/aria/cli/execution_logging.py @@ -105,8 +105,8 @@ def stylize_log(item, mark_pattern): # implementation if item.task: # operation task -implementation = item.task.implementation -inputs = dict(i.unwrap() for i in item.task.inputs.values()) +implementation = item.task.function +inputs = dict(arg.unwrap() for arg in item.task.arguments.values()) else: # execution task implementation = item.execution.workflow_name http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fdec01ab/aria/modeling/exceptions.py -- diff --git a/aria/modeling/exceptions.py b/aria/modeling/exceptions.py index d0e3e22..e784d1a 100644 --- a/aria/modeling/exceptions.py +++ b/aria/modeling/exceptions.py @@ -57,3 +57,9 @@ class UndeclaredParametersException(ParameterException): """ ARIA modeling exception: Undeclared parameters have been provided. """ + + +class ForbiddenParameterNamesException(ParameterException): +""" +ARIA modeling exception: Forbidden parameter names have been used. +""" http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fdec01ab/aria/modeling/orchestration.py ---
[3/5] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration
ARIA-149 Enhance operation configuration * Parse special "dependencies" configuration parameters as YAML and treat as Parameter models, allowing them full use of intrinsic functions, type coersions, and validations * Rename various functions that process "properties" to more generically process "parameters" (properties, inputs, attributes, arguments, etc.) * The "configuration" field in OperationTemplate and Operation models is now now a dict of Parameter models * Added "function" and "arguments" fields to Operation model to preserve user data (in "implementation" and "inputs") and to clearly demarcate orchestration data from user data * Some cleanup of parser code touched by this commit Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8fe7f4b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8fe7f4b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8fe7f4b1 Branch: refs/heads/ARIA-149-functions-in-operation-configuration Commit: 8fe7f4b1c89c44793a0db6cdb1e78c2722934334 Parents: 07d7951 Author: Tal Liron Authored: Thu Apr 20 17:54:47 2017 -0500 Committer: Tal Liron Committed: Tue May 30 13:03:04 2017 -0500 -- aria/cli/commands/services.py | 2 +- aria/core.py| 14 +- aria/modeling/constraints.py| 28 +++ aria/modeling/contraints.py | 28 --- aria/modeling/exceptions.py | 16 +- aria/modeling/service_common.py | 4 + aria/modeling/service_instance.py | 69 +++--- aria/modeling/service_template.py | 54 ++--- aria/modeling/utils.py | 105 - .../execution_plugin/instantiation.py | 133 +++- aria/orchestrator/workflow_runner.py| 2 +- aria/orchestrator/workflows/api/task.py | 4 +- aria/orchestrator/workflows/core/task.py| 1 - .../profiles/aria-1.0/aria-1.0.yaml | 16 +- .../simple_v1_0/assignments.py | 4 +- .../simple_v1_0/modeling/__init__.py| 65 -- .../simple_v1_0/modeling/artifacts.py | 2 +- .../simple_v1_0/modeling/capabilities.py| 24 ++- .../simple_v1_0/modeling/constraints.py | 2 +- .../simple_v1_0/modeling/data_types.py | 16 ++ .../simple_v1_0/modeling/interfaces.py | 34 ++- .../simple_v1_0/modeling/parameters.py | 211 +++ .../simple_v1_0/modeling/policies.py| 2 + .../simple_v1_0/modeling/properties.py | 202 -- .../simple_v1_0/modeling/requirements.py| 20 +- .../modeling/substitution_mappings.py | 4 + .../simple_v1_0/templates.py| 13 +- .../aria_extension_tosca/simple_v1_0/types.py | 24 +-- tests/cli/test_services.py | 14 +- tests/mock/models.py| 10 +- tests/mock/topology.py | 12 +- tests/orchestrator/context/test_operation.py| 53 +++-- tests/orchestrator/context/test_serialize.py| 2 +- tests/orchestrator/context/test_toolbelt.py | 14 +- .../orchestrator/execution_plugin/test_local.py | 10 +- tests/orchestrator/execution_plugin/test_ssh.py | 12 +- tests/orchestrator/test_workflow_runner.py | 8 +- tests/orchestrator/workflows/api/test_task.py | 26 +-- .../workflows/builtin/test_execute_operation.py | 2 +- .../orchestrator/workflows/core/test_engine.py | 6 +- .../orchestrator/workflows/core/test_events.py | 3 +- tests/orchestrator/workflows/core/test_task.py | 6 +- .../test_task_graph_into_execution_graph.py | 2 +- ...process_executor_concurrent_modifications.py | 10 +- .../executor/test_process_executor_extension.py | 13 +- .../test_process_executor_tracked_changes.py| 8 +- .../node-cellar/node-cellar.yaml| 24 ++- 47 files changed, 737 insertions(+), 597 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8fe7f4b1/aria/cli/commands/services.py -- diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py index 24de7c5..476387c 100644 --- a/aria/cli/commands/services.py +++ b/aria/cli/commands/services.py @@ -151,7 +151,7 @@ def create(service_template_name, except storage_exceptions.StorageError as e: utils.check_overriding_storage_exceptions(e, 'service', service_name) raise -except modeling_exceptions.InputsException: +except modeling_exceptions.ParameterException: service_templates.print_service_template_inputs(model_storage,
[2/5] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8fe7f4b1/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py -- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py deleted file mode 100644 index 9c3ea42..000 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py +++ /dev/null @@ -1,202 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from aria.utils.collections import merge, deepcopy_with_locators, OrderedDict -from aria.parser.presentation import Value -from aria.parser.validation import Issue - -from .data_types import coerce_value - -# -# ArtifactType, DataType, CapabilityType, RelationshipType, NodeType, GroupType, PolicyType -# - -# Works on properties, parameters, inputs, and attributes -def get_inherited_property_definitions(context, presentation, field_name, for_presentation=None): -""" -Returns our property definitions added on top of those of our parent, if we have one -(recursively). - -Allows overriding all aspects of parent properties except data type. -""" - -# Get definitions from parent -# If we inherit from a primitive, it does not have a parent: -parent = presentation._get_parent(context) if hasattr(presentation, '_get_parent') else None -definitions = get_inherited_property_definitions(context, parent, field_name, - for_presentation=presentation) \ - if parent is not None else OrderedDict() - -# Add/merge our definitions -# If we inherit from a primitive, it does not have our field -our_definitions = getattr(presentation, field_name, None) -if our_definitions: -our_definitions_clone = OrderedDict() -for name, our_definition in our_definitions.iteritems(): -our_definitions_clone[name] = our_definition._clone(for_presentation) -our_definitions = our_definitions_clone -merge_property_definitions(context, presentation, definitions, our_definitions, field_name) - -for definition in definitions.itervalues(): -definition._reset_method_cache() - -return definitions - -# -# NodeTemplate, RelationshipTemplate, GroupTemplate, PolicyTemplate -# - -def get_assigned_and_defined_property_values(context, presentation, field_name='property', - field_name_plural='properties'): -""" -Returns the assigned property values while making sure they are defined in our type. - -The property definition's default value, if available, will be used if we did not assign it. - -Makes sure that required properties indeed end up with a value. -""" - -values = OrderedDict() - -the_type = presentation._get_type(context) -assignments = getattr(presentation, field_name_plural) -get_fn_name = '_get_{0}'.format(field_name_plural) -definitions = getattr(the_type, get_fn_name)(context) if the_type is not None else None - -# Fill in our assignments, but make sure they are defined -if assignments: -for name, value in assignments.iteritems(): -if (definitions is not None) and (name in definitions): -definition = definitions[name] -values[name] = coerce_property_value(context, value, definition, value.value) -else: -context.validation.report('assignment to undefined {0} "{1}" in "{2}"' - .format(field_name, name, presentation._fullname), - locator=value._locator, level=Issue.BETWEEN_TYPES) - -# Fill in defaults from the definitions -if definitions: -for name, definition in definitions.iteritems(): -if values.get(name) is None: -values[name] = coerce_property_value(context, presentation, definition, - definition.default) - -validate_required_values(context, presentation, values, definitions) - -re
[2/2] incubator-ariatosca git commit: Fixes
Fixes * Rename implementation/inputs to function/arguments in Task API * Rename "create_parameters" to "merge_parameter_values" and improve * Change workflow "function" back to "implementation" Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/adf98c99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/adf98c99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/adf98c99 Branch: refs/heads/ARIA-149-functions-in-operation-configuration Commit: adf98c990866b68ddc19cb66046350a169ed5118 Parents: 8fe7f4b Author: Tal Liron Authored: Wed May 24 14:54:07 2017 -0500 Committer: Tal Liron Committed: Tue May 30 13:07:43 2017 -0500 -- aria/cli/execution_logging.py | 4 +- aria/modeling/exceptions.py | 6 + aria/modeling/orchestration.py | 14 +-- aria/modeling/service_instance.py | 11 +- aria/modeling/service_template.py | 25 ++-- aria/modeling/utils.py | 126 ++- aria/orchestrator/context/operation.py | 4 +- .../execution_plugin/instantiation.py | 12 +- aria/orchestrator/workflow_runner.py| 20 +-- aria/orchestrator/workflows/api/task.py | 89 + .../workflows/builtin/execute_operation.py | 2 +- aria/orchestrator/workflows/core/task.py| 4 +- aria/orchestrator/workflows/events_logging.py | 8 +- aria/orchestrator/workflows/executor/base.py| 4 +- aria/orchestrator/workflows/executor/celery.py | 6 +- aria/orchestrator/workflows/executor/dry.py | 6 +- aria/orchestrator/workflows/executor/process.py | 12 +- aria/orchestrator/workflows/executor/thread.py | 6 +- aria/utils/formatting.py| 4 +- aria/utils/validation.py| 8 +- .../profiles/aria-1.0/aria-1.0.yaml | 8 +- .../simple_v1_0/modeling/__init__.py| 22 ++-- .../simple_v1_0/modeling/functions.py | 4 +- tests/modeling/test_models.py | 12 +- tests/orchestrator/context/test_operation.py| 47 --- tests/orchestrator/context/test_serialize.py| 4 +- tests/orchestrator/context/test_toolbelt.py | 4 +- .../orchestrator/execution_plugin/test_local.py | 8 +- tests/orchestrator/execution_plugin/test_ssh.py | 6 +- tests/orchestrator/test_workflow_runner.py | 8 +- tests/orchestrator/workflows/api/test_task.py | 20 +-- .../orchestrator/workflows/core/test_engine.py | 40 +++--- tests/orchestrator/workflows/core/test_task.py | 4 +- .../test_task_graph_into_execution_graph.py | 4 +- .../orchestrator/workflows/executor/__init__.py | 6 +- .../workflows/executor/test_executor.py | 10 +- .../workflows/executor/test_process_executor.py | 2 +- ...process_executor_concurrent_modifications.py | 4 +- .../executor/test_process_executor_extension.py | 18 +-- .../test_process_executor_tracked_changes.py| 14 +-- .../node-cellar/node-cellar.yaml| 2 +- 41 files changed, 338 insertions(+), 280 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/adf98c99/aria/cli/execution_logging.py -- diff --git a/aria/cli/execution_logging.py b/aria/cli/execution_logging.py index b23165f..b3252f0 100644 --- a/aria/cli/execution_logging.py +++ b/aria/cli/execution_logging.py @@ -105,8 +105,8 @@ def stylize_log(item, mark_pattern): # implementation if item.task: # operation task -implementation = item.task.implementation -inputs = dict(i.unwrap() for i in item.task.inputs.values()) +implementation = item.task.function +inputs = dict(arg.unwrap() for arg in item.task.arguments.values()) else: # execution task implementation = item.execution.workflow_name http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/adf98c99/aria/modeling/exceptions.py -- diff --git a/aria/modeling/exceptions.py b/aria/modeling/exceptions.py index d0e3e22..e784d1a 100644 --- a/aria/modeling/exceptions.py +++ b/aria/modeling/exceptions.py @@ -57,3 +57,9 @@ class UndeclaredParametersException(ParameterException): """ ARIA modeling exception: Undeclared parameters have been provided. """ + + +class ForbiddenParameterNamesException(ParameterException): +""" +ARIA modeling exception: Forbidden parameter names have been used. +""" http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/adf98c99/aria/modeling/orchestration.py ---
[1/2] incubator-ariatosca git commit: Fixes [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-149-functions-in-operation-configuration fdec01ab0 -> adf98c990 (forced update) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/adf98c99/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml -- diff --git a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml index ee9e094..4d53f9b 100644 --- a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml +++ b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml @@ -311,7 +311,7 @@ policy_types: client connections cleanly and shut down services. derived_from: aria.Workflow properties: - function: + implementation: type: string default: workflows.maintenance enabled:
Podling Report Reminder - June 2017
Dear podling, This email was sent by an automated system on behalf of the Apache Incubator PMC. It is an initial reminder to give you plenty of time to prepare your quarterly board report. The board meeting is scheduled for Wed, 21 June 2017, 10:30 am PDT. The report for your podling will form a part of the Incubator PMC report. The Incubator PMC requires your report to be submitted 2 weeks before the board meeting, to allow sufficient time for review and submission (Wed, June 07). Please submit your report with sufficient time to allow the Incubator PMC, and subsequently board members to review and digest. Again, the very latest you should submit your report is 2 weeks prior to the board meeting. Thanks, The Apache Incubator PMC Submitting your Report -- Your report should contain the following: * Your project name * A brief description of your project, which assumes no knowledge of the project or necessarily of its field * A list of the three most important issues to address in the move towards graduation. * Any issues that the Incubator PMC or ASF Board might wish/need to be aware of * How has the community developed since the last report * How has the project developed since the last report. * How does the podling rate their own maturity. This should be appended to the Incubator Wiki page at: https://wiki.apache.org/incubator/June2017 Note: This is manually populated. You may need to wait a little before this page is created from a template. Mentors --- Mentors should review reports for their project(s) and sign them off on the Incubator wiki page. Signing off reports shows that you are following the project - projects that are not signed may raise alarms for the Incubator PMC. Incubator PMC
[NOTICE] Managing Podling Rosters
Podlings, I wanted to raise a point to all, hence the direct emails. The Whimsy PMC has put together a roster tool for managing the committers in a podling. Rather than managing the committer list in your status file, this will keep track and make sure we list out everyone's valid IDs. If you haven't accessed it, it can be found at https://whimsy.apache.org/roster/ppmc/ The Incubator guide has been updated to reflect this http://incubator.apache.org/guides/ppmc.html#podling+rosters Please reach out if you have any questions. John
[Slack] Notifications from the ASF team for May 31st, 2017 at 8:17 AM
Hi ARIA TOSCA, You have a new direct message from the ASF team (https://the-asf.slack.com/x-185534614710-189607769488/). --- @digestai View in the archives: https://the-asf.slack.com/x-185534614710-189607769488/archives/D5E4SCANM/p1496206862965834 Digest.AI (8:01 AM, May 31st) Hi ARIA, *Here’s your digest for May 31st 2017* There are 52 messages yesterday, and the most active user is jamesbognar *#ariatosca* @maxim: Well, you need os creds in the inputs file Under openstack_config Were you able to successfully finish the execution? You shouldn't be running this is dry mode * * * You can snooze these notifications for an hour: https://the-asf.slack.com/unsub/U5FFQJ2LW-5a1cb74d28-notify-mute-1h eight hours: https://the-asf.slack.com/unsub/U5FFQJ2LW-796e6535e1-notify-mute-8h a day: https://the-asf.slack.com/unsub/U5FFQJ2LW-4e6e073ada-notify-mute-1d three days: https://the-asf.slack.com/unsub/U5FFQJ2LW-806a2d8aa0-notify-mute-3d or the next week: https://the-asf.slack.com/unsub/U5FFQJ2LW-6adc840c34-notify-mute-7d. You can also turn email notifications off: https://the-asf.slack.com/unsub/U5FFQJ2LW-64de78982b-notify. For more detailed preferences, see your account page: https://the-asf.slack.com/account.