incubator-ariatosca git commit: ARIA-214 Dry execution changes the state of non implemented operations [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations d5ce0c676 -> 0ec237071 (forced update) ARIA-214 Dry execution changes the state of non implemented operations Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/0ec23707 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0ec23707 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0ec23707 Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: 0ec237071ebdeb28cd2feabbc1b51854543d398d Parents: 3e1ed14 Author: max-orlov Authored: Sun May 7 16:12:56 2017 +0300 Committer: max-orlov Committed: Sun May 7 22:29:53 2017 +0300 -- aria/orchestrator/workflows/core/task.py| 3 --- aria/orchestrator/workflows/core/translation.py | 6 + aria/orchestrator/workflows/executor/base.py| 19 -- aria/orchestrator/workflows/executor/celery.py | 2 +- aria/orchestrator/workflows/executor/dry.py | 26 ++-- aria/orchestrator/workflows/executor/process.py | 2 +- aria/orchestrator/workflows/executor/thread.py | 2 +- tests/orchestrator/workflows/core/test_task.py | 7 ++ .../workflows/executor/test_process_executor.py | 18 +- 9 files changed, 31 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0ec23707/aria/orchestrator/workflows/core/task.py -- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 78159c4..b3dfb3c 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -163,9 +163,6 @@ class OperationTask(BaseTask): self._task_id = task_model.id self._update_fields = None -def execute(self): -super(OperationTask, self).execute() - @contextmanager def _update(self): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0ec23707/aria/orchestrator/workflows/core/translation.py -- diff --git a/aria/orchestrator/workflows/core/translation.py b/aria/orchestrator/workflows/core/translation.py index 0bbce90..fec108b 100644 --- a/aria/orchestrator/workflows/core/translation.py +++ b/aria/orchestrator/workflows/core/translation.py @@ -48,11 +48,7 @@ def build_execution_graph( execution_graph, dependencies, default=[start_task]) if isinstance(api_task, api.task.OperationTask): -if api_task.implementation: -operation_task = core_task.OperationTask(api_task, executor=default_executor) -else: -operation_task = core_task.OperationTask(api_task, - executor=base.EmptyOperationExecutor()) +operation_task = core_task.OperationTask(api_task, executor=default_executor) _add_task_and_dependencies(execution_graph, operation_task, operation_dependencies) elif isinstance(api_task, api.task.WorkflowTask): # Build the graph recursively while adding start and end markers http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0ec23707/aria/orchestrator/workflows/executor/base.py -- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index a225837..c543278 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -25,13 +25,22 @@ class BaseExecutor(logger.LoggerMixin): """ Base class for executors for running tasks """ +def _execute(self, task): +raise NotImplementedError def execute(self, task): """ Execute a task :param task: task to execute """ -raise NotImplementedError +if task.implementation: +self._execute(task) +else: +# In this case the task is missing an implementation. This task still gets to an +# executor, but since there is nothing to run, we by default simply skip the execution +# itself. +self._task_started(task) +self._task_succeeded(task) def close(self): """ @@ -52,12 +61,6 @@ class BaseExecutor(logger.LoggerMixin): events.on_success_task_signal.send(task) -class StubTaskExecutor(BaseExecutor): +class StubTaskExecutor(BaseExecutor): # pylint: disable=ab
incubator-ariatosca git commit: ARIA-214 Dry execution changes the state of non implemented operations [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations eaa84b0ca -> 4ef3c4e0a (forced update) ARIA-214 Dry execution changes the state of non implemented operations Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/4ef3c4e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4ef3c4e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4ef3c4e0 Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: 4ef3c4e0af3675a156dbeb138c3cd3e30cda23fc Parents: 1cb3086 Author: max-orlov Authored: Sun May 7 16:12:56 2017 +0300 Committer: max-orlov Committed: Sun May 7 19:47:00 2017 +0300 -- aria/orchestrator/workflows/core/task.py| 3 --- aria/orchestrator/workflows/core/translation.py | 6 + aria/orchestrator/workflows/executor/base.py| 18 -- aria/orchestrator/workflows/executor/celery.py | 2 +- aria/orchestrator/workflows/executor/dry.py | 26 ++-- aria/orchestrator/workflows/executor/process.py | 2 +- aria/orchestrator/workflows/executor/thread.py | 2 +- tests/orchestrator/workflows/core/test_task.py | 7 ++ .../workflows/executor/test_process_executor.py | 18 +- 9 files changed, 30 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4ef3c4e0/aria/orchestrator/workflows/core/task.py -- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 0e081c2..755a4b9 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -163,9 +163,6 @@ class OperationTask(BaseTask): self._task_id = task_model.id self._update_fields = None -def execute(self): -super(OperationTask, self).execute() - @contextmanager def _update(self): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4ef3c4e0/aria/orchestrator/workflows/core/translation.py -- diff --git a/aria/orchestrator/workflows/core/translation.py b/aria/orchestrator/workflows/core/translation.py index 0bbce90..fec108b 100644 --- a/aria/orchestrator/workflows/core/translation.py +++ b/aria/orchestrator/workflows/core/translation.py @@ -48,11 +48,7 @@ def build_execution_graph( execution_graph, dependencies, default=[start_task]) if isinstance(api_task, api.task.OperationTask): -if api_task.implementation: -operation_task = core_task.OperationTask(api_task, executor=default_executor) -else: -operation_task = core_task.OperationTask(api_task, - executor=base.EmptyOperationExecutor()) +operation_task = core_task.OperationTask(api_task, executor=default_executor) _add_task_and_dependencies(execution_graph, operation_task, operation_dependencies) elif isinstance(api_task, api.task.WorkflowTask): # Build the graph recursively while adding start and end markers http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4ef3c4e0/aria/orchestrator/workflows/executor/base.py -- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index a225837..f2a3c20 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -25,13 +25,21 @@ class BaseExecutor(logger.LoggerMixin): """ Base class for executors for running tasks """ +def _execute(self, task): +raise NotImplementedError def execute(self, task): """ Execute a task :param task: task to execute """ -raise NotImplementedError +if task.implementation: +self._execute(task) +else: +# If a task i missing an implementation, we still need to update the state of the task, +# and log the operation. Here we send a signal which basically does both. +self._task_started(task) +self._task_succeeded(task) def close(self): """ @@ -52,12 +60,6 @@ class BaseExecutor(logger.LoggerMixin): events.on_success_task_signal.send(task) -class StubTaskExecutor(BaseExecutor): +class StubTaskExecutor(BaseExecutor): # pylint: disable=abstract-method def execut
incubator-ariatosca git commit: ARIA-214 Dry execution changes the state of non implemented operations [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations 532da3ad8 -> 724b4db9c (forced update) ARIA-214 Dry execution changes the state of non implemented operations Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/724b4db9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/724b4db9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/724b4db9 Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: 724b4db9cc15c33d8ccd96fa40ecacb2066311a2 Parents: 1cb3086 Author: max-orlov Authored: Sun May 7 16:12:56 2017 +0300 Committer: max-orlov Committed: Sun May 7 18:13:54 2017 +0300 -- aria/orchestrator/workflows/core/task.py| 3 --- aria/orchestrator/workflows/core/translation.py | 6 + aria/orchestrator/workflows/executor/base.py| 15 ++-- aria/orchestrator/workflows/executor/celery.py | 2 ++ aria/orchestrator/workflows/executor/dry.py | 24 ++-- aria/orchestrator/workflows/executor/process.py | 3 +++ aria/orchestrator/workflows/executor/thread.py | 2 ++ tests/orchestrator/workflows/core/test_task.py | 7 ++ .../workflows/executor/test_process_executor.py | 18 +-- 9 files changed, 31 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/724b4db9/aria/orchestrator/workflows/core/task.py -- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 0e081c2..755a4b9 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -163,9 +163,6 @@ class OperationTask(BaseTask): self._task_id = task_model.id self._update_fields = None -def execute(self): -super(OperationTask, self).execute() - @contextmanager def _update(self): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/724b4db9/aria/orchestrator/workflows/core/translation.py -- diff --git a/aria/orchestrator/workflows/core/translation.py b/aria/orchestrator/workflows/core/translation.py index 0bbce90..fec108b 100644 --- a/aria/orchestrator/workflows/core/translation.py +++ b/aria/orchestrator/workflows/core/translation.py @@ -48,11 +48,7 @@ def build_execution_graph( execution_graph, dependencies, default=[start_task]) if isinstance(api_task, api.task.OperationTask): -if api_task.implementation: -operation_task = core_task.OperationTask(api_task, executor=default_executor) -else: -operation_task = core_task.OperationTask(api_task, - executor=base.EmptyOperationExecutor()) +operation_task = core_task.OperationTask(api_task, executor=default_executor) _add_task_and_dependencies(execution_graph, operation_task, operation_dependencies) elif isinstance(api_task, api.task.WorkflowTask): # Build the graph recursively while adding start and end markers http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/724b4db9/aria/orchestrator/workflows/executor/base.py -- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index a225837..a95e58f 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -31,7 +31,14 @@ class BaseExecutor(logger.LoggerMixin): Execute a task :param task: task to execute """ -raise NotImplementedError +if task.model_task.implementation: +self._execute_empty_task(task) +else: +raise NotImplementedError + +def _execute_empty_task(self, task): +self._task_started(task) +self._task_succeeded(task) def close(self): """ @@ -55,9 +62,3 @@ class BaseExecutor(logger.LoggerMixin): class StubTaskExecutor(BaseExecutor): def execute(self, task): task.status = task.SUCCESS - - -class EmptyOperationExecutor(BaseExecutor): -def execute(self, task): -events.start_task_signal.send(task) -events.on_success_task_signal.send(task) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/724b4db9/aria/orchestrator/workflows/executor/celery.py -- diff --git a/aria/orchestrator/workflows/exec
incubator-ariatosca git commit: ARIA-214 Dry execution changes the state of non implemented operations [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations db3f9aeaf -> 532da3ad8 (forced update) ARIA-214 Dry execution changes the state of non implemented operations Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/532da3ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/532da3ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/532da3ad Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: 532da3ad8b1bfb8a207a11be73be904f61c6ce91 Parents: 1cb3086 Author: max-orlov Authored: Sun May 7 16:12:56 2017 +0300 Committer: max-orlov Committed: Sun May 7 18:03:09 2017 +0300 -- aria/orchestrator/workflows/core/task.py| 3 --- aria/orchestrator/workflows/core/translation.py | 6 + aria/orchestrator/workflows/executor/base.py| 15 ++-- aria/orchestrator/workflows/executor/celery.py | 2 ++ aria/orchestrator/workflows/executor/dry.py | 24 ++-- aria/orchestrator/workflows/executor/process.py | 3 +++ aria/orchestrator/workflows/executor/thread.py | 2 ++ tests/orchestrator/workflows/core/test_task.py | 7 ++ .../workflows/executor/test_process_executor.py | 17 +- 9 files changed, 31 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/532da3ad/aria/orchestrator/workflows/core/task.py -- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 0e081c2..755a4b9 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -163,9 +163,6 @@ class OperationTask(BaseTask): self._task_id = task_model.id self._update_fields = None -def execute(self): -super(OperationTask, self).execute() - @contextmanager def _update(self): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/532da3ad/aria/orchestrator/workflows/core/translation.py -- diff --git a/aria/orchestrator/workflows/core/translation.py b/aria/orchestrator/workflows/core/translation.py index 0bbce90..fec108b 100644 --- a/aria/orchestrator/workflows/core/translation.py +++ b/aria/orchestrator/workflows/core/translation.py @@ -48,11 +48,7 @@ def build_execution_graph( execution_graph, dependencies, default=[start_task]) if isinstance(api_task, api.task.OperationTask): -if api_task.implementation: -operation_task = core_task.OperationTask(api_task, executor=default_executor) -else: -operation_task = core_task.OperationTask(api_task, - executor=base.EmptyOperationExecutor()) +operation_task = core_task.OperationTask(api_task, executor=default_executor) _add_task_and_dependencies(execution_graph, operation_task, operation_dependencies) elif isinstance(api_task, api.task.WorkflowTask): # Build the graph recursively while adding start and end markers http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/532da3ad/aria/orchestrator/workflows/executor/base.py -- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index a225837..a95e58f 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -31,7 +31,14 @@ class BaseExecutor(logger.LoggerMixin): Execute a task :param task: task to execute """ -raise NotImplementedError +if task.model_task.implementation: +self._execute_empty_task(task) +else: +raise NotImplementedError + +def _execute_empty_task(self, task): +self._task_started(task) +self._task_succeeded(task) def close(self): """ @@ -55,9 +62,3 @@ class BaseExecutor(logger.LoggerMixin): class StubTaskExecutor(BaseExecutor): def execute(self, task): task.status = task.SUCCESS - - -class EmptyOperationExecutor(BaseExecutor): -def execute(self, task): -events.start_task_signal.send(task) -events.on_success_task_signal.send(task) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/532da3ad/aria/orchestrator/workflows/executor/celery.py -- diff --git a/aria/orchestrator/workflows/execu
incubator-ariatosca git commit: ARIA-214 Dry execution changes the state of non implemented operations [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations 55a8830c9 -> db3f9aeaf (forced update) ARIA-214 Dry execution changes the state of non implemented operations Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/db3f9aea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/db3f9aea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/db3f9aea Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: db3f9aeaf486bd54b862e00d484c378d19ff9c61 Parents: 1cb3086 Author: max-orlov Authored: Sun May 7 16:12:56 2017 +0300 Committer: max-orlov Committed: Sun May 7 17:35:00 2017 +0300 -- aria/orchestrator/workflows/core/task.py| 3 --- aria/orchestrator/workflows/core/translation.py | 6 + aria/orchestrator/workflows/executor/base.py| 15 ++-- aria/orchestrator/workflows/executor/celery.py | 2 ++ aria/orchestrator/workflows/executor/dry.py | 24 ++-- aria/orchestrator/workflows/executor/process.py | 3 +++ aria/orchestrator/workflows/executor/thread.py | 2 ++ 7 files changed, 28 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/db3f9aea/aria/orchestrator/workflows/core/task.py -- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 0e081c2..755a4b9 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -163,9 +163,6 @@ class OperationTask(BaseTask): self._task_id = task_model.id self._update_fields = None -def execute(self): -super(OperationTask, self).execute() - @contextmanager def _update(self): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/db3f9aea/aria/orchestrator/workflows/core/translation.py -- diff --git a/aria/orchestrator/workflows/core/translation.py b/aria/orchestrator/workflows/core/translation.py index 0bbce90..fec108b 100644 --- a/aria/orchestrator/workflows/core/translation.py +++ b/aria/orchestrator/workflows/core/translation.py @@ -48,11 +48,7 @@ def build_execution_graph( execution_graph, dependencies, default=[start_task]) if isinstance(api_task, api.task.OperationTask): -if api_task.implementation: -operation_task = core_task.OperationTask(api_task, executor=default_executor) -else: -operation_task = core_task.OperationTask(api_task, - executor=base.EmptyOperationExecutor()) +operation_task = core_task.OperationTask(api_task, executor=default_executor) _add_task_and_dependencies(execution_graph, operation_task, operation_dependencies) elif isinstance(api_task, api.task.WorkflowTask): # Build the graph recursively while adding start and end markers http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/db3f9aea/aria/orchestrator/workflows/executor/base.py -- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index a225837..a95e58f 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -31,7 +31,14 @@ class BaseExecutor(logger.LoggerMixin): Execute a task :param task: task to execute """ -raise NotImplementedError +if task.model_task.implementation: +self._execute_empty_task(task) +else: +raise NotImplementedError + +def _execute_empty_task(self, task): +self._task_started(task) +self._task_succeeded(task) def close(self): """ @@ -55,9 +62,3 @@ class BaseExecutor(logger.LoggerMixin): class StubTaskExecutor(BaseExecutor): def execute(self, task): task.status = task.SUCCESS - - -class EmptyOperationExecutor(BaseExecutor): -def execute(self, task): -events.start_task_signal.send(task) -events.on_success_task_signal.send(task) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/db3f9aea/aria/orchestrator/workflows/executor/celery.py -- diff --git a/aria/orchestrator/workflows/executor/celery.py b/aria/orchestrator/workflows/executor/celery.py index 7bd9b7c..0406d4e 100644 --- a/aria/orchestrator/workflows/ex
incubator-ariatosca git commit: ARIA-214 Dry execution changes the state of non implemented operations [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations 93b798328 -> 55a8830c9 (forced update) ARIA-214 Dry execution changes the state of non implemented operations Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/55a8830c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/55a8830c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/55a8830c Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: 55a8830c9fa398f03130ad10b69fd382892e10f5 Parents: 1cb3086 Author: max-orlov Authored: Sun May 7 16:12:56 2017 +0300 Committer: max-orlov Committed: Sun May 7 17:13:03 2017 +0300 -- aria/orchestrator/workflows/core/task.py| 3 --- aria/orchestrator/workflows/core/translation.py | 6 + aria/orchestrator/workflows/executor/base.py| 15 ++-- aria/orchestrator/workflows/executor/dry.py | 24 ++-- 4 files changed, 21 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/55a8830c/aria/orchestrator/workflows/core/task.py -- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 0e081c2..755a4b9 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -163,9 +163,6 @@ class OperationTask(BaseTask): self._task_id = task_model.id self._update_fields = None -def execute(self): -super(OperationTask, self).execute() - @contextmanager def _update(self): """ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/55a8830c/aria/orchestrator/workflows/core/translation.py -- diff --git a/aria/orchestrator/workflows/core/translation.py b/aria/orchestrator/workflows/core/translation.py index 0bbce90..fec108b 100644 --- a/aria/orchestrator/workflows/core/translation.py +++ b/aria/orchestrator/workflows/core/translation.py @@ -48,11 +48,7 @@ def build_execution_graph( execution_graph, dependencies, default=[start_task]) if isinstance(api_task, api.task.OperationTask): -if api_task.implementation: -operation_task = core_task.OperationTask(api_task, executor=default_executor) -else: -operation_task = core_task.OperationTask(api_task, - executor=base.EmptyOperationExecutor()) +operation_task = core_task.OperationTask(api_task, executor=default_executor) _add_task_and_dependencies(execution_graph, operation_task, operation_dependencies) elif isinstance(api_task, api.task.WorkflowTask): # Build the graph recursively while adding start and end markers http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/55a8830c/aria/orchestrator/workflows/executor/base.py -- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index a225837..a95e58f 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -31,7 +31,14 @@ class BaseExecutor(logger.LoggerMixin): Execute a task :param task: task to execute """ -raise NotImplementedError +if task.model_task.implementation: +self._execute_empty_task(task) +else: +raise NotImplementedError + +def _execute_empty_task(self, task): +self._task_started(task) +self._task_succeeded(task) def close(self): """ @@ -55,9 +62,3 @@ class BaseExecutor(logger.LoggerMixin): class StubTaskExecutor(BaseExecutor): def execute(self, task): task.status = task.SUCCESS - - -class EmptyOperationExecutor(BaseExecutor): -def execute(self, task): -events.start_task_signal.send(task) -events.on_success_task_signal.send(task) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/55a8830c/aria/orchestrator/workflows/executor/dry.py -- diff --git a/aria/orchestrator/workflows/executor/dry.py b/aria/orchestrator/workflows/executor/dry.py index eb70a41..5a4ca73 100644 --- a/aria/orchestrator/workflows/executor/dry.py +++ b/aria/orchestrator/workflows/executor/dry.py @@ -25,7 +25,6 @@ class DryExecutor(BaseExecutor): """ Executor which dry runs tasks - prints task informat
