Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-3-api-for-creating-workflows 3d9d460bb -> c4c7a0fd4
ARIA-5-Adapt-workflow-API-users-to-modified-API(builtin-workflows) Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c4c7a0fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c4c7a0fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c4c7a0fd Branch: refs/heads/ARIA-3-api-for-creating-workflows Commit: c4c7a0fd4c2e357f899263d3152ee43941074f49 Parents: 3d9d460 Author: mxmrlv <[email protected]> Authored: Tue Oct 25 12:05:17 2016 +0300 Committer: mxmrlv <[email protected]> Committed: Tue Oct 25 12:05:17 2016 +0300 ---------------------------------------------------------------------- aria/workflows/builtin/heal.py | 30 ++++++++++++++++-------------- aria/workflows/builtin/install.py | 8 +++----- aria/workflows/builtin/uninstall.py | 5 ++--- aria/workflows/builtin/workflows.py | 30 +++++++++++++----------------- 4 files changed, 34 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c4c7a0fd/aria/workflows/builtin/heal.py ---------------------------------------------------------------------- diff --git a/aria/workflows/builtin/heal.py b/aria/workflows/builtin/heal.py index cab2e6e..9a31fd6 100644 --- a/aria/workflows/builtin/heal.py +++ b/aria/workflows/builtin/heal.py @@ -46,7 +46,7 @@ def heal(context, graph, node_instance_id): if relationship_instance.target_id not in failed_node_instance_ids ] - graph.chain([ + graph.add_dependency( heal_uninstall( context=context, failing_node_instances=failed_node_instance_subgraph, @@ -55,7 +55,7 @@ def heal(context, graph, node_instance_id): context=context, failing_node_instances=failed_node_instance_subgraph, targeted_node_instances=targeted_node_instances) - ]) + ) @workflow(suffix_template='{failing_node_instances}') @@ -94,18 +94,19 @@ def heal_uninstall(context, graph, failing_node_instances, targeted_node_instanc target_node_instance = context.storage.node_instance.get( relationship_instance.target_id) if target_node_instance in failing_node_instances: - after_tasks = [node_instance_sub_workflows[relationship.target_id] - for relationship in node_instance.relationship_instances] + target_node_instances = [node_instance_sub_workflows[relationship.target_id] + for relationship in node_instance.relationship_instances] + dependency = graph.parallel(*target_node_instances) elif target_node_instance in targeted_node_instances: - after_tasks = [relationship_tasks( + dependency = relationship_tasks( node_instance=node_instance, relationship_instance=relationship_instance, context=context, - operation_name='aria.interfaces.relationship_lifecycle.unlink')] + operation_name='aria.interfaces.relationship_lifecycle.unlink') - if after_tasks: - graph.dependency(source_task=node_instance_sub_workflow, after=after_tasks) + if dependency: + graph.add_dependency(node_instance_sub_workflow, dependency) @workflow(suffix_template='{failing_node_instances}') @@ -144,18 +145,19 @@ def heal_install(context, graph, failing_node_instances, targeted_node_instances target_node_instance = context.storage.node_instance.get( relationship_instance.target_id) if target_node_instance in failing_node_instances: - after_tasks = [node_instance_sub_workflows[relationship.target_id] - for relationship in node_instance.relationship_instances] + target_node_instances = [node_instance_sub_workflows[relationship.target_id] + for relationship in node_instance.relationship_instances] + dependency = graph.parallel(*target_node_instances) elif target_node_instance in targeted_node_instances: - after_tasks = [relationship_tasks( + dependency = relationship_tasks( node_instance=node_instance, relationship_instance=relationship_instance, context=context, - operation_name='aria.interfaces.relationship_lifecycle.establish')] + operation_name='aria.interfaces.relationship_lifecycle.establish') - if after_tasks: - graph.dependency(source_task=node_instance_sub_workflow, after=after_tasks) + if dependency: + graph.dependency(node_instance_sub_workflow, dependency) def _get_contained_subgraph(context, host_node_instance): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c4c7a0fd/aria/workflows/builtin/install.py ---------------------------------------------------------------------- diff --git a/aria/workflows/builtin/install.py b/aria/workflows/builtin/install.py index 35d2968..3e3ab33 100644 --- a/aria/workflows/builtin/install.py +++ b/aria/workflows/builtin/install.py @@ -47,8 +47,6 @@ def install(context, graph, node_instances=(), node_instance_sub_workflows=None) # create dependencies between the node instance sub workflow for node_instance in node_instances: node_instance_sub_workflow = node_instance_sub_workflows[node_instance.id] - graph.dependency( - source_task=node_instance_sub_workflow, - after=[ - node_instance_sub_workflows[relationship.target_id] - for relationship in node_instance.relationship_instances]) + dependencies = graph.parallel([node_instance_sub_workflows[relationship.target_id] + for relationship in node_instance.relationship_instances]) + graph.add_dependency(node_instance_sub_workflow, dependencies) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c4c7a0fd/aria/workflows/builtin/uninstall.py ---------------------------------------------------------------------- diff --git a/aria/workflows/builtin/uninstall.py b/aria/workflows/builtin/uninstall.py index 47c8259..9659cb9 100644 --- a/aria/workflows/builtin/uninstall.py +++ b/aria/workflows/builtin/uninstall.py @@ -48,6 +48,5 @@ def uninstall(context, graph, node_instances=(), node_instance_sub_workflows=Non for node_instance in node_instances: node_instance_sub_workflow = node_instance_sub_workflows[node_instance.id] for relationship_instance in reversed(node_instance.relationship_instances): - graph.dependency( - source_task=node_instance_sub_workflows[relationship_instance.target_id], - after=[node_instance_sub_workflow]) + graph.add_dependency(node_instance_sub_workflows[relationship_instance.target_id], + node_instance_sub_workflow) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c4c7a0fd/aria/workflows/builtin/workflows.py ---------------------------------------------------------------------- diff --git a/aria/workflows/builtin/workflows.py b/aria/workflows/builtin/workflows.py index b6fbb94..32c4ee6 100644 --- a/aria/workflows/builtin/workflows.py +++ b/aria/workflows/builtin/workflows.py @@ -57,14 +57,12 @@ def install_node_instance(context, graph, node_instance): 'aria.interfaces.lifecycle.start'], node_instance=node_instance ) - graph.chain(tasks=[ - create_node_instance, - preconfigure_relationship(context=context, node_instance=node_instance), - configure_node_instance, - postconfigure_relationship(context=context, node_instance=node_instance), - start_node_instance, - establish_relationship(context=context, node_instance=node_instance), - ]) + graph.sequence(create_node_instance, + preconfigure_relationship(context=context, node_instance=node_instance), + configure_node_instance, + postconfigure_relationship(context=context, node_instance=node_instance), + start_node_instance, + establish_relationship(context=context, node_instance=node_instance)) @workflow(suffix_template='{node_instance.id}') @@ -76,7 +74,7 @@ def preconfigure_relationship(context, graph, node_instance): :param node_instance: :return: """ - graph.chain(tasks=relationships_tasks( + graph.sequence(*relationships_tasks( operation_name='aria.interfaces.relationship_lifecycle.preconfigure', context=context, node_instance=node_instance)) @@ -91,7 +89,7 @@ def postconfigure_relationship(context, graph, node_instance): :param node_instance: :return: """ - graph.chain(tasks=relationships_tasks( + graph.sequence(*relationships_tasks( operation_name='aria.interfaces.relationship_lifecycle.postconfigure', context=context, node_instance=node_instance)) @@ -106,7 +104,7 @@ def establish_relationship(context, graph, node_instance): :param node_instance: :return: """ - graph.chain(tasks=relationships_tasks( + graph.sequence(*relationships_tasks( operation_name='aria.interfaces.relationship_lifecycle.establish', context=context, node_instance=node_instance)) @@ -136,11 +134,9 @@ def uninstall_node_instance(graph, context, node_instance): node_instance=node_instance ) - graph.chain(tasks=[ - stop_node_instance, - unlink_relationship(context=context, node_instance=node_instance), - delete_node_instance, - ]) + graph.sequence(stop_node_instance, + unlink_relationship(context=context, node_instance=node_instance), + delete_node_instance) @workflow(suffix_template='{node_instance.id}') @@ -157,7 +153,7 @@ def unlink_relationship(context, graph, node_instance): context=context, node_instance=node_instance ) - graph.chain(tasks=tasks) + graph.sequence(*tasks) return tasks
