Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-105-integrate-modeling 36eb2d24c -> 24ad8ba1e
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/24ad8ba1/tests/storage/test_instrumentation.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_instrumentation.py b/tests/storage/test_instrumentation.py index 413b888..3ef74e4 100644 --- a/tests/storage/test_instrumentation.py +++ b/tests/storage/test_instrumentation.py @@ -18,11 +18,11 @@ from sqlalchemy import Column, Text, Integer, event from aria.modeling import ( bases, - exceptions, types as modeling_types, models ) from aria.storage import ( + exceptions, ModelStorage, sql_mapi, instrumentation @@ -281,8 +281,8 @@ class TestInstrumentation(object): def test_track_changes_to_strict_dict(self, storage): model_kwargs = dict(strict_dict={'key': 'value'}, strict_list=['item']) - mode_instance = StrictMockModel(**model_kwargs) - storage.strict_mock_model.put(mode_instance) + model_instance = StrictMockModel(**model_kwargs) + storage.strict_mock_model.put(model_instance) instrument = self._track_changes({ StrictMockModel.strict_dict: dict, @@ -291,7 +291,7 @@ class TestInstrumentation(object): assert not instrument.tracked_changes - storage_model_instance = storage.strict_mock_model.get(mode_instance.id) + storage_model_instance = storage.strict_mock_model.get(model_instance.id) with pytest.raises(exceptions.StorageError): storage_model_instance.strict_dict = {1: 1} @@ -312,7 +312,7 @@ class TestInstrumentation(object): assert instrument.tracked_changes == { 'strict_mock_model': { - mode_instance.id: { + model_instance.id: { 'strict_dict': Value(STUB, {'hello': 'world'}), 'strict_list': Value(STUB, ['hello']), } http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/24ad8ba1/tests/storage/test_model_storage.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_model_storage.py b/tests/storage/test_model_storage.py index 416a0a8..bb778d4 100644 --- a/tests/storage/test_model_storage.py +++ b/tests/storage/test_model_storage.py @@ -63,40 +63,40 @@ def test_application_storage_factory(): storage = application_model_storage(sql_mapi.SQLAlchemyModelAPI, initiator=init_inmemory_model_storage) - assert storage.parameter - assert storage.mapping_template - assert storage.substitution_template assert storage.service_template assert storage.node_template assert storage.group_template - assert storage.interface_template - assert storage.operation_template - assert storage.artifact_template assert storage.policy_template - assert storage.group_policy_template - assert storage.group_policy_trigger_template + assert storage.substitution_template + assert storage.substitution_template_mapping assert storage.requirement_template + assert storage.relationship_template assert storage.capability_template + assert storage.interface_template + assert storage.operation_template + assert storage.artifact_template - assert storage.mapping - assert storage.substitution - assert storage.service_instance + assert storage.service assert storage.node assert storage.group + assert storage.policy + assert storage.substitution + assert storage.substitution_mapping + assert storage.relationship + assert storage.capability assert storage.interface assert storage.operation - assert storage.capability assert storage.artifact - assert storage.policy - assert storage.group_policy - assert storage.group_policy_trigger - assert storage.relationship assert storage.execution - assert storage.service_instance_update - assert storage.service_instance_update_step - assert storage.service_instance_modification + assert storage.service_update + assert storage.service_update_step + assert storage.service_modification assert storage.plugin assert storage.task + assert storage.parameter + assert storage.type + assert storage.metadata + release_sqlite_storage(storage) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/24ad8ba1/tests/storage/test_models.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_models.py b/tests/storage/test_models.py index 45324dc..0088314 100644 --- a/tests/storage/test_models.py +++ b/tests/storage/test_models.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from datetime import datetime from contextlib import contextmanager @@ -34,7 +35,8 @@ from aria.modeling.models import ( Relationship, NodeTemplate, Node, - Parameter + Parameter, + Type ) from tests import mock @@ -59,55 +61,55 @@ def _empty_storage(): def _service_template_storage(): storage = _empty_storage() - service_template = mock.models.get_service_template() + service_template = mock.models.create_service_template() storage.service_template.put(service_template) + storage.type.put(Type(variant='node')) return storage -def _service_instance_storage(): +def _service_storage(): storage = _service_template_storage() - service_instance = mock.models.get_service( + service = mock.models.create_service( storage.service_template.get_by_name(mock.models.SERVICE_TEMPLATE_NAME)) - storage.service_instance.put(service_instance) + storage.service.put(service) return storage -def _service_instance_update_storage(): - storage = _service_instance_storage() - service_instance_update = ServiceUpdate( - service_instance=storage.service_instance.list()[0], +def _service_update_storage(): + storage = _service_storage() + service_update = ServiceUpdate( + service=storage.service.list()[0], created_at=now, - service_instance_plan={}, + service_plan={}, ) - storage.service_instance_update.put(service_instance_update) + storage.service_update.put(service_update) return storage def _node_template_storage(): - storage = _service_instance_storage() - node_template = mock.models.get_dependency_node_template(storage.service_instance.list()[0]) + storage = _service_storage() + service_template = storage.service_template.list()[0] + node_template = mock.models.create_dependency_node_template(service_template) storage.node_template.put(node_template) return storage def _nodes_storage(): - storage = _nodes_storage() - service_instance = storage.service_instance.get_by_name(mock.models.SERVICE_NAME) + storage = _nodes_storage() # ??? + service = storage.service.get_by_name(mock.models.SERVICE_NAME) dependent_node_template = storage.node_template.get_by_name(mock.models.DEPENDENT_NODE_NAME) dependency_node_template = storage.node_template.get_by_name(mock.models.DEPENDENCY_NODE_NAME) - dependency_node = mock.models.get_dependency_node(dependency_node_template, - service_instance) - dependent_node = mock.models.get_dependent_node(dependent_node_template, - service_instance) + dependency_node = mock.models.create_dependency_node(dependency_node_template, service) + dependent_node = mock.models.create_dependent_node(dependent_node_template, service) storage.node.put(dependency_node) storage.node.put(dependent_node) return storage def _execution_storage(): - storage = _service_instance_storage() - execution = mock.models.get_execution(storage.service_instance.list()[0]) - plugin = mock.models.get_plugin() + storage = _service_storage() + execution = mock.models.create_execution(storage.service.list()[0]) + plugin = mock.models.create_plugin() storage.execution.put(execution) storage.plugin.put(plugin) return storage @@ -126,14 +128,14 @@ def service_template_storage(): @pytest.fixture -def service_instance_storage(): - with sql_storage(_service_instance_storage) as storage: +def service_storage(): + with sql_storage(_service_storage) as storage: yield storage @pytest.fixture -def service_instance_update_storage(): - with sql_storage(_service_instance_update_storage) as storage: +def service_update_storage(): + with sql_storage(_service_update_storage) as storage: yield storage @@ -174,7 +176,7 @@ class TestServiceTemplate(object): @pytest.mark.parametrize( 'is_valid, description, created_at, updated_at, main_file_name', [ - (False, 'description', now, now, '/path'), + (True, 'description', now, now, '/path'), (False, {}, now, now, '/path'), (False, 'description', 'error', now, '/path'), (False, 'description', now, 'error', '/path'), @@ -183,8 +185,8 @@ class TestServiceTemplate(object): ] ) - def test_blueprint_model_creation(self, empty_storage, is_valid, description, created_at, - updated_at, main_file_name): + def test_service_template_model_creation(self, empty_storage, is_valid, description, created_at, + updated_at, main_file_name): _test_model(is_valid=is_valid, storage=empty_storage, model_cls=ServiceTemplate, @@ -199,58 +201,49 @@ class TestServiceTemplate(object): class TestService(object): @pytest.mark.parametrize( - 'is_valid, name, created_at, description, inputs, permalink, policy_triggers, ' - 'policy_types, outputs, scaling_groups, updated_at, workflows', + 'is_valid, name, created_at, description, inputs, permalink, ' + 'outputs, scaling_groups, updated_at', [ - (False, m_cls, now, 'desc', [], 'perlnk', {}, {}, [], {}, now, {}), - (False, 'name', m_cls, 'desc', [], 'perlnk', {}, {}, [], {}, now, {}), - (False, 'name', now, m_cls, [], 'perlnk', {}, {}, [], {}, now, {}), - (False, 'name', now, 'desc', [], m_cls, {}, {}, [], {}, now, {}), - (False, 'name', now, 'desc', [], 'perlnk', m_cls, {}, [], {}, now, {}), - (False, 'name', now, 'desc', [], 'perlnk', {}, m_cls, [], {}, now, {}), - (False, 'name', now, 'desc', [], 'perlnk', {}, {}, m_cls, {}, now, {}), - (False, 'name', now, 'desc', [], 'perlnk', {}, {}, [], m_cls, now, {}), - (False, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, m_cls, {}), - (False, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, now, m_cls), - - (True, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, now, {}), - (True, None, now, 'desc', [], 'perlnk', {}, {}, [], {}, now, {}), - (True, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, now, {}), - (True, 'name', now, None, [], 'perlnk', {}, {}, [], {}, now, {}), - (True, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, now, {}), - (True, 'name', now, 'desc', [], None, {}, {}, [], {}, now, {}), - (True, 'name', now, 'desc', [], 'perlnk', None, {}, [], {}, now, {}), - (True, 'name', now, 'desc', [], 'perlnk', {}, None, [], {}, now, {}), - (True, 'name', now, 'desc', [], 'perlnk', {}, {}, [], None, now, {}), - (True, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, None, {}), - (True, 'name', now, 'desc', [], 'perlnk', {}, {}, [], {}, now, None), + (False, m_cls, now, 'desc', {}, 'perlnk', {}, {}, now), + (False, 'name', m_cls, 'desc', {}, 'perlnk', {}, {}, now), + (False, 'name', now, m_cls, {}, 'perlnk', {}, {}, now), + (False, 'name', now, 'desc', {}, m_cls, {}, {}, now), + (False, 'name', now, 'desc', {}, 'perlnk', m_cls, {}, now), + (False, 'name', now, 'desc', {}, 'perlnk', {}, m_cls, now), + (False, 'name', now, 'desc', {}, 'perlnk', {}, {}, m_cls), + + (True, 'name', now, 'desc', {}, 'perlnk', {}, {}, now), + (True, None, now, 'desc', {}, 'perlnk', {}, {}, now), + (True, 'name', now, 'desc', {}, 'perlnk', {}, {}, now), + (True, 'name', now, None, {}, 'perlnk', {}, {}, now), + (True, 'name', now, 'desc', {}, 'perlnk', {}, {}, now), + (True, 'name', now, 'desc', {}, None, {}, {}, now), + (True, 'name', now, 'desc', {}, 'perlnk', {}, {}, now), + (True, 'name', now, 'desc', {}, 'perlnk', {}, None, now), + (True, 'name', now, 'desc', {}, 'perlnk', {}, {}, None), + (True, 'name', now, 'desc', {}, 'perlnk', {}, {}, now), ] ) - def test_deployment_model_creation(self, service_instance_storage, is_valid, name, created_at, - description, inputs, permalink, policy_triggers, - policy_types, outputs, scaling_groups, updated_at, - workflows): - service_instance = _test_model( + def test_service_model_creation(self, service_storage, is_valid, name, created_at, description, + inputs, permalink, outputs, scaling_groups, updated_at): + service = _test_model( is_valid=is_valid, - storage=service_instance_storage, + storage=service_storage, model_cls=Service, model_kwargs=dict( name=name, - service_template=service_instance_storage.service_template.list()[0], + service_template=service_storage.service_template.list()[0], created_at=created_at, description=description, inputs=inputs, permalink=permalink, - policy_triggers=policy_triggers, - policy_types=policy_types, outputs=outputs, scaling_groups=scaling_groups, - updated_at=updated_at, - workflows=workflows + updated_at=updated_at )) if is_valid: - assert service_instance.service_template == \ - service_instance_storage.service_template.list()[0] + assert service.service_template == \ + service_storage.service_template.list()[0] class TestExecution(object): @@ -274,15 +267,15 @@ class TestExecution(object): (True, now, now, now, 'error', False, None, Execution.STARTED, 'wf_name'), ] ) - def test_execution_model_creation(self, service_instance_storage, is_valid, created_at, - started_at, ended_at, error, is_system_workflow, parameters, - status, workflow_name): + def test_execution_model_creation(self, service_storage, is_valid, created_at, started_at, + ended_at, error, is_system_workflow, parameters, status, + workflow_name): execution = _test_model( is_valid=is_valid, - storage=service_instance_storage, + storage=service_storage, model_cls=Execution, model_kwargs=dict( - service_instance=service_instance_storage.service_instance.list()[0], + service=service_storage.service.list()[0], created_at=created_at, started_at=started_at, ended_at=ended_at, @@ -293,8 +286,8 @@ class TestExecution(object): workflow_name=workflow_name, )) if is_valid: - assert execution.service_instance == service_instance_storage.service_instance.list()[0] - assert execution.service_template == service_instance_storage.service_template.list()[0] + assert execution.service == service_storage.service.list()[0] + assert execution.service_template == service_storage.service_template.list()[0] def test_execution_status_transition(self): def create_execution(status): @@ -363,8 +356,8 @@ class TestExecution(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, ' + 'is_valid, created_at, service_plan, service_update_nodes, ' + 'service_update_service, service_update_node_templates, ' 'modified_entity_ids, state', [ (False, m_cls, {}, {}, {}, [], {}, 'state'), @@ -383,27 +376,27 @@ class TestServiceUpdate(object): (True, now, {}, {}, {}, [], {}, None), ] ) - def test_service_instance_update_model_creation( - self, service_instance_storage, is_valid, created_at, deployment_plan, - service_instance_update_node_instances, service_instance_update_service_instance, - service_instance_update_nodes, modified_entity_ids, state): - service_instance_update = _test_model( + def test_service_update_model_creation(self, service_storage, is_valid, created_at, + service_plan, service_update_nodes, + service_update_service, service_update_node_templates, + modified_entity_ids, state): + service_update = _test_model( is_valid=is_valid, - storage=service_instance_storage, + storage=service_storage, model_cls=ServiceUpdate, model_kwargs=dict( - service_instance=service_instance_storage.service_instance.list()[0], + service=service_storage.service.list()[0], created_at=created_at, - service_instance_plan=deployment_plan, - service_instance_update_node_instances=service_instance_update_node_instances, - service_instance_update_service_instance=service_instance_update_service_instance, - service_instance_update_nodes=service_instance_update_nodes, + service_plan=service_plan, + service_update_nodes=service_update_nodes, + service_update_service=service_update_service, + service_update_node_templates=service_update_node_templates, modified_entity_ids=modified_entity_ids, - state=state, + state=state )) if is_valid: - assert service_instance_update.service_instance == \ - service_instance_storage.service_instance.list()[0] + assert service_update.service == \ + service_storage.service.list()[0] class TestServiceUpdateStep(object): @@ -420,24 +413,24 @@ class TestServiceUpdateStep(object): ServiceUpdateStep.ENTITY_TYPES.NODE) ] ) - def test_deployment_update_step_model_creation(self, service_instance_update_storage, is_valid, - action, entity_id, entity_type): - service_instance_update_step = _test_model( + def test_service_update_step_model_creation(self, service_update_storage, is_valid, action, + entity_id, entity_type): + service_update_step = _test_model( is_valid=is_valid, - storage=service_instance_update_storage, + storage=service_update_storage, model_cls=ServiceUpdateStep, model_kwargs=dict( - service_instance_update= - service_instance_update_storage.service_instance_update.list()[0], + service_update= + service_update_storage.service_update.list()[0], action=action, entity_id=entity_id, entity_type=entity_type )) if is_valid: - assert service_instance_update_step.service_instance_update == \ - service_instance_update_storage.service_instance_update.list()[0] + assert service_update_step.service_update == \ + service_update_storage.service_update.list()[0] - def test_deployment_update_step_order(self): + def test_service_update_step_order(self): add_node = ServiceUpdateStep( id='add_step', action='add', @@ -478,7 +471,7 @@ class TestServiceUpdateStep(object): assert not add_node < None -class TestDeploymentModification(object): +class TestServiceModification(object): @pytest.mark.parametrize( 'is_valid, context, created_at, ended_at, modified_node_templates, nodes, status', [ @@ -495,66 +488,60 @@ class TestDeploymentModification(object): (True, {}, now, now, {}, None, ServiceModification.STARTED), ] ) - def test_deployment_modification_model_creation( - self, service_instance_storage, is_valid, context, created_at, ended_at, - modified_node_templates, nodes, status): - deployment_modification = _test_model( + def test_service_modification_model_creation(self, service_storage, is_valid, context, + created_at, ended_at, modified_node_templates, + nodes, status): + service_modification = _test_model( is_valid=is_valid, - storage=service_instance_storage, + storage=service_storage, model_cls=ServiceModification, model_kwargs=dict( - service_instance=service_instance_storage.service_instance.list()[0], + service=service_storage.service.list()[0], context=context, created_at=created_at, ended_at=ended_at, - modified_nodes=modified_node_templates, - node_instances=nodes, + modified_node_templates=modified_node_templates, + nodes=nodes, status=status, )) if is_valid: - assert deployment_modification.service_instance == \ - service_instance_storage.service_instance.list()[0] + assert service_modification.service == \ + service_storage.service.list()[0] class TestNodeTemplate(object): @pytest.mark.parametrize( - 'is_valid, name, default_instances, max_instances, min_instances, plugins, properties, ' - 'type_name, type_hierarchy', + 'is_valid, name, default_instances, max_instances, min_instances, plugins, properties', [ - (False, m_cls, 1, 1, 1, [], [], 'type', []), - (False, 'name', m_cls, 1, 1, [], [], 'type', []), - (False, 'name', 1, m_cls, 1, [], [], 'type', []), - (False, 'name', 1, 1, m_cls, [], [], 'type', []), - (False, 'name', 1, 1, 1, m_cls, [], 'type', []), - (False, 'name', 1, 1, 1, [], [], m_cls, []), - (False, 'name', 1, 1, 1, [], [], 'type', m_cls), - # - (True, 'name', 1, 1, 1, [], [], 'type', []), - (True, 'name', 1, 1, 1, None, [], 'type', []), - (True, 'name', 1, 1, 1, [], [], 'type', None), + (False, m_cls, 1, 1, 1, [], {}), + (False, 'name', m_cls, 1, 1, [], {}), + (False, 'name', 1, m_cls, 1, [], {}), + (False, 'name', 1, 1, m_cls, [], {}), + (False, 'name', 1, 1, 1, m_cls, {}), + (False, 'name', 1, 1, 1, None, {}), + + (True, 'name', 1, 1, 1, [], {}), ] ) - def test_node_model_creation(self, service_instance_storage, is_valid, name, - default_instances, max_instances, min_instances, plugins, - properties, type_name, type_hierarchy): + def test_node_template_model_creation(self, service_storage, is_valid, name, default_instances, + max_instances, min_instances, plugins, properties): node_template = _test_model( is_valid=is_valid, - storage=service_instance_storage, + storage=service_storage, model_cls=NodeTemplate, model_kwargs=dict( name=name, + type=service_storage.type.list()[0], default_instances=default_instances, max_instances=max_instances, min_instances=min_instances, plugins=plugins, properties=properties, - type_name=type_name, - type_hierarchy=type_hierarchy, - service_template=service_instance_storage.service_template.list()[0] + service_template=service_storage.service_template.list()[0] )) if is_valid: assert node_template.service_template == \ - service_instance_storage.service_template.list()[0] + service_storage.service_template.list()[0] class TestNode(object): @@ -574,62 +561,63 @@ class TestNode(object): (True, 'name', {}, [], 'state', None), ] ) - def test_node_instance_model_creation(self, node_template_storage, is_valid, name, - runtime_properties, scaling_groups, state, version): - node_instance = _test_model( + def test_node_model_creation(self, node_template_storage, is_valid, name, runtime_properties, + scaling_groups, state, version): + node = _test_model( is_valid=is_valid, storage=node_template_storage, model_cls=Node, model_kwargs=dict( node_template=node_template_storage.node_template.list()[0], + type=node_template_storage.type.list()[0], name=name, runtime_properties=runtime_properties, scaling_groups=scaling_groups, state=state, version=version, - service_instance=node_template_storage.service_instance.list()[0] + service=node_template_storage.service.list()[0] )) if is_valid: - assert node_instance.node_template == node_template_storage.node_template.list()[0] - assert node_instance.service_instance == \ - node_template_storage.service_instance.list()[0] + assert node.node_template == node_template_storage.node_template.list()[0] + assert node.service == \ + node_template_storage.service.list()[0] class TestNodeInstanceIP(object): ip = '1.1.1.1' - def test_ip_on_none_hosted_node_instance(self, service_instance_storage): - node_template = self._node_template(service_instance_storage, ip='not considered') - node = self._node(service_instance_storage, + def test_ip_on_none_hosted_node(self, service_storage): + node_template = self._node_template(service_storage, ip='not considered') + node = self._node(service_storage, node_template, is_host=False, ip='not considered') assert node.ip is None - def test_property_ip_on_host_node_instance(self, service_instance_storage): - node_template = self._node_template(service_instance_storage, ip=self.ip) - node = self._node(service_instance_storage, node_template, is_host=True, ip=None) + def test_property_ip_on_host_node(self, service_storage): + node_template = self._node_template(service_storage, ip=self.ip) + node = self._node(service_storage, node_template, is_host=True, ip=None) assert node.ip == self.ip - def test_runtime_property_ip_on_host_node_instance(self, service_instance_storage): - node_template = self._node_template(service_instance_storage, ip='not considered') - node = self._node(service_instance_storage, node_template, is_host=True, ip=self.ip) + def test_runtime_property_ip_on_host_node(self, service_storage): + node_template = self._node_template(service_storage, ip='not considered') + node = self._node(service_storage, node_template, is_host=True, ip=self.ip) assert node.ip == self.ip - def test_no_ip_configured_on_host_node_instance(self, service_instance_storage): - node_template = self._node_template(service_instance_storage, ip=None) - node = self._node(service_instance_storage, node_template, is_host=True, ip=None) + def test_no_ip_configured_on_host_node(self, service_storage): + node_template = self._node_template(service_storage, ip=None) + node = self._node(service_storage, node_template, is_host=True, ip=None) assert node.ip is None - def test_runtime_property_on_hosted_node_instance(self, service_instance_storage): - host_node_template = self._node_template(service_instance_storage, ip=None) - host_node = self._node(service_instance_storage, + def test_runtime_property_on_hosted_node(self, service_storage): + host_node_template = self._node_template(service_storage, ip=None) + host_node = self._node(service_storage, host_node_template, is_host=True, ip=self.ip) - node_template = self._node_template(service_instance_storage, ip=None) - node = self._node(service_instance_storage, + node_template = self._node_template(service_storage, ip=None) + node = self._node(service_storage, node_template, is_host=False, ip=None, @@ -639,14 +627,14 @@ class TestNodeInstanceIP(object): def _node_template(self, storage, ip): kwargs = dict( name='node_template', + type=storage.type.list()[0], default_instances=1, max_instances=1, min_instances=1, - type_name='', service_template=storage.service_template.list()[0] ) if ip: - kwargs['properties'] = [Parameter(name='ip', type='str', str_value=str(ip))] + kwargs['properties'] = {'ip': Parameter(name='ip', type_name='string', value=ip)} node = NodeTemplate(**kwargs) storage.node_template.put(node) return node @@ -655,9 +643,10 @@ class TestNodeInstanceIP(object): kwargs = dict( name='node', node_template=node, + type=storage.type.list()[0], runtime_properties={}, state='', - service_instance=storage.service_instance.list()[0] + service=storage.service.list()[0] ) if ip: kwargs['runtime_properties']['ip'] = ip @@ -665,21 +654,21 @@ class TestNodeInstanceIP(object): kwargs['host_fk'] = 1 elif host_fk: kwargs['host_fk'] = host_fk - node_instance = Node(**kwargs) - storage.node.put(node_instance) - return node_instance + node = Node(**kwargs) + storage.node.put(node) + return node @pytest.mark.skip('Should be reworked into relationship') -class TestRelationshipInstance(object): - def test_relatiship_instance_model_creation(self, nodes_storage): - relationship = mock.models.get_relationship( +class TestRelationship(object): + def test_relationship_model_creation(self, nodes_storage): + relationship = mock.models.create_relationship( target=nodes_storage.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME) ) nodes_storage.relationship.put(relationship) - node_instances = nodes_storage.node - source_node_instance = node_instances.get_by_name(mock.models.DEPENDENT_NODE_INSTANCE_NAME) - target_node_instance = node_instances.get_by_name(mock.models.DEPENDENCY_NODE_INSTANCE_NAME) + nodes = nodes_storage.node + source_node = nodes.get_by_name(mock.models.DEPENDENT_NODE_NAME) + target_node = nodes.get_by_name(mock.models.DEPENDENCY_NODE_NAME) relationship_instance = _test_model( is_valid=True, @@ -687,12 +676,12 @@ class TestRelationshipInstance(object): model_cls=Relationship, model_kwargs=dict( relationship=relationship, - source_node_instance=source_node_instance, - target_node_instance=target_node_instance + source_node=source_node, + target_node=target_node )) assert relationship_instance.relationship == relationship - assert relationship_instance.source_node_instance == source_node_instance - assert relationship_instance.target_node_instance == target_node_instance + assert relationship_instance.source_node == source_node + assert relationship_instance.target_node == target_node class TestPlugin(object): @@ -747,9 +736,9 @@ class TestPlugin(object): ] ) def test_plugin_model_creation(self, empty_storage, is_valid, archive_name, distribution, - distribution_release, distribution_version, - package_name, package_source, package_version, - supported_platform, supported_py_versions, uploaded_at, wheels): + distribution_release, distribution_version, package_name, + package_source, package_version, supported_platform, + supported_py_versions, uploaded_at, wheels): _test_model(is_valid=is_valid, storage=empty_storage, model_cls=Plugin, @@ -785,6 +774,7 @@ class TestTask(object): (False, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', m_cls, {}, '1'), (False, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', 'map', m_cls, '1'), (False, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', 'map', {}, m_cls), + (False, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', 'map', None, '1'), (True, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', 'map', {}, '1'), (True, Task.STARTED, None, now, now, 1, 1, 1, True, 'name', 'map', {}, '1'), @@ -795,7 +785,6 @@ class TestTask(object): (True, Task.STARTED, now, now, now, 1, 1, 1, None, 'name', 'map', {}, '1'), (True, Task.STARTED, now, now, now, 1, 1, 1, True, None, 'map', {}, '1'), (True, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', None, {}, '1'), - (True, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', 'map', None, '1'), (True, Task.STARTED, now, now, now, 1, 1, 1, True, 'name', 'map', {}, None), ] ) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/24ad8ba1/tests/storage/test_structures.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_structures.py b/tests/storage/test_structures.py index 67510ad..ceaea11 100644 --- a/tests/storage/test_structures.py +++ b/tests/storage/test_structures.py @@ -92,73 +92,71 @@ def test_inner_list_update(storage): def test_model_to_dict(context): - service_instance = context.service_instance - service_instance = service_instance.to_dict() + service = context.service + service = service.to_dict() expected_keys = [ 'description', - '_metadata', 'created_at', 'permalink', - 'policy_triggers', - 'policy_types', 'scaling_groups', - 'updated_at', - 'workflows', + 'updated_at' ] for expected_key in expected_keys: - assert expected_key in service_instance + assert expected_key in service def test_relationship_model_ordering(context): - service_instance = context.model.service_instance.get_by_name(models.SERVICE_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) + service = context.model.service.get_by_name(models.SERVICE_NAME) + source_node = context.model.node.get_by_name(models.DEPENDENT_NODE_NAME) + target_node = context.model.node.get_by_name(models.DEPENDENCY_NODE_NAME) + new_node_template = modeling.models.NodeTemplate( - name='new_node', - type_name='test_node_type', - type_hierarchy=[], + name='new_node_template', + type=source_node.type, default_instances=1, min_instances=1, max_instances=1, - service_template=service_instance.service_template + service_template=service.service_template ) + new_node = modeling.models.Node( - name='new_node_instance', + name='new_node', + type=source_node.type, runtime_properties={}, - service_instance=service_instance, + service=service, version=None, node_template=new_node_template, state='', scaling_groups=[] ) - source_to_new_relationship = modeling.models.Relationship( - target_node=new_node, + source_node.outbound_relationships.append(modeling.models.Relationship( source_node=source_node, - ) + target_node=new_node, + )) - new_to_target_relationship = modeling.models.Relationship( + new_node.outbound_relationships.append(modeling.models.Relationship( source_node=new_node, target_node=target_node, - ) + )) context.model.node_template.put(new_node_template) context.model.node.put(new_node) - context.model.relationship.put(source_to_new_relationship) - context.model.relationship.put(new_to_target_relationship) + context.model.node.refresh(source_node) + context.model.node.refresh(target_node) def flip_and_assert(node, direction): """ Reversed the order of relationships and assert effects took place. - :param node: the node instance to operatate on - :param direction: the type of relationships to flip (inbound/outbount) + :param node: the node instance to operate on + :param direction: the type of relationships to flip (inbound/outbound) :return: """ assert direction in ('inbound', 'outbound') - relationships = getattr(node, direction + '_relationships').all() + relationships = getattr(node, direction + '_relationships') assert len(relationships) == 2 reversed_relationship_instances = list(reversed(relationships))
