Github user mxmrlv commented on a diff in the pull request:
https://github.com/apache/incubator-ariatosca/pull/72#discussion_r106806308
--- Diff: tests/modeling/test_models.py ---
@@ -486,83 +472,79 @@ def test_deployment_update_step_order(self):
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',
[
- (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(
- 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,
- model_cls=ServiceInstanceModification,
+ 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,
plugin_specifications, '
+ '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, {}, {}),
--- End diff --
what happened to the rest of the valid node template creation params?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
