summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser/toscaparser/elements
AgeCommit message (Collapse)AuthorFilesLines
2017-08-10Support metadata validationshangxdy1-2/+2
When import service template, validata metadata validation in tosca_type_validation JIRA: PARSER-136 Change-Id: Ibb4a51e734c43364d92520f14f998ecf54789631 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-17synchronize upstream about tosca-parsershangxdy3-3/+26
synchronize tosca-parser with version of 0.81 JIRA: PARSER-128 Change-Id: Ib00e391bd6c1f4c69776796eb7b28062f14b92fc Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-13Add getting custom node by capabilityshangxdy2-7/+27
Currently _get_node_type_by_cap in nodetype definition is only concerned standard node, not consider custom node, the patch will support to get node by custom node. JIRA: PARSER-126 Change-Id: I822acc8bfb747562dc084783d863adf31603e794 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-02-26Sync upstream codeshangxdy11-22/+53
Sync upstream project of tosca-parser Change-Id: Ic707844203ea05007b3c02e9dcadb52389eb3149 JIRA:PARSER-118 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-14Update the upstream of tosco-parser and heat-translator to stableshangxdy5-879/+905
release 0.6/0.5 Currently the parser is based on dev branch of upstream projects, include tosco-parser and heat-translator, for the colorado release of parser, it should be based on a stable version, so it's necessary to update the upstream version to 0.6/tosca-parser and 0.5/heat-translator. JIRA:PARSER-106 Change-Id: I8fb043068d25188c47e5648e1b66184446ac82d6 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-10Fix bug in python3.4: 'dict_keys' object does not support indexingshangxdy1-2/+3
In python3.4, dictory's function of key() return value is a dict_key object, not list, so the follow code will be error: dict x = {1:11, 2:22, 3;33} y= x.keys()[0] the error is TypeError: 'dict_keys' object does not support indexing, the correct expression is below: y = list(x.keys())[0] So parser's code will be modified refer to above. Change-Id: I41e0c28167c7823fc735aaf3afc78c1a9a15e9e0 JIRA: PARSER-64 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-10Synchronise the openstack bugsshangxdy6-10/+111
When run unittests through tox, some test cases are always error, the errors are already done in openstack community, so it's necessary to synchronise the fixes. Change-Id: Ib29078e6cc138a474e89c6a2cc90ad7a1db1bb46 JIRA: PARSER-63 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-08Merge "netsted template validate type error"julien zhang1-2/+3
2016-07-04Merge "The grouptype's parent_type definition is error"julien zhang1-0/+11
2016-07-04Merge "The artifacttype's parent_type definition is error"julien zhang1-3/+11
2016-07-01The grouptype's parent_type definition is errorshangxdy1-0/+11
1. Group type define parent_type, but it shall be statuefulentity, not string, so the method of is_derived_from in group entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: I6e78b9dbf9ad0593db9246d34be29d8ec6f092ed JIRA: PARSER-54 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-30Merge "Incorrect inheritance of requirements in NodeType"julien zhang1-2/+7
2016-06-30Merge "The relationship type's parent_type definition is not complete"julien zhang1-1/+1
2016-06-30Merge "The policytype's parent_type definition is error"julien zhang1-3/+8
2016-06-29netsted template validate type errorshangxdy1-2/+3
When import nested template, validate type error, in the validate list lack the type of "topology_template" Change-Id: Ic16e02f460dc59936dfc5a361a21b9533f0e5e83 JIRA: PARSER-58 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-16The artifacttype's parent_type definition is errorshangxdy1-3/+11
1. Artifact type define parent_type, but it shall be statuefulentity, not string, so the method of is_derived_from in artifact entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: I8e64a28da0287ff5653da69a0cf15016c8ed937f JIRA: PARSER-53 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-15Incorrect inheritance of requirements in NodeTypeshangxdy1-2/+7
1. When define a new NodeType that inherits from a normative type that has some requirements, and if the reqirement item name is same as parent's, there will be duplicated requirements, not override the parent's item. 2. The bug will submit to openstack community. Change-Id: I22f6e723179a8a8c334d37c1a69b7039dc1f6ae7 JIRA: PARSER-56 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-15The relationship type's parent_type definition is not completeshangxdy1-1/+1
1. Relationship type define parent_type, but it shall include custom def, so the method of is_derived_from in group entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: Ia12b18543e3b1d28bfb946abd11b546a9eba9669 JIRA: PARSER-55 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-15The policytype's parent_type definition is errorshangxdy1-3/+8
1. policy type define parent_type, but it shall be statefulentity, not string, so the method of is_derived_from in policy entity may be error when it's called. 2. The bug will submit to openstack community. Change-Id: I25e1cb04e9c13eea6d47ed0bfeac961f59146842 JIRA: PARSER-52 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-06-04Nodetype's logical is incompleteshangxdy1-0/+4
When node is selected by abstract description and the node capability is customed, None will be return. JIRA:PARSER-41 Change-Id: I4b3e7233f766aac61a4ffc363c000bb3ebea19ad Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-05-19Merge "bugs:The code in function of get_all_requirements is duplicated"julien zhang1-19/+1
2016-05-15bugs:The code in function of get_all_requirements is duplicatedshangxdy1-19/+1
1、The virtualLink requirement of tosca.nodes.nfv.CP defined below: In nodetype.py, the most code in functon of get_all_requirements is not needed,becuase the property of requirements has realized the main logical in current get_all_requirements. So the duplicated code will be deleted. 2、The bug will be submitted to openstack community. JIRA: PARSER-37 Change-Id: I1a346ffc388546dd9c65a1b8d32e32859150d077 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-27Add affinity policy type definitionshangxdy1-0/+10
Add two definition in parser: tosca.policy.Placement.Colocate tosca.policy.Placement.Antilocate JIRA:PARSER-33 Change-Id: I0259bbc1ce2616dcbc28a912c34a7513e9432ff5 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-04-07Update tosca lib to version 0.5shangxdy17-0/+2785
Use tosca-parser and heat-translator to analyze to the basic nfv-tosca type definitions, and use simple tosca new feature such as policy, group and trigger, which are now supported by the latest version of tosca-parser and heat-translator. JIRA:PARSER-18 Change-Id: I797bcacbb5b32005d0aeb0f3f32851ac96e30f01 Signed--off-by: shangxdy <shang.xiaodong@zte.com.cn> Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>