Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-105-integrate-modeling daa2d538b -> 091152f27
Some test updates (unfinished) Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/091152f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/091152f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/091152f2 Branch: refs/heads/ARIA-105-integrate-modeling Commit: 091152f2716ae8abfdd42f23f399ff540abea41a Parents: daa2d53 Author: Tal Liron <[email protected]> Authored: Fri Mar 3 11:05:19 2017 -0600 Committer: Tal Liron <[email protected]> Committed: Fri Mar 3 11:05:19 2017 -0600 ---------------------------------------------------------------------- tests/storage/__init__.py | 16 ++++---- tests/storage/test_instrumentation.py | 33 ++++++++------- tests/storage/test_model_storage.py | 2 +- tests/storage/test_models.py | 66 +++++++++++++++--------------- tests/storage/test_structures.py | 25 ++++++----- 5 files changed, 74 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/091152f2/tests/storage/__init__.py ---------------------------------------------------------------------- diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index 8728467..f33205f 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -27,18 +27,18 @@ from sqlalchemy import ( ) -from aria.storage import ( - model, - type as aria_type, - structure +from aria.modeling import ( + models, + types as modeling_types, + bases ) from aria import modeling -class MockModel(model.aria_declarative_base, structure.ModelMixin): #pylint: disable=abstract-method +class MockModel(models.aria_declarative_base, bases.ModelMixin): #pylint: disable=abstract-method __tablename__ = 'mock_model' - model_dict = Column(aria_type.Dict) - model_list = Column(aria_type.List) + model_dict = Column(modeling_types.Dict) + model_list = Column(modeling_types.List) value = Column(Integer) name = Column(Text) @@ -65,7 +65,7 @@ def release_sqlite_storage(storage): session.rollback() session.close() for engine in set(mapi._engine for mapi in mapis): - model.aria_declarative_base.metadata.drop_all(engine) + models.aria_declarative_base.metadata.drop_all(engine) def init_inmemory_model_storage(): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/091152f2/tests/storage/test_instrumentation.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_instrumentation.py b/tests/storage/test_instrumentation.py index 08d5ae0..413b888 100644 --- a/tests/storage/test_instrumentation.py +++ b/tests/storage/test_instrumentation.py @@ -16,15 +16,18 @@ import pytest from sqlalchemy import Column, Text, Integer, event +from aria.modeling import ( + bases, + exceptions, + types as modeling_types, + models +) from aria.storage import ( - structure, ModelStorage, sql_mapi, - instrumentation, - exceptions, - type as aria_type, - model + instrumentation ) + from ..storage import release_sqlite_storage, init_inmemory_model_storage STUB = instrumentation._STUB @@ -334,27 +337,27 @@ def storage(): release_sqlite_storage(result) -class _MockModel(structure.ModelMixin): +class _MockModel(bases.ModelMixin): name = Column(Text) - dict1 = Column(aria_type.Dict) - dict2 = Column(aria_type.Dict) - list1 = Column(aria_type.List) - list2 = Column(aria_type.List) + dict1 = Column(modeling_types.Dict) + dict2 = Column(modeling_types.Dict) + list1 = Column(modeling_types.List) + list2 = Column(modeling_types.List) int1 = Column(Integer) int2 = Column(Integer) string2 = Column(Text) -class MockModel1(_MockModel, model.aria_declarative_base): +class MockModel1(_MockModel, models.aria_declarative_base): __tablename__ = 'mock_model_1' -class MockModel2(_MockModel, model.aria_declarative_base): +class MockModel2(_MockModel, models.aria_declarative_base): __tablename__ = 'mock_model_2' -class StrictMockModel(structure.ModelMixin, model.aria_declarative_base): +class StrictMockModel(bases.ModelMixin, models.aria_declarative_base): __tablename__ = 'strict_mock_model' - strict_dict = Column(aria_type.StrictDict(basestring, basestring)) - strict_list = Column(aria_type.StrictList(basestring)) + strict_dict = Column(modeling_types.StrictDict(basestring, basestring)) + strict_list = Column(modeling_types.StrictList(basestring)) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/091152f2/tests/storage/test_model_storage.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_model_storage.py b/tests/storage/test_model_storage.py index f58eefd..416a0a8 100644 --- a/tests/storage/test_model_storage.py +++ b/tests/storage/test_model_storage.py @@ -37,7 +37,7 @@ def storage(): @pytest.fixture(scope='module', autouse=True) def module_cleanup(): - modeling.model.aria_declarative_base.metadata.remove(MockModel.__table__) #pylint: disable=no-member + modeling.models.aria_declarative_base.metadata.remove(MockModel.__table__) #pylint: disable=no-member def test_storage_base(storage): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/091152f2/tests/storage/test_models.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_models.py b/tests/storage/test_models.py index 849806c..b186509 100644 --- a/tests/storage/test_models.py +++ b/tests/storage/test_models.py @@ -22,12 +22,12 @@ from aria.storage import ( exceptions, sql_mapi, ) -from aria.modeling.model import ( +from aria.modeling.models import ( ServiceTemplate, - ServiceInstance, - ServiceInstanceUpdate, - ServiceInstanceUpdateStep, - ServiceInstanceModification, + Service, + ServiceUpdate, + ServiceUpdateStep, + ServiceModification, Execution, Task, Plugin, @@ -74,7 +74,7 @@ def _service_instance_storage(): def _service_instance_update_storage(): storage = _service_instance_storage() - service_instance_update = ServiceInstanceUpdate( + service_instance_update = ServiceUpdate( service_instance=storage.service_instance.list()[0], created_at=now, service_instance_plan={}, @@ -196,7 +196,7 @@ class TestServiceTemplate(object): ) -class TestServiceInstance(object): +class TestService(object): @pytest.mark.parametrize( 'is_valid, name, created_at, description, inputs, permalink, policy_triggers, ' @@ -233,7 +233,7 @@ class TestServiceInstance(object): service_instance = _test_model( is_valid=is_valid, storage=service_instance_storage, - model_cls=ServiceInstance, + model_cls=Service, model_kwargs=dict( name=name, service_template=service_instance_storage.service_template.list()[0], @@ -361,7 +361,7 @@ class TestExecution(object): execution.status = transitioned_status -class TestServiceInstanceUpdate(object): +class TestServiceUpdate(object): @pytest.mark.parametrize( 'is_valid, created_at, deployment_plan, service_instance_update_node_instances, ' 'service_instance_update_service_instance, service_instance_update_nodes, ' @@ -390,7 +390,7 @@ class TestServiceInstanceUpdate(object): service_instance_update = _test_model( is_valid=is_valid, storage=service_instance_storage, - model_cls=ServiceInstanceUpdate, + model_cls=ServiceUpdate, model_kwargs=dict( service_instance=service_instance_storage.service_instance.list()[0], created_at=created_at, @@ -406,18 +406,18 @@ class TestServiceInstanceUpdate(object): service_instance_storage.service_instance.list()[0] -class TestServiceInstanceUpdateStep(object): +class TestServiceUpdateStep(object): @pytest.mark.parametrize( 'is_valid, action, entity_id, entity_type', [ - (False, m_cls, 'id', ServiceInstanceUpdateStep.ENTITY_TYPES.NODE), - (False, ServiceInstanceUpdateStep.ACTION_TYPES.ADD, m_cls, - ServiceInstanceUpdateStep.ENTITY_TYPES.NODE), - (False, ServiceInstanceUpdateStep.ACTION_TYPES.ADD, 'id', m_cls), + (False, m_cls, 'id', ServiceUpdateStep.ENTITY_TYPES.NODE), + (False, ServiceUpdateStep.ACTION_TYPES.ADD, m_cls, + ServiceUpdateStep.ENTITY_TYPES.NODE), + (False, ServiceUpdateStep.ACTION_TYPES.ADD, 'id', m_cls), - (True, ServiceInstanceUpdateStep.ACTION_TYPES.ADD, 'id', - ServiceInstanceUpdateStep.ENTITY_TYPES.NODE) + (True, ServiceUpdateStep.ACTION_TYPES.ADD, 'id', + ServiceUpdateStep.ENTITY_TYPES.NODE) ] ) def test_deployment_update_step_model_creation(self, service_instance_update_storage, is_valid, @@ -425,7 +425,7 @@ class TestServiceInstanceUpdateStep(object): service_instance_update_step = _test_model( is_valid=is_valid, storage=service_instance_update_storage, - model_cls=ServiceInstanceUpdateStep, + model_cls=ServiceUpdateStep, model_kwargs=dict( service_instance_update= service_instance_update_storage.service_instance_update.list()[0], @@ -438,19 +438,19 @@ class TestServiceInstanceUpdateStep(object): service_instance_update_storage.service_instance_update.list()[0] def test_deployment_update_step_order(self): - add_node = ServiceInstanceUpdateStep( + add_node = ServiceUpdateStep( id='add_step', action='add', entity_type='node', entity_id='node_id') - modify_node = ServiceInstanceUpdateStep( + modify_node = ServiceUpdateStep( id='modify_step', action='modify', entity_type='node', entity_id='node_id') - remove_node = ServiceInstanceUpdateStep( + remove_node = ServiceUpdateStep( id='remove_step', action='remove', entity_type='node', @@ -462,13 +462,13 @@ class TestServiceInstanceUpdateStep(object): assert remove_node < modify_node < add_node assert not remove_node > modify_node > add_node - add_rel = ServiceInstanceUpdateStep( + add_rel = ServiceUpdateStep( id='add_step', action='add', entity_type='relationship', entity_id='relationship_id') - remove_rel = ServiceInstanceUpdateStep( + remove_rel = ServiceUpdateStep( id='remove_step', action='remove', entity_type='relationship', @@ -482,17 +482,17 @@ class TestDeploymentModification(object): @pytest.mark.parametrize( 'is_valid, context, created_at, ended_at, modified_node_templates, nodes, status', [ - (False, m_cls, now, now, {}, {}, ServiceInstanceModification.STARTED), - (False, {}, m_cls, now, {}, {}, ServiceInstanceModification.STARTED), - (False, {}, now, m_cls, {}, {}, ServiceInstanceModification.STARTED), - (False, {}, now, now, m_cls, {}, ServiceInstanceModification.STARTED), - (False, {}, now, now, {}, m_cls, ServiceInstanceModification.STARTED), + (False, m_cls, now, now, {}, {}, ServiceModification.STARTED), + (False, {}, m_cls, now, {}, {}, ServiceModification.STARTED), + (False, {}, now, m_cls, {}, {}, ServiceModification.STARTED), + (False, {}, now, now, m_cls, {}, ServiceModification.STARTED), + (False, {}, now, now, {}, m_cls, ServiceModification.STARTED), (False, {}, now, now, {}, {}, m_cls), - (True, {}, now, now, {}, {}, ServiceInstanceModification.STARTED), - (True, {}, now, None, {}, {}, ServiceInstanceModification.STARTED), - (True, {}, now, now, None, {}, ServiceInstanceModification.STARTED), - (True, {}, now, now, {}, None, ServiceInstanceModification.STARTED), + (True, {}, now, now, {}, {}, ServiceModification.STARTED), + (True, {}, now, None, {}, {}, ServiceModification.STARTED), + (True, {}, now, now, None, {}, ServiceModification.STARTED), + (True, {}, now, now, {}, None, ServiceModification.STARTED), ] ) def test_deployment_modification_model_creation( @@ -501,7 +501,7 @@ class TestDeploymentModification(object): deployment_modification = _test_model( is_valid=is_valid, storage=service_instance_storage, - model_cls=ServiceInstanceModification, + model_cls=ServiceModification, model_kwargs=dict( service_instance=service_instance_storage.service_instance.list()[0], context=context, http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/091152f2/tests/storage/test_structures.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_structures.py b/tests/storage/test_structures.py index 24fb7ad..77e997c 100644 --- a/tests/storage/test_structures.py +++ b/tests/storage/test_structures.py @@ -20,12 +20,15 @@ import sqlalchemy from aria.storage import ( ModelStorage, sql_mapi, - exceptions, - type + exceptions ) from aria import modeling -from ..storage import release_sqlite_storage, structure, init_inmemory_model_storage +from ..storage import ( + release_sqlite_storage, + bases, + init_inmemory_model_storage +) from . import MockModel from ..mock import ( models, @@ -44,7 +47,7 @@ def storage(): @pytest.fixture(scope='module', autouse=True) def module_cleanup(): - modeling.model.aria_declarative_base.metadata.remove(MockModel.__table__) #pylint: disable=no-member + modeling.models.aria_declarative_base.metadata.remove(MockModel.__table__) #pylint: disable=no-member @pytest.fixture @@ -112,7 +115,7 @@ def test_relationship_model_ordering(context): service_instance = context.model.service_instance.get_by_name(models.DEPLOYMENT_NAME) source_node = context.model.node.get_by_name(models.DEPENDENT_NODE_INSTANCE_NAME) target_node = context.model.node.get_by_name(models.DEPENDENCY_NODE_INSTANCE_NAME) - new_node_template = modeling.model.NodeTemplate( + new_node_template = modeling.models.NodeTemplate( name='new_node', type_name='test_node_type', type_hierarchy=[], @@ -121,7 +124,7 @@ def test_relationship_model_ordering(context): max_instances=1, service_template=service_instance.service_template ) - new_node = modeling.model.Node( + new_node = modeling.models.Node( name='new_node_instance', runtime_properties={}, service_instance=service_instance, @@ -131,12 +134,12 @@ def test_relationship_model_ordering(context): scaling_groups=[] ) - source_to_new_relationship = modeling.model.Relationship( + source_to_new_relationship = modeling.models.Relationship( target_node=new_node, source_node=source_node, ) - new_to_target_relationship = modeling.model.Relationship( + new_to_target_relationship = modeling.models.Relationship( source_node=new_node, target_node=target_node, ) @@ -169,11 +172,11 @@ def test_relationship_model_ordering(context): flip_and_assert(target_node, 'inbound') -class StrictClass(modeling.model.aria_declarative_base, structure.ModelMixin): +class StrictClass(modeling.models.aria_declarative_base, bases.ModelMixin): __tablename__ = 'strict_class' - strict_dict = sqlalchemy.Column(type.StrictDict(basestring, basestring)) - strict_list = sqlalchemy.Column(type.StrictList(basestring)) + strict_dict = sqlalchemy.Column(modeling.types.StrictDict(basestring, basestring)) + strict_list = sqlalchemy.Column(modeling.types.StrictList(basestring)) def test_strict_dict():
