Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-174-Refactor-instantiation-phase 1e7586af3 -> 4bdf57c7b
fixed outputs issue Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/4bdf57c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4bdf57c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4bdf57c7 Branch: refs/heads/ARIA-174-Refactor-instantiation-phase Commit: 4bdf57c7b178441882bf8929e5c3816e66dec5b5 Parents: 1e7586a Author: max-orlov <[email protected]> Authored: Thu Jul 27 11:55:46 2017 +0300 Committer: max-orlov <[email protected]> Committed: Thu Jul 27 11:55:46 2017 +0300 ---------------------------------------------------------------------- aria/core.py | 3 ++- aria/orchestrator/topology/template.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4bdf57c7/aria/core.py ---------------------------------------------------------------------- diff --git a/aria/core.py b/aria/core.py index 77ed3de..0870bac 100644 --- a/aria/core.py +++ b/aria/core.py @@ -74,13 +74,14 @@ class Core(object): # setting no autoflush for the duration of instantiation - this helps avoid dependency # constraints as they're being set up with storage_session.no_autoflush: - handler = topology.Handler(self.model_storage) service = handler.instantiate(service_template, inputs=inputs) handler.coerce(service) + handler.validate(service) handler.satisfy_requirements(service) handler.coerce(service) + handler.validate_capabilities(service) handler.find_hosts(service) handler.configure_operations(service) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4bdf57c7/aria/orchestrator/topology/template.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/topology/template.py b/aria/orchestrator/topology/template.py index 8f06ba0..29a2397 100644 --- a/aria/orchestrator/topology/template.py +++ b/aria/orchestrator/topology/template.py @@ -76,7 +76,7 @@ class ServiceTemplate(common._TemplateHandlerMixin): if self._model.substitution_template is not None: service.substitution = self._topology.instantiate(self._model.substitution_template) - service.outputs = self._topology.instantiate(self._model.outputs) + service.outputs = self._topology.instantiate(self._model.outputs) return service
