Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-408-Remove-execution-creation-from-WorkflowRunner 4cf88f3fa -> 3dbe5b3cf
docs and tests fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9e844fc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9e844fc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9e844fc5 Branch: refs/heads/ARIA-408-Remove-execution-creation-from-WorkflowRunner Commit: 9e844fc5e09845fb1798af8c0001ef20cb404c21 Parents: 4cf88f3 Author: max-orlov <ma...@gigaspaces.com> Authored: Mon Nov 20 16:51:31 2017 +0200 Committer: max-orlov <ma...@gigaspaces.com> Committed: Mon Nov 20 16:51:31 2017 +0200 ---------------------------------------------------------------------- aria/cli/commands/executions.py | 7 ++++--- docs/aria.orchestrator.rst | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9e844fc5/aria/cli/commands/executions.py ---------------------------------------------------------------------- diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py index 61328a1..f2e9145 100644 --- a/aria/cli/commands/executions.py +++ b/aria/cli/commands/executions.py @@ -29,6 +29,7 @@ from ...orchestrator import execution_compiler from ...modeling.models import Execution from ...orchestrator.workflows.core.engine import Engine from ...orchestrator.workflows.executor.dry import DryExecutor +from ...orchestrator.workflows.executor.process import ProcessExecutor from ...utils import formatting from ...utils import threading @@ -142,7 +143,7 @@ def start(workflow_name, WORKFLOW_NAME is the unique name of the workflow within the service (e.g. "uninstall"). """ service = model_storage.service.get_by_name(service_name) - executor = DryExecutor() if dry else None # use WorkflowRunner's default executor + executor = DryExecutor() if dry else ProcessExecutor(plugin_manager=plugin_manager) compiler = execution_compiler.ExecutionCompiler( model_storage, @@ -183,7 +184,7 @@ def resume(execution_id, EXECUTION_ID is the unique ID of the execution. """ - executor = DryExecutor() if dry else None # use WorkflowRunner's default executor + executor = DryExecutor() if dry else ProcessExecutor(plugin_manager=plugin_manager) execution_to_resume = model_storage.execution.get(execution_id) if execution_to_resume.status != execution_to_resume.CANCELLED: @@ -223,7 +224,7 @@ def _run_execution( ctx.execution.workflow_name) execution_thread = threading.ExceptionThread(target=engine.execute, name=execution_thread_name, - **engine_kwargs) + kwargs=engine_kwargs) execution_thread.start() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9e844fc5/docs/aria.orchestrator.rst ---------------------------------------------------------------------- diff --git a/docs/aria.orchestrator.rst b/docs/aria.orchestrator.rst index 33454e6..8c1c938 100644 --- a/docs/aria.orchestrator.rst +++ b/docs/aria.orchestrator.rst @@ -40,7 +40,7 @@ .. automodule:: aria.orchestrator.plugin -:mod:`aria.orchestrator.workflow_runner` +:mod:`aria.orchestrator.execution_compiler` ---------------------------------------- -.. automodule:: aria.orchestrator.workflow_runner +.. automodule:: aria.orchestrator.execution_compiler
