summaryrefslogtreecommitdiffstats
path: root/tosca2heat/heat-translator
AgeCommit message (Collapse)AuthorFilesLines
2018-04-10Fix aarch64 image naming in parserCharalampos Kominos1-1/+6
Some hardcoded values within the parser project create problems for opnfv-armband. In this patch we fix image naming for parser, at least for the testcase we run in opnfv-ci. 1)Tosca functions like get_attribute() or get_item() could in theory be used but due to the current structure of the vRNC file it is not possible. JIRA: ARMBAND-369 JIRA: PARSER-175 Change-Id: I8cdc82b9e5c9008f3a3a5110d65706440d208ab8 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
2017-11-25Synchronize requirements with stable/pikeCédric Ollivier1-3/+3
All packages included in Functest should be strictly conform with OpenStack Pike global requirements. The next python packages are fine: - nfv-heattranslator - nfv-toscaparser - nfv-parser Change-Id: I2d6440232e6b282338dfa77a60d8d51a0d057a51 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-09Added a license metadata line to specify Apache-2.0rpaik1-0/+1
Change-Id: I567522d47fa30efa03e84e5292360481e81f30ad Signed-off-by: rpaik <rpaik@linuxfoundation.org>
2017-10-09Fix test for apexshangxdy1-1/+1
Currently the test in apex is error, the patch will fix it. JIRA: PARSER-160 Change-Id: I0c290f7819468e1f400f1610fc87bceb72086b92 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-10-09Remove python limitation for codeshipshangxdy1-1/+0
When publish nfv-toscaparser to onap through codefish, the python version of 2.7.13 doesn't support again, so it will be delete in .python-verson JIRA: PARSER-161 Change-Id: I90f1be241c539a405edc7c674e411c20de3e4ae1 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-09-28Add coverage test itemshangxdy2-3/+7
Currently there is no coverage report, so it's necessary to add covrage test for parser. JIRA: PARSER-159 Change-Id: I7688b2c7e3adc8d0009e5edf33be41c7c75a5d87 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-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-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-06Update the parser's version after publish 0.5.0 for onapshangxdy1-1/+1
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-07-26Modify the classifier Enviroment in setup cfgshangxdy1-1/+1
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 projectshangxdy1-5/+7
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.mdJulien2-1/+1
Change-Id: I95930de9fefd0897bd0b75d2aeb5a1d731332dad Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-07-19change some doc file namesJulien2-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-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-04-18fix the command of testrdongwenjuan1-2/+2
Change-Id: Ie85940e7c3a755f6506eb75fa1bae286c4b038ca Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2017-03-09Fix docs bugshangxdy2-9/+57
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 2zhipengh8-313/+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 codeshangxdy103-954/+3098
Sync heat-translator code from upstream JIRA:PARSER-119 Change-Id: I2287b78ad38bc54f7740fd1ee5f08989d5e680bf 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-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 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 stableshangxdy13-421/+367
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 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"shangxdy6-0/+1259
2016-09-07Merge "Add deployment scripts for vRNC"shangxdy11-0/+44
2016-09-07Merge "Fix network info output about compute node"shangxdy20-102/+6
2016-09-07Create translation test code for vRNCshangxdy6-0/+1259
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-09-02Merge "[NFV] Reduce instance requirements"xiaodong shang2-6/+6
2016-09-01Fix parser run error when attach blockstorage.shangxdy2-4/+4
The error is below: CREATE_FAILED Error: resources.tosca.relationships.attachesto_1: Failed to attach volume dc1cd8fb-9cf3-42c2-bb3e-6a24ba354003 to server fded0b07-9da2-4d9c-aedc-fefd22ee1efb - Invalid input for field/attribute device. Value: /data. u'/data' does not match '(^/dev/x{0,1}[a-z]{0,1}d{0,1})([a-z]+)[0-9]*$' JIRA:PARSER-102 Change-Id: Ie30c669ab5eeddbcd8bc33d648b8cd33d9942333 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-09-01[NFV] Reduce instance requirementsMichael Polenchuk2-6/+6
In order to keep requirements of cpu/ram at minimum reduce their values. Change-Id: I624f9638d6207a2dc8a6f83e47ad4e6a0f221595 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-09-01Fix network info output about compute nodeshangxdy20-102/+6
In the template version of 2013-05-23, the intrinsic function of get_attr doesn't support keys or indexes, it requires 2014-10-16 or higher, the syntax is below: get_attr: <resource name> <attribute name> <key/index 1> (optional) not support in 2013-05-23 <key/index 2> (optional) not support in 2013-05-23 So the translation about compute node's ip address only uses two parameters currently. JIRA:PARSER-101 Change-Id: I51e5d7c04c329ede69ff3be61bbee2941b56ea93 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-28Fix BlockStorageAttachment bug when translate compute nodeshangxdy3-3/+35
Currently, when translate compute node with local_storage and high_availability, there is not BlockStorageAttache resource created about block storage, and only BlockStorage created. If only local_storage requirement in compute node, the result is correct. The reason is the function logic of _get_attachment_node is error. and the patch will fixit. JIRA:PARSER-100 Change-Id: I36456089ae65102d4b17797d266c850d8c16b29d Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-24Add deployment scripts for vRNCshangxdy11-0/+44
Add deployment scripts for vRNC when deploy vRNC in openstack. JIRA:PARSER-49 Change-Id: I13092f9939a3fe6710e50e2191a82b8cdc25e3e3 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-23Bug: there is not segmentation_id in resource ofshangxdy3-2/+15
tosca.nodes.network.Network In current implementation of tosca.nodes.network.Network translation, the property of segmentation_id is included, but it doesn't exist in hot syntax, so it will be deleted from current code. JIRA:PARSER-96 Change-Id: I2bd32be887a07f77f7dad3fca469464f124e628f Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-23Replace the policie types with parent type when judging policy nodeshangxdy1-8/+10
template in HotResource In class of HotResource, because the policy node template has not interface property, so it is excepted when get all operation from node, but the policy types are enumerated, they are can expressed with parent type. JIRA:PARSER-97 Change-Id: I6393dcaefc774af3aa627ffa287b75083a173f3f Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-22Merge "Add high_availability test case"julien zhang2-0/+49
2016-08-22Add high_availability test caseshangxdy2-0/+49
As a template designer; I want to define a vdu with high availability; So i will add test case to violate high_availability requirement in VDU; JIRA:PARSER-94 Change-Id: Icd35e5a533231395a2174cdc20b747a9ab803599 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-22Modify the stack name to template file name when deploy stack useshangxdy2-4/+7
heat-translator When deploy a stack online, it can specify a name as a input name（which was added by issue PARSER-91), but the parameter is optional, if no specified name, currently the default stack name is shown below: 'heat' + first part of a random uuid For readable and to be easier founded, the default name will be improved to be the follow: 'heat' + filename of template file + first part of a random uuid. JIRA:PARSER-93 Change-Id: Ib8f5fd18bf4e57d2424c2a439aa6db8feead44cd Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-19Merge "Provide a specific stack_name when deploy a template use heat-translator"julien zhang1-3/+12
2016-08-19Judge volume node is error when translate compute nodeshangxdy1-2/+6
Currently, when translate a compute node in heat-translator, code is below: for requires in requirements: for value in requires.values(): if isinstance(value, dict): for node_name in value.values(): for n in self.nodetemplates: if n.name == node_name: volume_name = node_name break else: # unreachable code ! for n in self.nodetemplates: if n.name == node_name: volume_name = node_name break It's error in nfv tosca because there are more than one requirements, So the unreachable code will reach. Notes: the fix will submit to Openstack community. JIRA:PARSER-92 Change-Id: Ife9c0d28ebe236c04d9d2c02f0025cf774bf6208 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2016-08-19Provide a specific stack_name when deploy a template use heat-translatorshangxdy1-3/+12
Currently, the stack ame of a template is random when use heat-translator online, and there is not any other feedback information except success or failure, the result is not very convenient. So it is necessary to provide a stack name when deploy a template. Note: the improvement will submit to openstack community. JIRA:PARSER-91 Change-Id: Ia5f99c38301211dfb9c21a8b10dd31a50b82f966 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>