From af80965fcdd0f2efb9c54714c5a0fe642ad95cb1 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Wed, 9 Aug 2017 16:36:33 +0800 Subject: Support costum datatype in capability Support custom datatype definition in property for capability, a scenario if following: VDU: type: tosca.nodes.nfv.VDU.Compute capabilities: virtual_compute: properties: virtual_memory: virtual_mem_size: 24G requested_additional_capabilities: {} virtual_cpu: num_virtual_cpu: 4 node_types: tosca.nodes.nfv.VDU.Compute: derived_from: tosca.nodes.Root capabilities: virtual_compute: type: tosca.capabilities.nfv.VirtualCompute capability_types: tosca.capabilities.nfv.VirtualCompute: derived_from: tosca.capabilities.Root properties: virtual_memory: type: tosca.datatypes.nfv.VirtualMemory requested_additional_capabilities: entry_schema: type: tosca.datatypes.nfv.RequestedAdditionalCapability required: false type: map virtual_cpu: type: tosca.datatypes.nfv.VirtualCpu This patch will be submitted to Openstack. JIAR: PARSER-135 Change-Id: I7b5e3e909e0950de26b37123938fe719004d5417 Signed-off-by: shangxdy --- tosca2heat/tosca-parser/toscaparser/entity_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tosca2heat/tosca-parser/toscaparser/entity_template.py') diff --git a/tosca2heat/tosca-parser/toscaparser/entity_template.py b/tosca2heat/tosca-parser/toscaparser/entity_template.py index cc3d620..d454ac0 100644 --- a/tosca2heat/tosca-parser/toscaparser/entity_template.py +++ b/tosca2heat/tosca-parser/toscaparser/entity_template.py @@ -164,7 +164,7 @@ class EntityTemplate(object): if 'properties' in props and props['properties']: properties.update(props['properties']) - cap = Capability(name, properties, c) + cap = Capability(name, properties, c, self.custom_def) capability.append(cap) return capability -- cgit 1.2.3-korg