parser.git
7 years agoAdd import file with suffix of yml testcases 59/40559/1
shangxdy [Tue, 29 Aug 2017 07:01:35 +0000 (15:01 +0800)]
Add import file with suffix of yml testcases

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>
7 years agoUpdated the PTL info for the project 57/40057/1
rpaik [Thu, 24 Aug 2017 05:17:00 +0000 (22:17 -0700)]
Updated the PTL info for the project

Change-Id: Ieac0444fd8451c68bf702f40657def321794a6e9
Signed-off-by: rpaik <rpaik@linuxfoundation.org>
7 years agoSupport costum datatype definition in parameters 85/39185/3
shangxdy [Sun, 13 Aug 2017 05:17:03 +0000 (13:17 +0800)]
Support costum datatype definition in parameters

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>
7 years agoMerge "Support yaml file with suffix of yml"
xiaodong shang [Sat, 12 Aug 2017 14:02:30 +0000 (14:02 +0000)]
Merge "Support yaml file with suffix of yml"

7 years agoSupport yaml file with suffix of yml 59/39059/1
shangxdy [Thu, 10 Aug 2017 12:09:45 +0000 (20:09 +0800)]
Support yaml file with suffix of yml

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>
7 years agoSupport metadata validation 55/39055/1
shangxdy [Thu, 10 Aug 2017 12:06:47 +0000 (20:06 +0800)]
Support metadata validation

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>
7 years agoMerge "Support costum datatype in capability"
julien zhang [Thu, 10 Aug 2017 03:36:48 +0000 (03:36 +0000)]
Merge "Support costum datatype in capability"

7 years agoSupport costum datatype in capability 63/38963/1
shangxdy [Wed, 9 Aug 2017 08:36:33 +0000 (16:36 +0800)]
Support costum datatype in capability

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>
7 years agofix package init name for nfv-toscaparser 81/38881/1
shangxdy [Tue, 8 Aug 2017 06:45:16 +0000 (14:45 +0800)]
fix package init name for nfv-toscaparser

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>
7 years agoModify the classifier Enviroment in setup cfg 43/38143/1
shangxdy [Wed, 26 Jul 2017 08:25:45 +0000 (16:25 +0800)]
Modify the classifier Enviroment in setup cfg

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>
7 years agoMerge "Setup parser as a entire project"
xiaodong shang [Wed, 26 Jul 2017 07:39:18 +0000 (07:39 +0000)]
Merge "Setup parser as a entire project"

7 years agoMerge install and test script 59/38059/3
shangxdy [Tue, 25 Jul 2017 09:33:53 +0000 (17:33 +0800)]
Merge install and test script

Merge installation and test script because functest will not called the
script of parser_install.sh, and only call the script of
functest_run.sh.

JIRA: PARSER-130

Change-Id: I452010f0d635dfbd9fb802743f3b858d66b72b32
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoSetup parser as a entire project 55/38055/1
shangxdy [Tue, 25 Jul 2017 07:44:30 +0000 (15:44 +0800)]
Setup parser as a entire project

Modify the setup file

JIRA: PARSER-125

Change-Id: I4f3f5e2c0a5ce22f6602954fdfbd1b610410dfc0
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix MANIFEST file in heat-translator 61/37861/1
shangxdy [Thu, 20 Jul 2017 13:37:59 +0000 (21:37 +0800)]
Fix MANIFEST file in heat-translator

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>
7 years agorename all READM.rst to README.md 85/37785/1
Julien [Wed, 19 Jul 2017 13:40:40 +0000 (21:40 +0800)]
rename all READM.rst to README.md

Change-Id: I95930de9fefd0897bd0b75d2aeb5a1d731332dad
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
7 years agochange some doc file names 83/37783/2
Julien [Wed, 19 Jul 2017 12:02:20 +0000 (20:02 +0800)]
change some doc file names

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>
7 years agoMerge "Update cirros image to 0.3.5"
xiaodong shang [Wed, 19 Jul 2017 00:30:32 +0000 (00:30 +0000)]
Merge "Update cirros image to 0.3.5"

7 years agoMerge "synchronize upstream about tosca-parser"
julien zhang [Mon, 17 Jul 2017 12:42:12 +0000 (12:42 +0000)]
Merge "synchronize upstream about tosca-parser"

7 years agoUpdate cirros image to 0.3.5 25/37625/1
jose.lausuch [Mon, 17 Jul 2017 11:32:41 +0000 (13:32 +0200)]
Update cirros image to 0.3.5

The image that is offered by Functest in the container is 0.3.5
This changes avoids downloading 0.3.2 in Functest. See [1]

[1] https://gerrit.opnfv.org/gerrit/#/c/37393/6/functest/ci/download_images.sh

Change-Id: I04ecc9bbed77fb39774460dfb466c32db49b8d98
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
7 years agoSynchronize upstream version of 0.9 15/37615/1
shangxdy [Mon, 17 Jul 2017 09:40:59 +0000 (17:40 +0800)]
Synchronize upstream version of 0.9

Synchronize heat-translator wiht upstream versionn of 0.9

JIRA: PARSER-128

Change-Id: I4d2c62a0e81119d5c0305e3ac052415a6d5acee3
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agosynchronize upstream about tosca-parser 09/37609/1
shangxdy [Mon, 17 Jul 2017 08:29:36 +0000 (16:29 +0800)]
synchronize upstream about tosca-parser

synchronize tosca-parser with version of 0.81

JIRA: PARSER-128

Change-Id: Ib00e391bd6c1f4c69776796eb7b28062f14b92fc
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoMerge "Add more test for nested import list"
xiaodong shang [Mon, 17 Jul 2017 08:01:46 +0000 (08:01 +0000)]
Merge "Add more test for nested import list"

7 years agoMake use of existing cirros image in the Functest container 95/37395/3
jose.lausuch [Thu, 13 Jul 2017 13:57:59 +0000 (15:57 +0200)]
Make use of existing cirros image in the Functest container

Once [1] is merged, the image needed for this test case will be
available in /home/opnfv/functest/images/
So, no need to download again.

[1] https://gerrit.opnfv.org/gerrit/#/c/37393/

Change-Id: I219fc38cdf5e929ecdba1631d6315f6d076ae5d0
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
7 years agoAdd more test for nested import list 61/37361/1
shangxdy [Thu, 13 Jul 2017 11:01:08 +0000 (19:01 +0800)]
Add more test for nested import list

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>
7 years agoAdd getting custom node by capability 53/37353/1
shangxdy [Thu, 13 Jul 2017 09:51:42 +0000 (17:51 +0800)]
Add getting custom node by capability

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>
7 years agoFix import nested list bugs 97/37197/1
shangxdy [Tue, 11 Jul 2017 16:38:06 +0000 (00:38 +0800)]
Fix import nested list bugs

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>
7 years agofix the command of testr 67/33467/1
dongwenjuan [Tue, 18 Apr 2017 11:28:57 +0000 (19:28 +0800)]
fix the command of testr

Change-Id: Ie85940e7c3a755f6506eb75fa1bae286c4b038ca
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
7 years agoAdd verigraph documentation 03/30703/4
serena.spinoso [Thu, 16 Mar 2017 15:18:24 +0000 (16:18 +0100)]
Add verigraph documentation

Add user guide and test usage documentation.
Add examples of service graphs to use verigraph.

Change-Id: I3e454e03fa2de99bad0761e3e4a0eab98f2e0b23
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
7 years agoMerge "Design document for yang2tosca patch set-4 Signed-off-by: shiva-charan <shiva...
Zhipeng (Howard) Huang [Wed, 15 Mar 2017 11:40:23 +0000 (11:40 +0000)]
Merge "Design document for yang2tosca patch set-4 Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com> Change-Id: Id3b8c198d08ea71130828d941dcc16ac5b23a421"

7 years agoMerge "Modify documents about overview"
Zhipeng (Howard) Huang [Tue, 14 Mar 2017 14:38:45 +0000 (14:38 +0000)]
Merge "Modify documents about overview"

7 years agoDesign document for yang2tosca patch set-4 61/30261/4
shiva-charan [Fri, 10 Mar 2017 14:16:50 +0000 (09:16 -0500)]
Design document for yang2tosca patch set-4
Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com>
Change-Id: Id3b8c198d08ea71130828d941dcc16ac5b23a421

7 years agoModify documents about overview 23/30423/2
shangxdy [Tue, 14 Mar 2017 13:22:05 +0000 (21:22 +0800)]
Modify documents about overview

Add overview about apigateway and tosca2heat.

Change-Id: I2994ebcde39dcacd248bd09d33ab48823c12e9a1
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoDesign document for policy2tosca patch set-2 75/30375/2
shiva-charan [Mon, 13 Mar 2017 17:33:05 +0000 (13:33 -0400)]
Design document for policy2tosca patch set-2
Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com>
Change-Id: I9f1d1def0c49dadb03c5bcc1d704465eb60cc80a

7 years agoAdd top level git ignore files 79/30279/1
shangxdy [Fri, 10 Mar 2017 17:26:29 +0000 (01:26 +0800)]
Add top level git ignore files

Add more git ignore files for convenient use before submit.

Change-Id: I133988323f8e1193efcde31cd6dd6c3f298c52d3
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoAdd apigateway docs 77/30277/2
shangxdy [Fri, 10 Mar 2017 17:08:53 +0000 (01:08 +0800)]
Add apigateway docs

Add documents for apigateway.

JIRA:PARSER-123

Change-Id: Ibe8ebd6e3a3f62d58d8da0da4d9be8ceb673fb7b
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoAdd verigraph documentation 95/30195/4
riccardo.sisto [Thu, 9 Mar 2017 16:19:31 +0000 (17:19 +0100)]
Add verigraph documentation

Add design doc and installation instructions (pointing to Readme in code base).
User manual will be provided in next release

Change-Id: I5118894e80a36c1fc0dc29b6e6c3b59637e1b6d0
Signed-off-by: riccardo.sisto <riccardo.sisto@polito.it>
7 years agoFix minor format issues in documents 75/30175/2
Julien [Thu, 9 Mar 2017 14:20:21 +0000 (22:20 +0800)]
Fix minor format issues in documents

Change-Id: I9a7267b116338f72f7256b23b517bd7795eba602
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
7 years agoMerge "Adding Labels"
julien zhang [Thu, 9 Mar 2017 12:15:46 +0000 (12:15 +0000)]
Merge "Adding Labels"

7 years agoFix docs bug 55/30155/2
shangxdy [Thu, 9 Mar 2017 11:29:34 +0000 (19:29 +0800)]
Fix docs bug

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>
7 years agoAdding Labels 37/30037/1
ShubhamRathi [Wed, 8 Mar 2017 09:21:15 +0000 (14:51 +0530)]
Adding Labels

Labels serve as anchors/ refs when referenced from other documents
This patch adds labels to docs/*/*/index.rst

Change-Id: Idd352145f7b984c30aae1939cbe8cd6eb7e228ed
Signed-off-by: ShubhamRathi <shubhamiiitbackup@gmail.com>
7 years agoDanube Release Docs Fixup patch 2 31/29831/4
zhipengh [Mon, 6 Mar 2017 08:16:45 +0000 (16:16 +0800)]
Danube Release Docs Fixup patch 2

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>
7 years agoInit api gateway framework 33/29833/3
shangxdy [Tue, 28 Feb 2017 07:51:34 +0000 (15:51 +0800)]
Init api gateway framework

Add api gateway init frame code

JIRA:PARSER-112
Change-Id: I4e5cff09f8ded4107b02bcdd791e5e2b707e11c5
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoDanube Release Docs Fixup patch 1 03/29603/4
zhipengh [Thu, 2 Mar 2017 03:51:07 +0000 (11:51 +0800)]
Danube Release Docs Fixup patch 1

Done in this patch
1. Fixes in overview.rst
2. Moves governance folder under docs
3. Adds arno release use case doc from
https://wiki.opnfv.org/display/parser/Parser+Use+Cases to the
requirement folder
4. Moves two old tosca2heat documents into developer/design/examples
5. Adds new empty tosca2heat and verigraph design document under
developer/design.
6. Remove old contents in yang2tosca and policy2tosca design docs since
they are all related to installation/execution, not design.
7. Fixes in installation.instruction.rst and usage,guide.rst

To do in the following patches
1. Design doc writeup: Xiaodong(tosca2heat),
Shiva(yang2tosca/policy2tosca), Serena(verigraph)
2. Release doc writeup: Xiaodong and Howard
(postinstall.rst,scenario.description.rst), Serena(verigraph part of
release-notes.rst), release-notes.rst

Change-Id: If4f51067dd33acd2332e503ee31d6941b4df4c89
Signed-off-by: zhipengh <huangzhipeng@huawei.com>
7 years agoMerge "Release D doc update"
julien zhang [Tue, 28 Feb 2017 07:24:24 +0000 (07:24 +0000)]
Merge "Release D doc update"

7 years agoRelease D doc update 33/29433/2
zhipengh [Mon, 27 Feb 2017 09:26:21 +0000 (04:26 -0500)]
Release D doc update

Change-Id: I6b2749e5692cf6af2615ff5aff81ff060a1a25d3
Signed-off-by: zhipengh <huangzhipeng@huawei.com>
7 years agoMerge "Add verigraph code base"
Zhipeng (Howard) Huang [Mon, 27 Feb 2017 13:08:54 +0000 (13:08 +0000)]
Merge "Add verigraph code base"

7 years agoAdd verigraph code base 81/29381/5
serena.spinoso [Sat, 25 Feb 2017 11:00:55 +0000 (12:00 +0100)]
Add verigraph code base

JIRA: PARSER-111

Change-Id: Ie76e14fabbb6c388ebc89d9a15dd3021b25fa892
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
7 years agoMerge "Add top layer tox support"
Zhipeng (Howard) Huang [Mon, 27 Feb 2017 01:44:31 +0000 (01:44 +0000)]
Merge "Add top layer tox support"

7 years agoAdd top layer tox support 93/29393/3
Julien [Sun, 26 Feb 2017 14:44:45 +0000 (22:44 +0800)]
Add top layer tox support

It's easy to test each project.

Change-Id: I85f25a60a6fa90992cd0ca3b0631ffd8c4ef9685
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
7 years agoAdd ip output in compute node 97/29397/2
shangxdy [Sun, 26 Feb 2017 17:19:10 +0000 (01:19 +0800)]
Add ip output in compute node

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>
7 years agoFix heat-translator after sync code 95/29395/1
shangxdy [Sun, 26 Feb 2017 16:25:29 +0000 (00:25 +0800)]
Fix heat-translator after sync code

Fix heat-translator after sync code from upstream

JIRA:PARSER-120

Change-Id: I033fa7c09fea716d7568613f72643f1e4bf8cd19
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoSync heat-translator code 89/29389/9
shangxdy [Sun, 26 Feb 2017 08:22:30 +0000 (16:22 +0800)]
Sync heat-translator code

Sync heat-translator code from upstream

JIRA:PARSER-119

Change-Id: I2287b78ad38bc54f7740fd1ee5f08989d5e680bf
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoSync upstream code 85/29385/2
shangxdy [Sat, 25 Feb 2017 16:49:42 +0000 (00:49 +0800)]
Sync upstream code

Sync upstream project of tosca-parser

Change-Id: Ic707844203ea05007b3c02e9dcadb52389eb3149
JIRA:PARSER-118
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix ci bug 83/29383/1
shangxdy [Sat, 25 Feb 2017 14:27:38 +0000 (22:27 +0800)]
Fix ci bug

Fix ci bug when integrated with functest

JIRA:PARSER-117

Change-Id: I054ee8a578c5deeaa9cae383fac4bb0984389053
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoremove contributors 39/28139/1
Aric Gardner [Mon, 6 Feb 2017 16:11:23 +0000 (11:11 -0500)]
remove contributors

We do not track contributors in the INFO file
removed for consistency

Change-Id: I7b8f558d3599741fa62935d7314ac5a473347de9
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
7 years agoAdd output validation test case for substitution. 53/25653/2
shangxdy [Thu, 8 Dec 2016 03:42:45 +0000 (11:42 +0800)]
Add output validation test case for substitution.

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>
7 years agoAdd output validation for substitution mappings 35/25535/5
shangxdy [Mon, 5 Dec 2016 06:23:25 +0000 (14:23 +0800)]
Add output validation for substitution mappings

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>
7 years agoMerge "Add output in vRNC for substitution mappings"
xiaodong shang [Fri, 9 Dec 2016 15:21:33 +0000 (15:21 +0000)]
Merge "Add output in vRNC for substitution mappings"

7 years agoAdd output in vRNC for substitution mappings 17/25517/2
shangxdy [Tue, 6 Dec 2016 08:49:19 +0000 (16:49 +0800)]
Add output in vRNC for substitution mappings

Add attributes in rnc.nodes.VNF definition.

JIRA:PARSER-114

Change-Id: I8578cc89dc58202893370d367dc9923ddc1c111a
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoAdd input validation test case 05/25405/4
shangxdy [Fri, 2 Dec 2016 08:21:21 +0000 (16:21 +0800)]
Add input validation test case

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>
8 years agoadd verigraph team member 97/22797/1
zhipengh [Fri, 7 Oct 2016 14:59:01 +0000 (22:59 +0800)]
add verigraph team member

Change-Id: Idc2c187514dc640ed382fc5962fe9e25ac5cc7b7
Signed-off-by: zhipengh <huangzhipeng@huawei.com>
8 years agoReplace the hot template versoion of 2013-05-23 with 2014-10-16 17/22317/2
shangxdy [Thu, 22 Sep 2016 07:55:10 +0000 (15:55 +0800)]
Replace the hot template versoion of 2013-05-23 with 2014-10-16

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>
8 years agoMerge "Add ip output in compute translation"
shangxdy [Thu, 29 Sep 2016 17:01:31 +0000 (17:01 +0000)]
Merge "Add ip output in compute translation"

8 years agoUpdate the tosca2heat documents for release Colorado 01/22301/2
shangxdy [Thu, 22 Sep 2016 07:07:53 +0000 (15:07 +0800)]
Update the tosca2heat documents for release Colorado

Update the tosca2heat documents for release Colorado:
1. add brief description for feature or function;
2. add list of tosca keywords in parser.
3. other improvement.

JIRA:PARSER-107

Change-Id: I25b46ec2490885534b54cce4bcf5fa030e882785
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd ip output in compute translation 13/22313/2
shangxdy [Thu, 22 Sep 2016 07:38:17 +0000 (15:38 +0800)]
Add ip output in compute translation

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>
8 years agoParser Release C RC1 docs final clean up 17/21817/3
zhipengh [Tue, 20 Sep 2016 13:18:05 +0000 (21:18 +0800)]
Parser Release C RC1 docs final clean up

Change-Id: Ib74e8cbaaa6397e9f9f1e9eba35d7d2f8e8d5108
Signed-off-by: zhipengh <huangzhipeng@huawei.com>
8 years agoDelete not used property from vRNC 67/21467/1
shangxdy [Mon, 19 Sep 2016 15:18:22 +0000 (23:18 +0800)]
Delete not used property from vRNC

Delete not used property from vRNC,such as activestatus
and id.

Change-Id: I14b4563663d220c241440dff0244ccbadff7912b
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Provide file list about the difference between parser and upstreams."
shangxdy [Mon, 19 Sep 2016 14:24:09 +0000 (14:24 +0000)]
Merge "Provide file list about the difference between parser and upstreams."

8 years agoMerge "Update the upstream of tosco-parser and heat-translator to stable release...
shangxdy [Mon, 19 Sep 2016 14:23:44 +0000 (14:23 +0000)]
Merge "Update the upstream of tosco-parser and heat-translator to stable release 0.6/0.5"

8 years agoInstallation doc and userguide for policy2tosca and yang2tosca 57/21357/1
shiva-charan [Sat, 17 Sep 2016 02:28:44 +0000 (21:28 -0500)]
Installation doc and userguide for policy2tosca and yang2tosca

Change-Id: I10e5745b75e4cdeafae28767ad8233decabf3482
Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com>
8 years agoProvide file list about the difference between parser and upstreams. 01/21101/2
shangxdy [Wed, 14 Sep 2016 08:37:05 +0000 (16:37 +0800)]
Provide file list about the difference between parser and upstreams.

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>
8 years agoUpdate the upstream of tosco-parser and heat-translator to stable 97/21097/1
shangxdy [Wed, 14 Sep 2016 06:36:33 +0000 (14:36 +0800)]
Update the upstream of tosco-parser and heat-translator to stable
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>
8 years agoAdd resources and outputs informantion in script 23/20923/2
shangxdy [Mon, 12 Sep 2016 16:00:10 +0000 (00:00 +0800)]
Add resources and outputs informantion in script

Add debug information when run script in functest.

Change-Id: I4e86d6fb4b2285d96c131163b8f72942eafa2563
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Add keys validation testcase in substitution_mapping class"
shangxdy [Mon, 12 Sep 2016 15:20:00 +0000 (15:20 +0000)]
Merge "Add keys validation testcase in substitution_mapping class"

8 years agoMerge "Replace test file from test_tosca_nfv_sample with vRNC"
shangxdy [Mon, 12 Sep 2016 14:55:04 +0000 (14:55 +0000)]
Merge "Replace test file from test_tosca_nfv_sample with vRNC"

8 years agoMerge changes from topics 'Add_property_software_config_transport_in_compute_node...
shangxdy [Mon, 12 Sep 2016 14:43:56 +0000 (14:43 +0000)]
Merge changes from topics 'Add_property_software_config_transport_in_compute_node', 'Add_signal_transport_property_in_softwaredeployment'

* changes:
  Add property of software_config_transport in compute node
  Add signal_transport in software deployment resource

8 years agoMerge "index and intro docs update for Rel C"
zhipengh [Sat, 10 Sep 2016 02:03:20 +0000 (02:03 +0000)]
Merge "index and intro docs update for Rel C"

8 years agoAdd keys validation testcase in substitution_mapping class 55/20755/2
shangxdy [Fri, 9 Sep 2016 09:41:48 +0000 (17:41 +0800)]
Add keys validation testcase in substitution_mapping class

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>
8 years agoAdd property of software_config_transport in compute node 07/20707/1
shangxdy [Thu, 8 Sep 2016 18:16:12 +0000 (02:16 +0800)]
Add property of software_config_transport in compute node

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>
8 years agoAdd signal_transport in software deployment resource 01/20701/2
shangxdy [Thu, 8 Sep 2016 17:47:35 +0000 (01:47 +0800)]
Add signal_transport in software deployment resource

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>
8 years agoReplace test file from test_tosca_nfv_sample with vRNC 99/20699/2
shangxdy [Thu, 8 Sep 2016 17:03:26 +0000 (01:03 +0800)]
Replace test file from test_tosca_nfv_sample with vRNC

About parser test in funkiest, replace test case from
test_tosca_nfv_sample.yaml to vRNC.yaml, which include more VDUs, VLs
and CPs.

JIRA:PARSER-103

Change-Id: I7a1c5937f644f7269c0263e681b8778bf98a1406
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoEmergence merged for unit test. 01/20601/1
shangxdy [Wed, 7 Sep 2016 16:30:24 +0000 (00:30 +0800)]
Emergence merged for unit test.

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>
8 years agoMerge "Create translation test code for vRNC"
shangxdy [Wed, 7 Sep 2016 16:08:51 +0000 (16:08 +0000)]
Merge "Create translation test code for vRNC"

8 years agoMerge "Add deployment scripts for vRNC"
shangxdy [Wed, 7 Sep 2016 16:08:00 +0000 (16:08 +0000)]
Merge "Add deployment scripts for vRNC"

8 years agoMerge "Fix network info output about compute node"
shangxdy [Wed, 7 Sep 2016 16:07:04 +0000 (16:07 +0000)]
Merge "Fix network info output about compute node"

8 years agoCreate translation test code for vRNC 17/19317/6
shangxdy [Tue, 23 Aug 2016 08:20:54 +0000 (16:20 +0800)]
Create translation test code for vRNC

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>
8 years agoindex and intro docs update for Rel C 29/20529/2
zhipengh [Wed, 7 Sep 2016 07:38:49 +0000 (15:38 +0800)]
index and intro docs update for Rel C

Change-Id: Ie00fe27841522a4f324e598e37bffbdadac2ec15
Signed-off-by: zhipengh <huangzhipeng@huawei.com>
8 years agoMerge "policy2tosca doc patch set-3"
Zhipeng (Howard) Huang [Wed, 7 Sep 2016 00:31:15 +0000 (00:31 +0000)]
Merge "policy2tosca doc patch set-3"

8 years agopolicy2tosca doc patch set-3 97/20197/3
shiva-charan [Fri, 2 Sep 2016 06:15:26 +0000 (01:15 -0500)]
policy2tosca doc patch set-3

Change-Id: Icc2ad677a55bfe0f58bbfad6305674e7764422ea
Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com>
8 years agoMerge "[NFV] Reduce instance requirements"
xiaodong shang [Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)]
Merge "[NFV] Reduce instance requirements"

8 years agoFix parser run error when attach blockstorage. 49/20149/1
shangxdy [Thu, 1 Sep 2016 13:41:27 +0000 (21:41 +0800)]
Fix parser run error when attach blockstorage.

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>
8 years ago[NFV] Reduce instance requirements 07/19907/2
Michael Polenchuk [Tue, 30 Aug 2016 15:05:24 +0000 (18:05 +0300)]
[NFV] Reduce instance requirements

In order to keep requirements of cpu/ram
at minimum reduce their values.

Change-Id: I624f9638d6207a2dc8a6f83e47ad4e6a0f221595
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
8 years agoMerge "Fix BlockStorageAttachment bug when translate compute node"
julien zhang [Thu, 1 Sep 2016 02:20:06 +0000 (02:20 +0000)]
Merge "Fix BlockStorageAttachment bug when translate compute node"

8 years agoFix network info output about compute node 57/20057/1
shangxdy [Wed, 31 Aug 2016 16:27:36 +0000 (00:27 +0800)]
Fix network info output about compute node

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>
8 years agoAdjusted the docs structure according to directives 87/19887/1
Sofia Wallin [Tue, 30 Aug 2016 13:30:46 +0000 (15:30 +0200)]
Adjusted the docs structure according to directives

Created a new subdirectory /installationprocedure.
Moved the featureconfig.rst and installerconfig.rst to /installationprocedure
Added a feature.configuration.rst that should include needed configuration instructions. Please move relevant content to this file and remove the other two (featureconfig.rst and installerconfig.rst)
Index file adjusted to updates

Change-Id: I54f30b358b4e0685ff98223b1c83c14745c9259b
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
8 years agoFix BlockStorageAttachment bug when translate compute node 91/19691/1
shangxdy [Sun, 28 Aug 2016 09:25:28 +0000 (17:25 +0800)]
Fix BlockStorageAttachment bug when translate compute node

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>
8 years agoMake patch for provider network when run in functest 97/19597/2
shangxdy [Thu, 25 Aug 2016 13:48:23 +0000 (21:48 +0800)]
Make patch for provider network when run in functest

When run parser in functest, we don't know the provider network about
Openstack, if use vxlan or vlan or gre as default, it may be error.
So it's necessary to path the provider network definition in yaml, and
select it in runtime.

JIRA:PARSER-99

Change-Id: I20ae6b213870b18cee094d43ce2ba958f53b111e
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoModify the test script for reducing the test time 45/19545/2
shangxdy [Thu, 25 Aug 2016 07:33:37 +0000 (15:33 +0800)]
Modify the test script for reducing the test time

Currently in functest, when deploy a template use  parser, the timeout
is a constant value of 3min,
It can be set according to the actual running time.
Additionally, its necessary to add more debug information.

JIRA:PARSER-98

Change-Id: I11b667247644dbd64ecd6e8b0b1015240301279d
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd deployment scripts for vRNC 21/19321/2
shangxdy [Tue, 23 Aug 2016 09:11:21 +0000 (17:11 +0800)]
Add deployment scripts for vRNC

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>
8 years agoBug: there is not segmentation_id in resource of 77/19277/1
shangxdy [Tue, 23 Aug 2016 02:57:00 +0000 (10:57 +0800)]
Bug: there is not segmentation_id in resource of
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>