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

[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

[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):
+