Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-165-Make-node-name-suffix-UUIDs-become-more-readable 6c25143c1 -> cfe8e546c (forced update)
ARIA-165 Make node name suffix UUIDs become more readable Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/cfe8e546 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/cfe8e546 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/cfe8e546 Branch: refs/heads/ARIA-165-Make-node-name-suffix-UUIDs-become-more-readable Commit: cfe8e546c4494f68a5ec13f1d7becbf962d140c0 Parents: 0ec2370 Author: max-orlov <[email protected]> Authored: Mon May 8 15:25:37 2017 +0300 Committer: max-orlov <[email protected]> Committed: Tue May 9 00:56:23 2017 +0300 ---------------------------------------------------------------------- aria/modeling/service_template.py | 10 +++++++--- aria/parser/modeling/context.py | 5 ----- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cfe8e546/aria/modeling/service_template.py ---------------------------------------------------------------------- diff --git a/aria/modeling/service_template.py b/aria/modeling/service_template.py index 7fab4fc..bf7b383 100644 --- a/aria/modeling/service_template.py +++ b/aria/modeling/service_template.py @@ -306,7 +306,7 @@ class ServiceTemplateBase(TemplateModelMixin): utils.instantiate_dict(self, service.meta_data, self.meta_data) for node_template in self.node_templates.itervalues(): - for _ in range(node_template.default_instances): + for _ in range(2): node = node_template.instantiate(container) service.nodes[node.name] = node @@ -549,9 +549,13 @@ class NodeTemplateBase(TemplateModelMixin): ('requirement_templates', formatting.as_raw_list(self.requirement_templates)))) def instantiate(self, container): - context = ConsumptionContext.get_thread_local() from . import models - name = context.modeling.generate_node_id(self.name) + if self.nodes: + latest_node_index = self.nodes[-1].name.rsplit('_', 1)[1] + index = int(latest_node_index) + 1 + else: + index = 0 + name = '{name}_{index}'.format(name=self.name, index=index) node = models.Node(name=name, type=self.type, description=deepcopy_with_locators(self.description), http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cfe8e546/aria/parser/modeling/context.py ---------------------------------------------------------------------- diff --git a/aria/parser/modeling/context.py b/aria/parser/modeling/context.py index dff5991..4a53641 100644 --- a/aria/parser/modeling/context.py +++ b/aria/parser/modeling/context.py @@ -67,11 +67,6 @@ class ModelingContext(object): if self.instance is not None: model_storage.service.put(self.instance) - def generate_node_id(self, template_name): - return self.node_id_format.format( - template=template_name, - id=self.generate_id()) - def generate_id(self): if self.id_type == IdType.LOCAL_SERIAL: return self._serial_id_counter.next()
