[1/3] incubator-ariatosca git commit: Storage is now sql based with SQLAlchemy based models [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-30-SQL-based-storage-implementation 91f9de43b -> 8d768e611
(forced update)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8d768e61/tests/orchestrator/workflows/api/test_task.py
--
diff --git a/tests/orchestrator/workflows/api/test_task.py
b/tests/orchestrator/workflows/api/test_task.py
index 8536902..4da42c1 100644
--- a/tests/orchestrator/workflows/api/test_task.py
+++ b/tests/orchestrator/workflows/api/test_task.py
@@ -22,7 +22,7 @@ from aria.orchestrator.workflows import api
from tests import mock
-@pytest.fixture()
+@pytest.fixture
def ctx():
"""
Create the following graph in storage:
@@ -30,50 +30,26 @@ def ctx():
:return:
"""
simple_context = mock.context.simple()
-dependency_node = mock.models.get_dependency_node()
-dependency_node_instance = mock.models.get_dependency_node_instance(
-dependency_node=dependency_node)
-
-relationship = mock.models.get_relationship(dependency_node)
-relationship_instance = mock.models.get_relationship_instance(
-relationship=relationship,
-target_instance=dependency_node_instance
-)
-
-dependent_node = mock.models.get_dependent_node(relationship)
-dependent_node_instance = mock.models.get_dependent_node_instance(
-dependent_node=dependent_node,
-relationship_instance=relationship_instance
-)
-
-simple_context.model.node.store(dependent_node)
-simple_context.model.node.store(dependency_node)
-simple_context.model.node_instance.store(dependent_node_instance)
-simple_context.model.node_instance.store(dependency_node_instance)
-simple_context.model.relationship.store(relationship)
-simple_context.model.relationship_instance.store(relationship_instance)
-simple_context.model.execution.store(mock.models.get_execution())
-simple_context.model.deployment.store(mock.models.get_deployment())
+
simple_context.model.execution.store(mock.models.get_execution(simple_context.deployment))
return simple_context
class TestOperationTask(object):
-def test_node_operation_task_creation(self):
-workflow_context = mock.context.simple()
-
+def test_node_operation_task_creation(self, ctx):
operation_name = 'aria.interfaces.lifecycle.create'
op_details = {'operation': True}
-node = mock.models.get_dependency_node()
+node = ctx.model.node.get(mock.models.DEPENDENT_NODE_ID)
node.operations[operation_name] = op_details
-node_instance =
mock.models.get_dependency_node_instance(dependency_node=node)
+ctx.model.node.update(node)
+node_instance =
ctx.model.node_instance.get(mock.models.DEPENDENT_NODE_INSTANCE_ID)
inputs = {'inputs': True}
max_attempts = 10
retry_interval = 10
ignore_failure = True
-with context.workflow.current.push(workflow_context):
+with context.workflow.current.push(ctx):
api_task = api.task.OperationTask.node_instance(
name=operation_name,
instance=node_instance,
@@ -90,19 +66,18 @@ class TestOperationTask(object):
assert api_task.max_attempts == max_attempts
assert api_task.ignore_failure == ignore_failure
-def test_relationship_operation_task_creation(self):
-workflow_context = mock.context.simple()
-
+def test_relationship_operation_task_creation(self, ctx):
operation_name = 'aria.interfaces.relationship_lifecycle.preconfigure'
op_details = {'operation': True}
-relationship = mock.models.get_relationship()
+relationship = ctx.model.relationship.get(mock.models.RELATIONSHIP_ID)
relationship.source_operations[operation_name] = op_details
-relationship_instance =
mock.models.get_relationship_instance(relationship=relationship)
+relationship_instance = ctx.model.relationship_instance.get(
+mock.models.RELATIONSHIP_INSTANCE_ID)
inputs = {'inputs': True}
max_attempts = 10
retry_interval = 10
-with context.workflow.current.push(workflow_context):
+with context.workflow.current.push(ctx):
api_task = api.task.OperationTask.relationship_instance(
name=operation_name,
instance=relationship_instance,
@@ -118,18 +93,19 @@ class TestOperationTask(object):
assert api_task.retry_interval == retry_interval
assert api_task.max_attempts == max_attempts
-def test_operation_task_default_values(self):
-workflow_context = mock.context.simple(task_ignore_failure=True)
-with context.workflow.current.push(workflow_context):
-model_task = api.task.OperationTask(
+def test_operation_task_default_values(self, ctx):
+dependency_node_instance =
[1/3] incubator-ariatosca git commit: Storage is now sql based with SQLAlchemy based models [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/SQLAlchemy-based-models 7ba33f1d5 -> 2d6b9375d (forced update)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2d6b9375/tests/orchestrator/workflows/api/test_task.py
--
diff --git a/tests/orchestrator/workflows/api/test_task.py
b/tests/orchestrator/workflows/api/test_task.py
index 8536902..4da42c1 100644
--- a/tests/orchestrator/workflows/api/test_task.py
+++ b/tests/orchestrator/workflows/api/test_task.py
@@ -22,7 +22,7 @@ from aria.orchestrator.workflows import api
from tests import mock
-@pytest.fixture()
+@pytest.fixture
def ctx():
"""
Create the following graph in storage:
@@ -30,50 +30,26 @@ def ctx():
:return:
"""
simple_context = mock.context.simple()
-dependency_node = mock.models.get_dependency_node()
-dependency_node_instance = mock.models.get_dependency_node_instance(
-dependency_node=dependency_node)
-
-relationship = mock.models.get_relationship(dependency_node)
-relationship_instance = mock.models.get_relationship_instance(
-relationship=relationship,
-target_instance=dependency_node_instance
-)
-
-dependent_node = mock.models.get_dependent_node(relationship)
-dependent_node_instance = mock.models.get_dependent_node_instance(
-dependent_node=dependent_node,
-relationship_instance=relationship_instance
-)
-
-simple_context.model.node.store(dependent_node)
-simple_context.model.node.store(dependency_node)
-simple_context.model.node_instance.store(dependent_node_instance)
-simple_context.model.node_instance.store(dependency_node_instance)
-simple_context.model.relationship.store(relationship)
-simple_context.model.relationship_instance.store(relationship_instance)
-simple_context.model.execution.store(mock.models.get_execution())
-simple_context.model.deployment.store(mock.models.get_deployment())
+
simple_context.model.execution.store(mock.models.get_execution(simple_context.deployment))
return simple_context
class TestOperationTask(object):
-def test_node_operation_task_creation(self):
-workflow_context = mock.context.simple()
-
+def test_node_operation_task_creation(self, ctx):
operation_name = 'aria.interfaces.lifecycle.create'
op_details = {'operation': True}
-node = mock.models.get_dependency_node()
+node = ctx.model.node.get(mock.models.DEPENDENT_NODE_ID)
node.operations[operation_name] = op_details
-node_instance =
mock.models.get_dependency_node_instance(dependency_node=node)
+ctx.model.node.update(node)
+node_instance =
ctx.model.node_instance.get(mock.models.DEPENDENT_NODE_INSTANCE_ID)
inputs = {'inputs': True}
max_attempts = 10
retry_interval = 10
ignore_failure = True
-with context.workflow.current.push(workflow_context):
+with context.workflow.current.push(ctx):
api_task = api.task.OperationTask.node_instance(
name=operation_name,
instance=node_instance,
@@ -90,19 +66,18 @@ class TestOperationTask(object):
assert api_task.max_attempts == max_attempts
assert api_task.ignore_failure == ignore_failure
-def test_relationship_operation_task_creation(self):
-workflow_context = mock.context.simple()
-
+def test_relationship_operation_task_creation(self, ctx):
operation_name = 'aria.interfaces.relationship_lifecycle.preconfigure'
op_details = {'operation': True}
-relationship = mock.models.get_relationship()
+relationship = ctx.model.relationship.get(mock.models.RELATIONSHIP_ID)
relationship.source_operations[operation_name] = op_details
-relationship_instance =
mock.models.get_relationship_instance(relationship=relationship)
+relationship_instance = ctx.model.relationship_instance.get(
+mock.models.RELATIONSHIP_INSTANCE_ID)
inputs = {'inputs': True}
max_attempts = 10
retry_interval = 10
-with context.workflow.current.push(workflow_context):
+with context.workflow.current.push(ctx):
api_task = api.task.OperationTask.relationship_instance(
name=operation_name,
instance=relationship_instance,
@@ -118,18 +93,19 @@ class TestOperationTask(object):
assert api_task.retry_interval == retry_interval
assert api_task.max_attempts == max_attempts
-def test_operation_task_default_values(self):
-workflow_context = mock.context.simple(task_ignore_failure=True)
-with context.workflow.current.push(workflow_context):
-model_task = api.task.OperationTask(
+def test_operation_task_default_values(self, ctx):
+dependency_node_instance = ctx.model.node_instance.get(
+
