You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by da...@apache.org on 2017/01/22 18:43:50 UTC
incubator-ariatosca git commit: ARIA-70 fix task plugin_name
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-70-fix-task-plugin-name [created] eaf997484
ARIA-70 fix task plugin_name
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/eaf99748
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/eaf99748
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/eaf99748
Branch: refs/heads/ARIA-70-fix-task-plugin-name
Commit: eaf9974840c101a98d3a626723e37f4990e12ecb
Parents: 8ecf5bb
Author: Dan Kilman <da...@gigaspaces.com>
Authored: Sun Jan 22 20:43:40 2017 +0200
Committer: Dan Kilman <da...@gigaspaces.com>
Committed: Sun Jan 22 20:43:40 2017 +0200
----------------------------------------------------------------------
aria/orchestrator/workflows/core/task.py | 1 +
aria/storage/base_model.py | 5 +----
tests/orchestrator/workflows/core/test_task.py | 6 ++++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/eaf99748/aria/orchestrator/workflows/core/task.py
----------------------------------------------------------------------
diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py
index 1deb66a..4017ed0 100644
--- a/aria/orchestrator/workflows/core/task.py
+++ b/aria/orchestrator/workflows/core/task.py
@@ -135,6 +135,7 @@ class OperationTask(BaseTask):
retry_interval=api_task.retry_interval,
ignore_failure=api_task.ignore_failure,
plugin=plugins[0] if plugins else None,
+ plugin_name=plugin.get('name'),
execution=self._workflow_context.execution,
runs_on=api_task.runs_on
)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/eaf99748/aria/storage/base_model.py
----------------------------------------------------------------------
diff --git a/aria/storage/base_model.py b/aria/storage/base_model.py
index 8566e66..f7d0e5b 100644
--- a/aria/storage/base_model.py
+++ b/aria/storage/base_model.py
@@ -662,10 +662,6 @@ class TaskBase(ModelMixin):
return cls.one_to_many_relationship('plugin_fk')
@declared_attr
- def plugin_name(cls):
- return association_proxy('plugin', 'name')
-
- @declared_attr
def execution_fk(cls):
return cls.foreign_key(ExecutionBase, nullable=True)
@@ -723,6 +719,7 @@ class TaskBase(ModelMixin):
# Operation specific fields
operation_mapping = Column(String)
inputs = Column(Dict)
+ plugin_name = Column(String)
_runs_on = Column(Enum(*RUNS_ON, name='runs_on'), name='runs_on')
@property
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/eaf99748/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 020de32..34088f5 100644
--- a/tests/orchestrator/workflows/core/test_task.py
+++ b/tests/orchestrator/workflows/core/test_task.py
@@ -63,12 +63,14 @@ class TestOperationTask(object):
node_instance = ctx.model.node_instance.get_by_name(
mock.models.DEPENDENCY_NODE_INSTANCE_NAME)
node = node_instance.node
- node.plugins = [{'name': 'plugin1',
+ plugin_name = 'plugin1'
+ node.plugins = [{'name': plugin_name,
'package_name': 'p1',
'package_version': '0.1'}]
- node.operations['aria.interfaces.lifecycle.create'] = {'plugin': 'plugin1'}
+ node.operations['aria.interfaces.lifecycle.create'] = {'plugin': plugin_name}
api_task, core_task = self._create_node_operation_task(ctx, node_instance)
storage_task = ctx.model.task.get_by_name(core_task.name)
+ assert storage_task.plugin_name == plugin_name
assert storage_task.execution_name == ctx.execution.name
assert storage_task.runs_on.id == core_task.context.node_instance.id
assert core_task.model_task == storage_task