Repository: incubator-ariatosca Updated Branches: refs/heads/stub_task_branch 55366e64b -> cc0ee52e4
removed all for_node/rel from the api task Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/cc0ee52e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/cc0ee52e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/cc0ee52e Branch: refs/heads/stub_task_branch Commit: cc0ee52e469f05f441c17c24ce9865db1694bed3 Parents: 55366e6 Author: max-orlov <[email protected]> Authored: Sun Apr 30 22:17:37 2017 +0300 Committer: max-orlov <[email protected]> Committed: Sun Apr 30 22:17:37 2017 +0300 ---------------------------------------------------------------------- aria/orchestrator/workflows/api/task.py | 74 ----------------- aria/orchestrator/workflows/builtin/utils.py | 18 ++-- tests/orchestrator/context/test_operation.py | 32 ++++---- tests/orchestrator/context/test_serialize.py | 2 +- tests/orchestrator/context/test_toolbelt.py | 8 +- .../orchestrator/execution_plugin/test_local.py | 4 +- tests/orchestrator/execution_plugin/test_ssh.py | 4 +- tests/orchestrator/workflows/api/test_task.py | 16 ++-- .../orchestrator/workflows/core/test_engine.py | 86 +++++++++++--------- .../orchestrator/workflows/core/test_events.py | 4 +- tests/orchestrator/workflows/core/test_task.py | 8 +- .../test_task_graph_into_execution_graph.py | 21 +++-- ...process_executor_concurrent_modifications.py | 18 ++-- .../executor/test_process_executor_extension.py | 9 +- .../test_process_executor_tracked_changes.py | 9 +- 15 files changed, 130 insertions(+), 183 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/aria/orchestrator/workflows/api/task.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflows/api/task.py b/aria/orchestrator/workflows/api/task.py index 15397c3..f486a16 100644 --- a/aria/orchestrator/workflows/api/task.py +++ b/aria/orchestrator/workflows/api/task.py @@ -104,80 +104,6 @@ class OperationTask(BaseTask): def __repr__(self): return self.name - @classmethod - def for_node(cls, - node, - interface_name, - operation_name, - max_attempts=None, - retry_interval=None, - ignore_failure=None, - inputs=None, - is_stub=False): - """ - Creates an operation on a node. - - :param node: The node on which to run the operation - :param interface_name: The interface name - :param operation_name: The operation name within the interface - :param max_attempts: The maximum number of attempts in case the operation fails - (if not specified the defaults it taken from the workflow context) - :param retry_interval: The interval in seconds between attempts when the operation fails - (if not specified the defaults it taken from the workflow context) - :param ignore_failure: Whether to ignore failures - (if not specified the defaults it taken from the workflow context) - :param inputs: Additional operation inputs - """ - - assert isinstance(node, models.Node) - return cls( - actor=node, - interface_name=interface_name, - operation_name=operation_name, - max_attempts=max_attempts, - retry_interval=retry_interval, - ignore_failure=ignore_failure, - inputs=inputs, - is_stub=is_stub - ) - - @classmethod - def for_relationship(cls, - relationship, - interface_name, - operation_name, - max_attempts=None, - retry_interval=None, - ignore_failure=None, - inputs=None, - is_stub=False): - """ - Creates an operation on a relationship edge. - - :param relationship: The relationship on which to run the operation - :param interface_name: The interface name - :param operation_name: The operation name within the interface - :param max_attempts: The maximum number of attempts in case the operation fails - (if not specified the defaults it taken from the workflow context) - :param retry_interval: The interval in seconds between attempts when the operation fails - (if not specified the defaults it taken from the workflow context) - :param ignore_failure: Whether to ignore failures - (if not specified the defaults it taken from the workflow context) - :param inputs: Additional operation inputs - """ - - assert isinstance(relationship, models.Relationship) - return cls( - actor=relationship, - interface_name=interface_name, - operation_name=operation_name, - max_attempts=max_attempts, - retry_interval=retry_interval, - ignore_failure=ignore_failure, - inputs=inputs, - is_stub=is_stub - ) - class WorkflowTask(BaseTask): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/aria/orchestrator/workflows/builtin/utils.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflows/builtin/utils.py b/aria/orchestrator/workflows/builtin/utils.py index e649006..a9b7a00 100644 --- a/aria/orchestrator/workflows/builtin/utils.py +++ b/aria/orchestrator/workflows/builtin/utils.py @@ -23,11 +23,11 @@ def create_node_task(node, interface_name, operation_name, **kwargs): """ try: - return OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name, - is_stub=_is_empty_task(node, interface_name, operation_name), - **kwargs) + return OperationTask(node, + interface_name=interface_name, + operation_name=operation_name, + is_stub=_is_empty_task(node, interface_name, operation_name), + **kwargs) except exceptions.OperationNotFoundException: # We will skip nodes which do not have the operation return None @@ -70,8 +70,8 @@ def relationship_tasks(relationship, interface_name, source_operation_name=None, if source_operation_name: try: operations.append( - OperationTask.for_relationship( - relationship=relationship, + OperationTask( + relationship, interface_name=interface_name, operation_name=source_operation_name, is_stub=_is_empty_task(relationship, interface_name, source_operation_name), @@ -84,8 +84,8 @@ def relationship_tasks(relationship, interface_name, source_operation_name=None, if target_operation_name: try: operations.append( - OperationTask.for_relationship( - relationship=relationship, + OperationTask( + relationship, interface_name=interface_name, operation_name=target_operation_name, is_stub=_is_empty_task(relationship, interface_name, target_operation_name), http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/context/test_operation.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/context/test_operation.py b/tests/orchestrator/context/test_operation.py index c399474..971e0db 100644 --- a/tests/orchestrator/context/test_operation.py +++ b/tests/orchestrator/context/test_operation.py @@ -84,10 +84,10 @@ def test_node_operation_task_execution(ctx, thread_executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_node( + api.task.OperationTask( + node, interface_name=interface_name, operation_name=operation_name, - node=node, inputs=inputs ) ) @@ -141,8 +141,8 @@ def test_relationship_operation_task_execution(ctx, thread_executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_relationship( - relationship=relationship, + api.task.OperationTask( + relationship, interface_name=interface_name, operation_name=operation_name, inputs=inputs @@ -209,9 +209,10 @@ def test_invalid_task_operation_id(ctx, thread_executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name) + api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name) ) execute(workflow_func=basic_workflow, workflow_context=ctx, executor=thread_executor) @@ -250,10 +251,11 @@ def test_plugin_workdir(ctx, thread_executor, tmpdir): @workflow def basic_workflow(graph, **_): - graph.add_tasks(api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name, - inputs=inputs)) + graph.add_tasks(api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name, + inputs=inputs)) execute(workflow_func=basic_workflow, workflow_context=ctx, executor=thread_executor) expected_file = tmpdir.join('workdir', 'plugins', str(ctx.service.id), @@ -298,10 +300,10 @@ def test_node_operation_logging(ctx, executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_node( + api.task.OperationTask( + node, interface_name=interface_name, operation_name=operation_name, - node=node, inputs=inputs ) ) @@ -331,10 +333,10 @@ def test_relationship_operation_logging(ctx, executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_relationship( + api.task.OperationTask( + relationship, interface_name=interface_name, operation_name=operation_name, - relationship=relationship, inputs=inputs ) ) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/context/test_serialize.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/context/test_serialize.py b/tests/orchestrator/context/test_serialize.py index f4acc36..8a5db6f 100644 --- a/tests/orchestrator/context/test_serialize.py +++ b/tests/orchestrator/context/test_serialize.py @@ -51,7 +51,7 @@ def _mock_workflow(ctx, graph): plugin=plugin) ) node.interfaces[interface.name] = interface - task = api.task.OperationTask.for_node(node=node, interface_name='test', operation_name='op') + task = api.task.OperationTask(node, interface_name='test', operation_name='op') graph.add_tasks(task) return graph http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/context/test_toolbelt.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/context/test_toolbelt.py b/tests/orchestrator/context/test_toolbelt.py index 213d964..ecc3ac2 100644 --- a/tests/orchestrator/context/test_toolbelt.py +++ b/tests/orchestrator/context/test_toolbelt.py @@ -90,8 +90,8 @@ def test_host_ip(workflow_context, executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_node( - node=dependency_node, + api.task.OperationTask( + dependency_node, interface_name=interface_name, operation_name=operation_name, inputs=inputs @@ -121,8 +121,8 @@ def test_relationship_tool_belt(workflow_context, executor): @workflow def basic_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_relationship( - relationship=relationship, + api.task.OperationTask( + relationship, interface_name=interface_name, operation_name=operation_name, inputs=inputs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/execution_plugin/test_local.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/execution_plugin/test_local.py b/tests/orchestrator/execution_plugin/test_local.py index 58506ba..09d0499 100644 --- a/tests/orchestrator/execution_plugin/test_local.py +++ b/tests/orchestrator/execution_plugin/test_local.py @@ -489,8 +489,8 @@ if __name__ == '__main__': inputs=inputs) ) node.interfaces[interface.name] = interface - graph.add_tasks(api.task.OperationTask.for_node( - node=node, + graph.add_tasks(api.task.OperationTask( + node, interface_name='test', operation_name='op', inputs=inputs)) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/execution_plugin/test_ssh.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/execution_plugin/test_ssh.py b/tests/orchestrator/execution_plugin/test_ssh.py index a75d59a..a9dc5e8 100644 --- a/tests/orchestrator/execution_plugin/test_ssh.py +++ b/tests/orchestrator/execution_plugin/test_ssh.py @@ -245,8 +245,8 @@ class TestWithActualSSHServer(object): for test_operation in test_operations: op_inputs = inputs.copy() op_inputs['test_operation'] = test_operation - ops.append(api.task.OperationTask.for_node( - node=node, + ops.append(api.task.OperationTask( + node, interface_name='test', operation_name='op', inputs=op_inputs)) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/api/test_task.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/api/test_task.py b/tests/orchestrator/workflows/api/test_task.py index ab62361..642c785 100644 --- a/tests/orchestrator/workflows/api/test_task.py +++ b/tests/orchestrator/workflows/api/test_task.py @@ -62,8 +62,8 @@ class TestOperationTask(object): ignore_failure = True with context.workflow.current.push(ctx): - api_task = api.task.OperationTask.for_node( - node=node, + api_task = api.task.OperationTask( + node, interface_name=interface_name, operation_name=operation_name, inputs=inputs, @@ -109,8 +109,8 @@ class TestOperationTask(object): retry_interval = 10 with context.workflow.current.push(ctx): - api_task = api.task.OperationTask.for_relationship( - relationship=relationship, + api_task = api.task.OperationTask( + relationship, interface_name=interface_name, operation_name=operation_name, inputs=inputs, @@ -154,8 +154,8 @@ class TestOperationTask(object): retry_interval = 10 with context.workflow.current.push(ctx): - api_task = api.task.OperationTask.for_relationship( - relationship=relationship, + api_task = api.task.OperationTask( + relationship, interface_name=interface_name, operation_name=operation_name, inputs=inputs, @@ -193,8 +193,8 @@ class TestOperationTask(object): dependency_node.interfaces[interface_name] = interface with context.workflow.current.push(ctx): - task = api.task.OperationTask.for_node( - node=dependency_node, + task = api.task.OperationTask( + dependency_node, interface_name=interface_name, operation_name=operation_name) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/core/test_engine.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/core/test_engine.py b/tests/orchestrator/workflows/core/test_engine.py index af9af17..5a19bcd 100644 --- a/tests/orchestrator/workflows/core/test_engine.py +++ b/tests/orchestrator/workflows/core/test_engine.py @@ -55,34 +55,46 @@ class BaseTest(object): tasks_graph=graph) @staticmethod - def _op(func, ctx, + def _op(ctx, + func=None, inputs=None, max_attempts=None, retry_interval=None, - ignore_failure=None): + ignore_failure=None, + is_stub=False): node = ctx.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME) - operation_kwargs = dict(implementation='{name}.{func.__name__}'.format( - name=__name__, func=func)) - if inputs: - # the operation has to declare the inputs before those may be passed - operation_kwargs['inputs'] = inputs - - interface = mock.models.create_interface( - node.service, - 'aria.interfaces.lifecycle', - 'create', - operation_kwargs=operation_kwargs - ) + if not is_stub: + operation_kwargs = dict(implementation='{name}.{func.__name__}'.format( + name=__name__, func=func)) + if inputs: + # the operation has to declare the inputs before those may be passed + operation_kwargs['inputs'] = inputs + + interface = mock.models.create_interface( + node.service, + 'aria.interfaces.lifecycle', + 'create', + operation_kwargs=operation_kwargs + ) + else: + interface = mock.models.create_interface( + node.service, + 'aria.interfaces.lifecycle', + 'create', + ) + node.interfaces[interface.name] = interface - return api.task.OperationTask.for_node( - node=node, + + return api.task.OperationTask( + node, interface_name='aria.interfaces.lifecycle', operation_name='create', - inputs=inputs, + inputs=inputs or {}, max_attempts=max_attempts, retry_interval=retry_interval, - ignore_failure=ignore_failure + ignore_failure=ignore_failure, + is_stub=is_stub ) @pytest.fixture(autouse=True) @@ -162,7 +174,7 @@ class TestEngine(BaseTest): def test_single_task_successful_execution(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - graph.add_tasks(self._op(mock_success_task, ctx)) + graph.add_tasks(self._op(ctx, func=mock_success_task)) self._execute( workflow_func=mock_workflow, workflow_context=workflow_context, @@ -174,7 +186,7 @@ class TestEngine(BaseTest): def test_single_task_failed_execution(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - graph.add_tasks(self._op(mock_failed_task, ctx)) + graph.add_tasks(self._op(ctx, func=mock_failed_task)) with pytest.raises(exceptions.ExecutorException): self._execute( workflow_func=mock_workflow, @@ -191,8 +203,8 @@ class TestEngine(BaseTest): def test_two_tasks_execution_order(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op1 = self._op(mock_ordered_task, ctx, inputs={'counter': 1}) - op2 = self._op(mock_ordered_task, ctx, inputs={'counter': 2}) + op1 = self._op(ctx, func=mock_ordered_task, inputs={'counter': 1}) + op2 = self._op(ctx, func=mock_ordered_task, inputs={'counter': 2}) graph.sequence(op1, op2) self._execute( workflow_func=mock_workflow, @@ -206,9 +218,9 @@ class TestEngine(BaseTest): def test_stub_and_subworkflow_execution(self, workflow_context, executor): @workflow def sub_workflow(ctx, graph): - op1 = self._op(mock_ordered_task, ctx, inputs={'counter': 1}) - op2 = api.task.StubTask() - op3 = self._op(mock_ordered_task, ctx, inputs={'counter': 2}) + op1 = self._op(ctx, func=mock_ordered_task, inputs={'counter': 1}) + op2 = self._op(ctx, is_stub=True) + op3 = self._op(ctx, func=mock_ordered_task, inputs={'counter': 2}) graph.sequence(op1, op2, op3) @workflow @@ -220,7 +232,7 @@ class TestEngine(BaseTest): assert workflow_context.states == ['start', 'success'] assert workflow_context.exception is None assert global_test_holder.get('invocations') == [1, 2] - assert global_test_holder.get('sent_task_signal_calls') == 2 + assert global_test_holder.get('sent_task_signal_calls') == 3 class TestCancel(BaseTest): @@ -231,7 +243,7 @@ class TestCancel(BaseTest): @workflow def mock_workflow(ctx, graph): operations = ( - self._op(mock_sleep_task, ctx, inputs=dict(seconds=0.1)) + self._op(ctx, func=mock_sleep_task, inputs=dict(seconds=0.1)) for _ in range(number_of_tasks) ) return graph.sequence(*operations) @@ -271,7 +283,7 @@ class TestRetries(BaseTest): def test_two_max_attempts_and_success_on_retry(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, inputs={'failure_count': 1}, max_attempts=2) graph.add_tasks(op) @@ -287,7 +299,7 @@ class TestRetries(BaseTest): def test_two_max_attempts_and_failure_on_retry(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, inputs={'failure_count': 2}, max_attempts=2) graph.add_tasks(op) @@ -304,7 +316,7 @@ class TestRetries(BaseTest): def test_three_max_attempts_and_success_on_first_retry(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, inputs={'failure_count': 1}, max_attempts=3) graph.add_tasks(op) @@ -320,7 +332,7 @@ class TestRetries(BaseTest): def test_three_max_attempts_and_success_on_second_retry(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, inputs={'failure_count': 2}, max_attempts=3) graph.add_tasks(op) @@ -336,7 +348,7 @@ class TestRetries(BaseTest): def test_infinite_retries(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, inputs={'failure_count': 1}, max_attempts=-1) graph.add_tasks(op) @@ -362,7 +374,7 @@ class TestRetries(BaseTest): def _test_retry_interval(self, retry_interval, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, inputs={'failure_count': 1}, max_attempts=2, retry_interval=retry_interval) @@ -382,7 +394,7 @@ class TestRetries(BaseTest): def test_ignore_failure(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_conditional_failure_task, ctx, + op = self._op(ctx, func=mock_conditional_failure_task, ignore_failure=True, inputs={'failure_count': 100}, max_attempts=100) @@ -406,7 +418,7 @@ class TestTaskRetryAndAbort(BaseTest): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_task_retry, ctx, + op = self._op(ctx, func=mock_task_retry, inputs={'message': self.message}, retry_interval=default_retry_interval, max_attempts=2) @@ -430,7 +442,7 @@ class TestTaskRetryAndAbort(BaseTest): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_task_retry, ctx, + op = self._op(ctx, func=mock_task_retry, inputs={'message': self.message, 'retry_interval': custom_retry_interval}, retry_interval=default_retry_interval, @@ -453,7 +465,7 @@ class TestTaskRetryAndAbort(BaseTest): def test_task_abort(self, workflow_context, executor): @workflow def mock_workflow(ctx, graph): - op = self._op(mock_task_abort, ctx, + op = self._op(ctx, func=mock_task_abort, inputs={'message': self.message}, retry_interval=100, max_attempts=100) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/core/test_events.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/core/test_events.py b/tests/orchestrator/workflows/core/test_events.py index b9bff77..184071d 100644 --- a/tests/orchestrator/workflows/core/test_events.py +++ b/tests/orchestrator/workflows/core/test_events.py @@ -136,8 +136,8 @@ def _assert_node_state_changed_as_a_result_of_standard_lifecycle_operation(node, @workflow def single_operation_workflow(graph, node, interface_name, op_name, **_): - graph.add_tasks(api.task.OperationTask.for_node( - node=node, + graph.add_tasks(api.task.OperationTask( + node, interface_name=interface_name, operation_name=op_name)) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/core/test_task.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/core/test_task.py b/tests/orchestrator/workflows/core/test_task.py index 8dda209..ee302f4 100644 --- a/tests/orchestrator/workflows/core/test_task.py +++ b/tests/orchestrator/workflows/core/test_task.py @@ -66,8 +66,8 @@ class TestOperationTask(object): def _create_node_operation_task(self, ctx, node): with workflow_context.current.push(ctx): - api_task = api.task.OperationTask.for_node( - node=node, + api_task = api.task.OperationTask( + node, interface_name=NODE_INTERFACE_NAME, operation_name=NODE_OPERATION_NAME) core_task = core.task.OperationTask(api_task=api_task) @@ -75,8 +75,8 @@ class TestOperationTask(object): def _create_relationship_operation_task(self, ctx, relationship): with workflow_context.current.push(ctx): - api_task = api.task.OperationTask.for_relationship( - relationship=relationship, + api_task = api.task.OperationTask( + relationship, interface_name=RELATIONSHIP_INTERFACE_NAME, operation_name=RELATIONSHIP_OPERATION_NAME) core_task = core.task.OperationTask(api_task=api_task) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/core/test_task_graph_into_execution_graph.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/core/test_task_graph_into_execution_graph.py b/tests/orchestrator/workflows/core/test_task_graph_into_execution_graph.py index 16cb47d..c39f453 100644 --- a/tests/orchestrator/workflows/core/test_task_graph_into_execution_graph.py +++ b/tests/orchestrator/workflows/core/test_task_graph_into_execution_graph.py @@ -42,17 +42,20 @@ def test_task_graph_into_execution_graph(tmpdir): with context.workflow.current.push(task_context): test_task_graph = api.task.WorkflowTask(sub_workflow, name='test_task_graph') - simple_before_task = api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name) - simple_after_task = api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name) + simple_before_task = api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name) + simple_after_task = api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name) inner_task_graph = api.task.WorkflowTask(sub_workflow, name='test_inner_task_graph') - inner_task = api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name) + inner_task = api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name) inner_task_graph.add_tasks(inner_task) test_task_graph.add_tasks(simple_before_task) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/executor/test_process_executor_concurrent_modifications.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/executor/test_process_executor_concurrent_modifications.py b/tests/orchestrator/workflows/executor/test_process_executor_concurrent_modifications.py index 88e7ae0..1dbfae1 100644 --- a/tests/orchestrator/workflows/executor/test_process_executor_concurrent_modifications.py +++ b/tests/orchestrator/workflows/executor/test_process_executor_concurrent_modifications.py @@ -99,14 +99,16 @@ def _test(context, executor, lock_files, func, expected_failure): @workflow def mock_workflow(graph, **_): graph.add_tasks( - api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name, - inputs=inputs), - api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name, - inputs=inputs) + api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name, + inputs=inputs), + api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name, + inputs=inputs) ) signal = events.on_failure_task_signal http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/executor/test_process_executor_extension.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/executor/test_process_executor_extension.py b/tests/orchestrator/workflows/executor/test_process_executor_extension.py index 7ae337d..878ac24 100644 --- a/tests/orchestrator/workflows/executor/test_process_executor_extension.py +++ b/tests/orchestrator/workflows/executor/test_process_executor_extension.py @@ -46,10 +46,11 @@ def test_decorate_extension(context, executor): inputs=inputs) ) node.interfaces[interface.name] = interface - task = api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name, - inputs=inputs) + task = api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name, + inputs=inputs) graph.add_tasks(task) return graph graph = mock_workflow(ctx=context) # pylint: disable=no-value-for-parameter http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc0ee52e/tests/orchestrator/workflows/executor/test_process_executor_tracked_changes.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/workflows/executor/test_process_executor_tracked_changes.py b/tests/orchestrator/workflows/executor/test_process_executor_tracked_changes.py index 3a8c54b..4fbe9c1 100644 --- a/tests/orchestrator/workflows/executor/test_process_executor_tracked_changes.py +++ b/tests/orchestrator/workflows/executor/test_process_executor_tracked_changes.py @@ -99,10 +99,11 @@ def _run_workflow(context, executor, op_func, inputs=None): inputs=wf_inputs) ) node.interfaces[interface.name] = interface - task = api.task.OperationTask.for_node(node=node, - interface_name=interface_name, - operation_name=operation_name, - inputs=wf_inputs) + task = api.task.OperationTask( + node, + interface_name=interface_name, + operation_name=operation_name, + inputs=wf_inputs) graph.add_tasks(task) return graph graph = mock_workflow(ctx=context) # pylint: disable=no-value-for-parameter
