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