summaryrefslogtreecommitdiffstats
path: root/tosca2heat
AgeCommit message (Collapse)AuthorFilesLines
2017-09-05Merge "Support version of tosca_simple_yaml_1_1"0.5.0julien zhang5-4/+43
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-05Support version of tosca_simple_yaml_1_1shangxdy5-4/+43
Currently tosca-parser only support tosca_version_1_0, this patch will enable it to support tosca_version_1_1. This requirement is from ONAP, but not need to submit to OpenStack currently JIRA:PARSER-146 Change-Id: If1bc470e3f2d18a606b312425241f27be33b65b4 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-26Modify the classifier Enviroment in setup cfgshangxdy2-2/+2
There is no OPNFV enviroment in setup cfg classifier, and it will be error when upload package to pypi JIRA: PRRSER-131 Change-Id: I1b0f52b03adbbfa0b803dc1966f2412b525e7677 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-25Setup parser as a entire projectshangxdy2-12/+15
Modify the setup file JIRA: PARSER-125 Change-Id: I4f3f5e2c0a5ce22f6602954fdfbd1b610410dfc0 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-20Fix MANIFEST file in heat-translatorshangxdy1-0/+14
iWhen install heat-translator, it must provide manifest file to represent while files will be copied. JIRA: PARSER-129 Change-Id: I23f1981e8ddaeeabea17e8d7bef4d089f0ba585a Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-19rename all READM.rst to README.mdJulien4-2/+2
Change-Id: I95930de9fefd0897bd0b75d2aeb5a1d731332dad Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-07-19change some doc file namesJulien4-0/+0
upstream rst files kept in the project subdirectory which not meet the requirement of OPNFV(in docs/). issues in https://build.opnfv.org/ci/job/docs-verify-rtd-master/1590/console may be caused by parser project Change-Id: I096b84d76e7aba1bea181e640eb2e3710a779d3c Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-07-17Merge "synchronize upstream about tosca-parser"julien zhang25-40/+405
2017-07-17Synchronize upstream version of 0.9shangxdy33-99/+887
Synchronize heat-translator wiht upstream versionn of 0.9 JIRA: PARSER-128 Change-Id: I4d2c62a0e81119d5c0305e3ac052415a6d5acee3 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-17synchronize upstream about tosca-parsershangxdy25-40/+405
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-04-18fix the command of testrdongwenjuan2-4/+4
Change-Id: Ie85940e7c3a755f6506eb75fa1bae286c4b038ca Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2017-03-09Fix docs bugshangxdy4-18/+112
Fix docs bug when install parser or run tox tools JIRA:PARSER-122 Change-Id: I247afee0b81e64ea691b061ab600e20ce55849c7 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-03-07Danube Release Docs Fixup patch 2zhipengh18-649/+0
This patch provide an initial content for the docs/ release/release-notes.rst file. Further work needed. Remove policy2tosca and yang2tosca doc files in the code folder, move tosca2heat diff files to release folder. Remove all the tosca2heat original upstream rst docs due to CI failures Change-Id: I789102a7974b5ac79445f90e08e3f8252e0f4169 Signed-off-by: zhipengh <huangzhipeng@huawei.com>
2017-02-27Add ip output in compute nodeshangxdy21-162/+56
After sync the latest heat-translator code from upstream, there is not ip output in compute node, it's necessary to add. JIRA:PARSER-121 Change-Id: Idb0126f9d2bcb6100be6083e2a661cc1cdbe0f27 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-02-27Fix heat-translator after sync codeshangxdy2-13/+17
Fix heat-translator after sync code from upstream JIRA:PARSER-120 Change-Id: I033fa7c09fea716d7568613f72643f1e4bf8cd19 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-02-26Sync heat-translator codeshangxdy104-956/+3100
Sync heat-translator code from upstream JIRA:PARSER-119 Change-Id: I2287b78ad38bc54f7740fd1ee5f08989d5e680bf Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-02-26Sync upstream codeshangxdy76-215/+1888
Sync upstream project of tosca-parser Change-Id: Ic707844203ea05007b3c02e9dcadb52389eb3149 JIRA:PARSER-118 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-02-25Fix ci bugshangxdy2-1/+17
Fix ci bug when integrated with functest JIRA:PARSER-117 Change-Id: I054ee8a578c5deeaa9cae383fac4bb0984389053 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-30Replace the hot template versoion of 2013-05-23 with 2014-10-16shangxdy44-44/+44
Currently the translated hot version is 2013-05-23, but there some intrinsic function(such as get_attr) must be 2014-10-16 or higher in order to support more parameters. So it's necessary to update the hot template version. JIRA:PARSER-110 Change-Id: I72f7b36ba0ed32cb9e6f092c0be2dd0dea3d2572 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-23Add ip output in compute translationshangxdy21-57/+56
As a template designer, I want to visit a server which is depleted by parser, So it's necessary to make the ip exposed. JIRA:PARSER-109 Change-Id: Idef0605d23df6af38b86e7a393a151b34828e511 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-19Delete not used property from vRNCshangxdy2-20/+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-19Merge "Provide file list about the difference between parser and upstreams."shangxdy2-3/+113
2016-09-14Provide file list about the difference between parser and upstreams.shangxdy2-3/+113
Provide a list about difference between parser project and the upstream projects, include tosco-parser and heat-project in openstack community. JIRA:PARSER-108 Change-Id: I6195fe035340e5af40f7e7a30f7d7cb1fbcdb27f Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-14Update the upstream of tosco-parser and heat-translator to stableshangxdy29-1457/+1502
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-12Merge "Add keys validation testcase in substitution_mapping class"shangxdy3-6/+54
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-09Add property of software_config_transport in compute nodeshangxdy45-12/+92
According to hot syntax, when deploy software into compute, it shall include software_config_transport property in server resource, because the openstack environment configuration may not support the default value. so the software_config_transport shall be specified. JIRA:PARSER-105 Change-Id: Iefe50400ae2008214bb8cb98dde719130553b3bf Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-09Add signal_transport in software deployment resourceshangxdy18-3/+116
According to hot syntax, when deploy software, it shall include signal_transport property, or will use default value NO_SIGNAL, but the openstack environment configuration may not support the default value. so the signal_transport shall be specified. JIRA:PARSER-104 Change-Id: Ifd01cd55c7daf538efb32f44a8d278cf3058af05 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-08Emergence merged for unit test.shangxdy1-8/+0
Reversed merged caused the unit test error, i think this is the ci system's bug. Change-Id: I6d29f7f11cc0a78c695f179aa30c93545a575584 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-07Merge "Create translation test code for vRNC"shangxdy8-39/+1302