from:"mxmrlv"

[3/4] incubator-ariatosca git commit: ARIA-236 Resumable workflow executions

2017-06-22 Thread mxmrlv

ARIA-236 Resumable workflow executions


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/75112ab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/75112ab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/75112ab0

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 75112ab052c7de7162901a7a46b5e843316cc63d
Parents: a751934
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 22 14:21:54 2017 +0300

--
 aria/cli/commands/executions.py |  57 +-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  43 +++--
 aria/orchestrator/workflows/core/engine.py  |   6 +-
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 175 +--
 13 files changed, 282 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/75112ab0/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..b337e84 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, inputs=inputs, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+logger.info('Resuming {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
-logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+

[1/4] incubator-ariatosca git commit: ARIA-282 Make SSH capability opt-in [Forced Update!]

2017-06-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution a86ba295e -> 
827230da2 (forced update)


ARIA-282 Make SSH capability opt-in

Since the Fabric library uses Paramiko, which is a library
using a license which is incompatible with Apache's,
ARIA's SSH capabilities are now opt-in and no longer part
of the default installation.

Instead, users who would like to use SSH operations
should install ARIA's extra "[ssh]", which would install
Fabric and allow to take advantage of the execution-plugin's
SSH capabilities.

Users who won't install this extra will still be able to use
ARIA as well as the execution plugin, only without SSH.

Additional changes:

 - A new tox environment has been created for running
   SSH tests. The remaining envs only install plain ARIA.

 - requirements.in commented lines were removed -
   the bug that used to exist regarding environment markers
   has been fixed, and there's no longer the need
   to copy these manually to requirements.txt.

 - Environment-marked dependencies are now installed
   via "install_requires" rather than "extra_requires".

 - Added requirements.in to the manifest file,
   as well as fixed a bug in setup.py, which caused
   source distribution to make aria get installed
   without any dependencies before this fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/105971f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/105971f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/105971f8

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 105971f8ebc81de5ce5a98ce11a1d8580e671c21
Parents: 1fee85c
Author: Ran Ziv 
Authored: Wed Jun 21 15:39:34 2017 +0300
Committer: Ran Ziv 
Committed: Wed Jun 21 17:37:57 2017 +0300

--
 .travis.yml |  2 ++
 MANIFEST.in |  1 +
 Makefile|  5 +--
 .../orchestrator/execution_plugin/operations.py | 13 ++--
 requirements.in | 16 ++
 requirements.txt| 32 ---
 setup.py| 33 +---
 tox.ini | 18 ---
 8 files changed, 53 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index b11ed62..de02d78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ env:
 - TOX_ENV=py26
 - TOX_ENV=py27e2e
 - TOX_ENV=py26e2e
+- TOX_ENV=py27ssh
+- TOX_ENV=py26ssh
 install:
   - pip install --upgrade pip
   - pip install --upgrade setuptools

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/MANIFEST.in
--
diff --git a/MANIFEST.in b/MANIFEST.in
index 877a7dd..020b00e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include NOTICE
 include VERSION
 include CHANGELOG.rst
 include README.rst
+include requirements.in
 include requirements.txt
 recursive-include docs/html *
 recursive-include examples *

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/Makefile
--
diff --git a/Makefile b/Makefile
index cb4b58f..f5f2e66 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ clean:
-find . -type d -name '*.egg-info' -exec rm -rf {} \; 2>/dev/null
 
 install:
-   pip install .
+   pip install .[ssh]
 
 install-virtual:
-   pip install --editable .
+   pip install --editable .[ssh]

# "pip install --editable" will not add our extensions to the path, so 
we will patch the virtualenv
EXTENSIONS_PATH="$$(head -n 1 "$(EASY_INSTALL_PTH)")/extensions" && \
@@ -55,6 +55,7 @@ test:
tox -e pylint_tests
tox -e py$(PYTHON_VERSION)
tox -e py$(PYTHON_VERSION)e2e
+   tox -e py$(PYTHON_VERSION)ssh
 
 dist: docs
python ./setup.py sdist bdist_wheel

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/aria/orchestrator/execution_plugin/operations.py
--
diff --git a/aria/orchestrator/execution_plugin/operations.py 
b/aria/orchestrator/execution_plugin/operations.py
index 5effa8a..0bc8083 100644
--- a/aria/orchestrator/execution_plugin/operations.py
+++ b/aria/orchestrator/execution_plugin/operations.py
@@ -15,7 +15,6 @@
 
 from aria.orchestrator

[4/4] incubator-ariatosca git commit: wip

2017-06-22 Thread mxmrlv

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/827230da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/827230da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/827230da

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 827230da2f515c2c087d847a68137f27241de161
Parents: 75112ab
Author: max-orlov 
Authored: Wed Jun 21 12:41:33 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 22 14:28:55 2017 +0300

--
 aria/modeling/orchestration.py  |   2 -
 aria/orchestrator/context/workflow.py   |  19 --
 aria/orchestrator/workflow_runner.py|   5 +-
 aria/orchestrator/workflows/core/compile.py | 198 ++-
 aria/orchestrator/workflows/core/engine.py  | 110 +++
 tests/orchestrator/context/__init__.py  |   2 +-
 tests/orchestrator/context/test_serialize.py|   2 +-
 .../orchestrator/execution_plugin/test_local.py |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   3 +-
 .../orchestrator/workflows/core/test_engine.py  |   2 +-
 .../orchestrator/workflows/core/test_events.py  |   7 +-
 .../test_task_graph_into_execution_graph.py |  19 +-
 .../executor/test_process_executor_extension.py |   2 +-
 .../test_process_executor_tracked_changes.py|   2 +-
 14 files changed, 198 insertions(+), 177 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/827230da/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 276b68e..5b02d1b 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -306,7 +306,6 @@ class TaskBase(mixins.ModelMixin):
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
 
-_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
 _stub_type = Column(Enum(*STUB_TYPES))
@@ -442,7 +441,6 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'_api_id': api_task.id,
 '_context_cls': api_task._context_cls,
 '_executor': executor,
 }

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/827230da/aria/orchestrator/context/workflow.py
--
diff --git a/aria/orchestrator/context/workflow.py 
b/aria/orchestrator/context/workflow.py
index adcd635..18334f3 100644
--- a/aria/orchestrator/context/workflow.py
+++ b/aria/orchestrator/context/workflow.py
@@ -20,8 +20,6 @@ Workflow and operation contexts
 import threading
 from contextlib import contextmanager
 
-from networkx import DiGraph
-
 from .exceptions import ContextException
 from .common import BaseContext
 
@@ -96,23 +94,6 @@ class WorkflowContext(BaseContext):
 )
 
 @property
-def _graph(self):
-# Constructing a graph with only not ended nodes
-if self._execution_graph is None:
-graph = DiGraph()
-for task in self.execution.tasks:
-if task.has_ended():
-continue
-for dependency in task.dependencies:
-if dependency.has_ended():
-continue
-graph.add_edge(dependency, task)
-
-self._execution_graph = graph
-
-return self._execution_graph
-
-@property
 @contextmanager
 def persist_changes(self):
 yield

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/827230da/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 3ccb1ee..b3f100d 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -96,8 +96,9 @@ class WorkflowRunner(object):
 
 if not self._is_resume:
 workflow_fn = self._get_workflow_fn()
-tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-compile.create_execution_tasks(self._workflow_context, 
tasks_graph, executor.__class__)
+self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
+compile.GraphCompiler(self._workflow_context, 
executor.__class__).compile(
+self._tasks_graph)
 
 self._engine =

[2/4] incubator-ariatosca git commit: ARIA-283 Update readme installation instructions

2017-06-22 Thread mxmrlv

ARIA-283 Update readme installation instructions


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/a7519349
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/a7519349
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/a7519349

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: a7519349c07a20a04c1b8acda656daa8679f5135
Parents: 105971f
Author: Ran Ziv 
Authored: Wed Jun 21 18:05:05 2017 +0300
Committer: Ran Ziv 
Committed: Thu Jun 22 12:37:08 2017 +0300

--
 README.rst | 66 +++--
 1 file changed, 45 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/a7519349/README.rst
--
diff --git a/README.rst b/README.rst
index 8af13a5..dc53d47 100644
--- a/README.rst
+++ b/README.rst
@@ -26,37 +26,61 @@ ARIA is an incubation project under the `Apache Software 
Foundation `__.
+ARIA is `available on PyPI `__.
+
+ARIA requires Python 2.6/2.7. Python 3 is currently not supported.
 
 To install ARIA directly from PyPI (using a ``wheel``), use::
 
-pip install aria
+pip install --upgrade pip setuptools
+pip install apache-ariatosca
 
 To install ARIA from source, download the source tarball from
-`PyPI `__, extract it, and then when 
inside the extracted
-directory, use::
+`PyPI `__, extract it, and run::
+
+pip install --upgrade pip setuptools
+pip install incubator-ariatosca
+
+| The source package comes along with relevant examples, documentation, 
``requirements.txt`` (for installing specifically the frozen dependencies' 
versions with which ARIA was tested) and more.
+|
+|
+| ARIA has additional optional dependencies. These are required for running 
operations over SSH.
+| Below are instructions on how to install these dependencies, including 
required system dependencies per OS.
+|
+| Note: These dependencies may have varying licenses which may not be 
compatible with Apache license 2.0.
+|
+
+**Ubuntu/Debian** (tested on Ubuntu14.04, Ubuntu16.04)::
+
+apt-get install -y python-dev gcc libffi-dev libssl-dev
+pip install aria[ssh]
+
+**Centos** (tested on Centos6.6, Centos7)::
+
+yum install -y python-devel gcc libffi-devel openssl-devel
+pip install aria[ssh]
+
+**Archlinux**::
+
+pacman -Syu --noconfirm python2 gcc libffi openssl
+pip2 install aria[ssh]
 
-pip install .
+**Windows** (tested on Win10)::
 
-The source package comes along with relevant examples, documentation, 
``requirements.txt`` (for
-installing specifically the frozen dependencies' versions with which ARIA was 
tested) and more.
+# no additional system requirements are needed
+pip install aria[ssh]
 
-Note that for the ``pip install`` commands mentioned above, you must use a 
privileged user, or use
-virtualenv.
+**MacOS**::
 
-ARIA itself is in a ``wheel`` format compatible with all platforms. Some 
dependencies, however,
-might require compilation (based on a given platform), and therefore possibly 
some system
-dependencies are required as well.
+# TODO
 
-On Ubuntu or other Debian-based systems::
 
-sudo apt install python-setuptools python-dev build-essential libssl-dev 
libffi-dev
 
-On Archlinux::
+To install ``pip``, either use your distro's package management system, or 
run::
 
-sudo pacman -S python-setuptools
+wget http://bootstrap.pypa.io/get-pip.py
+python get-pip.py
 
-ARIA requires Python 2.6/2.7. Python 3+ is currently not supported.
 
 
 Getting Started
@@ -129,10 +153,10 @@ ARIA is licensed under the
:target: 
https://ci.appveyor.com/project/ApacheSoftwareFoundation/incubator-ariatosca/history
 .. |License| image:: 
https://img.shields.io/github/license/apache/incubator-ariatosca.svg
:target: http://www.apache.org/licenses/LICENSE-2.0
-.. |PyPI release| image:: https://img.shields.io/pypi/v/ariatosca.svg
-   :target: https://pypi.python.org/pypi/ariatosca
-.. |Python Versions| image:: 
https://img.shields.io/pypi/pyversions/ariatosca.svg
-.. |Wheel| image:: https://img.shields.io/pypi/wheel/ariatosca.svg
+.. |PyPI release| image:: https://img.shields.io/pypi/v/apache-ariatosca.svg
+   :target: https://pypi.python.org/pypi/apache-ariatosca
+.. |Python Versions| image:: 
https://img.shields.io/pypi/pyversions/apache-ariatosca.svg
+.. |Wheel| image:: https://img.shields.io/pypi/wheel/apache-ariatosca.svg
 ..

[incubator-ariatosca] Git Push Summary

2017-06-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions [deleted] 75112ab05

incubator-ariatosca git commit: ARIA-236 Resumable workflow executions

2017-06-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master a7519349c -> 75112ab05


ARIA-236 Resumable workflow executions


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/75112ab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/75112ab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/75112ab0

Branch: refs/heads/master
Commit: 75112ab052c7de7162901a7a46b5e843316cc63d
Parents: a751934
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 22 14:21:54 2017 +0300

--
 aria/cli/commands/executions.py |  57 +-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  43 +++--
 aria/orchestrator/workflows/core/engine.py  |   6 +-
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 175 +--
 13 files changed, 282 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/75112ab0/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..b337e84 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, inputs=inputs, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+logger.info('Resuming {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
-logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+

[3/3] incubator-ariatosca git commit: ARIA-236 Resumable workflow executions

2017-06-22 Thread mxmrlv

ARIA-236 Resumable workflow executions


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/75112ab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/75112ab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/75112ab0

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 75112ab052c7de7162901a7a46b5e843316cc63d
Parents: a751934
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 22 14:21:54 2017 +0300

--
 aria/cli/commands/executions.py |  57 +-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  43 +++--
 aria/orchestrator/workflows/core/engine.py  |   6 +-
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 175 +--
 13 files changed, 282 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/75112ab0/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..b337e84 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, inputs=inputs, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+logger.info('Resuming {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
-logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+

incubator-ariatosca git commit: review 2

2017-06-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 92ef0fd8b -> 608f5d791


review 2


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/608f5d79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/608f5d79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/608f5d79

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 608f5d7917fc0f332aaa3606732f4a46068ee7f8
Parents: 92ef0fd
Author: max-orlov 
Authored: Thu Jun 22 12:27:41 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 22 12:27:41 2017 +0300

--
 aria/orchestrator/workflow_runner.py   | 23 ++--
 aria/orchestrator/workflows/core/engine.py |  6 +-
 tests/orchestrator/test_workflow_runner.py | 28 -
 3 files changed, 26 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/608f5d79/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 829b8cd..2d4b515 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -55,9 +55,12 @@ class WorkflowRunner(object):
 :param task_retry_interval: Retry interval in between retry attempts 
of a failing task
 """
 
+if not (execution_id or (workflow_name and service_id and not 
execution_id)):
+exceptions.InvalidWorkflowRunnerParams(
+"Either provide execution id in order to resume a workflow or 
workflow name "
+"and service id with inputs")
+
 self._is_resume = execution_id is not None
-self._is_start = \
-workflow_name is not None and service_id is not None and 
execution_id is None
 
 self._model_storage = model_storage
 self._resource_storage = resource_storage
@@ -65,19 +68,15 @@ class WorkflowRunner(object):
 # the IDs are stored rather than the models themselves, so this module 
could be used
 # by several threads without raising errors on model objects shared 
between threads
 
-if self._is_start:
-self._service_id = service_id
-self._workflow_name = workflow_name
-self._validate_workflow_exists_for_service()
-self._execution_id = self._create_execution_model(inputs).id
-elif self._is_resume:
+if self._is_resume:
 self._execution_id = execution_id
 self._service_id = self.execution.service.id
 self._workflow_name = 
model_storage.execution.get(self._execution_id).workflow_name
 else:
-raise exceptions.InvalidWorkflowRunnerParams(
-"Either provide execution id in order to resume a workflow or 
workflow name "
-"and service id with inputs")
+self._service_id = service_id
+self._workflow_name = workflow_name
+self._validate_workflow_exists_for_service()
+self._execution_id = self._create_execution_model(inputs).id
 
 self._workflow_context = WorkflowContext(
 name=self.__class__.__name__,
@@ -95,7 +94,7 @@ class WorkflowRunner(object):
 # transforming the execution inputs to dict, to pass them to the 
workflow function
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
-if self._is_start:
+if not self._is_resume:
 workflow_fn = self._get_workflow_fn()
 tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
 compile.create_execution_tasks(self._workflow_context, 
tasks_graph, executor.__class__)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/608f5d79/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index a7e5148..d5a6e70 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -48,7 +48,7 @@ class Engine(logger.LoggerMixin):
 executing_tasks = []
 
 if resuming:
-self._resuming_execution(ctx)
+events.on_resume_workflow_signal.send(ctx)
 
 try:
 events.start_workflow_signal.send(ctx)
@@ -73,10 +73,6 @@ class Engine(logger.LoggerMixin):
 raise
 
 @staticmethod
-def _resuming_execution(ctx):
-events.on_resume_workflow_signal.send(ctx)
-
-@staticmethod
 def

incubator-ariatosca git commit: review 1 fix [Forced Update!]

2017-06-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions d6fa143b2 -> 92ef0fd8b 
(forced update)


review 1 fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/92ef0fd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/92ef0fd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/92ef0fd8

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 92ef0fd8b62c08d41715d402fb3df07a26458550
Parents: 2fc9896
Author: max-orlov 
Authored: Wed Jun 21 17:56:27 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 22 10:36:56 2017 +0300

--
 aria/cli/commands/executions.py|   7 +-
 aria/orchestrator/workflow_runner.py   |  24 ++---
 aria/orchestrator/workflows/core/engine.py |   8 +-
 tests/orchestrator/test_workflow_runner.py | 126 +---
 4 files changed, 93 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/92ef0fd8/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index a6f06c3..b337e84 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -135,8 +135,8 @@ def start(workflow_name,
 
 workflow_runner = \
 WorkflowRunner(
-inputs, model_storage, resource_storage, plugin_manager,
-service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, inputs=inputs, 
executor=executor,
 task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
 )
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
@@ -158,7 +158,6 @@ def start(workflow_name,
 @aria.pass_plugin_manager
 @aria.pass_logger
 def resume(execution_id,
-   inputs,
dry,
task_max_attempts,
task_retry_interval,
@@ -171,7 +170,7 @@ def resume(execution_id,
 
 workflow_runner = \
 WorkflowRunner(
-inputs, model_storage, resource_storage, plugin_manager,
+model_storage, resource_storage, plugin_manager,
 execution_id=execution_id, executor=executor,
 task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/92ef0fd8/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 99b6edf..829b8cd 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -37,8 +37,8 @@ DEFAULT_TASK_RETRY_INTERVAL = 30
 
 class WorkflowRunner(object):
 
-def __init__(self, inputs, model_storage, resource_storage, plugin_manager,
- execution_id=None, service_id=None, workflow_name=None, 
executor=None,
+def __init__(self, model_storage, resource_storage, plugin_manager,
+ execution_id=None, service_id=None, workflow_name=None, 
inputs=None, executor=None,
  task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
  task_retry_interval=DEFAULT_TASK_RETRY_INTERVAL):
 """
@@ -55,23 +55,29 @@ class WorkflowRunner(object):
 :param task_retry_interval: Retry interval in between retry attempts 
of a failing task
 """
 
+self._is_resume = execution_id is not None
+self._is_start = \
+workflow_name is not None and service_id is not None and 
execution_id is None
+
 self._model_storage = model_storage
 self._resource_storage = resource_storage
 
 # the IDs are stored rather than the models themselves, so this module 
could be used
 # by several threads without raising errors on model objects shared 
between threads
 
-if workflow_name is not None and service_id is not None and 
execution_id is None:
+if self._is_start:
 self._service_id = service_id
 self._workflow_name = workflow_name
 self._validate_workflow_exists_for_service()
 self._execution_id = self._create_execution_model(inputs).id
-elif execution_id is not None:
+elif self._is_resume:
 self._execution_id = execution_id
 self._service_id = self.execution.service.id
 self._workflow_name = 
model_storage.execution.get(self._execution_id).workflow_name

incubator-ariatosca git commit: review 1 fix [Forced Update!]

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 3de374534 -> d6fa143b2 
(forced update)


review 1 fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/d6fa143b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/d6fa143b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/d6fa143b

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: d6fa143b21c10cd5ed16b1819ee5c7ad221cb835
Parents: 2fc9896
Author: max-orlov 
Authored: Wed Jun 21 17:56:27 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 18:00:07 2017 +0300

--
 aria/cli/commands/executions.py|   7 +-
 aria/orchestrator/workflow_runner.py   |  24 ++---
 aria/orchestrator/workflows/core/engine.py |   8 +-
 tests/orchestrator/test_workflow_runner.py | 125 +---
 4 files changed, 92 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d6fa143b/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index a6f06c3..b337e84 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -135,8 +135,8 @@ def start(workflow_name,
 
 workflow_runner = \
 WorkflowRunner(
-inputs, model_storage, resource_storage, plugin_manager,
-service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, inputs=inputs, 
executor=executor,
 task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
 )
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
@@ -158,7 +158,6 @@ def start(workflow_name,
 @aria.pass_plugin_manager
 @aria.pass_logger
 def resume(execution_id,
-   inputs,
dry,
task_max_attempts,
task_retry_interval,
@@ -171,7 +170,7 @@ def resume(execution_id,
 
 workflow_runner = \
 WorkflowRunner(
-inputs, model_storage, resource_storage, plugin_manager,
+model_storage, resource_storage, plugin_manager,
 execution_id=execution_id, executor=executor,
 task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d6fa143b/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 99b6edf..829b8cd 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -37,8 +37,8 @@ DEFAULT_TASK_RETRY_INTERVAL = 30
 
 class WorkflowRunner(object):
 
-def __init__(self, inputs, model_storage, resource_storage, plugin_manager,
- execution_id=None, service_id=None, workflow_name=None, 
executor=None,
+def __init__(self, model_storage, resource_storage, plugin_manager,
+ execution_id=None, service_id=None, workflow_name=None, 
inputs=None, executor=None,
  task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
  task_retry_interval=DEFAULT_TASK_RETRY_INTERVAL):
 """
@@ -55,23 +55,29 @@ class WorkflowRunner(object):
 :param task_retry_interval: Retry interval in between retry attempts 
of a failing task
 """
 
+self._is_resume = execution_id is not None
+self._is_start = \
+workflow_name is not None and service_id is not None and 
execution_id is None
+
 self._model_storage = model_storage
 self._resource_storage = resource_storage
 
 # the IDs are stored rather than the models themselves, so this module 
could be used
 # by several threads without raising errors on model objects shared 
between threads
 
-if workflow_name is not None and service_id is not None and 
execution_id is None:
+if self._is_start:
 self._service_id = service_id
 self._workflow_name = workflow_name
 self._validate_workflow_exists_for_service()
 self._execution_id = self._create_execution_model(inputs).id
-elif execution_id is not None:
+elif self._is_resume:
 self._execution_id = execution_id
 self._service_id = self.execution.service.id
 self._workflow_name = 
model_storage.execution.get(self._execution_id).workflow_name

incubator-ariatosca git commit: review 1 fix

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 2fc9896cf -> 3de374534


review 1 fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/3de37453
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3de37453
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3de37453

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 3de37453468ef39f4cf3ea8af8e540f2c31ee58b
Parents: 2fc9896
Author: max-orlov 
Authored: Wed Jun 21 17:56:27 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 17:56:27 2017 +0300

--
 aria/cli/commands/executions.py|   7 +-
 aria/orchestrator/workflow_runner.py   |  24 ++---
 aria/orchestrator/workflows/core/engine.py |   8 +-
 tests/orchestrator/test_workflow_runner.py | 122 +---
 4 files changed, 90 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3de37453/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index a6f06c3..b337e84 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -135,8 +135,8 @@ def start(workflow_name,
 
 workflow_runner = \
 WorkflowRunner(
-inputs, model_storage, resource_storage, plugin_manager,
-service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, inputs=inputs, 
executor=executor,
 task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
 )
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
@@ -158,7 +158,6 @@ def start(workflow_name,
 @aria.pass_plugin_manager
 @aria.pass_logger
 def resume(execution_id,
-   inputs,
dry,
task_max_attempts,
task_retry_interval,
@@ -171,7 +170,7 @@ def resume(execution_id,
 
 workflow_runner = \
 WorkflowRunner(
-inputs, model_storage, resource_storage, plugin_manager,
+model_storage, resource_storage, plugin_manager,
 execution_id=execution_id, executor=executor,
 task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3de37453/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 99b6edf..829b8cd 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -37,8 +37,8 @@ DEFAULT_TASK_RETRY_INTERVAL = 30
 
 class WorkflowRunner(object):
 
-def __init__(self, inputs, model_storage, resource_storage, plugin_manager,
- execution_id=None, service_id=None, workflow_name=None, 
executor=None,
+def __init__(self, model_storage, resource_storage, plugin_manager,
+ execution_id=None, service_id=None, workflow_name=None, 
inputs=None, executor=None,
  task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
  task_retry_interval=DEFAULT_TASK_RETRY_INTERVAL):
 """
@@ -55,23 +55,29 @@ class WorkflowRunner(object):
 :param task_retry_interval: Retry interval in between retry attempts 
of a failing task
 """
 
+self._is_resume = execution_id is not None
+self._is_start = \
+workflow_name is not None and service_id is not None and 
execution_id is None
+
 self._model_storage = model_storage
 self._resource_storage = resource_storage
 
 # the IDs are stored rather than the models themselves, so this module 
could be used
 # by several threads without raising errors on model objects shared 
between threads
 
-if workflow_name is not None and service_id is not None and 
execution_id is None:
+if self._is_start:
 self._service_id = service_id
 self._workflow_name = workflow_name
 self._validate_workflow_exists_for_service()
 self._execution_id = self._create_execution_model(inputs).id
-elif execution_id is not None:
+elif self._is_resume:
 self._execution_id = execution_id
 self._service_id = self.execution.service.id
 self._workflow_name = 
model_storage.execution.get(self._execution_id).workflow_name
 else:
-

incubator-ariatosca git commit: fix retying mechanism

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution a66b74bf0 -> 
92773e206


fix retying mechanism


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/92773e20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/92773e20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/92773e20

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 92773e206c82a961ac127c71731de2cdcf6f7f2a
Parents: a66b74b
Author: max-orlov 
Authored: Wed Jun 21 15:25:44 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 15:25:44 2017 +0300

--
 aria/orchestrator/workflows/core/engine.py | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/92773e20/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 8999232..8f16203 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -53,8 +53,8 @@ class Engine(logger.LoggerMixin):
 if cancel:
 break
 for task in task_tracker.ended_tasks:
-task_tracker.finished_(task)
 self._handle_ended_tasks(task)
+task_tracker.finished_(task)
 for task in task_tracker.executable_tasks:
 task_tracker.executing_(task)
 self._handle_executable_task(ctx, task)
@@ -110,7 +110,7 @@ class Engine(logger.LoggerMixin):
 raise exceptions.ExecutorException('Workflow failed')
 
 
-class _TasksTracker():
+class _TasksTracker(object):
 def __init__(self, ctx):
 self._ctx = ctx
 self._tasks = ctx.execution.tasks
@@ -123,8 +123,10 @@ class _TasksTracker():
 return len(self._executed_tasks) == len(self._tasks) and 
len(self._executing_tasks) == 0
 
 def executing_(self, task):
-self._executable_tasks.remove(task)
-self._executing_tasks.append(task)
+# Task executing could be retrying (thus removed and added earlier)
+if task not in self._executing_tasks:
+self._executable_tasks.remove(task)
+self._executing_tasks.append(task)
 
 def finished_(self, task):
 self._executing_tasks.remove(task)
@@ -139,7 +141,7 @@ class _TasksTracker():
 @property
 def executable_tasks(self):
 now = datetime.utcnow()
-for task in self._update_tasks(self._executable_tasks):
+for task in self._update_tasks(self._executing_tasks + 
self._executable_tasks):
 if all([task.is_waiting(),
 task.due_at <= now,
 all(dependency in self._executed_tasks for dependency in 
task.dependencies)

incubator-ariatosca git commit: removed _graph from workflow context entirely

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution 5cb4f86a6 -> 
a66b74bf0


removed _graph from workflow context entirely


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/a66b74bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/a66b74bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/a66b74bf

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: a66b74bf06bb3245c69a15a1f601508f697c60ca
Parents: 5cb4f86
Author: max-orlov 
Authored: Wed Jun 21 15:00:40 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 15:00:40 2017 +0300

--
 aria/orchestrator/context/workflow.py  | 12 
 .../core/test_task_graph_into_execution_graph.py   | 13 +++--
 2 files changed, 11 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/a66b74bf/aria/orchestrator/context/workflow.py
--
diff --git a/aria/orchestrator/context/workflow.py 
b/aria/orchestrator/context/workflow.py
index aa5a786..2da3d4c 100644
--- a/aria/orchestrator/context/workflow.py
+++ b/aria/orchestrator/context/workflow.py
@@ -96,18 +96,6 @@ class WorkflowContext(BaseContext):
 )
 
 @property
-def _graph(self):
-if self._execution_graph is None:
-graph = DiGraph()
-for task in self.execution.tasks:
-for dependency in task.dependencies:
-graph.add_edge(dependency, task)
-
-self._execution_graph = graph
-
-return self._execution_graph
-
-@property
 @contextmanager
 def persist_changes(self):
 yield

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/a66b74bf/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 ef20374..3d47d54 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
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort
+from networkx import topological_sort, DiGraph
 
 from aria.modeling import models
 from aria.orchestrator import context
@@ -68,7 +68,7 @@ def test_task_graph_into_execution_graph(tmpdir):
 graph_compiler = compile.GraphCompiler(workflow_context, 
base.StubTaskExecutor)
 graph_compiler.compile(test_task_graph)
 
-execution_tasks = topological_sort(workflow_context._graph)
+execution_tasks = 
topological_sort(_graph(workflow_context.execution.tasks))
 
 assert len(execution_tasks) == 7
 
@@ -106,3 +106,12 @@ def _assert_execution_is_api_task(execution_task, 
api_task):
 
 def _get_task_by_name(task_name, graph):
 return graph.node[task_name]['task']
+
+
+def _graph(tasks):
+graph = DiGraph()
+for task in tasks:
+for dependency in task.dependencies:
+graph.add_edge(dependency, task)
+
+return graph

incubator-ariatosca git commit: removed the usage of execution graph from the code (currently still remain in test

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution c211e1064 -> 
5cb4f86a6


removed the usage of execution graph from the code (currently still remain in 
test


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/5cb4f86a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/5cb4f86a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/5cb4f86a

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 5cb4f86a6385a1085bc791bc6ce8f5dae4f36bb8
Parents: c211e10
Author: max-orlov 
Authored: Wed Jun 21 14:56:42 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 14:56:42 2017 +0300

--
 aria/orchestrator/workflows/core/engine.py | 106 +++-
 1 file changed, 66 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5cb4f86a/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 9f0ddd7..8999232 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -45,18 +45,20 @@ class Engine(logger.LoggerMixin):
 """
 execute the workflow
 """
-executing_tasks = []
+task_tracker = _TasksTracker(ctx)
 try:
 events.start_workflow_signal.send(ctx)
 while True:
 cancel = self._is_cancel(ctx)
 if cancel:
 break
-for task in self._ended_tasks(ctx, executing_tasks):
-self._handle_ended_tasks(ctx, task, executing_tasks)
-for task in self._executable_tasks(ctx):
-self._handle_executable_task(ctx, task, executing_tasks)
-if self._all_tasks_consumed(ctx):
+for task in task_tracker.ended_tasks:
+task_tracker.finished_(task)
+self._handle_ended_tasks(task)
+for task in task_tracker.executable_tasks:
+task_tracker.executing_(task)
+self._handle_executable_task(ctx, task)
+if task_tracker.all_tasks_consumed:
 break
 else:
 time.sleep(0.1)
@@ -82,34 +84,7 @@ class Engine(logger.LoggerMixin):
 execution = ctx.model.execution.refresh(ctx.execution)
 return execution.status in (models.Execution.CANCELLING, 
models.Execution.CANCELLED)
 
-def _executable_tasks(self, ctx):
-now = datetime.utcnow()
-return (
-task for task in self._tasks_iter(ctx)
-if task.is_waiting() and task.due_at <= now and \
-not self._task_has_dependencies(ctx, task)
-)
-
-@staticmethod
-def _ended_tasks(ctx, executing_tasks):
-for task in executing_tasks:
-if task.has_ended() and task in ctx._graph:
-yield task
-
-@staticmethod
-def _task_has_dependencies(ctx, task):
-return len(ctx._graph.pred.get(task, [])) > 0
-
-@staticmethod
-def _all_tasks_consumed(ctx):
-return len(ctx._graph.node) == 0
-
-@staticmethod
-def _tasks_iter(ctx):
-for task in ctx.execution.tasks:
-yield ctx.model.task.refresh(task)
-
-def _handle_executable_task(self, ctx, task, executing_tasks):
+def _handle_executable_task(self, ctx, task):
 task_executor = self._executors[task._executor]
 
 # If the task is a stub, a default context is provided, else it should 
hold the context cls
@@ -125,16 +100,67 @@ class Engine(logger.LoggerMixin):
 name=task.name
 )
 
-executing_tasks.append(task)
-
 if not task._stub_type:
 events.sent_task_signal.send(op_ctx)
 task_executor.execute(op_ctx)
 
 @staticmethod
-def _handle_ended_tasks(ctx, task, executing_tasks):
-executing_tasks.remove(task)
+def _handle_ended_tasks(task):
 if task.status == models.Task.FAILED and not task.ignore_failure:
 raise exceptions.ExecutorException('Workflow failed')
-else:
-ctx._graph.remove_node(task)
+
+
+class _TasksTracker():
+def __init__(self, ctx):
+self._ctx = ctx
+self._tasks = ctx.execution.tasks
+self._executable_tasks = list(self._tasks)
+self._executing_tasks = []
+self._executed_tasks = []
+
+@property
+def all_tasks_consumed(self):
+return len(self._executed_tasks) == len(self._tasks) and

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution 814306ba0 -> 
c211e1064 (forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c211e106
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c211e106
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c211e106

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: c211e1064fc84236ef753783fb4367d335ab197a
Parents: 1fee85c
Author: max-orlov 
Authored: Wed Jun 21 12:41:33 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 14:00:41 2017 +0300

--
 aria/modeling/orchestration.py  |   2 -
 aria/orchestrator/workflow_runner.py|   3 +-
 aria/orchestrator/workflows/core/compile.py | 198 ++-
 tests/orchestrator/context/__init__.py  |   2 +-
 tests/orchestrator/context/test_serialize.py|   2 +-
 .../orchestrator/execution_plugin/test_local.py |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   3 +-
 .../orchestrator/workflows/core/test_engine.py  |   2 +-
 .../orchestrator/workflows/core/test_events.py  |   7 +-
 .../test_task_graph_into_execution_graph.py |   6 +-
 .../executor/test_process_executor_extension.py |   2 +-
 .../test_process_executor_tracked_changes.py|   2 +-
 12 files changed, 116 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c211e106/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 17d2476..541f4c4 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -305,7 +305,6 @@ class TaskBase(mixins.ModelMixin):
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
 
-_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
 _stub_type = Column(Enum(*STUB_TYPES))
@@ -441,7 +440,6 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'_api_id': api_task.id,
 '_context_cls': api_task._context_cls,
 '_executor': executor,
 }

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c211e106/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 9e6b3ad..dcd8ce3 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -87,8 +87,7 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-compile.create_execution_tasks(
-self._workflow_context, self._tasks_graph, executor.__class__)
+compile.GraphCompiler(self._workflow_context, 
executor.__class__).compile(self._tasks_graph)
 
 self._engine = engine.Engine(executors={executor.__class__: executor})
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c211e106/aria/orchestrator/workflows/core/compile.py
--
diff --git a/aria/orchestrator/workflows/core/compile.py 
b/aria/orchestrator/workflows/core/compile.py
index 932268a..83de22c 100644
--- a/aria/orchestrator/workflows/core/compile.py
+++ b/aria/orchestrator/workflows/core/compile.py
@@ -18,99 +18,105 @@ from modeling import models
 from .. import executor, api
 
 
-def create_execution_tasks(ctx, task_graph, default_executor):
-execution = ctx.execution
-_construct_execution_tasks(execution, task_graph, default_executor)
-ctx.model.execution.update(execution)
-return execution.tasks
-
-
-def _construct_execution_tasks(execution,
-   task_graph,
-   default_executor,
-   stub_executor=executor.base.StubTaskExecutor,
-   start_stub_type=models.Task.START_WORKFLOW,
-   end_stub_type=models.Task.END_WORKFLOW,
-   depends_on=()):
-"""
-Translates the user graph to the execution graph
-:param task_graph: The user's graph
-:param start_stub_type: internal use
-:param end_stub_type: internal use
-:param

incubator-ariatosca git commit: wip

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution 1fee85c41 -> 
814306ba0


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/814306ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/814306ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/814306ba

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 814306ba0be3f478f2a1d135e2e26dfd6586a620
Parents: 1fee85c
Author: max-orlov 
Authored: Wed Jun 21 12:41:33 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 12:41:33 2017 +0300

--
 aria/modeling/orchestration.py  |   2 -
 aria/orchestrator/workflow_runner.py|   3 +-
 aria/orchestrator/workflows/core/compile.py | 198 ++-
 tests/orchestrator/context/__init__.py  |   2 +-
 tests/orchestrator/context/test_serialize.py|   2 +-
 .../orchestrator/execution_plugin/test_local.py |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   3 +-
 .../orchestrator/workflows/core/test_engine.py  |   2 +-
 .../orchestrator/workflows/core/test_events.py  |   7 +-
 .../test_task_graph_into_execution_graph.py |   6 +-
 .../executor/test_process_executor_extension.py |   2 +-
 .../test_process_executor_tracked_changes.py|   2 +-
 12 files changed, 116 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/814306ba/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 17d2476..541f4c4 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -305,7 +305,6 @@ class TaskBase(mixins.ModelMixin):
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
 
-_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
 _stub_type = Column(Enum(*STUB_TYPES))
@@ -441,7 +440,6 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'_api_id': api_task.id,
 '_context_cls': api_task._context_cls,
 '_executor': executor,
 }

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/814306ba/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 9e6b3ad..dcd8ce3 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -87,8 +87,7 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-compile.create_execution_tasks(
-self._workflow_context, self._tasks_graph, executor.__class__)
+compile.GraphCompiler(self._workflow_context, 
executor.__class__).compile(self._tasks_graph)
 
 self._engine = engine.Engine(executors={executor.__class__: executor})
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/814306ba/aria/orchestrator/workflows/core/compile.py
--
diff --git a/aria/orchestrator/workflows/core/compile.py 
b/aria/orchestrator/workflows/core/compile.py
index 932268a..50bd1c9 100644
--- a/aria/orchestrator/workflows/core/compile.py
+++ b/aria/orchestrator/workflows/core/compile.py
@@ -18,99 +18,105 @@ from modeling import models
 from .. import executor, api
 
 
-def create_execution_tasks(ctx, task_graph, default_executor):
-execution = ctx.execution
-_construct_execution_tasks(execution, task_graph, default_executor)
-ctx.model.execution.update(execution)
-return execution.tasks
-
-
-def _construct_execution_tasks(execution,
-   task_graph,
-   default_executor,
-   stub_executor=executor.base.StubTaskExecutor,
-   start_stub_type=models.Task.START_WORKFLOW,
-   end_stub_type=models.Task.END_WORKFLOW,
-   depends_on=()):
-"""
-Translates the user graph to the execution graph
-:param task_graph: The user's graph
-:param start_stub_type: internal use
-:param end_stub_type: internal use
-:param depends_on: internal

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 58de7a5ef -> 2fc9896cf 
(forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/2fc9896c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/2fc9896c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/2fc9896c

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 2fc9896cfdd7e6528e19b8bc418d4e4413e595ed
Parents: 1fee85c
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 12:02:52 2017 +0300

--
 aria/cli/commands/executions.py |  58 ++-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  40 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 157 +--
 13 files changed, 263 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2fc9896c/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..a6f06c3 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,64 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+logger.info('Resuming {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
-logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator =

[incubator-ariatosca] Git Push Summary

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution [created] 
1fee85c41

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 82f188a02 -> 58de7a5ef 
(forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/58de7a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/58de7a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/58de7a5e

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 58de7a5ef64b275eaed4ab33ec9ff6d311f5de8e
Parents: 1fee85c
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 11:20:19 2017 +0300

--
 aria/cli/commands/executions.py |  58 ++-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  40 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 157 +--
 13 files changed, 263 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/58de7a5e/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..a6f06c3 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,64 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+logger.info('Resuming {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
-logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator =

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 3ba6448b9 -> 82f188a02 
(forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/82f188a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/82f188a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/82f188a0

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 82f188a02d58e00802c4fcb683b0be048291282f
Parents: 1fee85c
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 11:05:05 2017 +0300

--
 aria/cli/commands/executions.py |  55 ++-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  40 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 157 +--
 13 files changed, 261 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/82f188a0/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-21 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 8fdea04ff -> 3ba6448b9 
(forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/3ba6448b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3ba6448b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3ba6448b

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 3ba6448b9da8f8eff5d1bf3c97cd2b54961cc430
Parents: 1fee85c
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 21 10:57:20 2017 +0300

--
 aria/cli/commands/executions.py |  55 ++-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  40 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 157 +--
 13 files changed, 261 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3ba6448b/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:

incubator-ariatosca git commit: wip

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 1fee85c41 -> 8fdea04ff


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8fdea04f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8fdea04f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8fdea04f

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 8fdea04ff2ba38855d415642d245a020ff4305de
Parents: 1fee85c
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 19:27:20 2017 +0300

--
 aria/cli/commands/executions.py |  55 ++-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  41 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 157 +--
 13 files changed, 262 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8fdea04f/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:
 while

[incubator-ariatosca] Git Push Summary

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions [deleted] c6f131e5f

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions b17c04f81 -> c6f131e5f 
(forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c6f131e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c6f131e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c6f131e5

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: c6f131e5f434b0928cba2a9c3cb021b158216b54
Parents: 507796e
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 19:23:25 2017 +0300

--
 aria/cli/commands/executions.py |  55 ++-
 aria/cli/logger.py  |   4 +-
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/exceptions.py |   7 +
 aria/orchestrator/workflow_runner.py|  41 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/__init__.py  |   2 +-
 tests/mock/models.py|  14 +-
 tests/modeling/test_models.py   |   5 +-
 tests/orchestrator/test_workflow_runner.py  | 157 +--
 13 files changed, 262 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c6f131e5/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,18 +134,63 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:

[incubator-ariatosca] Git Push Summary

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks [deleted] 1fee85c41

[2/2] incubator-ariatosca git commit: ARIA-278 remove core tasks

2017-06-20 Thread mxmrlv

ARIA-278 remove core tasks


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/1fee85c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/1fee85c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/1fee85c4

Branch: refs/heads/master
Commit: 1fee85c4193c635d8598affbf769d306917760d8
Parents: 9907520
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 19:14:41 2017 +0300

--
 aria/modeling/orchestration.py  | 143 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py|  22 +-
 aria/orchestrator/workflows/api/task.py |   7 +
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/compile.py | 116 
 aria/orchestrator/workflows/core/engine.py  | 121 +
 .../workflows/core/events_handler.py| 137 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  25 +-
 aria/orchestrator/workflows/executor/base.py|  31 ++-
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|  10 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  11 +-
 tests/orchestrator/test_workflow_runner.py  |  43 ++-
 .../orchestrator/workflows/core/test_engine.py  |  23 +-
 .../orchestrator/workflows/core/test_events.py  |  20 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  55 ++--
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   7 +-
 .../test_process_executor_tracked_changes.py|   7 +-
 32 files changed, 677 insertions(+), 823 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1fee85c4/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +256,24 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-  'relationship_fk',
-  'plugin_fk',
-  'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
+
+START_WORKFLOW = 'start_workflow'
+END_WORKFLOW = 'end_workflow'
+START_SUBWROFKLOW = 'start_subworkflow'
+END_SUBWORKFLOW = 'end_subworkflow'
+STUB = 'stub'
+CONDITIONAL =

[4/4] incubator-ariatosca git commit: ARIA-278 remove core tasks

2017-06-20 Thread mxmrlv

ARIA-278 remove core tasks


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/1fee85c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/1fee85c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/1fee85c4

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 1fee85c4193c635d8598affbf769d306917760d8
Parents: 9907520
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 19:14:41 2017 +0300

--
 aria/modeling/orchestration.py  | 143 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py|  22 +-
 aria/orchestrator/workflows/api/task.py |   7 +
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/compile.py | 116 
 aria/orchestrator/workflows/core/engine.py  | 121 +
 .../workflows/core/events_handler.py| 137 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  25 +-
 aria/orchestrator/workflows/executor/base.py|  31 ++-
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|  10 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  11 +-
 tests/orchestrator/test_workflow_runner.py  |  43 ++-
 .../orchestrator/workflows/core/test_engine.py  |  23 +-
 .../orchestrator/workflows/core/test_events.py  |  20 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  55 ++--
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   7 +-
 .../test_process_executor_tracked_changes.py|   7 +-
 32 files changed, 677 insertions(+), 823 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1fee85c4/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +256,24 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-  'relationship_fk',
-  'plugin_fk',
-  'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
+
+START_WORKFLOW = 'start_workflow'
+END_WORKFLOW = 'end_workflow'
+START_SUBWROFKLOW = 'start_subworkflow'
+END_SUBWORKFLOW = 'end_subworkflow'
+STUB = 'stub'
+

[1/2] incubator-ariatosca git commit: ARIA-278 remove core tasks

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master 990752026 -> 1fee85c41


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1fee85c4/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 5dd2855..f5fb17a 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
@@ -13,12 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
+from networkx import topological_sort
 
+from aria.modeling import models
 from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from aria.orchestrator.workflows import api
+from aria.orchestrator.workflows.core import compile
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +27,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +36,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -64,12 +65,9 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(inner_task_graph, simple_before_task)
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
-# Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+compile.create_execution_tasks(workflow_context, test_task_graph, 
base.StubTaskExecutor)
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +81,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t._api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks)._stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks)._stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks)._stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks)._stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert isinstance(_get_task_by_name(execution_tasks[6], execution_graph),
-

[1/4] incubator-ariatosca git commit: ARIA-54 Prepare for ARIA packaging [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 3e119df50 -> 1fee85c41 (forced update)


ARIA-54 Prepare for ARIA packaging

Preparations for ARIA packaging:
 - Added CHANGELOG file
 - Added CONTRIBUTING file
 - Added DISCLAIMER file
 - Updated Makefile
 - Converted README from md to rst for PyPI compatiability
 - Removed outdated TODO file
 - Added long_description, download_url to setup.py metadata
 - Modified setup.py url metadata to point at ASF domain
 - Added more badges to README


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/e6cf67ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e6cf67ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e6cf67ec

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: e6cf67ec1230bf46febc11d65122ee3c0eeebc10
Parents: 2149a5e
Author: Ran Ziv 
Authored: Mon Jun 5 13:24:49 2017 +0300
Committer: Ran Ziv 
Committed: Thu Jun 15 12:03:59 2017 +0300

--
 CHANGELOG.rst |   4 ++
 CONTRIBUTING  |   3 +
 DISCLAIMER|  10 
 MANIFEST.in   |  10 +++-
 Makefile  |  56 --
 README.md | 120 --
 README.rst| 140 +
 TODO.md   |   8 ---
 docs/conf.py  |   3 +-
 docs/requirements.txt |   4 +-
 setup.py  |   8 ++-
 11 files changed, 214 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e6cf67ec/CHANGELOG.rst
--
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 000..6abb1af
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,4 @@
+0.1.0
+-
+
+ * Initial release.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e6cf67ec/CONTRIBUTING
--
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 000..4124003
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,3 @@
+Contribution guide is available on our Confluence:
+
+https://cwiki.apache.org/confluence/display/ARIATOSCA/Contributing+to+ARIA
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e6cf67ec/DISCLAIMER
--
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 000..358d8e1
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,10 @@
+Apache AriaTosca is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e6cf67ec/MANIFEST.in
--
diff --git a/MANIFEST.in b/MANIFEST.in
index 6c79a3a..877a7dd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,10 @@
-include requirements.txt
-include VERSION
+include CONTRIBUTING
 include LICENSE
+include NOTICE
+include VERSION
+include CHANGELOG.rst
+include README.rst
+include requirements.txt
+recursive-include docs/html *
 recursive-include examples *
+prune docs/html/.doctrees

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e6cf67ec/Makefile
--
diff --git a/Makefile b/Makefile
index 3bafd3b..a857ca7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,34 +13,54 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-EXTENSIONS=extensions
-DOCS=docs
-HTML=docs/html
+EXTENSIONS = ./extensions
+DIST = ./dist
+DOCS = ./docs
+HTML = ./docs/html
+EASY_INSTALL_PTH = $(VIRTUAL_ENV)/lib/python2.7/site-packages/easy-install.pth
+PYTHON_VERSION = $$(python -V 2>&1 | cut -f2 -d' ' | cut -f1,2 -d'.' 
--output-delimiter='')
 
-.PHONY: clean aria-requirements docs-requirements docs
-.DEFAULT_GOAL = test
+.DEFAULT_GOAL = install
+.PHONY: clean install install-virtual docs test dist deploy
 
 clean:
-   rm -rf "$(HTML)" .tox .coverage*
+   rm -rf "$(DIST)" "$(HTML)" .tox .coverage*
-find . -type f -name '.coverage' -delete

[2/4] incubator-ariatosca git commit: ARIA-281 Update click library version

2017-06-20 Thread mxmrlv

ARIA-281 Update click library version

Updated click library version to a newer version.
This will also make it compatible in the same environment with the
pip-tools library which uses click too and requires the newer version.

Additional changes:
 - Removed PyYAML dependency from requirements.txt (leftover)
 - Disabled default goal of Makefile


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/99075202
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/99075202
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/99075202

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 990752026d3316286aff53b388eaaa47b804
Parents: e6cf67e
Author: Ran Ziv 
Authored: Tue Jun 20 15:47:09 2017 +0300
Committer: Ran Ziv 
Committed: Tue Jun 20 15:47:09 2017 +0300

--
 Makefile | 5 -
 requirements.in  | 2 +-
 requirements.txt | 5 ++---
 3 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/99075202/Makefile
--
diff --git a/Makefile b/Makefile
index a857ca7..cb4b58f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,12 @@ HTML = ./docs/html
 EASY_INSTALL_PTH = $(VIRTUAL_ENV)/lib/python2.7/site-packages/easy-install.pth
 PYTHON_VERSION = $$(python -V 2>&1 | cut -f2 -d' ' | cut -f1,2 -d'.' 
--output-delimiter='')
 
-.DEFAULT_GOAL = install
+.DEFAULT_GOAL = default
 .PHONY: clean install install-virtual docs test dist deploy
 
+default:
+   @echo "Please choose one of the following targets: clean, install, 
install-virtual, docs, test, dist, deploy, requirements.txt"
+
 clean:
rm -rf "$(DIST)" "$(HTML)" .tox .coverage*
-find . -type f -name '.coverage' -delete

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/99075202/requirements.in
--
diff --git a/requirements.in b/requirements.in
index 54e8714..d205c7a 100644
--- a/requirements.in
+++ b/requirements.in
@@ -28,7 +28,7 @@ wagon==0.6.0
 bottle>=0.12.0, <0.13
 Fabric>=1.13.0, <1.14
 setuptools>=35.0.0, <36.0.0
-click>=4.1, < 5.0
+click>=6.0, < 7.0
 colorama>=0.3.7, <=0.3.9
 PrettyTable>=0.7,<0.8
 click_didyoumean==0.0.3

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/99075202/requirements.txt
--
diff --git a/requirements.txt b/requirements.txt
index 8551c65..6cf2ade 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#pip-compile --output-file requirements.txt requirements.in
+#pip-compile --output-file ./requirements.txt ./requirements.in
 #
 # Since the tool we are using to generate our requirements.txt, `pip-tools`,
 # does not currently support conditional dependencies (;), we're adding our 
original
@@ -25,7 +25,7 @@ blinker==1.4
 bottle==0.12.13
 cachecontrol[filecache]==0.12.1
 cffi==1.10.0  # via cryptography
-click==4.1
+click==6.7
 click_didyoumean==0.0.3
 clint==0.5.1
 colorama==0.3.9
@@ -48,7 +48,6 @@ prettytable==0.7.2
 pyasn1==0.2.3 # via paramiko
 pycparser==2.17   # via cffi
 pyparsing==2.2.0  # via packaging
-pyyaml==3.12
 requests==2.13.0
 retrying==1.3.3
 ruamel.ordereddict==0.4.9  # via ruamel.yaml

[2/2] incubator-ariatosca git commit: ARIA-278 remove core tasks

2017-06-20 Thread mxmrlv

ARIA-278 remove core tasks


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/3e119df5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3e119df5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3e119df5

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 3e119df50b87f3f96fc7b17f48756e89fc058364
Parents: 2149a5e
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 19:14:22 2017 +0300

--
 aria/modeling/orchestration.py  | 143 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py|  22 +-
 aria/orchestrator/workflows/api/task.py |   7 +
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/compile.py | 116 
 aria/orchestrator/workflows/core/engine.py  | 121 +
 .../workflows/core/events_handler.py| 137 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  25 +-
 aria/orchestrator/workflows/executor/base.py|  31 ++-
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|  10 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  11 +-
 tests/orchestrator/test_workflow_runner.py  |  43 ++-
 .../orchestrator/workflows/core/test_engine.py  |  23 +-
 .../orchestrator/workflows/core/test_events.py  |  20 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  55 ++--
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   7 +-
 .../test_process_executor_tracked_changes.py|   7 +-
 32 files changed, 677 insertions(+), 823 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3e119df5/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +256,24 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-  'relationship_fk',
-  'plugin_fk',
-  'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
+
+START_WORKFLOW = 'start_workflow'
+END_WORKFLOW = 'end_workflow'
+START_SUBWROFKLOW = 'start_subworkflow'
+END_SUBWORKFLOW = 'end_subworkflow'
+STUB = 'stub'
+

[1/2] incubator-ariatosca git commit: ARIA-278 remove core tasks [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks b19ef4e77 -> 3e119df50 (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3e119df5/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 5dd2855..f5fb17a 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
@@ -13,12 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
+from networkx import topological_sort
 
+from aria.modeling import models
 from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from aria.orchestrator.workflows import api
+from aria.orchestrator.workflows.core import compile
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +27,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +36,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -64,12 +65,9 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(inner_task_graph, simple_before_task)
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
-# Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+compile.create_execution_tasks(workflow_context, test_task_graph, 
base.StubTaskExecutor)
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +81,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t._api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks)._stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks)._stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks)._stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks)._stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert isinstance(_get_task_by_name(execution_tasks[6], execution_graph),
-

incubator-ariatosca git commit: fix 2 [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 54d5d5095 -> b19ef4e77 (forced update)


fix 2


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/b19ef4e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/b19ef4e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/b19ef4e7

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: b19ef4e7727813dc042edb0953e04a59d95fc74e
Parents: 70ccc9f
Author: max-orlov 
Authored: Tue Jun 20 18:34:40 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 18:50:22 2017 +0300

--
 aria/orchestrator/workflow_runner.py|   5 +-
 aria/orchestrator/workflows/api/task.py |   3 +-
 aria/orchestrator/workflows/core/compile.py | 116 ++
 aria/orchestrator/workflows/core/task.py| 119 ---
 aria/orchestrator/workflows/executor/base.py|  17 ++-
 tests/orchestrator/context/__init__.py  |   4 +-
 tests/orchestrator/context/test_serialize.py|   4 +-
 .../orchestrator/execution_plugin/test_local.py |   4 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   5 +-
 .../orchestrator/workflows/core/test_engine.py  |   4 +-
 .../orchestrator/workflows/core/test_events.py  |   4 +-
 .../test_task_graph_into_execution_graph.py |   4 +-
 .../executor/test_process_executor_extension.py |   4 +-
 .../test_process_executor_tracked_changes.py|   4 +-
 14 files changed, 148 insertions(+), 149 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b19ef4e7/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index a57a34e..9e6b3ad 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -24,7 +24,7 @@ from datetime import datetime
 from . import exceptions
 from .context.workflow import WorkflowContext
 from .workflows import builtin
-from .workflows.core import engine, task
+from .workflows.core import engine, compile
 from .workflows.executor.process import ProcessExecutor
 from ..modeling import models
 from ..modeling import utils as modeling_utils
@@ -87,7 +87,8 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-task.create_execution_tasks(self._workflow_context, self._tasks_graph, 
executor.__class__)
+compile.create_execution_tasks(
+self._workflow_context, self._tasks_graph, executor.__class__)
 
 self._engine = engine.Engine(executors={executor.__class__: executor})
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b19ef4e7/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index ce34005..f7d2c66 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -145,7 +145,8 @@ class OperationTask(BaseTask):
 elif getattr(self.actor, 'source_node', None) is not None:
 self._context_cls = context.operation.RelationshipOperationContext
 else:
-self._context_cls = context.operation.BaseOperationContext
+raise exceptions.TaskCreationException('Could not locate valid 
context for '
+   
'{actor.__class__}'.format(actor=self.actor))
 
 def __repr__(self):
 return self.name

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b19ef4e7/aria/orchestrator/workflows/core/compile.py
--
diff --git a/aria/orchestrator/workflows/core/compile.py 
b/aria/orchestrator/workflows/core/compile.py
new file mode 100644
index 000..932268a
--- /dev/null
+++ b/aria/orchestrator/workflows/core/compile.py
@@ -0,0 +1,116 @@
+# 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

incubator-ariatosca git commit: fix 2

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 70ccc9f18 -> 54d5d5095


fix 2


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/54d5d509
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/54d5d509
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/54d5d509

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 54d5d509543f17bf9d5e1fa8e741c1a84297a42a
Parents: 70ccc9f
Author: max-orlov 
Authored: Tue Jun 20 18:34:40 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 18:34:40 2017 +0300

--
 aria/orchestrator/workflows/api/task.py  |   3 +-
 aria/orchestrator/workflows/core/compile.py  | 116 +
 aria/orchestrator/workflows/core/task.py | 119 --
 aria/orchestrator/workflows/executor/base.py |  17 ++--
 4 files changed, 126 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/54d5d509/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index ce34005..f7d2c66 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -145,7 +145,8 @@ class OperationTask(BaseTask):
 elif getattr(self.actor, 'source_node', None) is not None:
 self._context_cls = context.operation.RelationshipOperationContext
 else:
-self._context_cls = context.operation.BaseOperationContext
+raise exceptions.TaskCreationException('Could not locate valid 
context for '
+   
'{actor.__class__}'.format(actor=self.actor))
 
 def __repr__(self):
 return self.name

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/54d5d509/aria/orchestrator/workflows/core/compile.py
--
diff --git a/aria/orchestrator/workflows/core/compile.py 
b/aria/orchestrator/workflows/core/compile.py
new file mode 100644
index 000..932268a
--- /dev/null
+++ b/aria/orchestrator/workflows/core/compile.py
@@ -0,0 +1,116 @@
+# 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 modeling import models
+from .. import executor, api
+
+
+def create_execution_tasks(ctx, task_graph, default_executor):
+execution = ctx.execution
+_construct_execution_tasks(execution, task_graph, default_executor)
+ctx.model.execution.update(execution)
+return execution.tasks
+
+
+def _construct_execution_tasks(execution,
+   task_graph,
+   default_executor,
+   stub_executor=executor.base.StubTaskExecutor,
+   start_stub_type=models.Task.START_WORKFLOW,
+   end_stub_type=models.Task.END_WORKFLOW,
+   depends_on=()):
+"""
+Translates the user graph to the execution graph
+:param task_graph: The user's graph
+:param start_stub_type: internal use
+:param end_stub_type: internal use
+:param depends_on: internal use
+"""
+depends_on = list(depends_on)
+
+# Insert start marker
+start_task = models.Task(execution=execution,
+ dependencies=depends_on,
+ _api_id=_start_graph_suffix(task_graph.id),
+ _stub_type=start_stub_type,
+ _executor=stub_executor)
+
+for task in task_graph.topological_order(reverse=True):
+operation_dependencies = _get_tasks_from_dependencies(
+execution, task_graph.get_dependencies(task), [start_task])
+
+if isinstance(task, api.task.OperationTask):
+models.Task.from_api_task(api_task=task,
+

incubator-ariatosca git commit: review fixes [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks f84ad06b2 -> 70ccc9f18 (forced update)


review 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/70ccc9f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/70ccc9f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/70ccc9f1

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 70ccc9f188c2262be7406d1324f3431fbae02fbe
Parents: 507796e
Author: max-orlov 
Authored: Tue Jun 20 15:34:57 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 17:52:38 2017 +0300

--
 aria/modeling/orchestration.py  |  14 +-
 aria/orchestrator/context/operation.py  |   2 +-
 aria/orchestrator/context/workflow.py   |   2 +-
 aria/orchestrator/workflow_runner.py|   9 +-
 aria/orchestrator/workflows/api/task.py |   6 +
 aria/orchestrator/workflows/core/engine.py  | 128 +++
 .../workflows/core/events_handler.py|  19 ++-
 aria/orchestrator/workflows/core/task.py| 119 +
 aria/orchestrator/workflows/events_logging.py   |  56 
 aria/orchestrator/workflows/executor/base.py|   4 +-
 aria/orchestrator/workflows/executor/dry.py |   2 +-
 tests/end2end/testenv.py|   3 -
 tests/orchestrator/context/__init__.py  |   8 +-
 tests/orchestrator/context/test_operation.py|   2 +-
 tests/orchestrator/context/test_serialize.py|  10 +-
 .../orchestrator/execution_plugin/test_local.py |   8 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   8 +-
 tests/orchestrator/test_workflow_runner.py  |   4 +-
 .../orchestrator/workflows/core/test_engine.py  |  10 +-
 .../orchestrator/workflows/core/test_events.py  |   9 +-
 .../test_task_graph_into_execution_graph.py |  24 ++--
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../executor/test_process_executor_extension.py |   7 +-
 .../test_process_executor_tracked_changes.py|   7 +-
 24 files changed, 230 insertions(+), 233 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/70ccc9f1/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 007eefa..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -304,10 +304,11 @@ class TaskBase(mixins.ModelMixin):
 started_at = Column(DateTime, default=None)
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
-api_id = Column(String)
 
+_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
+_stub_type = Column(Enum(*STUB_TYPES))
 
 @declared_attr
 def logs(cls):
@@ -336,8 +337,6 @@ class TaskBase(mixins.ModelMixin):
 interface_name = Column(String)
 operation_name = Column(String)
 
-stub_type = Column(Enum(*STUB_TYPES))
-
 @property
 def actor(self):
 """
@@ -410,21 +409,18 @@ class TaskBase(mixins.ModelMixin):
 return self.status in (self.SUCCESS, self.FAILED)
 
 def is_waiting(self):
-if self.stub_type:
+if self._stub_type:
 return not self.has_ended()
 else:
 return self.status in (self.PENDING, self.RETRYING)
 
 @classmethod
 def from_api_task(cls, api_task, executor, **kwargs):
-from aria.orchestrator import context
 instantiation_kwargs = {}
 
 if hasattr(api_task.actor, 'outbound_relationships'):
-context_cls = context.operation.NodeOperationContext
 instantiation_kwargs['node'] = api_task.actor
 elif hasattr(api_task.actor, 'source_node'):
-context_cls = context.operation.RelationshipOperationContext
 instantiation_kwargs['relationship'] = api_task.actor
 else:
 raise RuntimeError('No operation context could be created for 
{actor.model_cls}'
@@ -445,8 +441,8 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'api_id': api_task.id,
-'_context_cls': context_cls,
+'_api_id': api_task.id,
+'_context_cls': api_task._context_cls,
 '_executor': executor,
 }
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/70ccc9f1/aria/orchestrator/context/operation.py
--
diff --git

incubator-ariatosca git commit: review fixes [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 43371e01f -> f84ad06b2 (forced update)


review 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/f84ad06b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f84ad06b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f84ad06b

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: f84ad06b2bf7c8a631db68d8c650a3202c187515
Parents: 507796e
Author: max-orlov 
Authored: Tue Jun 20 15:34:57 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 17:22:37 2017 +0300

--
 aria/modeling/orchestration.py  |  14 +-
 aria/orchestrator/context/operation.py  |   2 +-
 aria/orchestrator/context/workflow.py   |   2 +-
 aria/orchestrator/workflow_runner.py|   9 +-
 aria/orchestrator/workflows/api/task.py |   6 +
 aria/orchestrator/workflows/core/engine.py  | 128 +++
 .../workflows/core/events_handler.py|  19 ++-
 aria/orchestrator/workflows/core/task.py| 119 +
 aria/orchestrator/workflows/events_logging.py   |  56 
 aria/orchestrator/workflows/executor/base.py|   4 +-
 aria/orchestrator/workflows/executor/dry.py |   2 +-
 tests/end2end/testenv.py|   3 -
 tests/orchestrator/context/__init__.py  |   8 +-
 tests/orchestrator/context/test_operation.py|   2 +-
 tests/orchestrator/context/test_serialize.py|  10 +-
 .../orchestrator/execution_plugin/test_local.py |   8 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   8 +-
 tests/orchestrator/test_workflow_runner.py  |   4 +-
 .../orchestrator/workflows/core/test_engine.py  |  10 +-
 .../orchestrator/workflows/core/test_events.py  |   9 +-
 .../test_task_graph_into_execution_graph.py |  24 ++--
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../executor/test_process_executor_extension.py |   7 +-
 .../test_process_executor_tracked_changes.py|   7 +-
 24 files changed, 230 insertions(+), 233 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f84ad06b/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 007eefa..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -304,10 +304,11 @@ class TaskBase(mixins.ModelMixin):
 started_at = Column(DateTime, default=None)
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
-api_id = Column(String)
 
+_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
+_stub_type = Column(Enum(*STUB_TYPES))
 
 @declared_attr
 def logs(cls):
@@ -336,8 +337,6 @@ class TaskBase(mixins.ModelMixin):
 interface_name = Column(String)
 operation_name = Column(String)
 
-stub_type = Column(Enum(*STUB_TYPES))
-
 @property
 def actor(self):
 """
@@ -410,21 +409,18 @@ class TaskBase(mixins.ModelMixin):
 return self.status in (self.SUCCESS, self.FAILED)
 
 def is_waiting(self):
-if self.stub_type:
+if self._stub_type:
 return not self.has_ended()
 else:
 return self.status in (self.PENDING, self.RETRYING)
 
 @classmethod
 def from_api_task(cls, api_task, executor, **kwargs):
-from aria.orchestrator import context
 instantiation_kwargs = {}
 
 if hasattr(api_task.actor, 'outbound_relationships'):
-context_cls = context.operation.NodeOperationContext
 instantiation_kwargs['node'] = api_task.actor
 elif hasattr(api_task.actor, 'source_node'):
-context_cls = context.operation.RelationshipOperationContext
 instantiation_kwargs['relationship'] = api_task.actor
 else:
 raise RuntimeError('No operation context could be created for 
{actor.model_cls}'
@@ -445,8 +441,8 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'api_id': api_task.id,
-'_context_cls': context_cls,
+'_api_id': api_task.id,
+'_context_cls': api_task._context_cls,
 '_executor': executor,
 }
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f84ad06b/aria/orchestrator/context/operation.py
--
diff --git

incubator-ariatosca git commit: phase 3 fixes

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 2459a3e05 -> 43371e01f


phase 3 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/43371e01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/43371e01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/43371e01

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 43371e01f1e8b80ff9b23fdd5ab7d233b4a1347f
Parents: 2459a3e
Author: max-orlov 
Authored: Tue Jun 20 17:03:04 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 17:03:04 2017 +0300

--
 aria/orchestrator/workflows/api/task.py | 4 ++--
 aria/orchestrator/workflows/core/task.py| 2 +-
 tests/end2end/testenv.py| 3 ---
 tests/orchestrator/context/__init__.py  | 2 +-
 tests/orchestrator/context/test_operation.py| 2 +-
 tests/orchestrator/context/test_serialize.py| 5 ++---
 tests/orchestrator/execution_plugin/test_local.py   | 2 +-
 tests/orchestrator/execution_plugin/test_ssh.py | 2 +-
 tests/orchestrator/test_workflow_runner.py  | 4 ++--
 tests/orchestrator/workflows/core/test_engine.py| 5 ++---
 tests/orchestrator/workflows/core/test_events.py| 2 +-
 .../workflows/core/test_task_graph_into_execution_graph.py  | 3 ---
 .../workflows/executor/test_process_executor_extension.py   | 2 +-
 .../workflows/executor/test_process_executor_tracked_changes.py | 2 +-
 14 files changed, 16 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/43371e01/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 0e80e8a..ce34005 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -140,9 +140,9 @@ class OperationTask(BaseTask):
 self.arguments = modeling_utils.merge_parameter_values(arguments,

operation.arguments,

model_cls=models.Argument)
-if isinstance(self.actor, models.Node):
+if getattr(self.actor, 'outbound_relationships', None) is not None:
 self._context_cls = context.operation.NodeOperationContext
-elif isinstance(self.actor, models.Relationship):
+elif getattr(self.actor, 'source_node', None) is not None:
 self._context_cls = context.operation.RelationshipOperationContext
 else:
 self._context_cls = context.operation.BaseOperationContext

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/43371e01/aria/orchestrator/workflows/core/task.py
--
diff --git a/aria/orchestrator/workflows/core/task.py 
b/aria/orchestrator/workflows/core/task.py
index 84ce819..a9f8d18 100644
--- a/aria/orchestrator/workflows/core/task.py
+++ b/aria/orchestrator/workflows/core/task.py
@@ -77,7 +77,7 @@ def _construct_execution_tasks(execution,
 _api_id=task.id,
 _executor=stub_executor,
 _stub_type=models.Task.STUB,
-)
+   )
 else:
 raise RuntimeError('Undefined state')
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/43371e01/tests/end2end/testenv.py
--
diff --git a/tests/end2end/testenv.py b/tests/end2end/testenv.py
index 87ca5bd..85714e5 100644
--- a/tests/end2end/testenv.py
+++ b/tests/end2end/testenv.py
@@ -60,9 +60,6 @@ class TestEnvironment(object):
 
 def execute_workflow(self, service_name, workflow_name, dry=False):
 self.cli.executions.start(workflow_name, service_name=service_name, 
dry=dry)
-service = self.model_storage.service.get_by_name(service_name)
-for active_execution in [e for e in service.executions if not 
e.has_ended()]:
-self.model_storage.execution.refresh(active_execution)
 
 def verify_clean_storage(self):
 assert len(self.model_storage.service_template.list()) == 0

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/43371e01/tests/orchestrator/context/__init__.py
--
diff --git a/tests/orchestrator/context/__init__.py

incubator-ariatosca git commit: phase 2 fixes [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 958e28354 -> 2459a3e05 (forced update)


phase 2 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/2459a3e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/2459a3e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/2459a3e0

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 2459a3e055f25a5397abb4d73fb095440fd09060
Parents: 7762a49
Author: max-orlov 
Authored: Tue Jun 20 16:17:11 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 16:25:06 2017 +0300

--
 aria/orchestrator/workflow_runner.py|  5 +
 aria/orchestrator/workflows/core/engine.py  | 12 ++
 aria/orchestrator/workflows/core/task.py| 23 +---
 tests/orchestrator/context/__init__.py  |  3 +--
 tests/orchestrator/context/test_serialize.py|  3 +--
 .../orchestrator/execution_plugin/test_local.py |  3 +--
 tests/orchestrator/execution_plugin/test_ssh.py |  4 +---
 .../orchestrator/workflows/core/test_engine.py  |  3 +--
 .../orchestrator/workflows/core/test_events.py  |  5 ++---
 .../test_task_graph_into_execution_graph.py |  8 ++-
 .../executor/test_process_executor_extension.py |  3 +--
 .../test_process_executor_tracked_changes.py|  3 +--
 12 files changed, 35 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2459a3e0/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 66eec4a..a57a34e 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -87,10 +87,7 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-task.construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
-
-# Update the state
-self._model_storage.execution.update(execution)
+task.create_execution_tasks(self._workflow_context, self._tasks_graph, 
executor.__class__)
 
 self._engine = engine.Engine(executors={executor.__class__: executor})
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2459a3e0/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 7d542d0..9f0ddd7 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -25,7 +25,8 @@ from aria.modeling import models
 from aria.orchestrator import events
 from aria.orchestrator.context import operation
 
-from .. import exceptions, executor, api
+from .. import exceptions
+from ..executor.base import StubTaskExecutor
 # Import required so all signals are registered
 from . import events_handler  # pylint: disable=unused-import
 
@@ -37,7 +38,8 @@ class Engine(logger.LoggerMixin):
 
 def __init__(self, executors, **kwargs):
 super(Engine, self).__init__(**kwargs)
-self._executors = executors.copy
+self._executors = executors.copy()
+self._executors.setdefault(StubTaskExecutor, StubTaskExecutor())
 
 def execute(self, ctx):
 """
@@ -88,7 +90,8 @@ class Engine(logger.LoggerMixin):
 not self._task_has_dependencies(ctx, task)
 )
 
-def _ended_tasks(self, ctx, executing_tasks):
+@staticmethod
+def _ended_tasks(ctx, executing_tasks):
 for task in executing_tasks:
 if task.has_ended() and task in ctx._graph:
 yield task
@@ -128,7 +131,8 @@ class Engine(logger.LoggerMixin):
 events.sent_task_signal.send(op_ctx)
 task_executor.execute(op_ctx)
 
-def _handle_ended_tasks(self, ctx, task, executing_tasks):
+@staticmethod
+def _handle_ended_tasks(ctx, task, executing_tasks):
 executing_tasks.remove(task)
 if task.status == models.Task.FAILED and not task.ignore_failure:
 raise exceptions.ExecutorException('Workflow failed')

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2459a3e0/aria/orchestrator/workflows/core/task.py
--
diff --git a/aria/orchestrator/workflows/core/task.py 
b/aria/orchestrator/workflows/core/task.py
index cf1b7bc..84ce819 100644
--- a/aria/orchestrator/workflows/core/task.py
+++

incubator-ariatosca git commit: phase 2 fixes

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 7762a492e -> 958e28354


phase 2 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/958e2835
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/958e2835
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/958e2835

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 958e283545a1dfe595f01da7c5c530be8c33cdd3
Parents: 7762a49
Author: max-orlov 
Authored: Tue Jun 20 16:17:11 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 16:17:11 2017 +0300

--
 aria/orchestrator/workflow_runner.py|  5 +
 aria/orchestrator/workflows/core/task.py| 23 +---
 tests/orchestrator/context/__init__.py  |  3 +--
 tests/orchestrator/context/test_serialize.py|  3 +--
 .../orchestrator/execution_plugin/test_local.py |  3 +--
 tests/orchestrator/execution_plugin/test_ssh.py |  4 +---
 .../orchestrator/workflows/core/test_engine.py  |  3 +--
 .../orchestrator/workflows/core/test_events.py  |  5 ++---
 .../test_task_graph_into_execution_graph.py |  3 +--
 .../executor/test_process_executor_extension.py |  3 +--
 .../test_process_executor_tracked_changes.py|  3 +--
 11 files changed, 26 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/958e2835/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 66eec4a..a57a34e 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -87,10 +87,7 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-task.construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
-
-# Update the state
-self._model_storage.execution.update(execution)
+task.create_execution_tasks(self._workflow_context, self._tasks_graph, 
executor.__class__)
 
 self._engine = engine.Engine(executors={executor.__class__: executor})
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/958e2835/aria/orchestrator/workflows/core/task.py
--
diff --git a/aria/orchestrator/workflows/core/task.py 
b/aria/orchestrator/workflows/core/task.py
index cf1b7bc..84ce819 100644
--- a/aria/orchestrator/workflows/core/task.py
+++ b/aria/orchestrator/workflows/core/task.py
@@ -21,13 +21,20 @@ from modeling import models
 from .. import executor, api
 
 
-def construct_execution_tasks(execution,
-  task_graph,
-  default_executor,
-  stub_executor=executor.base.StubTaskExecutor,
-  start_stub_type=models.Task.START_WORKFLOW,
-  end_stub_type=models.Task.END_WORKFLOW,
-  depends_on=()):
+def create_execution_tasks(ctx, task_graph, default_executor):
+execution = ctx.execution
+_construct_execution_tasks(execution, task_graph, default_executor)
+ctx.model.execution.update(execution)
+return execution.tasks
+
+
+def _construct_execution_tasks(execution,
+   task_graph,
+   default_executor,
+   stub_executor=executor.base.StubTaskExecutor,
+   start_stub_type=models.Task.START_WORKFLOW,
+   end_stub_type=models.Task.END_WORKFLOW,
+   depends_on=()):
 """
 Translates the user graph to the execution graph
 :param task_graph: The user's graph
@@ -55,7 +62,7 @@ def construct_execution_tasks(execution,
 
 elif isinstance(task, api.task.WorkflowTask):
 # Build the graph recursively while adding start and end markers
-construct_execution_tasks(
+_construct_execution_tasks(
 execution=execution,
 task_graph=task,
 default_executor=default_executor,

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/958e2835/tests/orchestrator/context/__init__.py
--
diff --git a/tests/orchestrator/context/__init__.py 
b/tests/orchestrator/context/__init__.py
index d6c5d26..b55755b 100644
--- a/tests/orchestrator/context/__init__.py
+++

incubator-ariatosca git commit: phase 1 fixes [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 3281ad952 -> 7762a492e (forced update)


phase 1 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/7762a492
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7762a492
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7762a492

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 7762a492ef1c78266dc6bbb4fb56dc1913264fae
Parents: 507796e
Author: max-orlov 
Authored: Tue Jun 20 15:34:57 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 16:07:09 2017 +0300

--
 aria/modeling/orchestration.py  |  14 +--
 aria/orchestrator/context/operation.py  |   2 +-
 aria/orchestrator/context/workflow.py   |   2 +-
 aria/orchestrator/workflow_runner.py|   6 +-
 aria/orchestrator/workflows/api/task.py |   6 +
 aria/orchestrator/workflows/core/engine.py  | 122 +++
 .../workflows/core/events_handler.py|  19 ++-
 aria/orchestrator/workflows/core/task.py| 112 +
 aria/orchestrator/workflows/events_logging.py   |  56 -
 aria/orchestrator/workflows/executor/base.py|   4 +-
 aria/orchestrator/workflows/executor/dry.py |   2 +-
 tests/orchestrator/context/__init__.py  |   5 +-
 tests/orchestrator/context/test_serialize.py|   4 +-
 .../orchestrator/execution_plugin/test_local.py |   5 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   4 +-
 .../orchestrator/workflows/core/test_engine.py  |   8 +-
 .../orchestrator/workflows/core/test_events.py  |   6 +-
 .../test_task_graph_into_execution_graph.py |  15 +--
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../executor/test_process_executor_extension.py |   4 +-
 .../test_process_executor_tracked_changes.py|   4 +-
 21 files changed, 206 insertions(+), 196 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7762a492/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 007eefa..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -304,10 +304,11 @@ class TaskBase(mixins.ModelMixin):
 started_at = Column(DateTime, default=None)
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
-api_id = Column(String)
 
+_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
+_stub_type = Column(Enum(*STUB_TYPES))
 
 @declared_attr
 def logs(cls):
@@ -336,8 +337,6 @@ class TaskBase(mixins.ModelMixin):
 interface_name = Column(String)
 operation_name = Column(String)
 
-stub_type = Column(Enum(*STUB_TYPES))
-
 @property
 def actor(self):
 """
@@ -410,21 +409,18 @@ class TaskBase(mixins.ModelMixin):
 return self.status in (self.SUCCESS, self.FAILED)
 
 def is_waiting(self):
-if self.stub_type:
+if self._stub_type:
 return not self.has_ended()
 else:
 return self.status in (self.PENDING, self.RETRYING)
 
 @classmethod
 def from_api_task(cls, api_task, executor, **kwargs):
-from aria.orchestrator import context
 instantiation_kwargs = {}
 
 if hasattr(api_task.actor, 'outbound_relationships'):
-context_cls = context.operation.NodeOperationContext
 instantiation_kwargs['node'] = api_task.actor
 elif hasattr(api_task.actor, 'source_node'):
-context_cls = context.operation.RelationshipOperationContext
 instantiation_kwargs['relationship'] = api_task.actor
 else:
 raise RuntimeError('No operation context could be created for 
{actor.model_cls}'
@@ -445,8 +441,8 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'api_id': api_task.id,
-'_context_cls': context_cls,
+'_api_id': api_task.id,
+'_context_cls': api_task._context_cls,
 '_executor': executor,
 }
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7762a492/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 07bf297..d43b847 100644
--- a/aria/orchestrator/context/operation.py
+++

incubator-ariatosca git commit: phase 1 fixes [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 88325109f -> 3281ad952 (forced update)


phase 1 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/3281ad95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3281ad95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3281ad95

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 3281ad952dc8f9b41664f5e289a7cb39ecbc3fa9
Parents: 507796e
Author: max-orlov 
Authored: Tue Jun 20 15:34:57 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 15:59:11 2017 +0300

--
 aria/modeling/orchestration.py  |  14 +--
 aria/orchestrator/context/operation.py  |   2 +-
 aria/orchestrator/context/workflow.py   |   2 +-
 aria/orchestrator/workflow_runner.py|   4 +-
 aria/orchestrator/workflows/api/task.py |   6 +
 aria/orchestrator/workflows/core/engine.py  | 122 +++
 .../workflows/core/events_handler.py|  19 ++-
 aria/orchestrator/workflows/core/task.py| 110 +
 aria/orchestrator/workflows/events_logging.py   |  56 -
 aria/orchestrator/workflows/executor/base.py|   4 +-
 aria/orchestrator/workflows/executor/dry.py |   2 +-
 tests/orchestrator/context/__init__.py  |   5 +-
 tests/orchestrator/context/test_serialize.py|   4 +-
 .../orchestrator/execution_plugin/test_local.py |   5 +-
 tests/orchestrator/execution_plugin/test_ssh.py |   4 +-
 .../orchestrator/workflows/core/test_engine.py  |   8 +-
 .../orchestrator/workflows/core/test_events.py  |   6 +-
 .../test_task_graph_into_execution_graph.py |  15 +--
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../executor/test_process_executor_extension.py |   4 +-
 .../test_process_executor_tracked_changes.py|   4 +-
 21 files changed, 203 insertions(+), 195 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3281ad95/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 007eefa..17d2476 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -304,10 +304,11 @@ class TaskBase(mixins.ModelMixin):
 started_at = Column(DateTime, default=None)
 ended_at = Column(DateTime, default=None)
 attempts_count = Column(Integer, default=1)
-api_id = Column(String)
 
+_api_id = Column(String)
 _executor = Column(PickleType)
 _context_cls = Column(PickleType)
+_stub_type = Column(Enum(*STUB_TYPES))
 
 @declared_attr
 def logs(cls):
@@ -336,8 +337,6 @@ class TaskBase(mixins.ModelMixin):
 interface_name = Column(String)
 operation_name = Column(String)
 
-stub_type = Column(Enum(*STUB_TYPES))
-
 @property
 def actor(self):
 """
@@ -410,21 +409,18 @@ class TaskBase(mixins.ModelMixin):
 return self.status in (self.SUCCESS, self.FAILED)
 
 def is_waiting(self):
-if self.stub_type:
+if self._stub_type:
 return not self.has_ended()
 else:
 return self.status in (self.PENDING, self.RETRYING)
 
 @classmethod
 def from_api_task(cls, api_task, executor, **kwargs):
-from aria.orchestrator import context
 instantiation_kwargs = {}
 
 if hasattr(api_task.actor, 'outbound_relationships'):
-context_cls = context.operation.NodeOperationContext
 instantiation_kwargs['node'] = api_task.actor
 elif hasattr(api_task.actor, 'source_node'):
-context_cls = context.operation.RelationshipOperationContext
 instantiation_kwargs['relationship'] = api_task.actor
 else:
 raise RuntimeError('No operation context could be created for 
{actor.model_cls}'
@@ -445,8 +441,8 @@ class TaskBase(mixins.ModelMixin):
 'plugin': api_task.plugin,
 'function': api_task.function,
 'arguments': api_task.arguments,
-'api_id': api_task.id,
-'_context_cls': context_cls,
+'_api_id': api_task.id,
+'_context_cls': api_task._context_cls,
 '_executor': executor,
 }
 )

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3281ad95/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 07bf297..d43b847 100644
--- a/aria/orchestrator/context/operation.py
+++

incubator-ariatosca git commit: fixed logging issue [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 547ee4071 -> b17c04f81 
(forced update)


fixed logging issue


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/b17c04f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/b17c04f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/b17c04f8

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: b17c04f81f3f8862ca349a424be2bb01684dc836
Parents: 4d74419
Author: max-orlov 
Authored: Tue Jun 20 11:51:14 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 13:34:24 2017 +0300

--
 aria/cli/commands/executions.py| 5 -
 aria/cli/logger.py | 4 ++--
 tests/modeling/test_models.py  | 5 ++---
 tests/orchestrator/test_workflow_runner.py | 7 ---
 4 files changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b17c04f8/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index cfa211e..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -187,7 +187,10 @@ def _run_execution(workflow_runner, logger, model_storage, 
dry, mark_pattern):
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:
 while execution_thread.is_alive():
 execution_logging.log_list(log_iterator, mark_pattern=mark_pattern)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b17c04f8/aria/cli/logger.py
--
diff --git a/aria/cli/logger.py b/aria/cli/logger.py
index 5de3701..96f3fb3 100644
--- a/aria/cli/logger.py
+++ b/aria/cli/logger.py
@@ -115,8 +115,8 @@ class Logging(object):
 
 class ModelLogIterator(object):
 
-def __init__(self, model_storage, execution_id, filters=None, sort=None):
-self._last_visited_id = 0
+def __init__(self, model_storage, execution_id, filters=None, sort=None, 
offset=0):
+self._last_visited_id = offset
 self._model_storage = model_storage
 self._execution_id = execution_id
 self._additional_filters = filters or {}

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b17c04f8/tests/modeling/test_models.py
--
diff --git a/tests/modeling/test_models.py b/tests/modeling/test_models.py
index 464f432..bbc7352 100644
--- a/tests/modeling/test_models.py
+++ b/tests/modeling/test_models.py
@@ -314,7 +314,7 @@ class TestExecution(object):
Execution.CANCELLING],
 Execution.FAILED: [Execution.FAILED],
 Execution.SUCCEEDED: [Execution.SUCCEEDED],
-Execution.CANCELLED: [Execution.CANCELLED]
+Execution.CANCELLED: [Execution.CANCELLED, Execution.PENDING]
 }
 
 invalid_transitions = {
@@ -334,8 +334,7 @@ class TestExecution(object):
   Execution.FAILED,
   Execution.CANCELLED,
   Execution.CANCELLING],
-Execution.CANCELLED: [Execution.PENDING,
-  Execution.STARTED,
+Execution.CANCELLED: [Execution.STARTED,
   Execution.FAILED,
   Execution.SUCCEEDED,
   Execution.CANCELLING],

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b17c04f8/tests/orchestrator/test_workflow_runner.py
--
diff --git a/tests/orchestrator/test_workflow_runner.py 
b/tests/orchestrator/test_workflow_runner.py
index 7a08ba8..c83eb54 100644
--- a/tests/orchestrator/test_workflow_runner.py
+++ b/tests/orchestrator/test_workflow_runner.py
@@ -308,14 +308,15 @@ def _create_workflow_runner(request, workflow_name, 
inputs=None, executor=None,
 
 class TestResumableWorkflows(object):
 
-def test_single_task_successful_execution(self, workflow_context,

incubator-ariatosca git commit: fixed logging issue [Forced Update!]

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions f75b9ae7b -> c21e97d9d 
(forced update)


fixed logging issue


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c21e97d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c21e97d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c21e97d9

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: c21e97d9d5f1115facdbbb815890f279b6a78d0f
Parents: 4d74419
Author: max-orlov 
Authored: Tue Jun 20 11:51:14 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 11:53:36 2017 +0300

--
 aria/cli/commands/executions.py | 5 -
 aria/cli/logger.py  | 4 ++--
 tests/modeling/test_models.py   | 5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c21e97d9/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index cfa211e..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -187,7 +187,10 @@ def _run_execution(workflow_runner, logger, model_storage, 
dry, mark_pattern):
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:
 while execution_thread.is_alive():
 execution_logging.log_list(log_iterator, mark_pattern=mark_pattern)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c21e97d9/aria/cli/logger.py
--
diff --git a/aria/cli/logger.py b/aria/cli/logger.py
index 5de3701..96f3fb3 100644
--- a/aria/cli/logger.py
+++ b/aria/cli/logger.py
@@ -115,8 +115,8 @@ class Logging(object):
 
 class ModelLogIterator(object):
 
-def __init__(self, model_storage, execution_id, filters=None, sort=None):
-self._last_visited_id = 0
+def __init__(self, model_storage, execution_id, filters=None, sort=None, 
offset=0):
+self._last_visited_id = offset
 self._model_storage = model_storage
 self._execution_id = execution_id
 self._additional_filters = filters or {}

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c21e97d9/tests/modeling/test_models.py
--
diff --git a/tests/modeling/test_models.py b/tests/modeling/test_models.py
index 464f432..bbc7352 100644
--- a/tests/modeling/test_models.py
+++ b/tests/modeling/test_models.py
@@ -314,7 +314,7 @@ class TestExecution(object):
Execution.CANCELLING],
 Execution.FAILED: [Execution.FAILED],
 Execution.SUCCEEDED: [Execution.SUCCEEDED],
-Execution.CANCELLED: [Execution.CANCELLED]
+Execution.CANCELLED: [Execution.CANCELLED, Execution.PENDING]
 }
 
 invalid_transitions = {
@@ -334,8 +334,7 @@ class TestExecution(object):
   Execution.FAILED,
   Execution.CANCELLED,
   Execution.CANCELLING],
-Execution.CANCELLED: [Execution.PENDING,
-  Execution.STARTED,
+Execution.CANCELLED: [Execution.STARTED,
   Execution.FAILED,
   Execution.SUCCEEDED,
   Execution.CANCELLING],

incubator-ariatosca git commit: fixed logging issue

2017-06-20 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 4d74419e9 -> f75b9ae7b


fixed logging issue


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f75b9ae7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f75b9ae7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f75b9ae7

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: f75b9ae7b2afe975cd08c6e7416011093da990e5
Parents: 4d74419
Author: max-orlov 
Authored: Tue Jun 20 11:51:14 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 20 11:51:14 2017 +0300

--
 aria/cli/commands/executions.py | 5 -
 aria/cli/logger.py  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f75b9ae7/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index cfa211e..f2f8221 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -187,7 +187,10 @@ def _run_execution(workflow_runner, logger, model_storage, 
dry, mark_pattern):
 logger.info('Starting {0}execution. Press Ctrl+C cancel'.format('dry ' if 
dry else ''))
 execution_thread.start()
 
-log_iterator = cli_logger.ModelLogIterator(model_storage, 
workflow_runner.execution_id)
+last_task_id = workflow_runner.execution.logs[-1].id if 
workflow_runner.execution.logs else 0
+log_iterator = cli_logger.ModelLogIterator(model_storage,
+   workflow_runner.execution_id,
+   offset=last_task_id)
 try:
 while execution_thread.is_alive():
 execution_logging.log_list(log_iterator, mark_pattern=mark_pattern)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f75b9ae7/aria/cli/logger.py
--
diff --git a/aria/cli/logger.py b/aria/cli/logger.py
index 5de3701..96f3fb3 100644
--- a/aria/cli/logger.py
+++ b/aria/cli/logger.py
@@ -115,8 +115,8 @@ class Logging(object):
 
 class ModelLogIterator(object):
 
-def __init__(self, model_storage, execution_id, filters=None, sort=None):
-self._last_visited_id = 0
+def __init__(self, model_storage, execution_id, filters=None, sort=None, 
offset=0):
+self._last_visited_id = offset
 self._model_storage = model_storage
 self._execution_id = execution_id
 self._additional_filters = filters or {}

incubator-ariatosca git commit: cleaning up 1 [Forced Update!]

2017-06-19 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 2fa30b4c1 -> 4d74419e9 
(forced update)


cleaning up 1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/4d74419e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4d74419e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4d74419e

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 4d74419e9a770bfb9c0710d601820ec1d2da7d5f
Parents: 9431465
Author: max-orlov 
Authored: Mon Jun 19 18:52:05 2017 +0300
Committer: max-orlov 
Committed: Mon Jun 19 19:14:16 2017 +0300

--
 aria/cli/commands/executions.py| 50 --
 aria/orchestrator/events.py|  2 +-
 aria/orchestrator/exceptions.py|  7 +++
 aria/orchestrator/workflow_runner.py   | 25 +
 tests/mock/__init__.py |  2 +-
 tests/orchestrator/test_workflow_runner.py | 67 +++--
 6 files changed, 95 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4d74419e/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 6176ea2..cfa211e 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -134,11 +134,53 @@ def start(workflow_name,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 workflow_runner = \
-WorkflowRunner(workflow_name, service.id, inputs,
-   model_storage, resource_storage, plugin_manager,
-   executor, task_max_attempts, task_retry_interval)
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+service_id=service.id, workflow_name=workflow_name, 
executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
 
-execution_thread_name = '{0}_{1}'.format(service_name, workflow_name)
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+@executions.command(name='resume',
+short_help='Resume a workflow')
+@aria.argument('execution-id')
+@aria.options.inputs(help=helptexts.EXECUTION_INPUTS)
+@aria.options.dry_execution
+@aria.options.task_max_attempts()
+@aria.options.task_retry_interval()
+@aria.options.mark_pattern()
+@aria.options.verbose()
+@aria.pass_model_storage
+@aria.pass_resource_storage
+@aria.pass_plugin_manager
+@aria.pass_logger
+def resume(execution_id,
+   inputs,
+   dry,
+   task_max_attempts,
+   task_retry_interval,
+   mark_pattern,
+   model_storage,
+   resource_storage,
+   plugin_manager,
+   logger):
+executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
+
+workflow_runner = \
+WorkflowRunner(
+inputs, model_storage, resource_storage, plugin_manager,
+execution_id=execution_id, executor=executor,
+task_max_attempts=task_max_attempts, 
task_retry_interval=task_retry_interval
+)
+
+_run_execution(workflow_runner, logger, model_storage, dry, mark_pattern)
+
+
+def _run_execution(workflow_runner, logger, model_storage, dry, mark_pattern):
+execution_thread_name = '{0}_{1}'.format(workflow_runner.service.name,
+ 
workflow_runner.execution.workflow_name)
 execution_thread = 
threading.ExceptionThread(target=workflow_runner.execute,
  name=execution_thread_name)
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4d74419e/aria/orchestrator/events.py
--
diff --git a/aria/orchestrator/events.py b/aria/orchestrator/events.py
index a1d7006..aa1b5bc 100644
--- a/aria/orchestrator/events.py
+++ b/aria/orchestrator/events.py
@@ -34,4 +34,4 @@ on_cancelling_workflow_signal = 
signal('on_cancelling_workflow_signal')
 on_cancelled_workflow_signal = signal('on_cancelled_workflow_signal')
 on_success_workflow_signal = signal('on_success_workflow_signal')
 on_failure_workflow_signal = signal('on_failure_workflow_signal')
-on_resume_workflow_signal = signal('on_resume_workflow_signal')
\ No newline at end of file
+on_resume_workflow_signal = signal('on_resume_workflow_signal')

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4d74419e/aria/orchestrator/exceptions.py

incubator-ariatosca git commit: cleaning up 1

2017-06-19 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 9431465dd -> 2fa30b4c1


cleaning up 1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/2fa30b4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/2fa30b4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/2fa30b4c

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 2fa30b4c1fb8f02c4a6edf68fa5590e46a012a37
Parents: 9431465
Author: max-orlov 
Authored: Mon Jun 19 18:52:05 2017 +0300
Committer: max-orlov 
Committed: Mon Jun 19 18:52:05 2017 +0300

--
 aria/orchestrator/events.py|  2 +-
 aria/orchestrator/exceptions.py|  7 +++
 aria/orchestrator/workflow_runner.py   | 16 +++---
 tests/mock/__init__.py |  2 +-
 tests/orchestrator/test_workflow_runner.py | 67 +++--
 5 files changed, 44 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2fa30b4c/aria/orchestrator/events.py
--
diff --git a/aria/orchestrator/events.py b/aria/orchestrator/events.py
index a1d7006..aa1b5bc 100644
--- a/aria/orchestrator/events.py
+++ b/aria/orchestrator/events.py
@@ -34,4 +34,4 @@ on_cancelling_workflow_signal = 
signal('on_cancelling_workflow_signal')
 on_cancelled_workflow_signal = signal('on_cancelled_workflow_signal')
 on_success_workflow_signal = signal('on_success_workflow_signal')
 on_failure_workflow_signal = signal('on_failure_workflow_signal')
-on_resume_workflow_signal = signal('on_resume_workflow_signal')
\ No newline at end of file
+on_resume_workflow_signal = signal('on_resume_workflow_signal')

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2fa30b4c/aria/orchestrator/exceptions.py
--
diff --git a/aria/orchestrator/exceptions.py b/aria/orchestrator/exceptions.py
index 8d3dcc6..71b6401 100644
--- a/aria/orchestrator/exceptions.py
+++ b/aria/orchestrator/exceptions.py
@@ -74,3 +74,10 @@ class WorkflowImplementationNotFoundError(AriaError):
 Raised when attempting to import a workflow's code but the implementation 
is not found
 """
 pass
+
+
+class InvalidWorkflowRunnerParams(AriaError):
+"""
+Raised when invalid combination of arguments is passed to the workflow 
runner
+"""
+pass

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2fa30b4c/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 995d325..1f93292 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -62,18 +62,15 @@ class WorkflowRunner(object):
 # by several threads without raising errors on model objects shared 
between threads
 self._service_id = service_id
 
-if workflow_name is not None:
-assert execution_id is None
+if workflow_name is not None and execution_id is None:
 self._workflow_name = workflow_name
-execution = self._create_execution_model(inputs)
-self._execution_id = execution.id
 self._validate_workflow_exists_for_service()
-workflow_fn = self._get_workflow_fn()
-else:
-assert execution_id is not None
+self._execution_id = self._create_execution_model(inputs).id
+elif execution_id is not None:
 self._execution_id = execution_id
-self._workflow_name = \
-
self._model_storage.execution.get(self._execution_id).workflow_name
+self._workflow_name = 
model_storage.execution.get(self._execution_id).workflow_name
+else:
+raise exceptions.InvalidWorkflowRunnerParams("")
 
 self._workflow_context = WorkflowContext(
 name=self.__class__.__name__,
@@ -93,6 +90,7 @@ class WorkflowRunner(object):
 
 if execution_id is None:
 # Not an existing execution
+workflow_fn = self._get_workflow_fn()
 tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
 engine.construct_execution_tasks(self.execution, tasks_graph, 
executor.__class__)
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2fa30b4c/tests/mock/__init__.py
--
diff --git a/tests/mock/__init__.py b/tests/mock/__init__.py
index 9004b4c..9183b77 100644
--- a/tests/mock/__init__.py
+++

incubator-ariatosca git commit: wip

2017-06-19 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions 507796e69 -> 9431465dd


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9431465d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9431465d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9431465d

Branch: refs/heads/ARIA-236-Resumable-workflow-executions
Commit: 9431465ddcf59de37f9c984e8b600bc9ab81b82f
Parents: 507796e
Author: max-orlov 
Authored: Mon Jun 19 17:44:45 2017 +0300
Committer: max-orlov 
Committed: Mon Jun 19 17:44:45 2017 +0300

--
 aria/modeling/orchestration.py  |   3 +-
 aria/orchestrator/context/workflow.py   |   5 +
 aria/orchestrator/events.py |   1 +
 aria/orchestrator/workflow_runner.py|  38 +++--
 aria/orchestrator/workflows/core/engine.py  |   4 +
 .../workflows/core/events_handler.py|   7 +
 tests/mock/models.py|  14 +-
 tests/orchestrator/test_workflow_runner.py  | 149 ++-
 8 files changed, 200 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9431465d/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 007eefa..7751eb0 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -68,7 +68,8 @@ class ExecutionBase(mixins.ModelMixin):
 VALID_TRANSITIONS = {
 PENDING: (STARTED, CANCELLED),
 STARTED: END_STATES + (CANCELLING,),
-CANCELLING: END_STATES
+CANCELLING: END_STATES,
+CANCELLED: PENDING
 }
 
 @orm.validates('status')

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9431465d/aria/orchestrator/context/workflow.py
--
diff --git a/aria/orchestrator/context/workflow.py 
b/aria/orchestrator/context/workflow.py
index 4b7573f..97db8a9 100644
--- a/aria/orchestrator/context/workflow.py
+++ b/aria/orchestrator/context/workflow.py
@@ -97,10 +97,15 @@ class WorkflowContext(BaseContext):
 
 @property
 def _graph(self):
+# Constructing a graph with only not ended nodes
 if self._execution_graph is None:
 graph = DiGraph()
 for task in self.execution.tasks:
+if task.has_ended():
+continue
 for dependency in task.dependencies:
+if dependency.has_ended():
+continue
 graph.add_edge(dependency, task)
 
 self._execution_graph = graph

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9431465d/aria/orchestrator/events.py
--
diff --git a/aria/orchestrator/events.py b/aria/orchestrator/events.py
index a1c4922..a1d7006 100644
--- a/aria/orchestrator/events.py
+++ b/aria/orchestrator/events.py
@@ -34,3 +34,4 @@ on_cancelling_workflow_signal = 
signal('on_cancelling_workflow_signal')
 on_cancelled_workflow_signal = signal('on_cancelled_workflow_signal')
 on_success_workflow_signal = signal('on_success_workflow_signal')
 on_failure_workflow_signal = signal('on_failure_workflow_signal')
+on_resume_workflow_signal = signal('on_resume_workflow_signal')
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9431465d/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index c30ec4b..995d325 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -37,9 +37,9 @@ DEFAULT_TASK_RETRY_INTERVAL = 30
 
 class WorkflowRunner(object):
 
-def __init__(self, workflow_name, service_id, inputs,
- model_storage, resource_storage, plugin_manager,
- executor=None, task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
+def __init__(self, service_id, inputs, model_storage, resource_storage, 
plugin_manager,
+ execution_id=None, workflow_name=None, executor=None,
+ task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
  task_retry_interval=DEFAULT_TASK_RETRY_INTERVAL):
 """
 Manages a single workflow execution on a given service.
@@ -57,25 +57,30 @@ class WorkflowRunner(object):
 
 self._model_storage = model_storage
 self._resource_storage = resource_storage
-

[incubator-ariatosca] Git Push Summary

2017-06-19 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-236-Resumable-workflow-executions [created] 507796e69

[2/2] incubator-ariatosca git commit: ARIA-278 remove core tasks

2017-06-18 Thread mxmrlv

ARIA-278 remove core tasks


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/507796e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/507796e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/507796e6

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 507796e692d60ac8b948c46625667e7161845648
Parents: 2149a5e
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 18:13:01 2017 +0300

--
 aria/modeling/orchestration.py  | 145 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py|  24 +-
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/engine.py  | 211 +++
 .../workflows/core/events_handler.py| 138 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  63 +++--
 aria/orchestrator/workflows/executor/base.py|  36 +--
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/end2end/testenv.py|   3 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|   6 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/test_workflow_runner.py  |  43 ++-
 .../orchestrator/workflows/core/test_engine.py  |  23 +-
 .../orchestrator/workflows/core/test_events.py  |  21 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  59 ++--
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   6 +-
 .../test_process_executor_tracked_changes.py|   6 +-
 31 files changed, 687 insertions(+), 829 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/507796e6/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..007eefa 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +256,24 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-  'relationship_fk',
-  'plugin_fk',
-  'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
+
+START_WORKFLOW = 'start_workflow'
+END_WORKFLOW = 'end_workflow'
+START_SUBWROFKLOW = 'start_subworkflow'
+END_SUBWORKFLOW = 'end_subworkflow'
+STUB = 'stub'
+CONDITIONAL = 'conditional'
+
+STUB_TYPES = (
+

[1/2] incubator-ariatosca git commit: ARIA-278 remove core tasks [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks bfae4f39c -> 507796e69 (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/507796e6/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 5dd2855..569e8be 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
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
+from networkx import topological_sort
 
+from aria.modeling import models
 from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from aria.orchestrator.workflows import (
+api,
+core
+)
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +29,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +38,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -65,11 +68,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
 # Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+execution = workflow_context.model.execution.list()[0]
+
+core.engine.construct_execution_tasks(execution, test_task_graph, 
base.StubTaskExecutor)
+workflow_context.execution = execution
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +87,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t.api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks).stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks).stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks).stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks).stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert isinstance(_get_task_by_name(execution_tasks[6], execution_graph),
-

[2/2] incubator-ariatosca git commit: wip

2017-06-18 Thread mxmrlv

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/bfae4f39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/bfae4f39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/bfae4f39

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: bfae4f39c5d0496c76306d41c0463a1d8c19298d
Parents: 2149a5e
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 17:48:29 2017 +0300

--
 aria/modeling/orchestration.py  | 145 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py|  24 +-
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/engine.py  | 211 +++
 .../workflows/core/events_handler.py| 138 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  63 +++--
 aria/orchestrator/workflows/executor/base.py|  36 +--
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/end2end/testenv.py|   3 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|   6 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/test_workflow_runner.py  |  43 ++-
 .../orchestrator/workflows/core/test_engine.py  |  23 +-
 .../orchestrator/workflows/core/test_events.py  |  21 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  59 ++--
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   6 +-
 .../test_process_executor_tracked_changes.py|   6 +-
 31 files changed, 687 insertions(+), 829 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bfae4f39/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..007eefa 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +256,24 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-  'relationship_fk',
-  'plugin_fk',
-  'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
+
+START_WORKFLOW = 'start_workflow'
+END_WORKFLOW = 'end_workflow'
+START_SUBWROFKLOW = 'start_subworkflow'
+END_SUBWORKFLOW = 'end_subworkflow'
+STUB = 'stub'
+CONDITIONAL = 'conditional'
+
+STUB_TYPES = (
+START_WORKFLOW,
+

[1/2] incubator-ariatosca git commit: wip [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks ee0ff3ac6 -> bfae4f39c (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bfae4f39/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 5dd2855..569e8be 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
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
+from networkx import topological_sort
 
+from aria.modeling import models
 from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from aria.orchestrator.workflows import (
+api,
+core
+)
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +29,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +38,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -65,11 +68,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
 # Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+execution = workflow_context.model.execution.list()[0]
+
+core.engine.construct_execution_tasks(execution, test_task_graph, 
base.StubTaskExecutor)
+workflow_context.execution = execution
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +87,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t.api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks).stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks).stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks).stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks).stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert isinstance(_get_task_by_name(execution_tasks[6], execution_graph),
-

incubator-ariatosca git commit: moved things around [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks e3977fd5d -> ee0ff3ac6 (forced update)


moved things around


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/ee0ff3ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/ee0ff3ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/ee0ff3ac

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: ee0ff3ac6053e26f3569a5295ec60db91e9f76a0
Parents: b314f38
Author: max-orlov 
Authored: Sun Jun 18 17:25:25 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 17:30:19 2017 +0300

--
 aria/orchestrator/workflow_runner.py| 97 +--
 aria/orchestrator/workflows/core/engine.py  | 99 +++-
 tests/orchestrator/context/__init__.py  |  2 +-
 tests/orchestrator/context/test_serialize.py|  4 +-
 .../orchestrator/execution_plugin/test_local.py |  4 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  4 +-
 tests/orchestrator/test_workflow_runner.py  | 21 +++--
 .../orchestrator/workflows/core/test_engine.py  |  5 +-
 .../orchestrator/workflows/core/test_events.py  |  5 +-
 .../test_task_graph_into_execution_graph.py | 10 +-
 .../executor/test_process_executor_extension.py |  4 +-
 .../test_process_executor_tracked_changes.py|  4 +-
 12 files changed, 128 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ee0ff3ac/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index c4d8666..c30ec4b 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -24,10 +24,8 @@ from datetime import datetime
 from . import exceptions
 from .context.workflow import WorkflowContext
 from .workflows import builtin
-from .workflows.core.engine import Engine
+from .workflows.core import engine
 from .workflows.executor.process import ProcessExecutor
-from .workflows.executor.base import StubTaskExecutor
-from .workflows.api import task as api_task
 from ..modeling import models
 from ..modeling import utils as modeling_utils
 from ..utils.imports import import_fullname
@@ -89,12 +87,12 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
+engine.construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
 
 # Update the state
 self._model_storage.execution.update(execution)
 
-self._engine = Engine(executor=executor)
+self._engine = engine.Engine(default_executor=executor)
 
 @property
 def execution_id(self):
@@ -172,92 +170,3 @@ class WorkflowRunner(object):
 self._workflow_name, workflow.function))
 
 return workflow_fn
-
-
-def construct_execution_tasks(execution,
-  task_graph,
-  default_executor,
-  stub_executor=StubTaskExecutor,
-  start_stub_type=models.Task.START_WORKFLOW,
-  end_stub_type=models.Task.END_WORKFLOW,
-  depends_on=()):
-"""
-Translates the user graph to the execution graph
-:param task_graph: The user's graph
-:param start_stub_type: internal use
-:param end_stub_type: internal use
-:param depends_on: internal use
-"""
-depends_on = list(depends_on)
-
-# Insert start marker
-start_task = models.Task(api_id=_start_graph_suffix(task_graph.id),
- _executor=stub_executor,
- execution=execution,
- stub_type=start_stub_type,
- dependencies=depends_on)
-
-for task in task_graph.topological_order(reverse=True):
-operation_dependencies = _get_tasks_from_dependencies(
-execution, task_graph.get_dependencies(task), [start_task])
-
-if isinstance(task, api_task.OperationTask):
-models.Task.from_api_task(api_task=task,
-  executor=default_executor,
-  dependencies=operation_dependencies)
-
-elif isinstance(task, api_task.WorkflowTask):
-# Build the graph recursively while adding start and end markers
-

incubator-ariatosca git commit: moved things around

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks b314f388b -> e3977fd5d


moved things around


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/e3977fd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e3977fd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e3977fd5

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: e3977fd5d8eae5e5dd9af1d3faa72560dc979f0e
Parents: b314f38
Author: max-orlov 
Authored: Sun Jun 18 17:25:25 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 17:25:25 2017 +0300

--
 aria/orchestrator/workflow_runner.py| 97 +--
 aria/orchestrator/workflows/core/engine.py  | 99 +++-
 tests/orchestrator/context/__init__.py  |  2 +-
 tests/orchestrator/context/test_serialize.py|  4 +-
 .../orchestrator/execution_plugin/test_local.py |  4 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  4 +-
 tests/orchestrator/test_workflow_runner.py  | 18 ++--
 .../orchestrator/workflows/core/test_engine.py  |  5 +-
 .../orchestrator/workflows/core/test_events.py  |  5 +-
 .../test_task_graph_into_execution_graph.py | 10 +-
 .../executor/test_process_executor_extension.py |  4 +-
 .../test_process_executor_tracked_changes.py|  4 +-
 12 files changed, 126 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e3977fd5/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index c4d8666..c30ec4b 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -24,10 +24,8 @@ from datetime import datetime
 from . import exceptions
 from .context.workflow import WorkflowContext
 from .workflows import builtin
-from .workflows.core.engine import Engine
+from .workflows.core import engine
 from .workflows.executor.process import ProcessExecutor
-from .workflows.executor.base import StubTaskExecutor
-from .workflows.api import task as api_task
 from ..modeling import models
 from ..modeling import utils as modeling_utils
 from ..utils.imports import import_fullname
@@ -89,12 +87,12 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
 self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
-construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
+engine.construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
 
 # Update the state
 self._model_storage.execution.update(execution)
 
-self._engine = Engine(executor=executor)
+self._engine = engine.Engine(default_executor=executor)
 
 @property
 def execution_id(self):
@@ -172,92 +170,3 @@ class WorkflowRunner(object):
 self._workflow_name, workflow.function))
 
 return workflow_fn
-
-
-def construct_execution_tasks(execution,
-  task_graph,
-  default_executor,
-  stub_executor=StubTaskExecutor,
-  start_stub_type=models.Task.START_WORKFLOW,
-  end_stub_type=models.Task.END_WORKFLOW,
-  depends_on=()):
-"""
-Translates the user graph to the execution graph
-:param task_graph: The user's graph
-:param start_stub_type: internal use
-:param end_stub_type: internal use
-:param depends_on: internal use
-"""
-depends_on = list(depends_on)
-
-# Insert start marker
-start_task = models.Task(api_id=_start_graph_suffix(task_graph.id),
- _executor=stub_executor,
- execution=execution,
- stub_type=start_stub_type,
- dependencies=depends_on)
-
-for task in task_graph.topological_order(reverse=True):
-operation_dependencies = _get_tasks_from_dependencies(
-execution, task_graph.get_dependencies(task), [start_task])
-
-if isinstance(task, api_task.OperationTask):
-models.Task.from_api_task(api_task=task,
-  executor=default_executor,
-  dependencies=operation_dependencies)
-
-elif isinstance(task, api_task.WorkflowTask):
-# Build the graph recursively while adding start and end markers
-construct_execution_tasks(
-

[1/2] incubator-ariatosca git commit: wip [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 25427ae59 -> b314f388b (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b314f388/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 5dd2855..de40fcf 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
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
-
-from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from networkx import topological_sort
+
+from aria.modeling import models
+from aria.orchestrator import (
+context,
+workflow_runner
+)
+from aria.orchestrator.workflows import api
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +29,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +38,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -65,11 +68,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
 # Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+execution = workflow_context.model.execution.list()[0]
+
+workflow_runner.construct_execution_tasks(execution, test_task_graph, 
base.StubTaskExecutor)
+workflow_context.execution = execution
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +87,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t.api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks).stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks).stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks).stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks).stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert

[2/2] incubator-ariatosca git commit: wip

2017-06-18 Thread mxmrlv

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/b314f388
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/b314f388
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/b314f388

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: b314f388bb1c7409e643bb45ec8a60142cb7acd6
Parents: 2149a5e
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 16:58:24 2017 +0300

--
 aria/modeling/orchestration.py  | 145 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py| 113 +++-
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/engine.py  | 120 
 .../workflows/core/events_handler.py| 138 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  63 +++--
 aria/orchestrator/workflows/executor/base.py|  36 +--
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/end2end/testenv.py|   3 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|   8 +-
 .../orchestrator/execution_plugin/test_local.py |  12 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  12 +-
 tests/orchestrator/test_workflow_runner.py  |  30 +-
 .../orchestrator/workflows/core/test_engine.py  |  24 +-
 .../orchestrator/workflows/core/test_events.py  |  22 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  63 ++---
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   8 +-
 .../test_process_executor_tracked_changes.py|   8 +-
 31 files changed, 689 insertions(+), 828 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b314f388/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..007eefa 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +256,24 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-  'relationship_fk',
-  'plugin_fk',
-  'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
+
+START_WORKFLOW = 'start_workflow'
+END_WORKFLOW = 'end_workflow'
+START_SUBWROFKLOW = 'start_subworkflow'
+END_SUBWORKFLOW = 'end_subworkflow'
+STUB = 'stub'
+CONDITIONAL = 'conditional'
+
+STUB_TYPES = (
+START_WORKFLOW,
+

[2/2] incubator-ariatosca git commit: wip

2017-06-18 Thread mxmrlv

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/25427ae5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/25427ae5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/25427ae5

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 25427ae5974392e2b579109e4a5fdac4ba6ca5e8
Parents: 2149a5e
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 16:54:18 2017 +0300

--
 aria/modeling/mixins.py |   4 +-
 aria/modeling/orchestration.py  | 145 +++---
 aria/orchestrator/context/operation.py  |   7 +
 aria/orchestrator/context/workflow.py   |  21 ++
 aria/orchestrator/workflow_runner.py| 113 +++-
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/engine.py  | 120 
 .../workflows/core/events_handler.py| 138 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  63 +++--
 aria/orchestrator/workflows/executor/base.py|  36 +--
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/__init__.py   |   2 +
 tests/end2end/testenv.py|   3 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|   8 +-
 .../orchestrator/execution_plugin/test_local.py |  12 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  12 +-
 tests/orchestrator/test_workflow_runner.py  |  30 +-
 .../orchestrator/workflows/core/test_engine.py  |  24 +-
 .../orchestrator/workflows/core/test_events.py  |  22 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  63 ++---
 .../orchestrator/workflows/executor/__init__.py |  89 +++---
 .../workflows/executor/test_executor.py |  26 +-
 .../workflows/executor/test_process_executor.py |  26 +-
 .../executor/test_process_executor_extension.py |   8 +-
 .../test_process_executor_tracked_changes.py|   8 +-
 tox.ini |   2 +-
 33 files changed, 691 insertions(+), 832 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/25427ae5/aria/modeling/mixins.py
--
diff --git a/aria/modeling/mixins.py b/aria/modeling/mixins.py
index c98a866..31675fe 100644
--- a/aria/modeling/mixins.py
+++ b/aria/modeling/mixins.py
@@ -18,14 +18,12 @@ classes:
 * ModelMixin - abstract model implementation.
 * ModelIDMixin - abstract model implementation with IDs.
 """
-
 from sqlalchemy.ext import associationproxy
 from sqlalchemy import (
 Column,
 Integer,
 Text,
-PickleType
-)
+PickleType)
 
 from ..parser.consumption import ConsumptionContext
 from ..utils import console, collections, caching, formatting

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/25427ae5/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..007eefa 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit

[1/2] incubator-ariatosca git commit: wip [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 09c114bcc -> 25427ae59 (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/25427ae5/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 5dd2855..de40fcf 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
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
-
-from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from networkx import topological_sort
+
+from aria.modeling import models
+from aria.orchestrator import (
+context,
+workflow_runner
+)
+from aria.orchestrator.workflows import api
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +29,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +38,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -65,11 +68,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
 # Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+execution = workflow_context.model.execution.list()[0]
+
+workflow_runner.construct_execution_tasks(execution, test_task_graph, 
base.StubTaskExecutor)
+workflow_context.execution = execution
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +87,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t.api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks).stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks).stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks).stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks).stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert

incubator-ariatosca git commit: added storage cleanup, retruned the pluginmanager-storage link

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 8bd8a2a4c -> 09c114bcc


added storage cleanup, retruned the pluginmanager-storage link


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/09c114bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/09c114bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/09c114bc

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 09c114bcc92ef21dc9b5759cbc310450a6d8d113
Parents: 8bd8a2a
Author: max-orlov 
Authored: Sun Jun 18 16:26:51 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 16:26:51 2017 +0300

--
 tests/__init__.py|  2 ++
 .../orchestrator/workflows/executor/__init__.py  |  1 -
 .../workflows/executor/test_executor.py  |  8 
 .../workflows/executor/test_process_executor.py  | 19 +--
 tox.ini  |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/09c114bc/tests/__init__.py
--
diff --git a/tests/__init__.py b/tests/__init__.py
index d2858d2..ace30c8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,4 +15,6 @@
 
 import os
 
+from . import storage, mock
+
 ROOT_DIR = os.path.dirname(os.path.dirname(__file__))

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/09c114bc/tests/orchestrator/workflows/executor/__init__.py
--
diff --git a/tests/orchestrator/workflows/executor/__init__.py 
b/tests/orchestrator/workflows/executor/__init__.py
index 42e81d4..97b24f3 100644
--- a/tests/orchestrator/workflows/executor/__init__.py
+++ b/tests/orchestrator/workflows/executor/__init__.py
@@ -18,7 +18,6 @@ from contextlib import contextmanager
 
 import aria
 from aria.modeling import models
-from aria.orchestrator.context.operation import NodeOperationContext
 
 
 class MockContext(object):

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/09c114bc/tests/orchestrator/workflows/executor/test_executor.py
--
diff --git a/tests/orchestrator/workflows/executor/test_executor.py 
b/tests/orchestrator/workflows/executor/test_executor.py
index d9b1898..32a68e0 100644
--- a/tests/orchestrator/workflows/executor/test_executor.py
+++ b/tests/orchestrator/workflows/executor/test_executor.py
@@ -101,10 +101,10 @@ class MockException(Exception):
 
 @pytest.fixture
 def storage(tmpdir):
-return aria.application_model_storage(
-aria.storage.sql_mapi.SQLAlchemyModelAPI,
-initiator_kwargs=dict(base_dir=str(tmpdir))
-)
+_storage = 
aria.application_model_storage(aria.storage.sql_mapi.SQLAlchemyModelAPI,
+  
initiator_kwargs=dict(base_dir=str(tmpdir)))
+yield _storage
+tests.storage.release_sqlite_storage(_storage)
 
 
 @pytest.fixture(params=[

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/09c114bc/tests/orchestrator/workflows/executor/test_process_executor.py
--
diff --git a/tests/orchestrator/workflows/executor/test_process_executor.py 
b/tests/orchestrator/workflows/executor/test_process_executor.py
index 57859ef..1da0601 100644
--- a/tests/orchestrator/workflows/executor/test_process_executor.py
+++ b/tests/orchestrator/workflows/executor/test_process_executor.py
@@ -28,16 +28,15 @@ import tests.resources
 from tests.fixtures import (  # pylint: disable=unused-import
 plugins_dir,
 plugin_manager,
-fs_model as model
 )
 from . import MockTask, MockContext
 
 
 class TestProcessExecutor(object):
 
-def test_plugin_execution(self, executor, mock_plugin, storage):
+def test_plugin_execution(self, executor, mock_plugin, model):
 ctx = MockContext(
-storage,
+model,
 task_kwargs=dict(function='mock_plugin1.operation', 
plugin_fk=mock_plugin.id)
 )
 
@@ -66,10 +65,10 @@ class TestProcessExecutor(object):
 events.on_success_task_signal.disconnect(handler)
 events.on_failure_task_signal.disconnect(handler)
 
-def test_closed(self, executor, storage):
+def test_closed(self, executor, model):
 executor.close()
 with pytest.raises(RuntimeError) as exc_info:
-executor.execute(MockContext(storage, 
task_kwargs=dict(function='some.function')))
+executor.execute(MockContext(model, 
task_kwargs=dict(function='some.function')))

incubator-ariatosca git commit: removed package

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 566911aed -> 8bd8a2a4c


removed package


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8bd8a2a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8bd8a2a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8bd8a2a4

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 8bd8a2a4c055b738ec742b91b49fd451afe0f217
Parents: 566911a
Author: max-orlov 
Authored: Sun Jun 18 16:07:16 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 16:07:16 2017 +0300

--
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8bd8a2a4/tox.ini
--
diff --git a/tox.ini b/tox.ini
index d118c52..5830e8a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,10 @@ basepython =
   pylint_tests: python2.7
 
 [testenv:py27]
-commands=pytest tests --ignore=tests/end2end --cov-report term-missing --cov 
aria
+commands=pytest tests --ignore=tests/end2end 
--ignore=/home/maxim-pcu/dev/repos/incubator-ariatosca/tests/orchestrator/workflows/executor
 --cov-report term-missing --cov aria
 
 [testenv:py26]  
-commands=pytest tests --ignore=tests/end2end --cov-report term-missing --cov 
aria
+commands=pytest tests --ignore=tests/end2end 
--ignore=/home/maxim-pcu/dev/repos/incubator-ariatosca/tests/orchestrator/workflows/executor
 --cov-report term-missing --cov aria
 
 [testenv:py27e2e]
 commands=pytest tests/end2end --cov-report term-missing --cov aria

incubator-ariatosca git commit: reverted test changes [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 094d20dbe -> 566911aed (forced update)


reverted test changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/566911ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/566911ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/566911ae

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 566911aed2cb4611e34fe90b9de3d9ed21d73687
Parents: e5e6b60
Author: max-orlov 
Authored: Sun Jun 18 14:12:40 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 15:23:53 2017 +0300

--
 .../orchestrator/workflows/executor/__init__.py | 95 
 .../workflows/executor/test_executor.py | 83 -
 .../workflows/executor/test_process_executor.py | 58 
 tests/requirements.txt  |  1 -
 tox.ini | 12 +--
 5 files changed, 116 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/566911ae/tests/orchestrator/workflows/executor/__init__.py
--
diff --git a/tests/orchestrator/workflows/executor/__init__.py 
b/tests/orchestrator/workflows/executor/__init__.py
index 4bc5c54..42e81d4 100644
--- a/tests/orchestrator/workflows/executor/__init__.py
+++ b/tests/orchestrator/workflows/executor/__init__.py
@@ -13,61 +13,80 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+import uuid
+from contextlib import contextmanager
 
 import aria
+from aria.modeling import models
 from aria.orchestrator.context.operation import NodeOperationContext
 
 
 class MockContext(object):
 
-def __init__(self, storage, **kwargs):
+def __init__(self, storage, task_kwargs=None):
 self.logger = logging.getLogger('mock_logger')
-self.model = storage
-task = storage.task.model_cls(**kwargs)
-self.model.task.put(task)
-self._task_id = task.id
+self._task_kwargs = task_kwargs or {}
+self._storage = storage
+self.task = MockTask(storage, **task_kwargs)
 self.states = []
 self.exception = None
 
 @property
-def task(self):
-return self.model.task.get(self._task_id)
-
-@property
 def serialization_dict(self):
-if self.model:
-context = self.model.serialization_dict
-context['task_id'] = self.task_id
-return {'context': context, 'context_cls': self.__class__}
-else:
-return {'context_cls': self.__class__, 'context': {'task': 
self.task_id}}
+return {
+'context_cls': self.__class__,
+'context': {
+'storage_kwargs': self._storage.serialization_dict,
+'task_kwargs': self._task_kwargs
+}
+}
 
 def __getattr__(self, item):
 return None
 
-@classmethod
-def instantiate_from_dict(cls, task_id, **kwargs):
-if kwargs:
-return cls(task_id=task_id, 
storage=aria.application_model_storage(**kwargs))
-else:
-return cls(task=task_id, storage=None)
-
-@staticmethod
-def close():
+def close(self):
 pass
 
+@classmethod
+def instantiate_from_dict(cls, storage_kwargs=None, task_kwargs=None):
+return cls(storage=aria.application_model_storage(**(storage_kwargs or 
{})),
+   task_kwargs=(task_kwargs or {}))
+
+@property
+@contextmanager
+def track_changes(self):
+yield
+
+
+class MockActor(object):
+def __init__(self):
+self.name = 'actor_name'
 
-def put_to_storage_and_get_ctx(ctx, task):
-ctx.model.task.put(task)
-op_ctx = NodeOperationContext(
-model_storage=ctx.model,
-resource_storage=ctx.resource,
-workdir=ctx._workdir,
-task_id=task.id,
-actor_id=task.actor.id if task.actor else None,
-service_id=task.execution.service.id,
-execution_id=task.execution.id,
-name=task.name
-)
-op_ctx.states = []
-return op_ctx
+
+class MockTask(object):
+
+INFINITE_RETRIES = models.Task.INFINITE_RETRIES
+
+def __init__(self, model, function, arguments=None, plugin_fk=None):
+self.function = self.name = function
+self.plugin_fk = plugin_fk
+self.arguments = arguments or {}
+self.states = []
+self.exception = None
+self.id = str(uuid.uuid4())
+self.logger = logging.getLogger()
+self.attempts_count = 1
+self.max_attempts = 1
+

incubator-ariatosca git commit: reverted test changes

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks e5e6b605a -> 094d20dbe


reverted test changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/094d20db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/094d20db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/094d20db

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 094d20dbe9bfff984fe8990d1b6d1f6fc0b6f18b
Parents: e5e6b60
Author: max-orlov 
Authored: Sun Jun 18 14:12:40 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 14:12:40 2017 +0300

--
 .../orchestrator/workflows/executor/__init__.py | 95 
 .../workflows/executor/test_executor.py | 83 -
 .../workflows/executor/test_process_executor.py | 58 
 tests/requirements.txt  |  1 -
 tox.ini | 12 +--
 5 files changed, 116 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/094d20db/tests/orchestrator/workflows/executor/__init__.py
--
diff --git a/tests/orchestrator/workflows/executor/__init__.py 
b/tests/orchestrator/workflows/executor/__init__.py
index 4bc5c54..42e81d4 100644
--- a/tests/orchestrator/workflows/executor/__init__.py
+++ b/tests/orchestrator/workflows/executor/__init__.py
@@ -13,61 +13,80 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+import uuid
+from contextlib import contextmanager
 
 import aria
+from aria.modeling import models
 from aria.orchestrator.context.operation import NodeOperationContext
 
 
 class MockContext(object):
 
-def __init__(self, storage, **kwargs):
+def __init__(self, storage, task_kwargs=None):
 self.logger = logging.getLogger('mock_logger')
-self.model = storage
-task = storage.task.model_cls(**kwargs)
-self.model.task.put(task)
-self._task_id = task.id
+self._task_kwargs = task_kwargs or {}
+self._storage = storage
+self.task = MockTask(storage, **task_kwargs)
 self.states = []
 self.exception = None
 
 @property
-def task(self):
-return self.model.task.get(self._task_id)
-
-@property
 def serialization_dict(self):
-if self.model:
-context = self.model.serialization_dict
-context['task_id'] = self.task_id
-return {'context': context, 'context_cls': self.__class__}
-else:
-return {'context_cls': self.__class__, 'context': {'task': 
self.task_id}}
+return {
+'context_cls': self.__class__,
+'context': {
+'storage_kwargs': self._storage.serialization_dict,
+'task_kwargs': self._task_kwargs
+}
+}
 
 def __getattr__(self, item):
 return None
 
-@classmethod
-def instantiate_from_dict(cls, task_id, **kwargs):
-if kwargs:
-return cls(task_id=task_id, 
storage=aria.application_model_storage(**kwargs))
-else:
-return cls(task=task_id, storage=None)
-
-@staticmethod
-def close():
+def close(self):
 pass
 
+@classmethod
+def instantiate_from_dict(cls, storage_kwargs=None, task_kwargs=None):
+return cls(storage=aria.application_model_storage(**(storage_kwargs or 
{})),
+   task_kwargs=(task_kwargs or {}))
+
+@property
+@contextmanager
+def track_changes(self):
+yield
+
+
+class MockActor(object):
+def __init__(self):
+self.name = 'actor_name'
 
-def put_to_storage_and_get_ctx(ctx, task):
-ctx.model.task.put(task)
-op_ctx = NodeOperationContext(
-model_storage=ctx.model,
-resource_storage=ctx.resource,
-workdir=ctx._workdir,
-task_id=task.id,
-actor_id=task.actor.id if task.actor else None,
-service_id=task.execution.service.id,
-execution_id=task.execution.id,
-name=task.name
-)
-op_ctx.states = []
-return op_ctx
+
+class MockTask(object):
+
+INFINITE_RETRIES = models.Task.INFINITE_RETRIES
+
+def __init__(self, model, function, arguments=None, plugin_fk=None):
+self.function = self.name = function
+self.plugin_fk = plugin_fk
+self.arguments = arguments or {}
+self.states = []
+self.exception = None
+self.id = str(uuid.uuid4())
+self.logger = logging.getLogger()
+self.attempts_count = 1
+self.max_attempts = 1
+self.ignore_failure =

incubator-ariatosca git commit: testing package only

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks b1a9c311a -> e5e6b605a


testing package only


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/e5e6b605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e5e6b605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e5e6b605

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: e5e6b605adad799fb10c389dfc601eb5aa89b915
Parents: b1a9c31
Author: max-orlov 
Authored: Sun Jun 18 13:03:23 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 13:03:23 2017 +0300

--
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e5e6b605/tox.ini
--
diff --git a/tox.ini b/tox.ini
index e58ba02..d933148 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,10 @@ basepython =
   pylint_tests: python2.7
 
 [testenv:py27]
-commands=pytest tests -n 4 --ignore=tests/end2end 
--ignore=tests/orchestrator/workflows/executor --cov-report term-missing --cov 
aria
+commands=pytest tests/orchestrator/workflows/executor -n 4 
--ignore=--ignore=tests/end2end
 
 [testenv:py26]
-commands=pytest tests -n 4 --ignore=tests/end2end 
--ignore=tests/orchestrator/workflows/executor --cov-report term-missing --cov 
aria
+commands=pytest tests/orchestrator/workflows/executor -n 4 
--ignore=tests/end2end
 
 [testenv:py27e2e]
 commands=pytest tests/end2end -n 4 --cov-report term-missing --cov aria

incubator-ariatosca git commit: removed packge from testing

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 039a403d2 -> b1a9c311a


removed packge from testing


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/b1a9c311
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/b1a9c311
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/b1a9c311

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: b1a9c311a0dc9411f0d261855d2600b61b0b30c1
Parents: 039a403
Author: max-orlov 
Authored: Sun Jun 18 12:26:04 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 12:26:04 2017 +0300

--
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b1a9c311/tox.ini
--
diff --git a/tox.ini b/tox.ini
index 6a99294..e58ba02 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,10 @@ basepython =
   pylint_tests: python2.7
 
 [testenv:py27]
-commands=pytest tests -n 4 --ignore=tests/end2end --cov-report term-missing 
--cov aria
+commands=pytest tests -n 4 --ignore=tests/end2end 
--ignore=tests/orchestrator/workflows/executor --cov-report term-missing --cov 
aria
 
 [testenv:py26]
-commands=pytest tests -n 4 --ignore=tests/end2end --cov-report term-missing 
--cov aria
+commands=pytest tests -n 4 --ignore=tests/end2end 
--ignore=tests/orchestrator/workflows/executor --cov-report term-missing --cov 
aria
 
 [testenv:py27e2e]
 commands=pytest tests/end2end -n 4 --cov-report term-missing --cov aria
@@ -44,7 +44,7 @@ commands=pytest tests/end2end -n 4 --cov-report term-missing 
--cov aria
 commands=pytest tests/end2end -n 4 --cov-report term-missing --cov aria
 
 [testenv:pywin]
-commands=pytest tests --ignore=tests/end2end --cov-report term-missing --cov 
aria
+commands=pytest tests -n 4 --ignore=tests/end2end --cov-report term-missing 
--cov aria
 
 [testenv:pylint_code]
 commands=pylint --rcfile=aria/.pylintrc --disable=fixme,missing-docstring aria 
extensions/aria_extension_tosca/

incubator-ariatosca git commit: added parallel execution

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 70cfab13c -> 039a403d2


added parallel execution


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/039a403d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/039a403d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/039a403d

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 039a403d2575340d3e7e67f7218a89f96d9ddb74
Parents: 70cfab1
Author: max-orlov 
Authored: Sun Jun 18 12:10:08 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 12:10:08 2017 +0300

--
 tests/requirements.txt | 1 +
 tox.ini| 8 
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/039a403d/tests/requirements.txt
--
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 71a227a..6681ef8 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -18,3 +18,4 @@ pylint==1.6.4
 pytest==3.0.2
 pytest-cov==2.3.1
 pytest-mock==1.2
+pytest-xdist

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/039a403d/tox.ini
--
diff --git a/tox.ini b/tox.ini
index 58e62c3..6a99294 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,16 +32,16 @@ basepython =
   pylint_tests: python2.7
 
 [testenv:py27]
-commands=pytest tests --ignore=tests/end2end --cov-report term-missing --cov 
aria
+commands=pytest tests -n 4 --ignore=tests/end2end --cov-report term-missing 
--cov aria
 
 [testenv:py26]
-commands=pytest tests --ignore=tests/end2end --cov-report term-missing --cov 
aria
+commands=pytest tests -n 4 --ignore=tests/end2end --cov-report term-missing 
--cov aria
 
 [testenv:py27e2e]
-commands=pytest tests/end2end --cov-report term-missing --cov aria
+commands=pytest tests/end2end -n 4 --cov-report term-missing --cov aria
 
 [testenv:py26e2e]
-commands=pytest tests/end2end --cov-report term-missing --cov aria
+commands=pytest tests/end2end -n 4 --cov-report term-missing --cov aria
 
 [testenv:pywin]
 commands=pytest tests --ignore=tests/end2end --cov-report term-missing --cov 
aria

incubator-ariatosca git commit: removed a test [Forced Update!]

2017-06-18 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 85e44e912 -> 70cfab13c (forced update)


removed a test


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/70cfab13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/70cfab13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/70cfab13

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 70cfab13c97760f6d9b72cb7bf51ebae222941a3
Parents: aa6f801
Author: max-orlov 
Authored: Thu Jun 15 22:04:08 2017 +0300
Committer: max-orlov 
Committed: Sun Jun 18 11:55:47 2017 +0300

--
 tests/orchestrator/workflows/executor/test_process_executor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/70cfab13/tests/orchestrator/workflows/executor/test_process_executor.py
--
diff --git a/tests/orchestrator/workflows/executor/test_process_executor.py 
b/tests/orchestrator/workflows/executor/test_process_executor.py
index cde5402..a4543cd 100644
--- a/tests/orchestrator/workflows/executor/test_process_executor.py
+++ b/tests/orchestrator/workflows/executor/test_process_executor.py
@@ -114,4 +114,4 @@ def ctx(tmpdir):
 
 @pytest.fixture
 def model(ctx):
-return ctx.model
\ No newline at end of file
+return ctx.model

incubator-ariatosca git commit: removed a test [Forced Update!]

2017-06-16 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 9bad514e6 -> 85e44e912 (forced update)


removed a test


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/85e44e91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/85e44e91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/85e44e91

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 85e44e9127178643bebe9b0cba201f7f6d3af2d7
Parents: aa6f801
Author: max-orlov 
Authored: Thu Jun 15 22:04:08 2017 +0300
Committer: max-orlov 
Committed: Fri Jun 16 12:21:20 2017 +0300

--
 tests/orchestrator/workflows/executor/test_process_executor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/85e44e91/tests/orchestrator/workflows/executor/test_process_executor.py
--
diff --git a/tests/orchestrator/workflows/executor/test_process_executor.py 
b/tests/orchestrator/workflows/executor/test_process_executor.py
index cde5402..595c6f7 100644
--- a/tests/orchestrator/workflows/executor/test_process_executor.py
+++ b/tests/orchestrator/workflows/executor/test_process_executor.py
@@ -37,6 +37,7 @@ from tests.orchestrator.workflows.executor import 
put_to_storage_and_get_ctx
 
 class TestProcessExecutor(object):
 
+@pytest.mark.skip("This test currently might freeze the entire test suite")
 def test_plugin_execution(self, executor, mock_plugin, ctx):
 node = next(ctx.nodes)
 task_ctx = put_to_storage_and_get_ctx(
@@ -114,4 +115,4 @@ def ctx(tmpdir):
 
 @pytest.fixture
 def model(ctx):
-return ctx.model
\ No newline at end of file
+return ctx.model

incubator-ariatosca git commit: removed a test

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks aa6f801de -> 9bad514e6


removed a test


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9bad514e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9bad514e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9bad514e

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 9bad514e62edaa289f1fd9f794a3efb6bab20c93
Parents: aa6f801
Author: max-orlov 
Authored: Thu Jun 15 22:04:08 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 22:04:08 2017 +0300

--
 tests/orchestrator/workflows/executor/test_process_executor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9bad514e/tests/orchestrator/workflows/executor/test_process_executor.py
--
diff --git a/tests/orchestrator/workflows/executor/test_process_executor.py 
b/tests/orchestrator/workflows/executor/test_process_executor.py
index cde5402..99e0e91 100644
--- a/tests/orchestrator/workflows/executor/test_process_executor.py
+++ b/tests/orchestrator/workflows/executor/test_process_executor.py
@@ -74,6 +74,7 @@ class TestProcessExecutor(object):
 events.on_success_task_signal.disconnect(handler)
 events.on_failure_task_signal.disconnect(handler)
 
+@pytest.mark.skip("This test currently might freeze the entire test")
 def test_closed(self, ctx, executor):
 executor.close()
 node = next(ctx.nodes)
@@ -114,4 +115,4 @@ def ctx(tmpdir):
 
 @pytest.fixture
 def model(ctx):
-return ctx.model
\ No newline at end of file
+return ctx.model

incubator-ariatosca git commit: optimization - try1 [Forced Update!]

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 15a1f66f9 -> f198fc05e (forced update)


optimization - try1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f198fc05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f198fc05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f198fc05

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: f198fc05e29aacc4c7d822be4a63e68233375df7
Parents: d517b82
Author: max-orlov 
Authored: Thu Jun 15 18:44:51 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 19:08:08 2017 +0300

--
 aria/orchestrator/workflows/core/engine.py | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f198fc05/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 48fb60a..e547aa1 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -38,6 +38,7 @@ class Engine(logger.LoggerMixin):
 def __init__(self, executor, **kwargs):
 super(Engine, self).__init__(**kwargs)
 self._executors = {executor.__class__: executor}
+self._executing_tasks = []
 
 def execute(self, ctx):
 """
@@ -88,7 +89,7 @@ class Engine(logger.LoggerMixin):
 )
 
 def _ended_tasks(self, ctx):
-for task in self._tasks_iter(ctx):
+for task in self._executing_tasks:
 if task.has_ended() and task in ctx._graph:
 yield task
 
@@ -122,12 +123,14 @@ class Engine(logger.LoggerMixin):
 name=task.name
 )
 
+self._executing_tasks.append(task)
+
 if not task.stub_type:
 events.sent_task_signal.send(op_ctx)
 executor.execute(op_ctx)
 
-@staticmethod
-def _handle_ended_tasks(ctx, task):
+def _handle_ended_tasks(self, ctx, task):
+self._executing_tasks.remove(task)
 if task.status == models.Task.FAILED and not task.ignore_failure:
 raise exceptions.ExecutorException('Workflow failed')
 else:

incubator-ariatosca git commit: optimization - try1

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks d517b820e -> 15a1f66f9


optimization - try1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/15a1f66f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/15a1f66f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/15a1f66f

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 15a1f66f9ca8c51746a92cea59cf14b3c043b2fd
Parents: d517b82
Author: max-orlov 
Authored: Thu Jun 15 18:44:51 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 18:44:51 2017 +0300

--
 aria/orchestrator/workflows/core/engine.py  |   9 +-
 .../workflows/core/events_handler.py| 129 +--
 aria/orchestrator/workflows/executor/base.py|   9 +-
 3 files changed, 72 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/15a1f66f/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 48fb60a..e547aa1 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -38,6 +38,7 @@ class Engine(logger.LoggerMixin):
 def __init__(self, executor, **kwargs):
 super(Engine, self).__init__(**kwargs)
 self._executors = {executor.__class__: executor}
+self._executing_tasks = []
 
 def execute(self, ctx):
 """
@@ -88,7 +89,7 @@ class Engine(logger.LoggerMixin):
 )
 
 def _ended_tasks(self, ctx):
-for task in self._tasks_iter(ctx):
+for task in self._executing_tasks:
 if task.has_ended() and task in ctx._graph:
 yield task
 
@@ -122,12 +123,14 @@ class Engine(logger.LoggerMixin):
 name=task.name
 )
 
+self._executing_tasks.append(task)
+
 if not task.stub_type:
 events.sent_task_signal.send(op_ctx)
 executor.execute(op_ctx)
 
-@staticmethod
-def _handle_ended_tasks(ctx, task):
+def _handle_ended_tasks(self, ctx, task):
+self._executing_tasks.remove(task)
 if task.status == models.Task.FAILED and not task.ignore_failure:
 raise exceptions.ExecutorException('Workflow failed')
 else:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/15a1f66f/aria/orchestrator/workflows/core/events_handler.py
--
diff --git a/aria/orchestrator/workflows/core/events_handler.py 
b/aria/orchestrator/workflows/core/events_handler.py
index 3a780d5..1f03167 100644
--- a/aria/orchestrator/workflows/core/events_handler.py
+++ b/aria/orchestrator/workflows/core/events_handler.py
@@ -31,108 +31,99 @@ from ... import exceptions
 
 @events.sent_task_signal.connect
 def _task_sent(ctx, *args, **kwargs):
-with ctx.track_changes:
-ctx.task.status = ctx.task.SENT
+ctx.task.status = ctx.task.SENT
 
 
 @events.start_task_signal.connect
 def _task_started(ctx, *args, **kwargs):
-with ctx.track_changes:
-ctx.task.started_at = datetime.utcnow()
-ctx.task.status = ctx.task.STARTED
-_update_node_state_if_necessary(ctx, is_transitional=True)
+ctx.task.started_at = datetime.utcnow()
+ctx.task.status = ctx.task.STARTED
+_update_node_state_if_necessary(ctx, is_transitional=True)
 
 
 @events.on_failure_task_signal.connect
 def _task_failed(ctx, exception, *args, **kwargs):
-with ctx.track_changes:
-should_retry = all([
-not isinstance(exception, exceptions.TaskAbortException),
-ctx.task.attempts_count < ctx.task.max_attempts or
-ctx.task.max_attempts == ctx.task.INFINITE_RETRIES,
-# ignore_failure check here means the task will not be retried and 
it will be marked
-# as failed. The engine will also look at ignore_failure so it 
won't fail the
-# workflow.
-not ctx.task.ignore_failure
-])
-if should_retry:
-retry_interval = None
-if isinstance(exception, exceptions.TaskRetryException):
-retry_interval = exception.retry_interval
-if retry_interval is None:
-retry_interval = ctx.task.retry_interval
-ctx.task.status = ctx.task.RETRYING
-ctx.task.attempts_count += 1
-ctx.task.due_at = datetime.utcnow() + 
timedelta(seconds=retry_interval)
-else:
-ctx.task.ended_at = datetime.utcnow()
-ctx.task.status = ctx.task.FAILED
+should_retry =

[2/2] incubator-ariatosca git commit: wip

2017-06-15 Thread mxmrlv

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/d517b820
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/d517b820
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/d517b820

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: d517b820e45cb5d59e23045710417f2562228efa
Parents: 2149a5e
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 18:15:33 2017 +0300

--
 aria/modeling/mixins.py |   4 +-
 aria/modeling/orchestration.py  | 145 +++---
 aria/orchestrator/context/operation.py  |   8 +
 aria/orchestrator/context/workflow.py   |  22 ++
 aria/orchestrator/workflow_runner.py| 113 +++-
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/engine.py  | 115 
 .../workflows/core/events_handler.py| 138 +-
 aria/orchestrator/workflows/core/task.py| 271 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  63 +++--
 aria/orchestrator/workflows/executor/base.py|  36 +--
 aria/orchestrator/workflows/executor/dry.py |  57 ++--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/end2end/testenv.py|   3 +
 tests/orchestrator/context/__init__.py  |   9 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|   8 +-
 .../orchestrator/execution_plugin/test_local.py |  12 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  12 +-
 tests/orchestrator/test_workflow_runner.py  |  30 +-
 .../orchestrator/workflows/core/test_engine.py  |  24 +-
 .../orchestrator/workflows/core/test_events.py  |  22 +-
 tests/orchestrator/workflows/core/test_task.py  |  31 +--
 .../test_task_graph_into_execution_graph.py |  63 ++---
 .../orchestrator/workflows/executor/__init__.py |  75 +++--
 .../workflows/executor/test_executor.py |  83 +++---
 .../workflows/executor/test_process_executor.py |  51 +++-
 .../executor/test_process_executor_extension.py |   8 +-
 .../test_process_executor_tracked_changes.py|   8 +-
 31 files changed, 727 insertions(+), 857 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d517b820/aria/modeling/mixins.py
--
diff --git a/aria/modeling/mixins.py b/aria/modeling/mixins.py
index c98a866..31675fe 100644
--- a/aria/modeling/mixins.py
+++ b/aria/modeling/mixins.py
@@ -18,14 +18,12 @@ classes:
 * ModelMixin - abstract model implementation.
 * ModelIDMixin - abstract model implementation with IDs.
 """
-
 from sqlalchemy.ext import associationproxy
 from sqlalchemy import (
 Column,
 Integer,
 Text,
-PickleType
-)
+PickleType)
 
 from ..parser.consumption import ConsumptionContext
 from ..utils import console, collections, caching, formatting

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d517b820/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..007eefa 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,7 +21,6 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
 from datetime import datetime
 
 from sqlalchemy import (
@@ -34,19 +33,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +151,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +212,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status,

[1/2] incubator-ariatosca git commit: wip [Forced Update!]

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks f29148af4 -> d517b820e (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d517b820/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 5dd2855..de40fcf 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
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networkx import topological_sort, DiGraph
-
-from aria.orchestrator import context
-from aria.orchestrator.workflows import api, core
+from networkx import topological_sort
+
+from aria.modeling import models
+from aria.orchestrator import (
+context,
+workflow_runner
+)
+from aria.orchestrator.workflows import api
 from aria.orchestrator.workflows.executor import base
-
 from tests import mock
 from tests import storage
 
@@ -26,8 +29,8 @@ from tests import storage
 def test_task_graph_into_execution_graph(tmpdir):
 interface_name = 'Standard'
 operation_name = 'create'
-task_context = mock.context.simple(str(tmpdir))
-node = 
task_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
+workflow_context = mock.context.simple(str(tmpdir))
+node = 
workflow_context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 interface = mock.models.create_interface(
 node.service,
 interface_name,
@@ -35,12 +38,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 operation_kwargs=dict(function='test')
 )
 node.interfaces[interface.name] = interface
-task_context.model.node.update(node)
+workflow_context.model.node.update(node)
 
 def sub_workflow(name, **_):
 return api.task_graph.TaskGraph(name)
 
-with context.workflow.current.push(task_context):
+with context.workflow.current.push(workflow_context):
 test_task_graph = api.task.WorkflowTask(sub_workflow, 
name='test_task_graph')
 simple_before_task = api.task.OperationTask(
 node,
@@ -65,11 +68,12 @@ def test_task_graph_into_execution_graph(tmpdir):
 test_task_graph.add_dependency(simple_after_task, inner_task_graph)
 
 # Direct check
-execution_graph = DiGraph()
-core.translation.build_execution_graph(task_graph=test_task_graph,
-   execution_graph=execution_graph,
-   
default_executor=base.StubTaskExecutor())
-execution_tasks = topological_sort(execution_graph)
+execution = workflow_context.model.execution.list()[0]
+
+workflow_runner.construct_execution_tasks(execution, test_task_graph, 
base.StubTaskExecutor)
+workflow_context.execution = execution
+
+execution_tasks = topological_sort(workflow_context._graph)
 
 assert len(execution_tasks) == 7
 
@@ -83,30 +87,23 @@ def test_task_graph_into_execution_graph(tmpdir):
 '{0}-End'.format(test_task_graph.id)
 ]
 
-assert expected_tasks_names == execution_tasks
-
-assert isinstance(_get_task_by_name(execution_tasks[0], execution_graph),
-  core.task.StartWorkflowTask)
-
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[1], 
execution_graph),
-  simple_before_task)
-assert isinstance(_get_task_by_name(execution_tasks[2], execution_graph),
-  core.task.StartSubWorkflowTask)
+assert expected_tasks_names == [t.api_id for t in execution_tasks]
+assert all(isinstance(task, models.Task) for task in execution_tasks)
+execution_tasks = iter(execution_tasks)
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[3], 
execution_graph),
-  inner_task)
-assert isinstance(_get_task_by_name(execution_tasks[4], execution_graph),
-  core.task.EndSubWorkflowTask)
+assert next(execution_tasks).stub_type == models.Task.START_WORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_before_task)
+assert next(execution_tasks).stub_type == models.Task.START_SUBWROFKLOW
+_assert_execution_is_api_task(next(execution_tasks), inner_task)
+assert next(execution_tasks).stub_type == models.Task.END_SUBWORKFLOW
+_assert_execution_is_api_task(next(execution_tasks), simple_after_task)
+assert next(execution_tasks).stub_type == models.Task.END_WORKFLOW
 
-_assert_execution_is_api_task(_get_task_by_name(execution_tasks[5], 
execution_graph),
-  simple_after_task)
-assert

incubator-ariatosca git commit: tiny fix to testenv [Forced Update!]

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 23ac30197 -> f29148af4 (forced update)


tiny fix to testenv


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f29148af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f29148af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f29148af

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: f29148af40766753817d5528660c474f19484411
Parents: 7c5b9ff
Author: max-orlov 
Authored: Thu Jun 15 17:32:53 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 18:14:32 2017 +0300

--
 aria/orchestrator/context/operation.py|  2 +-
 aria/orchestrator/context/workflow.py |  4 ++--
 aria/orchestrator/workflows/core/engine.py|  8 
 .../orchestrator/workflows/core/events_handler.py | 18 +-
 aria/orchestrator/workflows/events_logging.py | 16 
 aria/orchestrator/workflows/executor/base.py  |  4 ++--
 aria/orchestrator/workflows/executor/dry.py   |  2 +-
 tests/end2end/testenv.py  |  4 +++-
 .../core/test_task_graph_into_execution_graph.py  |  2 +-
 9 files changed, 31 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f29148af/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 6071c9b..2e897b5 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -109,7 +109,7 @@ class BaseOperationContext(common.BaseContext):
 
 @property
 @contextmanager
-def track_task(self):
+def track_changes(self):
 self.model.task.update(self.task)
 yield
 self.model.task.update(self.task)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f29148af/aria/orchestrator/context/workflow.py
--
diff --git a/aria/orchestrator/context/workflow.py 
b/aria/orchestrator/context/workflow.py
index 6a7fb1b..ce7a892 100644
--- a/aria/orchestrator/context/workflow.py
+++ b/aria/orchestrator/context/workflow.py
@@ -96,7 +96,7 @@ class WorkflowContext(BaseContext):
 )
 
 @property
-def graph(self):
+def _graph(self):
 if self._execution_graph is None:
 graph = DiGraph()
 for task in self.execution.tasks:
@@ -109,7 +109,7 @@ class WorkflowContext(BaseContext):
 
 @property
 @contextmanager
-def track_execution(self):
+def track_changes(self):
 self._model.execution.update(self.execution)
 yield
 self._model.execution.update(self.execution)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f29148af/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index db5cc8e..48fb60a 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -89,16 +89,16 @@ class Engine(logger.LoggerMixin):
 
 def _ended_tasks(self, ctx):
 for task in self._tasks_iter(ctx):
-if task.has_ended() and task in ctx.graph:
+if task.has_ended() and task in ctx._graph:
 yield task
 
 @staticmethod
 def _task_has_dependencies(ctx, task):
-return len(ctx.graph.pred.get(task, [])) > 0
+return len(ctx._graph.pred.get(task, [])) > 0
 
 @staticmethod
 def _all_tasks_consumed(ctx):
-return len(ctx.graph.node) == 0
+return len(ctx._graph.node) == 0
 
 @staticmethod
 def _tasks_iter(ctx):
@@ -131,4 +131,4 @@ class Engine(logger.LoggerMixin):
 if task.status == models.Task.FAILED and not task.ignore_failure:
 raise exceptions.ExecutorException('Workflow failed')
 else:
-ctx.graph.remove_node(task)
+ctx._graph.remove_node(task)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f29148af/aria/orchestrator/workflows/core/events_handler.py
--
diff --git a/aria/orchestrator/workflows/core/events_handler.py 
b/aria/orchestrator/workflows/core/events_handler.py
index b9d467d..3a780d5 100644
--- a/aria/orchestrator/workflows/core/events_handler.py
+++ b/aria/orchestrator/workflows/core/events_handler.py
@@ -31,13 +31,13 @@ from ... import exceptions
 
 @events.sent_task_signal.connect
 def

incubator-ariatosca git commit: wip4

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 21120aa64 -> 7c5b9ff73


wip4


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/7c5b9ff7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7c5b9ff7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7c5b9ff7

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 7c5b9ff73fe438ce073e1ba481176d0b0a4d07f1
Parents: 21120aa
Author: max-orlov 
Authored: Thu Jun 15 16:42:01 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 16:42:01 2017 +0300

--
 aria/modeling/orchestration.py| 6 +-
 aria/orchestrator/context/operation.py| 3 ---
 aria/orchestrator/workflows/core/engine.py| 8 ++--
 aria/orchestrator/workflows/events_logging.py | 8 
 aria/orchestrator/workflows/executor/base.py  | 6 ++
 tests/end2end/testenv.py  | 1 +
 6 files changed, 10 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7c5b9ff7/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 11a4684..007eefa 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -259,7 +259,6 @@ class TaskBase(mixins.ModelMixin):
 __private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
   'relationship_fk', 'plugin_fk', 'execution_fk']
 
-
 START_WORKFLOW = 'start_workflow'
 END_WORKFLOW = 'end_workflow'
 START_SUBWROFKLOW = 'start_subworkflow'
@@ -408,10 +407,7 @@ class TaskBase(mixins.ModelMixin):
 return relationship.one_to_many_self(cls, 'dependency_fk')
 
 def has_ended(self):
-if self.stub_type is not None:
-return self.status == self.SUCCESS
-else:
-return self.status in (self.SUCCESS, self.FAILED)
+return self.status in (self.SUCCESS, self.FAILED)
 
 def is_waiting(self):
 if self.stub_type:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7c5b9ff7/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 7591d70..6071c9b 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -59,9 +59,6 @@ class BaseOperationContext(common.BaseContext):
 self._thread_local.task = self.model.task.get(self._task_id)
 return self._thread_local.task
 
-def update_task(self):
-self.model.task.update(self.task)
-
 @property
 def plugin_workdir(self):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7c5b9ff7/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 9ac7215..db5cc8e 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -73,7 +73,6 @@ class Engine(logger.LoggerMixin):
 will be modified to 'cancelled' directly.
 """
 events.on_cancelling_workflow_signal.send(ctx)
-ctx.execution = ctx.execution
 
 @staticmethod
 def _is_cancel(ctx):
@@ -95,8 +94,7 @@ class Engine(logger.LoggerMixin):
 
 @staticmethod
 def _task_has_dependencies(ctx, task):
-return task.dependencies and \
-   all(d in ctx.graph for d in task.dependencies)
+return len(ctx.graph.pred.get(task, [])) > 0
 
 @staticmethod
 def _all_tasks_consumed(ctx):
@@ -105,9 +103,7 @@ class Engine(logger.LoggerMixin):
 @staticmethod
 def _tasks_iter(ctx):
 for task in ctx.execution.tasks:
-if not task.has_ended():
-task = ctx.model.task.refresh(task)
-yield task
+yield ctx.model.task.refresh(task)
 
 def _handle_executable_task(self, ctx, task):
 if task._executor not in self._executors:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7c5b9ff7/aria/orchestrator/workflows/events_logging.py
--
diff --git a/aria/orchestrator/workflows/events_logging.py 
b/aria/orchestrator/workflows/events_logging.py
index e45367f..543e190 100644
--- a/aria/orchestrator/workflows/events_logging.py
+++ b/aria/orchestrator/workflows/events_logging.py
@@ -81,8 +81,8 @@ def

incubator-ariatosca git commit: wip2 [Forced Update!]

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks ecf5fc9f0 -> 4d9112085 (forced update)


wip2


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/4d911208
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4d911208
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4d911208

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 4d911208504f41e581376d0c5f770fa59571119e
Parents: 7f5c620
Author: max-orlov 
Authored: Thu Jun 15 13:49:19 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 13:58:43 2017 +0300

--
 aria/orchestrator/workflow_runner.py|  4 +-
 aria/orchestrator/workflows/core/engine.py  | 78 ++--
 tests/orchestrator/test_workflow_runner.py  | 31 
 .../orchestrator/workflows/core/test_engine.py  |  6 +-
 .../test_task_graph_into_execution_graph.py | 17 ++---
 5 files changed, 67 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4d911208/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 919da58..c4d8666 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -109,10 +109,10 @@ class WorkflowRunner(object):
 return self._model_storage.service.get(self._service_id)
 
 def execute(self):
-self._engine.execute(self._workflow_context)
+self._engine.execute(ctx=self._workflow_context)
 
 def cancel(self):
-self._engine.cancel_execution()
+self._engine.cancel_execution(ctx=self._workflow_context)
 
 def _create_execution_model(self, inputs):
 execution = models.Execution(

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4d911208/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index b9c3439..ade3661 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -38,75 +38,78 @@ class Engine(logger.LoggerMixin):
 def __init__(self, executor, **kwargs):
 super(Engine, self).__init__(**kwargs)
 self._executors = {executor.__class__: executor}
-self._workflow_context = None
 
 def execute(self, ctx):
 """
 execute the workflow
 """
-self._workflow_context = ctx
-
 try:
-events.start_workflow_signal.send(self._workflow_context)
+events.start_workflow_signal.send(ctx)
 while True:
-cancel = self._is_cancel()
+cancel = self._is_cancel(ctx)
 if cancel:
 break
-for task in self._ended_tasks():
-self._handle_ended_tasks(task)
-for task in self._executable_tasks():
-self._handle_executable_task(task)
-if self._all_tasks_consumed():
+for task in self._ended_tasks(ctx):
+self._handle_ended_tasks(ctx, task)
+for task in self._executable_tasks(ctx):
+self._handle_executable_task(ctx, task)
+if self._all_tasks_consumed(ctx):
 break
 else:
 time.sleep(0.1)
 if cancel:
-
events.on_cancelled_workflow_signal.send(self._workflow_context)
+events.on_cancelled_workflow_signal.send(ctx)
 else:
-events.on_success_workflow_signal.send(self._workflow_context)
+events.on_success_workflow_signal.send(ctx)
 except BaseException as e:
-events.on_failure_workflow_signal.send(self._workflow_context, 
exception=e)
+events.on_failure_workflow_signal.send(ctx, exception=e)
 raise
 
-def cancel_execution(self):
+@staticmethod
+def cancel_execution(ctx):
 """
 Send a cancel request to the engine. If execution already started, 
execution status
 will be modified to 'cancelling' status. If execution is in pending 
mode, execution status
 will be modified to 'cancelled' directly.
 """
-events.on_cancelling_workflow_signal.send(self._workflow_context)
-self._workflow_context.execution = self._workflow_context.execution
+events.on_cancelling_workflow_signal.send(ctx)
+ctx.execution = ctx.execution
 
-def

incubator-ariatosca git commit: wip2

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 7f5c6204f -> ecf5fc9f0


wip2


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/ecf5fc9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/ecf5fc9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/ecf5fc9f

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: ecf5fc9f0223fc96e22d216edea636874902d237
Parents: 7f5c620
Author: max-orlov 
Authored: Thu Jun 15 13:49:19 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 13:49:19 2017 +0300

--
 aria/orchestrator/workflow_runner.py|  2 +-
 aria/orchestrator/workflows/core/engine.py  | 78 ++--
 tests/orchestrator/test_workflow_runner.py  | 28 +++
 .../orchestrator/workflows/core/test_engine.py  |  6 +-
 .../test_task_graph_into_execution_graph.py | 17 ++---
 5 files changed, 65 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ecf5fc9f/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 919da58..1963087 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -109,7 +109,7 @@ class WorkflowRunner(object):
 return self._model_storage.service.get(self._service_id)
 
 def execute(self):
-self._engine.execute(self._workflow_context)
+self._engine.execute(ctx=self._workflow_context)
 
 def cancel(self):
 self._engine.cancel_execution()

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ecf5fc9f/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index b9c3439..ade3661 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -38,75 +38,78 @@ class Engine(logger.LoggerMixin):
 def __init__(self, executor, **kwargs):
 super(Engine, self).__init__(**kwargs)
 self._executors = {executor.__class__: executor}
-self._workflow_context = None
 
 def execute(self, ctx):
 """
 execute the workflow
 """
-self._workflow_context = ctx
-
 try:
-events.start_workflow_signal.send(self._workflow_context)
+events.start_workflow_signal.send(ctx)
 while True:
-cancel = self._is_cancel()
+cancel = self._is_cancel(ctx)
 if cancel:
 break
-for task in self._ended_tasks():
-self._handle_ended_tasks(task)
-for task in self._executable_tasks():
-self._handle_executable_task(task)
-if self._all_tasks_consumed():
+for task in self._ended_tasks(ctx):
+self._handle_ended_tasks(ctx, task)
+for task in self._executable_tasks(ctx):
+self._handle_executable_task(ctx, task)
+if self._all_tasks_consumed(ctx):
 break
 else:
 time.sleep(0.1)
 if cancel:
-
events.on_cancelled_workflow_signal.send(self._workflow_context)
+events.on_cancelled_workflow_signal.send(ctx)
 else:
-events.on_success_workflow_signal.send(self._workflow_context)
+events.on_success_workflow_signal.send(ctx)
 except BaseException as e:
-events.on_failure_workflow_signal.send(self._workflow_context, 
exception=e)
+events.on_failure_workflow_signal.send(ctx, exception=e)
 raise
 
-def cancel_execution(self):
+@staticmethod
+def cancel_execution(ctx):
 """
 Send a cancel request to the engine. If execution already started, 
execution status
 will be modified to 'cancelling' status. If execution is in pending 
mode, execution status
 will be modified to 'cancelled' directly.
 """
-events.on_cancelling_workflow_signal.send(self._workflow_context)
-self._workflow_context.execution = self._workflow_context.execution
+events.on_cancelling_workflow_signal.send(ctx)
+ctx.execution = ctx.execution
 
-def _is_cancel(self):
-execution = 
self._workflow_context.model.execution.update(self._workflow_context.execution)
+@staticmethod
+def _is_cancel(ctx):
+

incubator-ariatosca git commit: wip

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks e758e86ad -> 7f5c6204f


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/7f5c6204
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7f5c6204
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7f5c6204

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 7f5c6204fbbeda08520ee0741b7eb485878c6129
Parents: e758e86
Author: max-orlov 
Authored: Thu Jun 15 13:22:48 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 13:22:48 2017 +0300

--
 aria/orchestrator/context/workflow.py   | 15 
 aria/orchestrator/workflow_runner.py| 23 --
 aria/orchestrator/workflows/core/engine.py  | 25 
 aria/orchestrator/workflows/executor/base.py|  3 ++-
 tests/orchestrator/context/__init__.py  |  5 ++--
 tests/orchestrator/context/test_serialize.py|  5 ++--
 .../orchestrator/execution_plugin/test_local.py |  5 ++--
 tests/orchestrator/execution_plugin/test_ssh.py |  5 ++--
 tests/orchestrator/test_workflow_runner.py  | 13 ++
 .../orchestrator/workflows/core/test_engine.py  |  8 +++
 .../orchestrator/workflows/core/test_events.py  | 11 -
 .../executor/test_process_executor_extension.py |  5 ++--
 .../test_process_executor_tracked_changes.py|  5 ++--
 13 files changed, 65 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7f5c6204/aria/orchestrator/context/workflow.py
--
diff --git a/aria/orchestrator/context/workflow.py 
b/aria/orchestrator/context/workflow.py
index 920b237..5404df5 100644
--- a/aria/orchestrator/context/workflow.py
+++ b/aria/orchestrator/context/workflow.py
@@ -20,6 +20,8 @@ Workflow and operation contexts
 import threading
 from contextlib import contextmanager
 
+from networkx import DiGraph
+
 from .exceptions import ContextException
 from .common import BaseContext
 
@@ -41,6 +43,7 @@ class WorkflowContext(BaseContext):
 self._task_max_attempts = task_max_attempts
 self._task_retry_interval = task_retry_interval
 self._task_ignore_failure = task_ignore_failure
+self._execution_graph = None
 self._register_logger()
 
 def __repr__(self):
@@ -92,6 +95,18 @@ class WorkflowContext(BaseContext):
 }
 )
 
+@property
+def graph(self):
+if self._execution_graph is None:
+graph = DiGraph()
+for task in self.execution.tasks:
+for dependency in task.dependencies:
+graph.add_edge(dependency, task)
+
+self._execution_graph = graph
+
+return self._execution_graph
+
 
 class _CurrentContext(threading.local):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7f5c6204/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 422066c..919da58 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -21,8 +21,6 @@ import os
 import sys
 from datetime import datetime
 
-from networkx import DiGraph
-
 from . import exceptions
 from .context.workflow import WorkflowContext
 from .workflows import builtin
@@ -74,7 +72,7 @@ class WorkflowRunner(object):
 execution = self._create_execution_model(inputs)
 self._execution_id = execution.id
 
-workflow_context = WorkflowContext(
+self._workflow_context = WorkflowContext(
 name=self.__class__.__name__,
 model_storage=self._model_storage,
 resource_storage=resource_storage,
@@ -90,15 +88,13 @@ class WorkflowRunner(object):
 # transforming the execution inputs to dict, to pass them to the 
workflow function
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 
-self._tasks_graph = workflow_fn(ctx=workflow_context, 
**execution_inputs_dict)
+self._tasks_graph = workflow_fn(ctx=self._workflow_context, 
**execution_inputs_dict)
 construct_execution_tasks(self.execution, self._tasks_graph, 
executor.__class__)
 
 # Update the state
 self._model_storage.execution.update(execution)
 
-self._engine = Engine(executor=executor,
-  workflow_context=workflow_context,
-  
execution_graph=get_execution_graph(self.execution))
+self._engine = Engine(executor=executor)

incubator-ariatosca git commit: shited stuff around [Forced Update!]

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 5fce85b12 -> e758e86ad (forced update)


shited stuff around


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/e758e86a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e758e86a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e758e86a

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: e758e86ade7741b654740b073938d30cf063985e
Parents: d1cfd26
Author: max-orlov 
Authored: Thu Jun 15 11:03:15 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 11:09:57 2017 +0300

--
 aria/modeling/orchestration.py |  3 +-
 aria/orchestrator/context/operation.py |  8 
 aria/orchestrator/workflow_runner.py   | 28 +--
 aria/orchestrator/workflows/executor/base.py   | 48 +--
 aria/orchestrator/workflows/executor/dry.py| 51 ++---
 tests/orchestrator/workflows/core/test_task.py |  5 +-
 6 files changed, 72 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e758e86a/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 6f69483..11a4684 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -452,7 +452,8 @@ class TaskBase(mixins.ModelMixin):
 'api_id': api_task.id,
 '_context_cls': context_cls,
 '_executor': executor,
-})
+}
+)
 
 instantiation_kwargs.update(**kwargs)
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e758e86a/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 7477912..7591d70 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -18,6 +18,7 @@ Workflow and operation contexts
 """
 
 import threading
+from contextlib import contextmanager
 
 import aria
 from aria.utils import file
@@ -109,6 +110,13 @@ class BaseOperationContext(common.BaseContext):
 self.model.log._session.remove()
 self.model.log._engine.dispose()
 
+@property
+@contextmanager
+def track_task(self):
+self.model.task.update(self.task)
+yield
+self.model.task.update(self.task)
+
 
 class NodeOperationContext(BaseOperationContext):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e758e86a/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index f0a48ad..422066c 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -29,7 +29,7 @@ from .workflows import builtin
 from .workflows.core.engine import Engine
 from .workflows.executor.process import ProcessExecutor
 from .workflows.executor.base import StubTaskExecutor
-from .workflows.api import task
+from .workflows.api import task as api_task
 from ..modeling import models
 from ..modeling import utils as modeling_utils
 from ..utils.imports import import_fullname
@@ -180,9 +180,9 @@ class WorkflowRunner(object):
 
 def get_execution_graph(execution):
 graph = DiGraph()
-for t in execution.tasks:
-for dependency in t.dependencies:
-graph.add_edge(dependency, t)
+for task in execution.tasks:
+for dependency in task.dependencies:
+graph.add_edge(dependency, task)
 
 return graph
 
@@ -210,28 +210,28 @@ def construct_execution_tasks(execution,
  stub_type=start_stub_type,
  dependencies=depends_on)
 
-for api_task in task_graph.topological_order(reverse=True):
+for task in task_graph.topological_order(reverse=True):
 operation_dependencies = _get_tasks_from_dependencies(
-execution, task_graph.get_dependencies(api_task), [start_task])
+execution, task_graph.get_dependencies(task), [start_task])
 
-if isinstance(api_task, task.OperationTask):
-models.Task.from_api_task(api_task=api_task,
+if isinstance(task, api_task.OperationTask):
+models.Task.from_api_task(api_task=task,
   executor=default_executor,
   dependencies=operation_dependencies)
 
-elif isinstance(api_task,

incubator-ariatosca git commit: shited stuff around

2017-06-15 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks d1cfd261d -> 5fce85b12


shited stuff around


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/5fce85b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/5fce85b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/5fce85b1

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 5fce85b12ddd7ac0feebecbb456e7240ff2512ca
Parents: d1cfd26
Author: max-orlov 
Authored: Thu Jun 15 11:03:15 2017 +0300
Committer: max-orlov 
Committed: Thu Jun 15 11:03:15 2017 +0300

--
 aria/modeling/orchestration.py |  3 +-
 aria/orchestrator/context/operation.py |  8 
 aria/orchestrator/workflow_runner.py   | 24 +-
 aria/orchestrator/workflows/executor/base.py   | 48 +--
 aria/orchestrator/workflows/executor/dry.py| 51 ++---
 tests/orchestrator/workflows/core/test_task.py |  5 +-
 6 files changed, 70 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5fce85b1/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 6f69483..11a4684 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -452,7 +452,8 @@ class TaskBase(mixins.ModelMixin):
 'api_id': api_task.id,
 '_context_cls': context_cls,
 '_executor': executor,
-})
+}
+)
 
 instantiation_kwargs.update(**kwargs)
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5fce85b1/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 7477912..7591d70 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -18,6 +18,7 @@ Workflow and operation contexts
 """
 
 import threading
+from contextlib import contextmanager
 
 import aria
 from aria.utils import file
@@ -109,6 +110,13 @@ class BaseOperationContext(common.BaseContext):
 self.model.log._session.remove()
 self.model.log._engine.dispose()
 
+@property
+@contextmanager
+def track_task(self):
+self.model.task.update(self.task)
+yield
+self.model.task.update(self.task)
+
 
 class NodeOperationContext(BaseOperationContext):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5fce85b1/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index f0a48ad..b24e474 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -29,7 +29,7 @@ from .workflows import builtin
 from .workflows.core.engine import Engine
 from .workflows.executor.process import ProcessExecutor
 from .workflows.executor.base import StubTaskExecutor
-from .workflows.api import task
+from .workflows.api import task as api_task
 from ..modeling import models
 from ..modeling import utils as modeling_utils
 from ..utils.imports import import_fullname
@@ -180,9 +180,9 @@ class WorkflowRunner(object):
 
 def get_execution_graph(execution):
 graph = DiGraph()
-for t in execution.tasks:
-for dependency in t.dependencies:
-graph.add_edge(dependency, t)
+for task in execution.tasks:
+for dependency in task.dependencies:
+graph.add_edge(dependency, task)
 
 return graph
 
@@ -210,16 +210,16 @@ def construct_execution_tasks(execution,
  stub_type=start_stub_type,
  dependencies=depends_on)
 
-for api_task in task_graph.topological_order(reverse=True):
+for task in task_graph.topological_order(reverse=True):
 operation_dependencies = _get_tasks_from_dependencies(
-execution, task_graph.get_dependencies(api_task), [start_task])
+execution, task_graph.get_dependencies(task), [start_task])
 
-if isinstance(api_task, task.OperationTask):
-models.Task.from_api_task(api_task=api_task,
+if isinstance(task, api_task.OperationTask):
+models.Task.from_api_task(api_task=task,
   executor=default_executor,
   dependencies=operation_dependencies)
 
-elif isinstance(api_task, task.WorkflowTask):
+

incubator-ariatosca git commit: task update wrapper [Forced Update!]

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 8b6d7068d -> d1cfd261d (forced update)


task update wrapper


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/d1cfd261
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/d1cfd261
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/d1cfd261

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: d1cfd261d73cbc448615f1ad3402a9b8dbd1
Parents: 600e54e
Author: max-orlov 
Authored: Wed Jun 14 19:08:14 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 23:48:12 2017 +0300

--
 aria/orchestrator/workflows/executor/base.py | 26 ++---
 aria/orchestrator/workflows/executor/dry.py  | 34 +++
 2 files changed, 33 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d1cfd261/aria/orchestrator/workflows/executor/base.py
--
diff --git a/aria/orchestrator/workflows/executor/base.py 
b/aria/orchestrator/workflows/executor/base.py
index 955b536..a727e5c 100644
--- a/aria/orchestrator/workflows/executor/base.py
+++ b/aria/orchestrator/workflows/executor/base.py
@@ -21,6 +21,15 @@ from aria import logger
 from aria.orchestrator import events
 
 
+def update_ctx(func):
+def _wrapper(self, ctx, *args, **kwargs):
+ctx.update_task()
+func(self, ctx, *args, **kwargs)
+ctx.update_task()
+
+return _wrapper
+
+
 class BaseExecutor(logger.LoggerMixin):
 """
 Base class for executors for running tasks
@@ -28,12 +37,12 @@ class BaseExecutor(logger.LoggerMixin):
 def _execute(self, task):
 raise NotImplementedError
 
+@update_ctx
 def execute(self, ctx):
 """
 Execute a task
 :param task: task to execute
 """
-ctx.update_task()
 if ctx.task.function:
 self._execute(ctx)
 else:
@@ -49,20 +58,17 @@ class BaseExecutor(logger.LoggerMixin):
 """
 pass
 
-@staticmethod
-def _task_started(ctx):
+@update_ctx
+def _task_started(self, ctx):
 events.start_task_signal.send(ctx)
-ctx.update_task()
 
-@staticmethod
-def _task_failed(ctx, exception, traceback=None):
+@update_ctx
+def _task_failed(self, ctx, exception, traceback=None):
 events.on_failure_task_signal.send(ctx, exception=exception, 
traceback=traceback)
-ctx.update_task()
 
-@staticmethod
-def _task_succeeded(ctx):
+@update_ctx
+def _task_succeeded(self, ctx):
 events.on_success_task_signal.send(ctx)
-ctx.update_task()
 
 
 class StubTaskExecutor(BaseExecutor):  
 # pylint: disable=abstract-method

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d1cfd261/aria/orchestrator/workflows/executor/dry.py
--
diff --git a/aria/orchestrator/workflows/executor/dry.py 
b/aria/orchestrator/workflows/executor/dry.py
index 72080b4..c12ba7c 100644
--- a/aria/orchestrator/workflows/executor/dry.py
+++ b/aria/orchestrator/workflows/executor/dry.py
@@ -18,37 +18,37 @@ Dry executor
 """
 from datetime import datetime
 
-from .base import BaseExecutor
+from . import base
 
 
-class DryExecutor(BaseExecutor):   
 # pylint: disable=abstract-method
+class DryExecutor(base.BaseExecutor):  
  # pylint: disable=abstract-method
 """
 Executor which dry runs tasks - prints task information without causing 
any side effects
 """
-def execute(self, task):
+@base.update_ctx
+def execute(self, ctx):
 # updating the task manually instead of calling 
self._task_started(task),
 # to avoid any side effects raising that event might cause
-with task._update():
-task.started_at = datetime.utcnow()
-task.status = task.STARTED
+ctx.task.started_at = datetime.utcnow()
+ctx.task.status = ctx.task.STARTED
 
 dry_msg = ' {name} {task.interface_name}.{task.operation_name} 
{suffix}'
-logger = task.context.logger.info if task.function else 
task.context.logger.debug
+logger = ctx.logger.info if ctx.task.function else ctx.logger.debug
 
-if hasattr(task.actor, 'source_node'):
+if hasattr(ctx.task.actor, 'source_node'):
 name = '{source_node.name}->{target_node.name}'.format(
-source_node=task.actor.source_node,

incubator-ariatosca git commit: task update wrapper

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 600e54e89 -> 8b6d7068d


task update wrapper


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8b6d7068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8b6d7068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8b6d7068

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 8b6d7068de219a8826dbfeb4a75654b03f151842
Parents: 600e54e
Author: max-orlov 
Authored: Wed Jun 14 19:08:14 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 19:08:14 2017 +0300

--
 aria/orchestrator/workflows/executor/base.py | 26 ++---
 aria/orchestrator/workflows/executor/dry.py  | 34 +++
 2 files changed, 33 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8b6d7068/aria/orchestrator/workflows/executor/base.py
--
diff --git a/aria/orchestrator/workflows/executor/base.py 
b/aria/orchestrator/workflows/executor/base.py
index 955b536..a727e5c 100644
--- a/aria/orchestrator/workflows/executor/base.py
+++ b/aria/orchestrator/workflows/executor/base.py
@@ -21,6 +21,15 @@ from aria import logger
 from aria.orchestrator import events
 
 
+def update_ctx(func):
+def _wrapper(self, ctx, *args, **kwargs):
+ctx.update_task()
+func(self, ctx, *args, **kwargs)
+ctx.update_task()
+
+return _wrapper
+
+
 class BaseExecutor(logger.LoggerMixin):
 """
 Base class for executors for running tasks
@@ -28,12 +37,12 @@ class BaseExecutor(logger.LoggerMixin):
 def _execute(self, task):
 raise NotImplementedError
 
+@update_ctx
 def execute(self, ctx):
 """
 Execute a task
 :param task: task to execute
 """
-ctx.update_task()
 if ctx.task.function:
 self._execute(ctx)
 else:
@@ -49,20 +58,17 @@ class BaseExecutor(logger.LoggerMixin):
 """
 pass
 
-@staticmethod
-def _task_started(ctx):
+@update_ctx
+def _task_started(self, ctx):
 events.start_task_signal.send(ctx)
-ctx.update_task()
 
-@staticmethod
-def _task_failed(ctx, exception, traceback=None):
+@update_ctx
+def _task_failed(self, ctx, exception, traceback=None):
 events.on_failure_task_signal.send(ctx, exception=exception, 
traceback=traceback)
-ctx.update_task()
 
-@staticmethod
-def _task_succeeded(ctx):
+@update_ctx
+def _task_succeeded(self, ctx):
 events.on_success_task_signal.send(ctx)
-ctx.update_task()
 
 
 class StubTaskExecutor(BaseExecutor):  
 # pylint: disable=abstract-method

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8b6d7068/aria/orchestrator/workflows/executor/dry.py
--
diff --git a/aria/orchestrator/workflows/executor/dry.py 
b/aria/orchestrator/workflows/executor/dry.py
index 72080b4..c12ba7c 100644
--- a/aria/orchestrator/workflows/executor/dry.py
+++ b/aria/orchestrator/workflows/executor/dry.py
@@ -18,37 +18,37 @@ Dry executor
 """
 from datetime import datetime
 
-from .base import BaseExecutor
+from . import base
 
 
-class DryExecutor(BaseExecutor):   
 # pylint: disable=abstract-method
+class DryExecutor(base.BaseExecutor):  
  # pylint: disable=abstract-method
 """
 Executor which dry runs tasks - prints task information without causing 
any side effects
 """
-def execute(self, task):
+@base.update_ctx
+def execute(self, ctx):
 # updating the task manually instead of calling 
self._task_started(task),
 # to avoid any side effects raising that event might cause
-with task._update():
-task.started_at = datetime.utcnow()
-task.status = task.STARTED
+ctx.task.started_at = datetime.utcnow()
+ctx.task.status = ctx.task.STARTED
 
 dry_msg = ' {name} {task.interface_name}.{task.operation_name} 
{suffix}'
-logger = task.context.logger.info if task.function else 
task.context.logger.debug
+logger = ctx.logger.info if ctx.task.function else ctx.logger.debug
 
-if hasattr(task.actor, 'source_node'):
+if hasattr(ctx.task.actor, 'source_node'):
 name = '{source_node.name}->{target_node.name}'.format(
-source_node=task.actor.source_node, 
target_node=task.actor.target_node)

incubator-ariatosca git commit: linting

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 4c723c9c3 -> 600e54e89


linting


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/600e54e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/600e54e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/600e54e8

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 600e54e89b05bb52a78bf64ec0a603d87656688a
Parents: 4c723c9
Author: max-orlov 
Authored: Wed Jun 14 18:36:38 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 18:41:53 2017 +0300

--
 aria/modeling/orchestration.py  |  6 ++--
 aria/orchestrator/workflow_runner.py| 36 ++--
 aria/orchestrator/workflows/executor/base.py|  6 ++--
 .../orchestrator/workflows/core/test_events.py  |  5 +--
 .../orchestrator/workflows/executor/__init__.py |  2 +-
 .../workflows/executor/test_executor.py |  5 +--
 .../workflows/executor/test_process_executor.py | 12 ---
 7 files changed, 38 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/600e54e8/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index c0b7f04..6f69483 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,10 +21,8 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-from contextlib import contextmanager
 from datetime import datetime
 
-from networkx import DiGraph
 from sqlalchemy import (
 Column,
 Integer,
@@ -258,8 +256,8 @@ class TaskBase(mixins.ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ =  ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
-   'relationship_fk', 'plugin_fk', 'execution_fk']
+__private_fields__ = ['dependency_operation_task_fk', 
'dependency_stub_task_fk', 'node_fk',
+  'relationship_fk', 'plugin_fk', 'execution_fk']
 
 
 START_WORKFLOW = 'start_workflow'

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/600e54e8/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index f09cb79..f0a48ad 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -180,9 +180,9 @@ class WorkflowRunner(object):
 
 def get_execution_graph(execution):
 graph = DiGraph()
-for task in execution.tasks:
-for dependency in task.dependencies:
-graph.add_edge(dependency, task)
+for t in execution.tasks:
+for dependency in t.dependencies:
+graph.add_edge(dependency, t)
 
 return graph
 
@@ -211,8 +211,8 @@ def construct_execution_tasks(execution,
  dependencies=depends_on)
 
 for api_task in task_graph.topological_order(reverse=True):
-operation_dependencies = _get_tasks_from_dependencies(execution,
-task_graph.get_dependencies(api_task), [start_task])
+operation_dependencies = _get_tasks_from_dependencies(
+execution, task_graph.get_dependencies(api_task), [start_task])
 
 if isinstance(api_task, task.OperationTask):
 models.Task.from_api_task(api_task=api_task,
@@ -257,20 +257,20 @@ def _end_graph_suffix(api_id):
 
 def _get_non_dependent_tasks(execution):
 dependency_tasks = set()
-for task in execution.tasks:
-dependency_tasks.update(task.dependencies)
+for t in execution.tasks:
+dependency_tasks.update(t.dependencies)
 return list(set(execution.tasks) - set(dependency_tasks))
 
 
 def _get_tasks_from_dependencies(execution, dependencies, default=()):
-"""
-Returns task list from dependencies.
-"""
-tasks = []
-for dependency in dependencies:
-if getattr(dependency, 'actor', False):
-dependency_name = dependency.id
-else:
-dependency_name = _end_graph_suffix(dependency.id)
-tasks.extend(task for task in execution.tasks if task.api_id == 
dependency_name)
-return tasks or default
+"""
+Returns task list from dependencies.
+"""
+tasks = []
+for dependency in dependencies:
+if getattr(dependency, 'actor', False):
+dependency_name = dependency.id
+else:
+dependency_name = _end_graph_suffix(dependency.id)
+tasks.extend(task for task in

incubator-ariatosca git commit: tiny test fix

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 4ad3600b2 -> 4c723c9c3


tiny test fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/4c723c9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4c723c9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4c723c9c

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 4c723c9c393b6d7849ed8aed54af4399e2b34954
Parents: 4ad3600
Author: max-orlov 
Authored: Wed Jun 14 18:17:23 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 18:32:48 2017 +0300

--
 tests/orchestrator/context/test_serialize.py   | 11 +++-
 tests/orchestrator/workflows/core/test_task.py | 30 ++---
 2 files changed, 18 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4c723c9c/tests/orchestrator/context/test_serialize.py
--
diff --git a/tests/orchestrator/context/test_serialize.py 
b/tests/orchestrator/context/test_serialize.py
index aa19f56..ef215cd 100644
--- a/tests/orchestrator/context/test_serialize.py
+++ b/tests/orchestrator/context/test_serialize.py
@@ -33,12 +33,6 @@ def test_serialize_operation_context(context, executor, 
tmpdir):
 test_file.write(TEST_FILE_CONTENT)
 resource = context.resource
 resource.service_template.upload(TEST_FILE_ENTRY_ID, str(test_file))
-graph = _mock_workflow(ctx=context)  # pylint: 
disable=no-value-for-parameter
-workflow_runner.construct_execution_tasks(context.execution, graph, 
executor.__class__)
-context.execution = context.execution
-execution_graph = workflow_runner.get_execution_graph(context.execution)
-eng = engine.Engine(executor, context, execution_graph)
-eng.execute()
 
 node = context.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME)
 plugin = mock.models.create_plugin()
@@ -54,7 +48,10 @@ def test_serialize_operation_context(context, executor, 
tmpdir):
 context.model.node.update(node)
 
 graph = _mock_workflow(ctx=context)  # pylint: 
disable=no-value-for-parameter
-eng = engine.Engine(executor=executor, workflow_context=context, 
tasks_graph=graph)
+workflow_runner.construct_execution_tasks(context.execution, graph, 
executor.__class__)
+context.execution = context.execution
+execution_graph = workflow_runner.get_execution_graph(context.execution)
+eng = engine.Engine(executor, context, execution_graph)
 eng.execute()
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4c723c9c/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 c0d3616..f0f3a3b 100644
--- a/tests/orchestrator/workflows/core/test_task.py
+++ b/tests/orchestrator/workflows/core/test_task.py
@@ -25,6 +25,7 @@ from aria.orchestrator.workflows import (
 core,
 exceptions,
 )
+from aria.modeling import models
 
 from tests import mock, storage
 
@@ -70,8 +71,8 @@ class TestOperationTask(object):
 node,
 interface_name=NODE_INTERFACE_NAME,
 operation_name=NODE_OPERATION_NAME)
-core_task = core.task.OperationTask(api_task=api_task, 
executor=None)
-return api_task, core_task
+model_task = models.Task.from_api_task(api_task, None)
+return api_task, model_task
 
 def _create_relationship_operation_task(self, ctx, relationship):
 with workflow_context.current.push(ctx):
@@ -79,7 +80,7 @@ class TestOperationTask(object):
 relationship,
 interface_name=RELATIONSHIP_INTERFACE_NAME,
 operation_name=RELATIONSHIP_OPERATION_NAME)
-core_task = core.task.OperationTask(api_task=api_task, 
executor=None)
+core_task = models.Task.from_api_task(api_task, None)
 return api_task, core_task
 
 def test_node_operation_task_creation(self, ctx):
@@ -96,25 +97,21 @@ class TestOperationTask(object):
 )
 node.interfaces[interface.name] = interface
 ctx.model.node.update(node)
-api_task, core_task = self._create_node_operation_task(ctx, node)
-storage_task = ctx.model.task.get_by_name(core_task.name)
-assert storage_task.plugin is storage_plugin
-assert storage_task.execution_name == ctx.execution.name
-assert storage_task.actor == core_task.context.node
-assert core_task.model_task == storage_task
-assert core_task.name == api_task.name
-assert

incubator-ariatosca git commit: executor test fixes

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 546e7af7a -> 4ad3600b2


executor test 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/4ad3600b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4ad3600b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4ad3600b

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 4ad3600b2cf7edb1190e7dc76f2d2d39e5805391
Parents: 546e7af
Author: max-orlov 
Authored: Wed Jun 14 18:05:30 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 18:05:30 2017 +0300

--
 .../orchestrator/workflows/executor/__init__.py | 17 +++
 .../workflows/executor/test_executor.py | 53 +---
 .../workflows/executor/test_process_executor.py | 42 
 .../executor/test_process_executor_extension.py |  7 ++-
 .../test_process_executor_tracked_changes.py|  7 ++-
 5 files changed, 93 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4ad3600b/tests/orchestrator/workflows/executor/__init__.py
--
diff --git a/tests/orchestrator/workflows/executor/__init__.py 
b/tests/orchestrator/workflows/executor/__init__.py
index b8032b7..87910e9 100644
--- a/tests/orchestrator/workflows/executor/__init__.py
+++ b/tests/orchestrator/workflows/executor/__init__.py
@@ -15,6 +15,7 @@
 import logging
 
 import aria
+from aria.orchestrator.context.operation import NodeOperationContext
 
 
 class MockContext(object):
@@ -54,3 +55,19 @@ class MockContext(object):
 @staticmethod
 def close():
 pass
+
+
+def put_to_storage_and_get_ctx(ctx, task):
+ctx.model.task.put(task)
+op_ctx = NodeOperationContext(
+model_storage=ctx.model,
+resource_storage=ctx.resource,
+workdir=ctx._workdir,
+task_id=task.id,
+actor_id=task.actor.id if task.actor else None,
+service_id=task.execution.service.id,
+execution_id=task.execution.id,
+name=task.name
+)
+op_ctx.states = []
+return op_ctx

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4ad3600b/tests/orchestrator/workflows/executor/test_executor.py
--
diff --git a/tests/orchestrator/workflows/executor/test_executor.py 
b/tests/orchestrator/workflows/executor/test_executor.py
index 410a982..d91b3e0 100644
--- a/tests/orchestrator/workflows/executor/test_executor.py
+++ b/tests/orchestrator/workflows/executor/test_executor.py
@@ -18,6 +18,7 @@ import pytest
 import retrying
 
 from tests import mock, storage
+from . import put_to_storage_and_get_ctx
 
 try:
 import celery as _celery
@@ -44,24 +45,31 @@ def _get_function(func):
 
 def execute_and_assert(executor, ctx):
 node = ctx.model.node.list()[0]
-execution = ctx.model.execution.list()[0]
 expected_value = 'value'
-successful_ctx = models.Task(function=_get_function(mock_successful_task),
- node=node, _executor=executor, 
execution=execution)
-failing_ctx = models.Task(
-function=_get_function(mock_failing_task), node=node, 
_executor=executor, execution=execution)
-ctx_with_inputs = models.Task(
-node=node,
-function=_get_function(mock_task_with_input),
-arguments={'input': models.Argument.wrap('input', 'value')},
-_executor=executor,
-execution=execution)
-
-ctx.model.execution.update(execution)
+successful_ctx = put_to_storage_and_get_ctx(
+ctx,
+models.Task(
+function=_get_function(mock_successful_task), node=node, 
execution=ctx.execution
+)
+)
+failing_ctx = put_to_storage_and_get_ctx(
+ctx,
+models.Task(
+function=_get_function(mock_failing_task), node=node, 
execution=ctx.execution
+)
+)
+ctx_with_inputs = put_to_storage_and_get_ctx(
+ctx,
+models.Task(
+node=node,
+function=_get_function(mock_task_with_input),
+arguments={'input': models.Argument.wrap('input', 'value')},
+execution=ctx.execution
+)
+)
 
 for op_ctx in [successful_ctx, failing_ctx, ctx_with_inputs]:
-op_ctx.states = []
-op_ctx.execute(ctx)
+executor.execute(op_ctx)
 
 @retrying.retry(stop_max_delay=1, wait_fixed=100)
 def assertion():
@@ -111,9 +119,18 @@ def ctx(tmpdir):
 storage.release_sqlite_storage(context.model)
 
 
-@pytest.fixture
-def thread_executor():
-return thread.ThreadExecutor
+@pytest.fixture(params=[
+

[5/5] incubator-ariatosca git commit: deleted _task and fixed some tests

2017-06-14 Thread mxmrlv

deleted _task and fixed some tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/546e7af7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/546e7af7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/546e7af7

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 546e7af7ae648c9e89a6b0c9d2ef565740a07136
Parents: 907ed6e
Author: max-orlov 
Authored: Wed Jun 14 17:33:15 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 17:33:15 2017 +0300

--
 aria/orchestrator/workflows/core/_task.py   | 267 ---
 tests/orchestrator/execution_plugin/test_ssh.py |  11 +-
 2 files changed, 6 insertions(+), 272 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/546e7af7/aria/orchestrator/workflows/core/_task.py
--
diff --git a/aria/orchestrator/workflows/core/_task.py 
b/aria/orchestrator/workflows/core/_task.py
deleted file mode 100644
index 399c177..000
--- a/aria/orchestrator/workflows/core/_task.py
+++ /dev/null
@@ -1,267 +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.
-
-"""
-Workflow tasks
-"""
-
-from contextlib import contextmanager
-from datetime import datetime
-from functools import (
-partial,
-wraps,
-)
-
-
-from modeling import models
-from ...context import operation as operation_context
-from .. import exceptions
-
-
-def _locked(func=None):
-if func is None:
-return partial(_locked, func=_locked)
-
-@wraps(func)
-def _wrapper(self, value, **kwargs):
-if self._update_fields is None:
-raise exceptions.TaskException('Task is not in update mode')
-return func(self, value, **kwargs)
-return _wrapper
-
-
-class BaseTask(object):
-"""
-Base class for Task objects
-"""
-
-def __init__(self, id, executor, *args, **kwargs):
-super(BaseTask, self).__init__(*args, **kwargs)
-self._id = id
-self._executor = executor
-
-def execute(self):
-return self._executor.execute(self)
-
-@property
-def id(self):
-"""
-:return: the task's id
-"""
-return self._id
-
-
-class StubTask(BaseTask):
-"""
-Base stub task for marker user tasks that only mark the start/end of a 
workflow
-or sub-workflow
-"""
-STARTED = models.Task.STARTED
-SUCCESS = models.Task.SUCCESS
-
-def __init__(self, *args, **kwargs):
-super(StubTask, self).__init__(*args, **kwargs)
-self.status = models.Task.PENDING
-self.due_at = datetime.utcnow()
-
-
-
-
-class StartWorkflowTask(StubTask):
-"""
-Task marking a workflow start
-"""
-pass
-
-
-class EndWorkflowTask(StubTask):
-"""
-Task marking a workflow end
-"""
-pass
-
-
-class StartSubWorkflowTask(StubTask):
-"""
-Task marking a subworkflow start
-"""
-pass
-
-
-class EndSubWorkflowTask(StubTask):
-"""
-Task marking a subworkflow end
-"""
-pass
-
-
-class OperationTask(BaseTask):
-"""
-Operation task
-"""
-def __init__(self, api_task, *args, **kwargs):
-# If no executor is provided, we infer that this is an empty task 
which does not need to be
-# executed.
-super(OperationTask, self).__init__(id=api_task.id, *args, **kwargs)
-self._workflow_context = api_task._workflow_context
-self.interface_name = api_task.interface_name
-self.operation_name = api_task.operation_name
-model_storage = api_task._workflow_context.model
-
-actor = getattr(api_task.actor, '_wrapped', api_task.actor)
-
-base_task_model = model_storage.task.model_cls
-if isinstance(actor, models.Node):
-context_cls = operation_context.NodeOperationContext
-create_task_model = base_task_model.for_node
-elif isinstance(actor, models.Relationship):
-context_cls =

[1/5] incubator-ariatosca git commit: ARIA-166 Update README file [Forced Update!]

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks fc05b65d4 -> 546e7af7a (forced update)


ARIA-166 Update README 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/22f6e9ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/22f6e9ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/22f6e9ef

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 22f6e9efd5300f33bee51a1c1622c22b1531bbf5
Parents: 5afa2f7
Author: Ran Ziv 
Authored: Thu Jun 8 18:26:29 2017 +0300
Committer: Ran Ziv 
Committed: Mon Jun 12 19:08:44 2017 +0300

--
 README.md | 231 +++--
 1 file changed, 75 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/22f6e9ef/README.md
--
diff --git a/README.md b/README.md
index e534645..6aee414 100644
--- a/README.md
+++ b/README.md
@@ -1,201 +1,120 @@
 ARIA
 
 
-[![Build 
Status](https://travis-ci.org/apache/incubator-ariatosca.svg?branch=master)](https://travis-ci.org/apache/incubator-ariatosca)
-[![Appveyor Build 
Status](https://ci.appveyor.com/api/projects/status/ltv89jk63ahiu306?svg=true)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/incubator-ariatosca/history)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Build 
Status](https://img.shields.io/travis/apache/incubator-ariatosca/master.svg)](https://travis-ci.org/apache/incubator-ariatosca)
+[![Appveyor Build 
Status](https://img.shields.io/appveyor/ci/ApacheSoftwareFoundation/incubator-ariatosca/master.svg)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/incubator-ariatosca/history)
+[![License](https://img.shields.io/github/license/apache/incubator-ariatosca.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+[![PyPI 
release](https://img.shields.io/pypi/v/ariatosca.svg)](https://pypi.python.org/pypi/ariatosca)
+![Python Versions](https://img.shields.io/pypi/pyversions/ariatosca.svg)
+![Wheel](https://img.shields.io/pypi/wheel/ariatosca.svg)
+![Contributors](https://img.shields.io/github/contributors/apache/incubator-ariatosca.svg)
+[![Open Pull 
Requests](https://img.shields.io/github/issues-pr/apache/incubator-ariatosca.svg)](https://github.com/apache/incubator-ariatosca/pulls)
+[![Closed Pull 
Requests](https://img.shields.io/github/issues-pr-closed-raw/apache/incubator-ariatosca.svg)](https://github.com/apache/incubator-ariatosca/pulls?q=is%3Apr+is%3Aclosed)
 
 
-[ARIA](http://ariatosca.org/) is a minimal TOSCA orchestrator, as well as a 
platform for building
-TOSCA-based products. Its features can be accessed via a well-documented 
Python API.
+What is ARIA?
+
 
-On its own, ARIA provides built-in tools for blueprint validation and for 
creating ready-to-run
-service instances. 
+[ARIA](http://ariatosca.incubator.apache.org/) is a an open-source, 
[TOSCA](https://www.oasis-open.org/committees/tosca/)-based, lightweight 
library and CLI for orchestration and for consumption by projects building 
TOSCA-based solutions for resources and services orchestration.
 
-ARIA adheres strictly and meticulously to the
-[TOSCA Simple Profile v1.0 cos01 
specification](http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/cos01/TOSCA-Simple-Profile-YAML-v1.0-cos01.html),
-providing state-of-the-art validation at seven different levels:
+ARIA can be utilized by any organization that wants to implement TOSCA-based 
orchestration in its solutions, whether a multi-cloud enterprise application, 
or an NFV or SDN solution for multiple virtual infrastructure managers.
 
-
-Platform errors. E.g. network, hardware, or even an internal bug in ARIA 
(let us know,
-   please!).
-Syntax and format errors. E.g. non-compliant YAML, XML, JSON.
-Field validation. E.g. assigning a string where an integer is expected, 
using a list instead of
-   a dict.
-Relationships between fields within a type. This is "grammar" as it 
applies to rules for
-setting the values of fields in relation to each other.
-Relationships between types. E.g. referring to an unknown type, causing a 
type inheritance
-loop.
-Topology. These errors happen if requirements and capabilities cannot be 
matched in order to
-   assemble a valid topology.
-External dependencies. These errors happen if requirement/capability 
matching fails due to
-external resources missing, e.g. the lack of a valid virtual machine, API 
credentials, etc.
- 
-
+With ARIA, you can utilize TOSCA's cloud portability out-of-the-box, to 
develop, test and run

incubator-ariatosca git commit: wip [Forced Update!]

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 58e212c7d -> fc05b65d4 (forced update)


wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/fc05b65d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/fc05b65d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/fc05b65d

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: fc05b65d449bc67f817c48e7b0838a7c2705a7af
Parents: 5afa2f7
Author: max-orlov 
Authored: Sun Jun 11 19:05:35 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 17:27:58 2017 +0300

--
 aria/modeling/mixins.py |   4 +-
 aria/modeling/orchestration.py  | 150 ---
 aria/orchestrator/context/operation.py  |   3 +
 aria/orchestrator/workflow_runner.py| 118 +++-
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/_task.py   | 265 ++
 aria/orchestrator/workflows/core/engine.py  |  67 +++--
 .../workflows/core/events_handler.py|  77 +++---
 aria/orchestrator/workflows/core/task.py| 269 ---
 aria/orchestrator/workflows/core/translation.py | 109 
 aria/orchestrator/workflows/events_logging.py   |  25 +-
 aria/orchestrator/workflows/executor/base.py|  32 +--
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  18 +-
 tests/orchestrator/context/__init__.py  |   8 +-
 tests/orchestrator/context/test_operation.py|  26 +-
 tests/orchestrator/context/test_serialize.py|  11 +-
 .../orchestrator/execution_plugin/test_local.py |  11 +-
 .../orchestrator/workflows/core/test_engine.py  |  14 +-
 .../orchestrator/workflows/core/test_events.py  |  10 +-
 .../test_task_graph_into_execution_graph.py |  52 ++--
 .../orchestrator/workflows/executor/__init__.py |  58 ++--
 .../workflows/executor/test_executor.py |  95 +++
 .../workflows/executor/test_process_executor.py |   1 -
 24 files changed, 751 insertions(+), 692 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fc05b65d/aria/modeling/mixins.py
--
diff --git a/aria/modeling/mixins.py b/aria/modeling/mixins.py
index c98a866..31675fe 100644
--- a/aria/modeling/mixins.py
+++ b/aria/modeling/mixins.py
@@ -18,14 +18,12 @@ classes:
 * ModelMixin - abstract model implementation.
 * ModelIDMixin - abstract model implementation with IDs.
 """
-
 from sqlalchemy.ext import associationproxy
 from sqlalchemy import (
 Column,
 Integer,
 Text,
-PickleType
-)
+PickleType)
 
 from ..parser.consumption import ConsumptionContext
 from ..utils import console, collections, caching, formatting

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fc05b65d/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 995c8c2..c0b7f04 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,9 +21,10 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
-
+from contextlib import contextmanager
 from datetime import datetime
 
+from networkx import DiGraph
 from sqlalchemy import (
 Column,
 Integer,
@@ -34,19 +35,19 @@ from sqlalchemy import (
 String,
 Float,
 orm,
-)
+PickleType)
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 
 from ..orchestrator.exceptions import (TaskAbortException, TaskRetryException)
-from .mixins import ModelMixin, ParameterMixin
+from . import mixins
 from . import (
 relationship,
 types as modeling_types
 )
 
 
-class ExecutionBase(ModelMixin):
+class ExecutionBase(mixins.ModelMixin):
 """
 Execution model representation.
 """
@@ -152,7 +153,7 @@ class ExecutionBase(ModelMixin):
 )
 
 
-class PluginBase(ModelMixin):
+class PluginBase(mixins.ModelMixin):
 """
 An installed plugin.
 
@@ -213,7 +214,7 @@ class PluginBase(ModelMixin):
 uploaded_at = Column(DateTime, nullable=False, index=True)
 
 
-class TaskBase(ModelMixin):
+class TaskBase(mixins.ModelMixin):
 """
 Represents the smallest unit of stateful execution in ARIA. The task state 
includes inputs,
 outputs, as well as an atomic status, ensuring that the task can only be 
running once at any
@@ -257,10 +258,25 @@ class TaskBase(ModelMixin):
 
 __tablename__ = 'task'
 
-__private_fields__ = ['node_fk',
-

incubator-ariatosca git commit: tasks no longer execute their executor

2017-06-14 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 092b45f0d -> 58e212c7d


tasks no longer execute their executor


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/58e212c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/58e212c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/58e212c7

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 58e212c7dbdea7aa9b532bba9fea4a5359a49019
Parents: 092b45f
Author: max-orlov 
Authored: Wed Jun 14 17:17:16 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 14 17:17:16 2017 +0300

--
 aria/modeling/orchestration.py  |  36 ++
 aria/orchestrator/context/operation.py  |   3 +
 aria/orchestrator/workflow_runner.py| 123 +--
 aria/orchestrator/workflows/core/__init__.py|   2 +-
 aria/orchestrator/workflows/core/engine.py  |  60 +
 .../workflows/core/events_handler.py|   2 +-
 aria/orchestrator/workflows/core/translation.py | 112 -
 aria/orchestrator/workflows/executor/base.py|  13 +-
 aria/orchestrator/workflows/executor/thread.py  |   2 -
 tests/orchestrator/context/__init__.py  |  11 +-
 tests/orchestrator/context/test_operation.py|  20 ++-
 tests/orchestrator/context/test_serialize.py|  15 ++-
 tests/orchestrator/context/test_toolbelt.py |   7 +-
 .../orchestrator/execution_plugin/test_local.py |  15 ++-
 tests/orchestrator/test_workflow_runner.py  |   2 +-
 .../orchestrator/workflows/core/test_engine.py  |  21 ++--
 .../orchestrator/workflows/core/test_events.py  |  12 +-
 .../test_task_graph_into_execution_graph.py |  48 +++-
 .../workflows/executor/test_executor.py |  39 +++---
 19 files changed, 271 insertions(+), 272 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/58e212c7/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 4a5771a..c0b7f04 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -24,6 +24,7 @@ classes:
 from contextlib import contextmanager
 from datetime import datetime
 
+from networkx import DiGraph
 from sqlalchemy import (
 Column,
 Integer,
@@ -309,7 +310,6 @@ class TaskBase(mixins.ModelMixin):
 api_id = Column(String)
 
 _executor = Column(PickleType)
-_executor_kwargs = Column(modeling_types.Dict)
 _context_cls = Column(PickleType)
 
 @declared_attr
@@ -400,14 +400,14 @@ class TaskBase(mixins.ModelMixin):
 def retry(message=None, retry_interval=None):
 raise TaskRetryException(message, retry_interval=retry_interval)
 
-# @declared_attr
-# def dependency_fk(cls):
-# """For Type one-to-many to Type"""
-# return relationship.foreign_key('task', nullable=True)
+@declared_attr
+def dependency_fk(self):
+return relationship.foreign_key('task', nullable=True)
 
 @declared_attr
-def dependent_tasks(cls):
-return relationship.many_to_many(cls, 'task', 'dependent', 
other_property='dependencies')
+def dependencies(cls):
+# symmetric relationship causes funky graphs
+return relationship.one_to_many_self(cls, 'dependency_fk')
 
 def has_ended(self):
 if self.stub_type is not None:
@@ -422,7 +422,7 @@ class TaskBase(mixins.ModelMixin):
 return self.status in (self.PENDING, self.RETRYING)
 
 @classmethod
-def from_api_task(cls, api_task, executor, executor_kwargs=None, **kwargs):
+def from_api_task(cls, api_task, executor, **kwargs):
 from aria.orchestrator import context
 instantiation_kwargs = {}
 
@@ -454,32 +454,12 @@ class TaskBase(mixins.ModelMixin):
 'api_id': api_task.id,
 '_context_cls': context_cls,
 '_executor': executor,
-'_executor_kwargs': executor_kwargs or {}
 })
 
 instantiation_kwargs.update(**kwargs)
 
 return cls(**instantiation_kwargs)
 
-def execute(self, ctx, executor_kwargs=None):
-from aria.orchestrator.context import operation
-context_cls = self._context_cls or operation.BaseOperationContext
-op_ctx = context_cls(
-model_storage=ctx.model,
-resource_storage=ctx.resource,
-workdir=ctx._workdir,
-task_id=self.id,
-actor_id=self.actor.id if self.actor else None,
-service_id=self.execution.service.id,
-execution_id=self.execution.id,
-name=self.name
-)
-

incubator-ariatosca git commit: graph work

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 979a4b445 -> 092b45f0d


graph work


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/092b45f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/092b45f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/092b45f0

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 092b45f0de707cc9c1ed8bebe594bb0b7bb5846f
Parents: 979a4b4
Author: max-orlov 
Authored: Tue Jun 13 20:33:34 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 20:33:34 2017 +0300

--
 aria/modeling/orchestration.py  | 10 +--
 aria/orchestrator/workflows/core/engine.py  | 16 ++--
 aria/orchestrator/workflows/core/translation.py | 93 +---
 .../test_task_graph_into_execution_graph.py | 13 +--
 .../workflows/executor/test_process_executor.py |  1 -
 5 files changed, 60 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/092b45f0/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 37aa431..4a5771a 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -400,14 +400,14 @@ class TaskBase(mixins.ModelMixin):
 def retry(message=None, retry_interval=None):
 raise TaskRetryException(message, retry_interval=retry_interval)
 
-@declared_attr
-def operation_task_dependency_fk(cls):
-"""For Type one-to-many to Type"""
-return relationship.foreign_key('task', nullable=True)
+# @declared_attr
+# def dependency_fk(cls):
+# """For Type one-to-many to Type"""
+# return relationship.foreign_key('task', nullable=True)
 
 @declared_attr
 def dependent_tasks(cls):
-return relationship.one_to_many_self(cls, 
'operation_task_dependency_fk')
+return relationship.many_to_many(cls, 'task', 'dependent', 
other_property='dependencies')
 
 def has_ended(self):
 if self.stub_type is not None:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/092b45f0/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 826a7a2..67e8c1d 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -42,13 +42,13 @@ class Engine(logger.LoggerMixin):
 self._workflow_context = workflow_context
 self._execution_graph = networkx.DiGraph()
 self._executor_kwargs = executor_kwargs
-translation.build_execution_graph(task_graph=tasks_graph,
-  
execution_graph=self._execution_graph,
-  default_executor=executor,
-  execution=workflow_context.execution)
+translation.store_tasks(task_graph=tasks_graph,
+execution_graph=self._execution_graph,
+default_executor=executor,
+execution=workflow_context.execution)
 
 # Flush changes
-workflow_context.model.execution._session.flush()
+workflow_context.model.execution.update(workflow_context.execution)
 
 def execute(self):
 """
@@ -106,11 +106,7 @@ class Engine(logger.LoggerMixin):
 
 def _tasks_iter(self):
 for _, data in self._execution_graph.nodes_iter(data=True):
-task = data['task']
-if isinstance(task, models.Task):
-if not task.has_ended():
-self._workflow_context.model.task.refresh(task)
-yield task
+yield self._workflow_context.model.task.get(data['task'].id)
 
 def _handle_executable_task(self, task):
 if not task.stub_type:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/092b45f0/aria/orchestrator/workflows/core/translation.py
--
diff --git a/aria/orchestrator/workflows/core/translation.py 
b/aria/orchestrator/workflows/core/translation.py
index be4e34d..8da9bd7 100644
--- a/aria/orchestrator/workflows/core/translation.py
+++ b/aria/orchestrator/workflows/core/translation.py
@@ -22,14 +22,10 @@ from .. import api
 from ..executor import base
 
 
-def build_execution_graph(
-task_graph,
-execution_graph,
-default_executor,
-execution,
-

[incubator-ariatosca] Git Push Summary

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-276-Support-model-instrumentation-for-workflows [deleted] 
2149a5ee0

incubator-ariatosca git commit: wip on executor tests

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 8044a035f -> 979a4b445


wip on executor tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/979a4b44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/979a4b44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/979a4b44

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 979a4b445bf0261db2bb2632cd93e88ea6d61222
Parents: 8044a03
Author: max-orlov 
Authored: Tue Jun 13 16:49:15 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 16:49:15 2017 +0300

--
 aria/orchestrator/workflows/executor/base.py|  3 -
 aria/orchestrator/workflows/executor/thread.py  |  2 +
 .../orchestrator/workflows/executor/__init__.py | 42 +++-
 .../workflows/executor/test_executor.py | 70 +++-
 4 files changed, 49 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/979a4b44/aria/orchestrator/workflows/executor/base.py
--
diff --git a/aria/orchestrator/workflows/executor/base.py 
b/aria/orchestrator/workflows/executor/base.py
index 089126d..54a9438 100644
--- a/aria/orchestrator/workflows/executor/base.py
+++ b/aria/orchestrator/workflows/executor/base.py
@@ -42,7 +42,6 @@ class BaseExecutor(logger.LoggerMixin):
 # itself.
 self._task_started(ctx)
 self._task_succeeded(ctx)
-ctx.model.task.update(ctx.task)
 
 def close(self):
 """
@@ -58,12 +57,10 @@ class BaseExecutor(logger.LoggerMixin):
 def _task_failed(self, ctx, exception, traceback=None):
 events.on_failure_task_signal.send(ctx, exception=exception, 
traceback=traceback)
 ctx.model.task.update(ctx.task)
-self.close()
 
 def _task_succeeded(self, ctx):
 events.on_success_task_signal.send(ctx)
 ctx.model.task.update(ctx.task)
-self.close()
 
 
 class StubTaskExecutor(BaseExecutor):  
 # pylint: disable=abstract-method

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/979a4b44/aria/orchestrator/workflows/executor/thread.py
--
diff --git a/aria/orchestrator/workflows/executor/thread.py 
b/aria/orchestrator/workflows/executor/thread.py
index 8c447b6..074b54b 100644
--- a/aria/orchestrator/workflows/executor/thread.py
+++ b/aria/orchestrator/workflows/executor/thread.py
@@ -68,6 +68,8 @@ class ThreadExecutor(BaseExecutor):
 self._task_failed(ctx,
   exception=e,
   
traceback=exceptions.get_exception_as_string(*sys.exc_info()))
+finally:
+break
 # Daemon threads
 except BaseException as e:
 pass

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/979a4b44/tests/orchestrator/workflows/executor/__init__.py
--
diff --git a/tests/orchestrator/workflows/executor/__init__.py 
b/tests/orchestrator/workflows/executor/__init__.py
index 07fb8ad..b8032b7 100644
--- a/tests/orchestrator/workflows/executor/__init__.py
+++ b/tests/orchestrator/workflows/executor/__init__.py
@@ -12,47 +12,25 @@
 # 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.
-import uuid
 import logging
-from collections import namedtuple
-from contextlib import contextmanager
 
 import aria
-from aria.modeling import models
-
-
-class MockTask(object):
-
-INFINITE_RETRIES = models.Task.INFINITE_RETRIES
-
-def __init__(self, function, arguments=None, plugin=None, storage=None):
-self.function = self.name = function
-self.plugin_fk = plugin.id if plugin else None
-self.plugin = plugin or None
-self.arguments = arguments or {}
-self.states = []
-self.exception = None
-self.id = str(uuid.uuid4())
-self.logger = logging.getLogger()
-self.context = MockContext(self.id, storage)
-self.attempts_count = 1
-self.max_attempts = 1
-self.ignore_failure = False
-self.interface_name = 'interface_name'
-self.operation_name = 'operation_name'
-self.actor = namedtuple('actor', 'name')(name='actor_name')
-self.model_task = None
-
-for state in models.Task.STATES:
-setattr(self, state.upper(), state)

incubator-ariatosca git commit: test fixes, moved close executor to be handled inside the executor

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks 62fa985c6 -> 8044a035f


test fixes, moved close executor to be handled inside the executor


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8044a035
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8044a035
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8044a035

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 8044a035fdb7f88e871e3a643b47b3e42c43da67
Parents: 62fa985
Author: max-orlov 
Authored: Tue Jun 13 15:56:44 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 15:56:44 2017 +0300

--
 aria/modeling/orchestration.py  |  6 ++---
 aria/orchestrator/workflow_runner.py|  9 +--
 aria/orchestrator/workflows/core/engine.py  |  4 +--
 aria/orchestrator/workflows/core/translation.py |  5 +---
 aria/orchestrator/workflows/executor/base.py| 15 +++
 tests/modeling/test_mixins.py   |  8 --
 tests/orchestrator/context/test_operation.py| 28 +---
 tests/orchestrator/context/test_serialize.py| 14 ++
 tests/orchestrator/context/test_toolbelt.py |  7 +
 tests/orchestrator/test_workflow_runner.py  |  2 +-
 10 files changed, 41 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8044a035/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 9ac885d..37aa431 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -461,7 +461,7 @@ class TaskBase(mixins.ModelMixin):
 
 return cls(**instantiation_kwargs)
 
-def execute(self, ctx):
+def execute(self, ctx, executor_kwargs=None):
 from aria.orchestrator.context import operation
 context_cls = self._context_cls or operation.BaseOperationContext
 op_ctx = context_cls(
@@ -474,10 +474,10 @@ class TaskBase(mixins.ModelMixin):
 execution_id=self.execution.id,
 name=self.name
 )
-executor = self._executor(**(self._executor_kwargs or {}))
+executor = self._executor(**dict(self._executor_kwargs or {}, 
**(executor_kwargs or {})))
 try:
 return executor.execute(op_ctx)
-finally:
+except BaseException:
 executor.close()
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8044a035/aria/orchestrator/workflow_runner.py
--
diff --git a/aria/orchestrator/workflow_runner.py 
b/aria/orchestrator/workflow_runner.py
index 848c59b..961796a 100644
--- a/aria/orchestrator/workflow_runner.py
+++ b/aria/orchestrator/workflow_runner.py
@@ -39,7 +39,7 @@ class WorkflowRunner(object):
 
 def __init__(self, workflow_name, service_id, inputs,
  model_storage, resource_storage, plugin_manager,
- executor=None, task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
+ executor=None, executor_kwargs=None, 
task_max_attempts=DEFAULT_TASK_MAX_ATTEMPTS,
  task_retry_interval=DEFAULT_TASK_RETRY_INTERVAL):
 """
 Manages a single workflow execution on a given service.
@@ -84,9 +84,14 @@ class WorkflowRunner(object):
 execution_inputs_dict = dict(inp.unwrapped for inp in 
self.execution.inputs.values())
 self._tasks_graph = workflow_fn(ctx=workflow_context, 
**execution_inputs_dict)
 
-executor = executor or ProcessExecutor(plugin_manager=plugin_manager)
+# Set default executor and kwargs
+if executor is None:
+executor = ProcessExecutor
+executor_kwargs = dict(plugin_manager=plugin_manager)
+
 self._engine = Engine(
 executor=executor,
+executor_kwargs=executor_kwargs,
 workflow_context=workflow_context,
 tasks_graph=self._tasks_graph)
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8044a035/aria/orchestrator/workflows/core/engine.py
--
diff --git a/aria/orchestrator/workflows/core/engine.py 
b/aria/orchestrator/workflows/core/engine.py
index 02749b7..826a7a2 100644
--- a/aria/orchestrator/workflows/core/engine.py
+++ b/aria/orchestrator/workflows/core/engine.py
@@ -41,10 +41,10 @@ class Engine(logger.LoggerMixin):
 super(Engine, self).__init__(**kwargs)
 self._workflow_context = workflow_context
 self._execution_graph = networkx.DiGraph()
+self._executor_kwargs

incubator-ariatosca git commit: ARIA-276 Support model instrumentation for workflows

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master 1e883c57a -> 2149a5ee0


ARIA-276 Support model instrumentation for 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/2149a5ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/2149a5ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/2149a5ee

Branch: refs/heads/master
Commit: 2149a5ee0c4656a253f54db20f279197961588c1
Parents: 1e883c5
Author: max-orlov 
Authored: Thu Jun 8 09:52:31 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 14:34:41 2017 +0300

--
 aria/orchestrator/context/common.py |   7 +
 aria/orchestrator/context/operation.py  |   7 -
 aria/orchestrator/decorators.py |   5 +-
 aria/orchestrator/workflows/api/task.py |   2 -
 aria/orchestrator/workflows/core/task.py|  12 +-
 aria/storage/collection_instrumentation.py  |  46 +--
 .../context/test_collection_instrumentation.py  | 325 ---
 .../context/test_context_instrumentation.py | 108 ++
 tests/orchestrator/context/test_serialize.py|  20 +-
 tests/orchestrator/context/test_workflow.py |  93 --
 .../orchestrator/execution_plugin/test_local.py |  26 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  50 +--
 .../workflows/builtin/test_execute_operation.py |   9 +-
 .../orchestrator/workflows/core/test_engine.py  |  88 +++--
 .../executor/test_process_executor_extension.py |  24 +-
 .../test_process_executor_tracked_changes.py|  26 +-
 .../storage/test_collection_instrumentation.py  | 257 +++
 17 files changed, 627 insertions(+), 478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index c98e026..f4df317 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -36,6 +36,13 @@ class BaseContext(object):
 Base context object for workflow and operation
 """
 
+INSTRUMENTATION_FIELDS = (
+modeling.models.Node.attributes,
+modeling.models.Node.properties,
+modeling.models.NodeTemplate.attributes,
+modeling.models.NodeTemplate.properties
+)
+
 class PrefixedLogger(object):
 def __init__(self, base_logger, task_id=None):
 self._logger = base_logger

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index af7220d..efdc04d 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,13 +29,6 @@ class BaseOperationContext(common.BaseContext):
 Context object used during operation creation and execution
 """
 
-INSTRUMENTATION_FIELDS = (
-aria.modeling.models.Node.attributes,
-aria.modeling.models.Node.properties,
-aria.modeling.models.NodeTemplate.attributes,
-aria.modeling.models.NodeTemplate.properties
-)
-
 def __init__(self, task_id, actor_id, **kwargs):
 self._task_id = task_id
 self._actor_id = actor_id

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 80f6962..389bfb8 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -49,8 +49,9 @@ def workflow(func=None, suffix_template=''):
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
 validate_function_arguments(func, workflow_parameters)
-with context.workflow.current.push(ctx):
-func(**workflow_parameters)
+with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
+with context.workflow.current.push(ctx):
+func(**workflow_parameters)
 return workflow_parameters['graph']
 return _wrapper
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index bcba56e..ca125a8 100644
---

[incubator-ariatosca] Git Push Summary

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/tmp_276 [deleted] 3f978ff23

incubator-ariatosca git commit: ARIA-276 Support model instrumentation for workflows [Forced Update!]

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/tmp_276 2149a5ee0 -> 3f978ff23 (forced update)


ARIA-276 Support model instrumentation for 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/3f978ff2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/3f978ff2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/3f978ff2

Branch: refs/heads/tmp_276
Commit: 3f978ff232fb543126dca0304044dcb7adaca30b
Parents: 1e883c5
Author: max-orlov 
Authored: Thu Jun 8 09:52:31 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 14:36:18 2017 +0300

--
 aria/orchestrator/context/common.py |   7 +
 aria/orchestrator/context/operation.py  |   7 -
 aria/orchestrator/decorators.py |   5 +-
 aria/orchestrator/workflows/api/task.py |   2 -
 aria/orchestrator/workflows/core/task.py|  12 +-
 aria/storage/collection_instrumentation.py  |  46 +--
 .../context/test_collection_instrumentation.py  | 325 ---
 .../context/test_context_instrumentation.py | 108 ++
 tests/orchestrator/context/test_serialize.py|  20 +-
 tests/orchestrator/context/test_workflow.py |  93 --
 .../orchestrator/execution_plugin/test_local.py |  26 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  50 +--
 .../workflows/builtin/test_execute_operation.py |   9 +-
 .../orchestrator/workflows/core/test_engine.py  |  88 +++--
 .../executor/test_process_executor_extension.py |  24 +-
 .../test_process_executor_tracked_changes.py|  26 +-
 .../storage/test_collection_instrumentation.py  | 257 +++
 17 files changed, 627 insertions(+), 478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3f978ff2/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index c98e026..f4df317 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -36,6 +36,13 @@ class BaseContext(object):
 Base context object for workflow and operation
 """
 
+INSTRUMENTATION_FIELDS = (
+modeling.models.Node.attributes,
+modeling.models.Node.properties,
+modeling.models.NodeTemplate.attributes,
+modeling.models.NodeTemplate.properties
+)
+
 class PrefixedLogger(object):
 def __init__(self, base_logger, task_id=None):
 self._logger = base_logger

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3f978ff2/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index af7220d..efdc04d 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,13 +29,6 @@ class BaseOperationContext(common.BaseContext):
 Context object used during operation creation and execution
 """
 
-INSTRUMENTATION_FIELDS = (
-aria.modeling.models.Node.attributes,
-aria.modeling.models.Node.properties,
-aria.modeling.models.NodeTemplate.attributes,
-aria.modeling.models.NodeTemplate.properties
-)
-
 def __init__(self, task_id, actor_id, **kwargs):
 self._task_id = task_id
 self._actor_id = actor_id

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3f978ff2/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 80f6962..389bfb8 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -49,8 +49,9 @@ def workflow(func=None, suffix_template=''):
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
 validate_function_arguments(func, workflow_parameters)
-with context.workflow.current.push(ctx):
-func(**workflow_parameters)
+with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
+with context.workflow.current.push(ctx):
+func(**workflow_parameters)
 return workflow_parameters['graph']
 return _wrapper
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3f978ff2/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index bcba56e..ca125a8 100644
---

[incubator-ariatosca] Git Push Summary

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/tmp_276 [created] 2149a5ee0

incubator-ariatosca git commit: ARIA-276 Support model instrumentation for workflows [Forced Update!]

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-276-Support-model-instrumentation-for-workflows f93bc0364 -> 
2149a5ee0 (forced update)


ARIA-276 Support model instrumentation for 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/2149a5ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/2149a5ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/2149a5ee

Branch: refs/heads/ARIA-276-Support-model-instrumentation-for-workflows
Commit: 2149a5ee0c4656a253f54db20f279197961588c1
Parents: 1e883c5
Author: max-orlov 
Authored: Thu Jun 8 09:52:31 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 14:34:41 2017 +0300

--
 aria/orchestrator/context/common.py |   7 +
 aria/orchestrator/context/operation.py  |   7 -
 aria/orchestrator/decorators.py |   5 +-
 aria/orchestrator/workflows/api/task.py |   2 -
 aria/orchestrator/workflows/core/task.py|  12 +-
 aria/storage/collection_instrumentation.py  |  46 +--
 .../context/test_collection_instrumentation.py  | 325 ---
 .../context/test_context_instrumentation.py | 108 ++
 tests/orchestrator/context/test_serialize.py|  20 +-
 tests/orchestrator/context/test_workflow.py |  93 --
 .../orchestrator/execution_plugin/test_local.py |  26 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  50 +--
 .../workflows/builtin/test_execute_operation.py |   9 +-
 .../orchestrator/workflows/core/test_engine.py  |  88 +++--
 .../executor/test_process_executor_extension.py |  24 +-
 .../test_process_executor_tracked_changes.py|  26 +-
 .../storage/test_collection_instrumentation.py  | 257 +++
 17 files changed, 627 insertions(+), 478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index c98e026..f4df317 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -36,6 +36,13 @@ class BaseContext(object):
 Base context object for workflow and operation
 """
 
+INSTRUMENTATION_FIELDS = (
+modeling.models.Node.attributes,
+modeling.models.Node.properties,
+modeling.models.NodeTemplate.attributes,
+modeling.models.NodeTemplate.properties
+)
+
 class PrefixedLogger(object):
 def __init__(self, base_logger, task_id=None):
 self._logger = base_logger

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index af7220d..efdc04d 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,13 +29,6 @@ class BaseOperationContext(common.BaseContext):
 Context object used during operation creation and execution
 """
 
-INSTRUMENTATION_FIELDS = (
-aria.modeling.models.Node.attributes,
-aria.modeling.models.Node.properties,
-aria.modeling.models.NodeTemplate.attributes,
-aria.modeling.models.NodeTemplate.properties
-)
-
 def __init__(self, task_id, actor_id, **kwargs):
 self._task_id = task_id
 self._actor_id = actor_id

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 80f6962..389bfb8 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -49,8 +49,9 @@ def workflow(func=None, suffix_template=''):
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
 validate_function_arguments(func, workflow_parameters)
-with context.workflow.current.push(ctx):
-func(**workflow_parameters)
+with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
+with context.workflow.current.push(ctx):
+func(**workflow_parameters)
 return workflow_parameters['graph']
 return _wrapper
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2149a5ee/aria/orchestrator/workflows/api/task.py
--
diff --git

incubator-ariatosca git commit: ARIA-276 Support model instrumentation for workflows [Forced Update!]

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-276-Support-model-instrumentation-for-workflows 4cde4d202 -> 
f93bc0364 (forced update)


ARIA-276 Support model instrumentation for 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/f93bc036
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f93bc036
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f93bc036

Branch: refs/heads/ARIA-276-Support-model-instrumentation-for-workflows
Commit: f93bc03648fd48c31de6e203c761f70f954a6b0f
Parents: 1e883c5
Author: max-orlov 
Authored: Thu Jun 8 09:52:31 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 13:40:28 2017 +0300

--
 aria/orchestrator/context/common.py |   7 +
 aria/orchestrator/context/operation.py  |   7 -
 aria/orchestrator/decorators.py |   5 +-
 aria/orchestrator/workflows/api/task.py |   2 -
 aria/orchestrator/workflows/core/task.py|  12 +-
 aria/storage/collection_instrumentation.py  |  46 +--
 .../context/test_collection_instrumentation.py  | 325 ---
 .../context/test_context_instrumentation.py | 108 ++
 tests/orchestrator/context/test_serialize.py|  20 +-
 tests/orchestrator/context/test_workflow.py |  93 --
 .../orchestrator/execution_plugin/test_local.py |  26 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  50 +--
 .../workflows/builtin/test_execute_operation.py |   9 +-
 .../orchestrator/workflows/core/test_engine.py  |  88 +++--
 .../executor/test_process_executor_extension.py |  24 +-
 .../test_process_executor_tracked_changes.py|  26 +-
 .../storage/test_collection_instrumentation.py  | 257 +++
 17 files changed, 627 insertions(+), 478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f93bc036/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index c98e026..f4df317 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -36,6 +36,13 @@ class BaseContext(object):
 Base context object for workflow and operation
 """
 
+INSTRUMENTATION_FIELDS = (
+modeling.models.Node.attributes,
+modeling.models.Node.properties,
+modeling.models.NodeTemplate.attributes,
+modeling.models.NodeTemplate.properties
+)
+
 class PrefixedLogger(object):
 def __init__(self, base_logger, task_id=None):
 self._logger = base_logger

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f93bc036/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index af7220d..efdc04d 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,13 +29,6 @@ class BaseOperationContext(common.BaseContext):
 Context object used during operation creation and execution
 """
 
-INSTRUMENTATION_FIELDS = (
-aria.modeling.models.Node.attributes,
-aria.modeling.models.Node.properties,
-aria.modeling.models.NodeTemplate.attributes,
-aria.modeling.models.NodeTemplate.properties
-)
-
 def __init__(self, task_id, actor_id, **kwargs):
 self._task_id = task_id
 self._actor_id = actor_id

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f93bc036/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 80f6962..389bfb8 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -49,8 +49,9 @@ def workflow(func=None, suffix_template=''):
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
 validate_function_arguments(func, workflow_parameters)
-with context.workflow.current.push(ctx):
-func(**workflow_parameters)
+with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
+with context.workflow.current.push(ctx):
+func(**workflow_parameters)
 return workflow_parameters['graph']
 return _wrapper
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f93bc036/aria/orchestrator/workflows/api/task.py
--
diff --git

[2/3] incubator-ariatosca git commit: ARIA-275 Update NFV profile to csd04

2017-06-13 Thread mxmrlv

ARIA-275 Update NFV profile to csd04

This update was done according to:
http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html

We resolved some inconsistencies of csd04 with the TOSCA spec, and within csd04 
itself. Wherever we resolved such inconsistencies, we added a detailed
comment describing our reasoning.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/1e883c57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/1e883c57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/1e883c57

Branch: refs/heads/ARIA-276-Support-model-instrumentation-for-workflows
Commit: 1e883c57abb733b10e13f0b7005cf564886d3fb1
Parents: 22f6e9e
Author: Avia Efrat 
Authored: Sun Jun 4 22:11:10 2017 +0300
Committer: Avia Efrat 
Committed: Mon Jun 12 22:24:04 2017 +0300

--
 .../profiles/tosca-simple-1.0/artifacts.yaml|   8 +-
 .../profiles/tosca-simple-1.0/capabilities.yaml |   2 +-
 .../profiles/tosca-simple-1.0/data.yaml |   2 +-
 .../profiles/tosca-simple-1.0/groups.yaml   |   2 +-
 .../profiles/tosca-simple-1.0/interfaces.yaml   |   2 +-
 .../profiles/tosca-simple-1.0/nodes.yaml|   2 +-
 .../profiles/tosca-simple-1.0/policies.yaml |  10 +-
 .../tosca-simple-1.0/relationships.yaml |   2 +-
 .../tosca-simple-nfv-1.0/artifacts.yaml |  84 +
 .../tosca-simple-nfv-1.0/capabilities.yaml  |  99 ++
 .../profiles/tosca-simple-nfv-1.0/data.yaml | 305 ++---
 .../profiles/tosca-simple-nfv-1.0/groups.yaml   |  56 
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 323 ---
 .../tosca-simple-nfv-1.0/relationships.yaml |  37 +--
 .../tosca-simple-nfv-1.0.yaml   |   2 +-
 15 files changed, 604 insertions(+), 332 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1e883c57/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
index af99340..cfb0df5 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
@@ -17,7 +17,7 @@ artifact_types:
 
   tosca.artifacts.Root:
 _extensions:
-  shorthand_name: Root # ARIA NOTE: ommitted in the spec
+  shorthand_name: Root # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Root
   specification: tosca-simple-1.0
   specification_section: 5.3.1
@@ -41,7 +41,7 @@ artifact_types:
   
   tosca.artifacts.Deployment:
 _extensions:
-  shorthand_name: Deployment # ARIA NOTE: ommitted in the spec
+  shorthand_name: Deployment # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Deployment
   specification: tosca-simple-1.0
   specification_section: 5.3.3.1
@@ -67,7 +67,7 @@ artifact_types:
   
   tosca.artifacts.Deployment.Image.VM:
 _extensions:
-  shorthand_name: Deployment.VM # ARIA NOTE: ommitted in the spec
+  shorthand_name: Deployment.VM # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Deployment.VM
   specification: tosca-simple-1.0
   specification_section: 5.3.3.4
@@ -85,7 +85,7 @@ artifact_types:
   
   tosca.artifacts.Implementation:
 _extensions:
-  shorthand_name: Implementation # ARIA NOTE: ommitted in the spec
+  shorthand_name: Implementation # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Implementation
   specification: tosca-simple-1.0
   specification_section: 5.3.4.1

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1e883c57/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
index 0b81a16..30abe10 100644
--- 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
@@ -17,7 +17,7 @@ capability_types:
 
   tosca.capabilities.Root:
 _extensions:
-  shorthand_name: Root # ARIA NOTE: ommitted in the spec
+  shorthand_name: Root # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Root
   specification: tosca-simple-1.0
   specification_section: 5.4.1

incubator-ariatosca git commit: ARIA-276 Support model instrumentation for workflows [Forced Update!]

2017-06-13 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-276-Support-model-instrumentation-for-workflows 3bca25d2e -> 
9845de5e7 (forced update)


ARIA-276 Support model instrumentation for 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/9845de5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9845de5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9845de5e

Branch: refs/heads/ARIA-276-Support-model-instrumentation-for-workflows
Commit: 9845de5e77163470074c5af70626dae4b6fa9d06
Parents: 5afa2f7
Author: max-orlov 
Authored: Thu Jun 8 09:52:31 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 13 12:32:01 2017 +0300

--
 aria/orchestrator/context/common.py |   7 +
 aria/orchestrator/context/operation.py  |   7 -
 aria/orchestrator/decorators.py |   5 +-
 aria/orchestrator/workflows/api/task.py |   2 -
 aria/orchestrator/workflows/core/task.py|  12 +-
 aria/storage/collection_instrumentation.py  |  46 +--
 .../context/test_collection_instrumentation.py  | 325 ---
 .../context/test_context_instrumentation.py | 108 ++
 tests/orchestrator/context/test_serialize.py|  20 +-
 tests/orchestrator/context/test_workflow.py |  93 --
 .../orchestrator/execution_plugin/test_local.py |  26 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  50 +--
 .../workflows/builtin/test_execute_operation.py |   9 +-
 .../orchestrator/workflows/core/test_engine.py  |  88 +++--
 .../executor/test_process_executor_extension.py |  24 +-
 .../test_process_executor_tracked_changes.py|  26 +-
 .../storage/test_collection_instrumentation.py  | 257 +++
 17 files changed, 627 insertions(+), 478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9845de5e/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index c98e026..f4df317 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -36,6 +36,13 @@ class BaseContext(object):
 Base context object for workflow and operation
 """
 
+INSTRUMENTATION_FIELDS = (
+modeling.models.Node.attributes,
+modeling.models.Node.properties,
+modeling.models.NodeTemplate.attributes,
+modeling.models.NodeTemplate.properties
+)
+
 class PrefixedLogger(object):
 def __init__(self, base_logger, task_id=None):
 self._logger = base_logger

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9845de5e/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index af7220d..efdc04d 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,13 +29,6 @@ class BaseOperationContext(common.BaseContext):
 Context object used during operation creation and execution
 """
 
-INSTRUMENTATION_FIELDS = (
-aria.modeling.models.Node.attributes,
-aria.modeling.models.Node.properties,
-aria.modeling.models.NodeTemplate.attributes,
-aria.modeling.models.NodeTemplate.properties
-)
-
 def __init__(self, task_id, actor_id, **kwargs):
 self._task_id = task_id
 self._actor_id = actor_id

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9845de5e/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 80f6962..389bfb8 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -49,8 +49,9 @@ def workflow(func=None, suffix_template=''):
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
 validate_function_arguments(func, workflow_parameters)
-with context.workflow.current.push(ctx):
-func(**workflow_parameters)
+with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
+with context.workflow.current.push(ctx):
+func(**workflow_parameters)
 return workflow_parameters['graph']
 return _wrapper
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9845de5e/aria/orchestrator/workflows/api/task.py
--
diff --git

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1401 matches

Mail list logo