summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser/toscaparser
AgeCommit message (Collapse)AuthorFilesLines
2017-09-05Fix exceptions overwritten when nested import service topologyshangxdy2-11/+39
Currently exceptions will be overwritten when import nested service topology, the patch will fix the issue. JIRA: PARSER-145 Change-Id: I531755efe55b43aef304fa972773c63613c915ff Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-01Merge "Add import file with suffix of yml testcases"julien zhang3-0/+35
2017-08-29Add import file with suffix of yml testcasesshangxdy3-0/+35
Add import file with suffix of yml testcases: 1.normal file with suffix of yml; 2.import file with suffix of yml. JIRA: PARSER-144 Change-Id: I24368f7248e782df2e57202a3129c677e1bf068f Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-08-29Add parameter validation in design timeshangxdy3-6/+28
Add validation for SDC from ONAP when use parse in design time: ignore parameter validation and only print warning message. JIRA: PARSER-142 Change-Id: I9372f20816f2acbda83c5f1e4f673f2ffc3c2e94 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-08-14Support costum datatype definition in parametersshangxdy2-3/+7
Currently, it's only allowed to define standard parameters in the input section, this patch support to define custom datatype in parameters. The patch will be submitted to OpenStack community. JIRA: PARSER-138 Change-Id: Ie83f446958f6daa301382d21d8a32128bf8dffc9 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-08-12Merge "Support yaml file with suffix of yml"xiaodong shang1-1/+1
2017-08-10Support yaml file with suffix of ymlshangxdy1-1/+1
Currently toscaparser only support service template file with suffix: yaml, zip and csar, need to support file with suffix of yml. the patch will be submitted to OpenStack JIRA: PARSER-137 Change-Id: I039bcfbfeb8e2aae47df133221162a68736ded55 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
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-08-10Merge "Support costum datatype in capability"julien zhang2-3/+5
2017-08-09Support costum datatype in capabilityshangxdy2-3/+5
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 <shang.xiaodong@zte.com.cn>
2017-08-08fix package init name for nfv-toscaparsershangxdy1-1/+1
When loading nfv-toscaparser use pbr tool, switch the version of tosco-parser to nfv-toscaparserf, which will affect the Modeling project in ONAP. JIRA: PARSER-134 Change-Id: If5934075af1fa725fea763083fcca7b597043818 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-17synchronize upstream about tosca-parsershangxdy17-27/+367
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-17Merge "Add more test for nested import list"xiaodong shang3-1/+9
2017-07-13Add more test for nested import listshangxdy3-1/+9
Currently the test about nested import list is not enough, the patch enhance the test. Change-Id: Ica25345062d316b9a32f4efb8c5c2a98b8bda497 JIRA: PARSER-127 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-13Add getting custom node by capabilityshangxdy4-10/+36
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-07-12Fix import nested list bugsshangxdy1-0/+3
When import list yaml in top service template, and the nested template import also list yaml, the result type definition is not complete JIRA: PARSER-124 Change-Id: I0ee7f4367d7fabd27641e93c498646d1d0b127b8 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-02-26Sync upstream codeshangxdy69-203/+1828
Sync upstream project of tosca-parser Change-Id: Ic707844203ea05007b3c02e9dcadb52389eb3149 JIRA:PARSER-118 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-12-09Add output validation test case for substitution.shangxdy10-33/+283
According to currently implementation, add new test case for substitution mappings output validation: 1. Unknown output; 2. Missing required output. JIRA:PARSER-116 Change-Id: I84dc80c2bc6fd8b63dd7c4ddf0b81dc5148a4ceb Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-12-09Add output validation for substitution mappingsshangxdy6-25/+73
1. The outputs defined by the topology template have to match the attributes of the node type or the substituted node template, 2.The observable attributes of the substituted node template have to be defined as attributes of the node type or outputs in the topology template. The patch will be submitted to openstack too. JIRA: PARSER-115 Change-Id: Ifa62be9d5c1be79ceacfa1ae6e3835b2de446f88 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-12-09Merge "Add output in vRNC for substitution mappings"xiaodong shang2-4/+17
2016-12-07Add output in vRNC for substitution mappingsshangxdy2-4/+17
Add attributes in rnc.nodes.VNF definition. JIRA:PARSER-114 Change-Id: I8578cc89dc58202893370d367dc9923ddc1c111a Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-12-05Add input validation test caseshangxdy5-35/+211
The required properties without default value in substituted node template which be mapped must be as inputs of nested service template which defines substutition mappings, and the inputs of nested service template which are not in the properties of the substituted node template must provide default values. JIRA:PARSER-113 Change-Id: Idce9ffa7de61f65032fa29f2ccf26c6433c14a40 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-19Delete not used property from vRNCshangxdy1-10/+0
Delete not used property from vRNC,such as activestatus and id. Change-Id: I14b4563663d220c241440dff0244ccbadff7912b Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-14Update the upstream of tosco-parser and heat-translator to stableshangxdy14-1035/+1134
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-09-09Add keys validation testcase in substitution_mapping classshangxdy3-6/+54
Add keys validation in class of substitution_mapping according to specification of http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/TOSCA-Simple-Profile-YAML-v1.0.html: 1) Substitution mapping only supports keys of node_type, capabilities and requirements; 2) The key of node_type is required, the others are optional. JIRA:PARSER-80 Change-Id: Icd3284349175429e5ba5e52814819a6790f0e831 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-07Create translation test code for vRNCshangxdy2-39/+43
Create translation test code from tosca to hot about vRNC definition. JIRA:PARSER-50 Change-Id: I04d5e776b40a856f95548f5d751aeb51220856eb Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-22Remove the cyclic dependencies in vRNC definitionshangxdy1-3/+0
Current the high_availability definition in vRNC about active MM/CM VDUs and passive MM/CM VDUs is cyclic dependencies, and the consequence is deployment of vRNC may fall into a infinite loop. The correct definition is passive VDU depend on the active VDU, but the active VDU doesn't depend on the passive VDU. JIRA:PARSER-95 Change-Id: I3f2fb8c0ce959878b12d7da49e2dc81596b4b528 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-15Merge "Add required definition in class of Input."julien zhang11-20/+70
2016-08-15Add required definition in class of Input.shangxdy11-20/+70
As a template designer; I want to know if the parameters is missed when deploy a template, but currently there is not validation about the required parameters; So i add property in class of Input, and validate the require parameter. Note: the patch will submit to Openstack community too. JIRA:PARSER-88 Change-Id: I5763a18da4037b0f81a55b8c8d83414e685b03d2 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-15The definition about the sequence of capabilities and requirements inshangxdy1-8/+9
SubstitutionMappings is error The definition in SubstitutionMappings about SECTION is below: SECTIONS = (NODE_TYPE, CAPABILITIES, REQUIREMENTS) = \ ('node_type', 'requirements', 'capabilities') The order of CAPABILITIES and REQUIREMENTS is reserved. JIRA:PARSER-86 Change-Id: Ib55e737f6ed5b49ea3ab9b5e14f8c57486602e7e Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-14Add input validation in substitution_mapping classshangxdy6-23/+99
Add input validation in class of substitution_mapping according to specification of http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/ TOSCA-Simple-Profile-YAML-v1.0.html: 1) The properties of substituted node template which be mapped must be in the inputs of nested service template which defines substutition mappings; 2) The inputs of nested service template which are not in properties of the substituted node template must have default values. 3) If the properties of node_type is required and no default value, must provide inputs for them; 4) Property names and the input names must be the same. JIRA:PARSER-79 Change-Id: Ie4664fe17c8279ad531ac9acec057f98d4e9281a Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-14Change the name of Substitution_mappings to SubstitutionMappingsshangxdy2-21/+11
Change the name of Substitution_mappings to SubstitutionMappings consistent to other classes. JIRA:PARSER-85 Change-Id: I9b27783ccec3f515cfcd2eca9995f09426bbfadd Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-08Service template with substitution mapping definition can deployedshangxdy2-5/+9
standalone According to specification of http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/TOSCA-Simple-Profile-YAML-v1.0.html,the two main use cases: 1. No matter whether or not the service template has substitution mapping definition，it can be deployed standalone; 2. Also can be imported and used as nested service template substituted a node template with substitution mapping definition; 3. substitution mapping will expose node_type,may expose capabilities and requirements. JIRA:PARSER-78 Change-Id: I81ac940545f946925f6aa96a1b2ca0ccc9bbb076 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-04Add relationship of node template associated with tosca template inshangxdy4-10/+8
substitution mapping As a nested template desinger; I want to known the tosca template which a substituted node template associated; So i will create the relationship under node template which is substituted. JIRA:PARSER-76 Change-Id: Ifb9883e5c5f630cd7f1b5d1292eddb54ad4c20be Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-03Distinguish the mapping and mapped by name.shangxdy5-65/+71
1. Use complete name like nested_topology_tpls here and other places like get_nested_topology_tpls for better readability; 2. Use "sub_mapped_node_tpl" instead of submaped_node_tpl; 3. Use sub_mapped_ instead of submaped. Upper changed in substitution_mappings.py, tosca_template.py, tosca_template.py and others JIRA:PARSER-73 Change-Id: I21b2d3a35773078d7437bbae9ff5d1522608c4d2 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-03Merge "Use the real yaml file in testcase of system.yaml"julien zhang5-109/+28
2016-07-31Use the real yaml file in testcase of system.yamlshangxdy5-109/+28
As a tester; I want to make sure of the validation of substitution mappings in system chain. So i use the real test yaml file and delete the old. Change-Id: Id3dee02d8af5b221b654a3ee79e28f0ad5b53868 JIRA:PARSER-74 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-31Doesn't support nested exceptioncollector when implement the nestedshangxdy1-2/+4
tosca template After the netsted tosca template is implemented, the ExceptionCollector doesn't work in netsted template, because the exceptions are reset by upper tosca template. The solution is judging if support nested node template before starting or stop exceptioncollector. Change-Id: Ic48bcb639031391a6771db2f7235b674b22be837 JIRA:PARSER-72 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-29tosca-parser support the semantic of substitution mappingshangxdy5-20/+235
As a template designer, I want to using node template substitution for model composition or chaining subsystems. So firstly tosca-paser should support the substitution mappings analysis. Change-Id: I44371795504415ba8cf5a15f7e1d046e3ff00ade JIRA: PARSER-43 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-29Merge "Add transaction subsystem definition in the use case of ↵shangxdy5-14/+129
substitution_mappings"
2016-07-29Add transaction subsystem definition in the use case ofshangxdy5-14/+129
substitution_mappings As a developer; I want to implement the function of substitution_mapping; So that will complete the test file about transaction subsystem definitions for example. Change-Id: I5e44c2b4933afadf96743641279016af5afc39e0 JIRA: PARSER-68 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-29Add queuing subsystem definition in the use case of substitution_mappingsshangxdy1-0/+75
As a developer; I want to implement the function of substitution_mapping; So that will complete the test file about queuing subsystem definitions. Change-Id: I0602eb915954a4e35ae9e0d8d4c857822e4725d4 JIRA: PARSER-46 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-29Merge "Add database subsystem definition in the use case of ↵julien zhang1-0/+90
substitution_mappings"
2016-07-21Add database subsystem definition in the use case ofshangxdy1-0/+90
substitution_mappings As a developer; I want to implement the function of substitution_mapping; So that will complete the test file about database subsystem definitions. Change-Id: I197f971cbdc64963b6c41b2ca3aa3fb86b2fae8b JIRA: PARSER-47 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-21Substitution mappings doesn't supports propertiesshangxdy1-2/+0
According to the simple tosca specification, substitution mapping only supports key words of node_type, capabilities and requirements, but in the definition of vRNC, add keywords of properties, so it will be deleted Change-Id: I45ca5f6d44410e5a6b8cdb448f3f148d63cc1376 JIRA: PARSER-67 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-19Tosca-Pacer doesn't support https proxy.shangxdy1-3/+3
When access CSAR file which is URL and the protocol is https by proxy, it will be error and the information is below: toscaparser.common.exception.URLException: Failed to reach server "https://raw.githubusercontent.com/openstack/tosca- parser/master/toscaparser /tests/data/custom_types/wordpress.yaml". Reason is: Tunnel connection failed: 503 Service Unavailable. The reason of the error is urllib doesn't support https proxy. JIRA: PARSER-66 Change-Id: I82ec68d533743527fba613cc362e4241494359d4 Signed-off-by: 10013968 <zhang.jun3g@zte.com.cn> Signed-off-by: shangxdy <shangxdy@shangxdy.local>
2016-07-12Merge "fix import and vRNC Ctrl_net definition error"julien zhang2-8/+8
2016-07-10fix import and vRNC Ctrl_net definition errorshangxdy2-8/+8
1. Currently DM_Port_Ctrl requirement definition requirements: virtualBinding: DM virtualLink: CTRL_Net_Host shall be below: requirements: virtualBinding: DM_Host virtualLink: CTRL_Net 2. In function of _load_import_template when import vRNC definition, it will return "None, None" instead of return Null in case of no value return. Change-Id: I81d2d471eafff8ebd77eef356e6178e1f7701a22 JIRA: PARSER-65 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-07-10Fix bug in python3.4: 'dict_keys' object does not support indexingshangxdy2-3/+4
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 bugsshangxdy38-134/+1116
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>