incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism c67a93197 -> 6d9e7254f (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: 6d9e7254f1f96ec0eb96455f09c9d0b33e4beb64
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Sun Dec 18 12:51:20 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 ++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  98 -
 aria/orchestrator/workflows/executor/process.py | 204 +++
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  86 
 requirements.txt|   3 +-
 setup.py|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 107 +-
 .../workflows/executor/test_process_executor.py |  96 +
 tests/resources/__init__.py |  19 ++
 .../plugins/mock-plugin1/mock_plugin1.py|  27 +++
 tests/resources/plugins/mock-plugin1/setup.py   |  28 +++
 tests/storage/test_models.py| 188 -
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 +++
 23 files changed, 826 insertions(+), 317 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6d9e7254/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..1cd765f 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.process import ProcessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = ProcessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6d9e7254/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism d68fefb54 -> c67a93197 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: c67a931974ec9d5a9c6dae38b5824a660fc6396c
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Sun Dec 18 12:40:37 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  98 --
 aria/orchestrator/workflows/executor/process.py | 183 ++
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  86 +
 requirements.txt|   3 +-
 setup.py|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 111 +--
 .../workflows/executor/test_process_executor.py |  96 ++
 tests/resources/__init__.py |  19 ++
 .../plugins/mock-plugin1/mock_plugin1.py|  27 +++
 tests/resources/plugins/mock-plugin1/setup.py   |  28 +++
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 23 files changed, 809 insertions(+), 317 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c67a9319/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..1cd765f 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.process import ProcessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = ProcessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c67a9319/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
 

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism d12c00711 -> d68fefb54 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: d68fefb54c326c5089caf0beb2392c472a99da7d
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Wed Dec 14 20:06:14 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  97 ++
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  86 +
 requirements.txt|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 106 +--
 .../executor/test_multiprocess_executor.py  |  88 +
 tests/resources/__init__.py |  19 ++
 .../plugins/mock-plugin1/mock_plugin1.py|  27 +++
 tests/resources/plugins/mock-plugin1/setup.py   |  28 +++
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 21 files changed, 675 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d68fefb5/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..825be68 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d68fefb5/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
  if max_attempts is None else max_attempts)
 self.retry_interval = 

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism 623423e3b -> d12c00711 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: d12c007112e7e91b06fc06c9b127d064cc451e9b
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Wed Dec 14 20:05:30 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  97 ++
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  86 +
 requirements.txt|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 106 +--
 .../executor/test_multiprocess_executor.py  |  88 +
 tests/resources/__init__.py |  19 ++
 .../plugins/mock-plugin1/mock_plugin1.py|  27 +++
 tests/resources/plugins/mock-plugin1/setup.py   |  28 +++
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 21 files changed, 675 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d12c0071/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..825be68 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d12c0071/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
  if max_attempts is None else max_attempts)
 self.retry_interval = 

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism 8b0a49e65 -> f562c3715 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: f562c3715876cf557985148104d2b610c3ee563c
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Wed Dec 14 19:11:15 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  97 ++
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  81 
 requirements.txt|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 106 +--
 .../executor/test_multiprocess_executor.py  |  88 +
 tests/resources/__init__.py |  19 ++
 .../plugins/mock-plugin1/mock_plugin1.py|  27 +++
 tests/resources/plugins/mock-plugin1/setup.py   |  28 +++
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 21 files changed, 670 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f562c371/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..825be68 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f562c371/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
  if max_attempts is None else max_attempts)
 self.retry_interval = 

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism 0e1a1a5d8 -> 8b0a49e65 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: 8b0a49e65aa9b215ce1853642f933b98bef5500c
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Wed Dec 14 18:59:08 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  92 +
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  81 
 requirements.txt|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 106 +--
 .../executor/test_multiprocess_executor.py  |  88 +
 tests/resources/__init__.py |  19 ++
 .../plugins/mock-plugin1/mock_plugin1.py|  27 +++
 tests/resources/plugins/mock-plugin1/setup.py   |  28 +++
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 21 files changed, 665 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8b0a49e6/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..825be68 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8b0a49e6/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
  if max_attempts is None else max_attempts)
 self.retry_interval = 

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism 11072ee33 -> 62a993299 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: 62a99329958a9cd2dbba26de5319afb0522e180f
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Tue Dec 13 17:33:11 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  88 +
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  75 
 requirements.txt|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 104 +-
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 17 files changed, 492 insertions(+), 250 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/62a99329/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..825be68 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/62a99329/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
  if max_attempts is None else max_attempts)
 self.retry_interval = (self.workflow_context._task_retry_interval
@@ -98,15 +99,13 @@ class OperationTask(BaseTask):
 :param name: the name of the operation.
 """
 assert isinstance(instance, models.NodeInstance)
-operation_details = instance.node.operations[name]

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism 5c3bee47d -> 11072ee33 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: 11072ee33f06bcd40151de2b8dcd65affa167c44
Parents: 04c9bd0
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Tue Dec 13 17:17:08 2016 +0200

--
 aria/cli/commands.py|   4 +-
 aria/orchestrator/workflows/api/task.py |  42 +++--
 aria/orchestrator/workflows/core/task.py|  10 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 
 .../workflows/executor/multiprocess.py  |  88 +
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |  15 +-
 aria/utils/plugin.py|  74 
 requirements.txt|   3 +-
 tests/mock/models.py|  16 ++
 tests/orchestrator/workflows/api/test_task.py   |  51 -
 tests/orchestrator/workflows/core/test_task.py  |  16 +-
 .../workflows/executor/test_executor.py | 104 +-
 tests/storage/test_models.py| 188 +--
 tests/utils/__init__.py |  14 ++
 tests/utils/test_plugin.py  |  75 
 17 files changed, 491 insertions(+), 250 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/11072ee3/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 141da07..825be68 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -34,7 +34,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import iter_specifications
 from ..parser.consumption import (
 ConsumptionContext,
@@ -252,7 +252,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/11072ee3/aria/orchestrator/workflows/api/task.py
--
diff --git a/aria/orchestrator/workflows/api/task.py 
b/aria/orchestrator/workflows/api/task.py
index 1c12407..70f9773 100644
--- a/aria/orchestrator/workflows/api/task.py
+++ b/aria/orchestrator/workflows/api/task.py
@@ -67,11 +67,11 @@ class OperationTask(BaseTask):
  max_attempts=None,
  retry_interval=None,
  ignore_failure=None,
- inputs=None):
+ inputs=None,
+ plugin=None):
 """
 Creates an operation task using the name, details, node instance and 
any additional kwargs.
 :param name: the operation of the name.
-:param operation_details: the details for the operation.
 :param actor: the operation host on which this operation is registered.
 :param inputs: operation inputs.
 """
@@ -82,6 +82,7 @@ class OperationTask(BaseTask):
 self.name = '{name}.{actor.id}'.format(name=name, actor=actor)
 self.operation_mapping = operation_mapping
 self.inputs = inputs or {}
+self.plugin = plugin or {}
 self.max_attempts = (self.workflow_context._task_max_attempts
  if max_attempts is None else max_attempts)
 self.retry_interval = (self.workflow_context._task_retry_interval
@@ -98,15 +99,13 @@ class OperationTask(BaseTask):
 :param name: the name of the operation.
 """
 assert isinstance(instance, models.NodeInstance)
-operation_details = instance.node.operations[name]

incubator-ariatosca git commit: ARIA-26 TBD [Forced Update!]

[dankilman]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-26-plugin-mechanism ad9cab78d -> b9e292d83 (forced update)


ARIA-26 TBD


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

Branch: refs/heads/ARIA-26-plugin-mechanism
Commit: b9e292d8338effc80cba75379d2df1f8c426fafc
Parents: b33c70e
Author: Dan Kilman 
Authored: Sun Nov 27 16:31:29 2016 +0200
Committer: Dan Kilman 
Committed: Mon Nov 28 17:31:22 2016 +0200

--
 aria/cli/commands.py|   4 +-
 .../orchestrator/workflows/executor/__init__.py |   2 +-
 .../orchestrator/workflows/executor/blocking.py |  36 ---
 .../workflows/executor/multiprocess.py  |  61 ++-
 aria/orchestrator/workflows/executor/thread.py  |   3 +-
 aria/storage/models.py  |   2 +-
 aria/utils/plugin.py|  21 
 requirements.txt|   1 +
 tests/orchestrator/context/test_toolbelt.py |   1 +
 .../orchestrator/workflows/core/test_engine.py  |   8 +-
 .../workflows/executor/test_executor.py | 103 +--
 11 files changed, 113 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b9e292d8/aria/cli/commands.py
--
diff --git a/aria/cli/commands.py b/aria/cli/commands.py
index 57118a7..ab035ba 100644
--- a/aria/cli/commands.py
+++ b/aria/cli/commands.py
@@ -31,7 +31,7 @@ from ..logger import LoggerMixin
 from ..storage import (FileSystemModelDriver, FileSystemResourceDriver)
 from ..orchestrator.context.workflow import WorkflowContext
 from ..orchestrator.workflows.core.engine import Engine
-from ..orchestrator.workflows.executor.thread import ThreadExecutor
+from ..orchestrator.workflows.executor.multiprocess import MultiprocessExecutor
 from ..parser import (DSL_SPECIFICATION_PACKAGES, iter_specifications)
 from ..parser.consumption import (
 ConsumptionContext,
@@ -248,7 +248,7 @@ class ExecuteCommand(BaseCommand):
 )
 workflow_function = self._load_workflow_handler(workflow['operation'])
 tasks_graph = workflow_function(workflow_context, 
**workflow_context.parameters)
-executor = ThreadExecutor()
+executor = MultiprocessExecutor()
 workflow_engine = Engine(executor=executor,
  workflow_context=workflow_context,
  tasks_graph=tasks_graph)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b9e292d8/aria/orchestrator/workflows/executor/__init__.py
--
diff --git a/aria/orchestrator/workflows/executor/__init__.py 
b/aria/orchestrator/workflows/executor/__init__.py
index 16b6c9b..7b205c1 100644
--- a/aria/orchestrator/workflows/executor/__init__.py
+++ b/aria/orchestrator/workflows/executor/__init__.py
@@ -18,5 +18,5 @@ Executors for task execution
 """
 
 
-from . import blocking, multiprocess, thread
+from . import multiprocess, thread
 from .base import BaseExecutor

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b9e292d8/aria/orchestrator/workflows/executor/blocking.py
--
diff --git a/aria/orchestrator/workflows/executor/blocking.py 
b/aria/orchestrator/workflows/executor/blocking.py
deleted file mode 100644
index 9d3a9ba..000
--- a/aria/orchestrator/workflows/executor/blocking.py
+++ /dev/null
@@ -1,36 +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.
-
-"""
-Blocking executor
-"""
-
-from aria.utils import imports
-from .base import BaseExecutor
-
-
-class CurrentThreadBlockingExecutor(BaseExecutor):
-"""
-Executor which runs tasks in the current