summaryrefslogtreecommitdiffstats
path: root/tosca2heat
AgeCommit message (Collapse)AuthorFilesLines
2017-09-15Merge "Add required parameters validation for nested service"xiaodong shang2-6/+11
2017-09-14Add required parameters validation for nested serviceshangxdy2-6/+11
Add validation for SDC from ONAP when use parse in design time: ignore nested parameters(inputs and outputs) validation and only print warning message. JIRA: PARSER-141 Change-Id: Idd3b35a197594e9a7ff38024f16acfa650728bd1 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-14Merge "Disable syslog in heat-translator for functest integration"xiaodong shang1-2/+2
2017-09-13Disable syslog in heat-translator for functest integrationshangxdy1-2/+2
Since run in container with the base image of alpine, in which no service and rsyslog installed, it need to delete syslog in heat-translator: reference patch: https://gerrit.opnfv.org/gerrit/#/c/41115/ JIRA: PARSER-149 Change-Id: Iddd8c5fa54556fff2670a9439653de7e97b8aa18 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-12Fix substitution mapping assigned value to nodetemplateshangxdy2-9/+11
Currently the assignment mapped template value to nodetemplate is error, and additionally debug_mode is not transfered to nested template. So the patch will fix them. JIRA: PARSER-155 Change-Id: I8c5801b00ae56b9ba2eb92a6f14357c2f5328718 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-10Merge "Update heat-translator requirement"julien zhang2-2/+3
2017-09-10Update heat-translator requirementshangxdy2-2/+3
Currently heat-translator use openstack tosca-parser other than nfv-toscaparser, this patch modifies the requriement since nfv-toscaparser has tagged and published to pypi. JIRA: PARSER-150 Change-Id: Ib1ddf28f0932fbe19f25627ad4ef5df2d16dca0a Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-10Merge "Fix StatefulEntityType when entitytype is not define"julien zhang2-2/+3
2017-09-10Merge "fix costum datatype definition in parameters"julien zhang1-1/+1
2017-09-10Merge "Add debug mode parameter"julien zhang2-24/+51
2017-09-10Merge "Refactor heat-translator setup.py"julien zhang2-1/+48
2017-09-08Fix StatefulEntityType when entitytype is not defineshangxdy2-2/+3
Currently, if a entity type is not defined, the defs in StatefulEntityType will be none, then the access to self.defs will raise error, finally the parser will be crushed. this patch will enhance it. JIRA: PARSER-153 Change-Id: I5db50102e9c63428298ce6c8ecbf38e3bd8e57f8 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-07fix costum datatype definition in parametersshangxdy1-1/+1
Currently, support customized datatype in parameters is error when transfer custom_defs in DataEntity.validate_datatype(self.type, value, None, datatype), it should be full custom definitions , not only one definition. the patch will fix it. JIRA: PARSER-152 Change-Id: If6d59f21fa75cbdf4e8e16f093e3d807910ad234 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-07Add debug mode parametershangxdy2-24/+51
In debug mode, it's not allowed to raise exceptions as possible for convinient to debug more details, this patch will add parameter to enable such scenario. The requirement is from ONAP JIRA: PARSER-148 Change-Id: Ide8acec333d17331bd6ed400110a141391fd3593 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-07Refactor heat-translator setup.pyshangxdy2-1/+48
Overwrite setup.py in heat-translator project to uninstall openstack heat-translator before build/install nfv-heattranslator. JIRA: PARSER-151 Change-Id: I65da014439e3c07b866b3baf8643e569d813165c Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-06Package for funectestshangxdy1-0/+49
Modify the install script JIRA: PARSER-125 Change-Id: Ia43687286fb8ac3b18b816aa5e4928ce9a12beec Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-06Update the parser's version after publish 0.5.0 for onapshangxdy2-2/+2
1. git tag 0.5.0 git push origin 0.5.0 2. set apigateway version empty set toscaparser version empty set heat-translator version empty version management use git tag, note: tag name must be started with digit JIRA: PARSER-147 Change-Id: I71cc9b910bce57eebf4c07976bd24efd441048fa Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
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>