Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-174-Refactor-instantiation-phase a33ba12e1 -> 0f10ec758
review 1 - fixups 2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/0f10ec75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0f10ec75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0f10ec75 Branch: refs/heads/ARIA-174-Refactor-instantiation-phase Commit: 0f10ec758ba7a527f03df23c0e4c818db1500d55 Parents: a33ba12 Author: max-orlov <[email protected]> Authored: Thu Aug 3 16:07:21 2017 +0300 Committer: max-orlov <[email protected]> Committed: Thu Aug 3 16:07:21 2017 +0300 ---------------------------------------------------------------------- aria/orchestrator/topology/topology.py | 1 - tests/parser/service_templates.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0f10ec75/aria/orchestrator/topology/topology.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/topology/topology.py b/aria/orchestrator/topology/topology.py index b81f61d..96ee4f9 100644 --- a/aria/orchestrator/topology/topology.py +++ b/aria/orchestrator/topology/topology.py @@ -36,7 +36,6 @@ class Topology(issue.ReporterMixin): models.SubstitutionTemplate: models.Substitution, models.RelationshipTemplate: models.Relationship, models.OperationTemplate: models.Operation, - models.RequirementTemplate: None, models.SubstitutionTemplateMapping: models.SubstitutionMapping, # Common http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0f10ec75/tests/parser/service_templates.py ---------------------------------------------------------------------- diff --git a/tests/parser/service_templates.py b/tests/parser/service_templates.py index ec41cd2..9e8fcae 100644 --- a/tests/parser/service_templates.py +++ b/tests/parser/service_templates.py @@ -27,7 +27,6 @@ def consume_literal(literal, consumer_class_name='instance', cache=True, no_issu context = create_context(LiteralLocation(literal)) consumer, dumper = create_consumer(context, consumer_class_name) consumer.consume() - consumer.dump() if no_issues: context.validation.dump_issues() assert not context.validation.has_issues @@ -48,6 +47,7 @@ def consume_use_case(use_case_name, consumer_class_name='instance', cache=True): assert not context.validation.has_issues return context, dumper + def consume_types_use_case(use_case_name, consumer_class_name='instance', cache=True): cachedmethod.ENABLED = cache uri = get_service_template_uri('tosca-simple-1.0', 'types', use_case_name, @@ -62,6 +62,7 @@ def consume_types_use_case(use_case_name, consumer_class_name='instance', cache= assert not context.validation.has_issues return context, dumper + def consume_node_cellar(consumer_class_name='instance', cache=True): consume_test_case( get_service_template_uri('tosca-simple-1.0', 'node-cellar', 'node-cellar.yaml'),
