parser.git
5 years agoSupport python3 uploaded to pypi websit 29/68229/2 master
shangxdy [Thu, 11 Jul 2019 15:57:11 +0000 (23:57 +0800)]
Support python3 uploaded to  pypi websit

The patch only trigger new version building for ONAP

JIRA:parser-189

Change-Id: Id5f9cf8af309c6b913797fde737607938275daec
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
5 years agotoscaparser: Support deriving from capability types of no property 64/67664/2
Lianhao Lu [Mon, 22 Apr 2019 05:48:41 +0000 (13:48 +0800)]
toscaparser: Support deriving from capability types of no property

Change-Id: I259a43b72a4dd3c74ad54a250ada9f913b5ce67b
Issue-ID: PARSER-188
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
5 years agoMerge "toscaparser: Avoid exception when creating our own" 1.1.1
Shang Xiaodong [Thu, 29 Nov 2018 01:18:40 +0000 (01:18 +0000)]
Merge "toscaparser: Avoid exception when creating our own"

5 years agotoscaparser: Avoid exception when creating our own 37/65437/4
Lianhao Lu [Mon, 19 Nov 2018 08:28:05 +0000 (16:28 +0800)]
toscaparser: Avoid exception when creating our own

Fixed the bug that new exception is thrown when we're creating our own
exceptions.

JIRA: PARSER-187

Change-Id: If4c445eb9b5c6ff26d40cf6b3fa7f19cd31fd425
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
6 years agoSkip Installing Parse when building documentation 39/64739/1
Trevor Bramwell [Thu, 8 Nov 2018 05:17:08 +0000 (21:17 -0800)]
Skip Installing Parse when building documentation

'usedevelop = True' is set in the tox '[testenv]', so every tox env
including documentation will build and install the parser code.

Disabling this for the docs and docs-linkcheck environments should speed
up builds and feedback on documentation changes.

Change-Id: I72780b852ff56608313efb099ad1eeb4b665143b
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
6 years agoLocal Docs Builds 75/62075/1 1.1.0
Trevor Bramwell [Mon, 10 Sep 2018 23:30:41 +0000 (16:30 -0700)]
Local Docs Builds

Added local sphinx documentation build following this guide:
  https://docs.opnfv.org/en/latest/how-to-use-docs/local-build-transition.html

Change-Id: I8d0c430e6fff46dc1bf869fd54f304b0994aca8a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
6 years agomodify nrpv for parameter 79/61179/2
shangxdy [Tue, 21 Aug 2018 13:55:51 +0000 (21:55 +0800)]
modify nrpv for parameter

JIRA: PARSER-181

Change-Id: I3d439f3f80e5f936fdc24dea74b19dd3cace8492
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoMerge "Add CLI in verigraph."
xiaodong shang [Fri, 17 Aug 2018 03:37:02 +0000 (03:37 +0000)]
Merge "Add CLI in verigraph."

6 years agoMerge "parameter -nrpv not fuctioning in toscaparser"
xiaodong shang [Wed, 15 Aug 2018 16:05:39 +0000 (16:05 +0000)]
Merge "parameter -nrpv not fuctioning in toscaparser"

6 years agoparameter -nrpv not fuctioning in toscaparser 37/60937/2
shangxdy [Tue, 14 Aug 2018 13:57:35 +0000 (21:57 +0800)]
parameter -nrpv not fuctioning in toscaparser

In opnfv-toscaparer ver 1.0.1, when passing -nrpv to prohibit the input
parameter validation, i.e.

    toscaparser --template-file <file> -nrpv

The exceptions of type MissingRequiredParameterError are still got
raised. Seems that -nrpv parameter is not working.

JIRA: PARSER-181

Change-Id: If44eefcc2b7bdb360eae023ed2c2cd67789c2128
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoBug fixe version info print 39/60939/1
shangxdy [Tue, 14 Aug 2018 14:03:34 +0000 (22:03 +0800)]
Bug fixe version info print

If parser Tosca error happens, it may not exist version info;
So it needs a process before print it.

JIRA: PARSER-183

Change-Id: I283d1d794b0db19f83a9abc0eee3962e94e21572
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoAdd CLI in verigraph. 75/56875/1
serena.spinoso [Sun, 29 Apr 2018 08:48:44 +0000 (10:48 +0200)]
Add CLI in verigraph.

JIRA: PARSER-180

Add CLI to select one of the available interfaces (i.e. REST or gRPC), one of the supported service descriptor formats (i.e. TOSCA/XML, TOSCA/YAML, JSON),
and the operations to perform (i.e. read, create, update, delete graphs and run verifications).

Change-Id: I02f4d86e221baf0ac583d0ffd0ebe028aa6209be
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
6 years agoSupport TOSCA in verigraph (gRPC service) 51/56651/2
serena.spinoso [Thu, 26 Apr 2018 12:19:16 +0000 (14:19 +0200)]
Support TOSCA in verigraph (gRPC service)

JIRA: PARSER-179

Add TOSCA service description in gRPC server.
Add a TOSCA-based client to use the new functionality.
Add a JUnit class for testing gRPC service with TOSCA descriptor

Change-Id: Id3217a674f076714cd48e3b7e4236e7445d89cd2
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
6 years agoMerge "Fix aarch64 image naming in parser" 1.0.1 opnfv-6.0.0
xiaodong shang [Thu, 26 Apr 2018 09:12:17 +0000 (09:12 +0000)]
Merge "Fix aarch64 image naming in parser"

6 years agoMerge "Update release notes for fraser"
xiaodong shang [Thu, 26 Apr 2018 09:04:31 +0000 (09:04 +0000)]
Merge "Update release notes for fraser"

6 years agoUpdate release notes for fraser 31/56631/1
shangxdy [Thu, 26 Apr 2018 09:04:43 +0000 (17:04 +0800)]
Update release notes for fraser

Update release notes for new release

JIRA: PARSER-178

Change-Id: I9caf66a24b532c96137d5af88b0d62d2a666b052
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoModify user guide for Frase 11/56611/1
shangxdy [Thu, 26 Apr 2018 07:40:56 +0000 (15:40 +0800)]
Modify user guide for Frase

Update user guide for nfv-toscaprser

JIRA: PARSER-177

Change-Id: I68f65c37c4e0c69627467a4c2e1814183638535e
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoFix aarch64 image naming in parser 29/55229/9
Charalampos Kominos [Mon, 9 Apr 2018 11:35:33 +0000 (13:35 +0200)]
Fix aarch64 image naming in parser

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>
6 years ago[p/parser] Add aarch64 download option 97/54197/9
Charalampos Kominos [Tue, 20 Mar 2018 13:06:08 +0000 (14:06 +0100)]
[p/parser] Add aarch64 download option

Hardcoded values within the parser project create problems
for opnfv-armband. In this patch we :
1) Add aarch64 image download conditional
2) Fix typos and comments

JIRA: ARMBAND-369
JIRA: PARSER-175

Change-Id: I001087a8783fef66336e9bddc8d67342f6810a1f
Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
6 years agoMerge "Auto Generated INFO.yaml file"
xiaodong shang [Tue, 27 Mar 2018 13:32:42 +0000 (13:32 +0000)]
Merge "Auto Generated INFO.yaml file"

6 years agoAuto Generated INFO.yaml file 93/51593/2
agardner [Fri, 2 Feb 2018 23:07:13 +0000 (18:07 -0500)]
Auto Generated INFO.yaml file

INFO.yaml meant to be machine readable.
This file was auto generated from an ldap lookup
and your projects INFO file.

Meeting times are not currently filled out.
please ammend this patchset to complete

Going forward comitter promotions should be done
against this file.

PTLs:
Must be merged for you to gain delete access on
testresults.opnfv.org

If project_lead: is missing (my script could not parse)
please amend with same from commiters section eg:

project_lead: &opnfv_$project_ptl
    name: 'Lead Name'
    email: 'lead email'
    id: 'lead lfid'
    company: 'lead company'

Change-Id: Id3dea3ab924bb3069aa3580848c682d8b1277fc6
Signed-off-by: agardner <agardner@linuxfoundation.org>
6 years agoHandle flavor before image 49/54149/4
shangxdy [Tue, 20 Mar 2018 03:24:38 +0000 (11:24 +0800)]
Handle flavor before image

JIRA: PARSER-174

Change-Id: I891398e634846db617081b0baed9adf0662743b7
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoAdd documents for Relase F 75/53875/1
shangxdy [Thu, 15 Mar 2018 12:28:05 +0000 (20:28 +0800)]
Add documents for Relase F

nfv-toscaprser api document

JIRA: PARSER-173

Change-Id: I94603ce8f6698f424f5249ab1008c15199c35845
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoAdd default flavor 73/51473/2
shangxdy [Thu, 1 Feb 2018 17:55:39 +0000 (01:55 +0800)]
Add default flavor

Add default falvor since there is not any flavor for
some installers.

JIRA: PARSER-172

Change-Id: I5fb0fdc4857a35840399c8cec8f051055a3a4eac
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoMerge "Replace relative path with absolute path for functest script"
xiaodong shang [Wed, 3 Jan 2018 17:56:37 +0000 (17:56 +0000)]
Merge "Replace relative path with absolute path for functest script"

6 years agoReplace relative path with absolute path for functest script 07/49907/1
shangxdy [Wed, 3 Jan 2018 06:32:58 +0000 (14:32 +0800)]
Replace relative path with absolute path for functest script

urrent parser script for functest is supposed that functest enterns the
tests directory of parser firstly, and then call functest_parser.sh; it
need to use absolute path instead of relative path as work directory.

This modification is from functest patch:
https://gerrit.opnfv.org/gerrit/#/c/49649/

JIRA: PARSER-171

Change-Id: I55b3ce882e6ddd48edf9f43eb8fae8334c5458aa
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoAdd dependency for openstackcleint 37/48637/1
shangxdy [Mon, 11 Dec 2017 09:49:13 +0000 (17:49 +0800)]
Add dependency for openstackcleint

Currently, the ci test result is error after the functest team modified
the parser dockerfile.
========= 1/4. Preparing VM image for parser... =========
Download image cirros-0.3.5-x86_64-disk.img...
./functest_run.sh: line 72: openstack: command not found
Registe image cirros-0.3.2-x86_64-uec...
./functest_run.sh: line 79: openstack: command not found
Clean-up the environment...
./functest_run.sh: line 243: openstack: command not found
Delete local image file cirros-0.3.2-x86_64-uec.img after test.
Delete local URL image file cirros-0.3.5-x86_64-disk.img after test.
./functest_run.sh: line 275: openstack: command not found
Delete user parser's role from project parser
./functest_run.sh: line 283: openstack: command not found
Delete user parser
./functest_run.sh: line 290: openstack: command not found
Delete project parser
./functest_run.sh: line 295: openstack: command not found
======================={ Parser functest end }==========================

it need to add python-openstackclient requirement in parser project.

JIRA: PARSER-166

Change-Id: I8b38325c602b508823d36709a93b1dd8739156f9
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
6 years agoSynchronize requirements with stable/pike 95/47795/3
Cédric Ollivier [Sat, 25 Nov 2017 12:20:27 +0000 (13:20 +0100)]
Synchronize requirements with stable/pike

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>
7 years agoAdded a license metadata line to specify Apache-2.0 89/46989/1
rpaik [Thu, 9 Nov 2017 18:55:56 +0000 (10:55 -0800)]
Added a license metadata line to specify Apache-2.0

Change-Id: I567522d47fa30efa03e84e5292360481e81f30ad
Signed-off-by: rpaik <rpaik@linuxfoundation.org>
7 years agoUpdate notes for release E 37/45837/1 stable/euphrates opnfv-5.1.0
shangxdy [Thu, 19 Oct 2017 14:47:31 +0000 (22:47 +0800)]
Update notes for release E

Update userguide and release-notes

JIRA:PARSER-163

Change-Id: I3b15aa40afcb86a415997fc7e2471894bf3c9f06
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoUpdate notes for release E 29/45829/1
shangxdy [Thu, 19 Oct 2017 14:47:31 +0000 (22:47 +0800)]
Update notes for release E

Update userguide and release-notes

JIRA:PARSER-163

Change-Id: I3b15aa40afcb86a415997fc7e2471894bf3c9f06
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix integration error when no role of heat_stack_owner 57/44657/1
shangxdy [Tue, 10 Oct 2017 11:36:44 +0000 (19:36 +0800)]
Fix integration error when no role of heat_stack_owner

If there is no role of heat_stack_owner in openstack, integration
will be error, the patch will fix it.

JIRA: PARSER-162

Change-Id: I74d4e70153a312c1a64c75e0ff956b7ab2219adf
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix integration error when no role of heat_stack_owner 53/44653/1
shangxdy [Tue, 10 Oct 2017 11:36:44 +0000 (19:36 +0800)]
Fix integration error when no role of heat_stack_owner

If there is no role of heat_stack_owner in openstack, integration
will be error, the patch will fix it.

JIRA: PARSER-162

Change-Id: I74d4e70153a312c1a64c75e0ff956b7ab2219adf
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix test for apex 53/44553/1
shangxdy [Mon, 9 Oct 2017 08:46:08 +0000 (16:46 +0800)]
Fix test for apex

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>
7 years agoFix test for apex 43/44543/2
shangxdy [Mon, 9 Oct 2017 08:46:08 +0000 (16:46 +0800)]
Fix test for apex

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>
7 years agoRemove python limitation for codeship 49/44549/1
shangxdy [Mon, 9 Oct 2017 09:05:09 +0000 (17:05 +0800)]
Remove python limitation for codeship

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>
7 years agoRemove python limitation for codeship 47/44547/1
shangxdy [Mon, 9 Oct 2017 09:05:09 +0000 (17:05 +0800)]
Remove python limitation for codeship

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>
7 years agoMerge "Add coverage test item"
xiaodong shang [Mon, 9 Oct 2017 08:26:14 +0000 (08:26 +0000)]
Merge "Add coverage test item"

7 years agoAdd coverage test item 25/43425/1
shangxdy [Thu, 28 Sep 2017 05:52:20 +0000 (13:52 +0800)]
Add coverage test item

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>
7 years agoAdd coverage test item 91/43391/1
shangxdy [Thu, 28 Sep 2017 05:52:20 +0000 (13:52 +0800)]
Add coverage test item

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>
7 years agoFix user role list bug 35/43235/1
shangxdy [Wed, 27 Sep 2017 01:24:14 +0000 (09:24 +0800)]
Fix user role list bug

Currently the query misses a option of --user,
the patch will fix it.

JIRA: PARSER-158

Change-Id: I324d843b00271f7fb333b02c5372cb061d09ae70
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix user role list bug 33/43233/1
shangxdy [Wed, 27 Sep 2017 01:24:14 +0000 (09:24 +0800)]
Fix user role list bug

Currently the query misses a option of --user,
the patch will fix it.

JIRA: PARSER-158

Change-Id: I324d843b00271f7fb333b02c5372cb061d09ae70
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoFix heat_stack_owner bug 45/42845/1
shangxdy [Fri, 22 Sep 2017 09:29:45 +0000 (17:29 +0800)]
Fix heat_stack_owner bug

In env installed by apex, there is no role of heat_stack_owner, so it
need to separate the condition  in script.

JIRA:PARSER-157

Change-Id: Ie40715268a1124b57f0bf36ddc566bbcdbed964b
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
(cherry picked from commit 51a4cb9a4026037147da64b2353ec44002c7a7a7)

7 years agoFix heat_stack_owner bug 49/42749/2
shangxdy [Fri, 22 Sep 2017 09:29:45 +0000 (17:29 +0800)]
Fix heat_stack_owner bug

In env installed by apex, there is no role of heat_stack_owner, so it
need to separate the condition  in script.

JIRA:PARSER-157

Change-Id: Ie40715268a1124b57f0bf36ddc566bbcdbed964b
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoMerge "Add required parameters validation for nested service"
xiaodong shang [Fri, 15 Sep 2017 17:08:15 +0000 (17:08 +0000)]
Merge "Add required parameters validation for nested service"

7 years agoAdd required parameters validation for nested service 59/41959/1
shangxdy [Thu, 14 Sep 2017 11:45:53 +0000 (19:45 +0800)]
Add required parameters validation for nested service

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>
7 years agoMerge "Fix functest_run script for role of heat_stack_owner"
xiaodong shang [Thu, 14 Sep 2017 11:19:04 +0000 (11:19 +0000)]
Merge "Fix functest_run script for role of heat_stack_owner"

7 years agoMerge "Disable syslog in heat-translator for functest integration"
xiaodong shang [Thu, 14 Sep 2017 11:12:36 +0000 (11:12 +0000)]
Merge "Disable syslog in heat-translator for functest integration"

7 years agoFix functest_run script for role of heat_stack_owner 49/41949/1
shangxdy [Thu, 14 Sep 2017 10:24:35 +0000 (18:24 +0800)]
Fix functest_run script for role of heat_stack_owner

When update openstack to ocata and run test in functest, the following
error happends:
  ERROR: Missing required credential: roles ['heat_stack_owner']
It need to add role heat_stack_owner to parser user

JIRA: PARSER-156

Change-Id: Ie0417c53c7dbd28efe8d9c4eb3fda23de8e1f841
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoDisable syslog in heat-translator for functest integration 71/41171/2
shangxdy [Wed, 6 Sep 2017 10:27:44 +0000 (18:27 +0800)]
Disable syslog in heat-translator for functest integration

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>
7 years agoMerge "Fix substitution mapping assigned value to nodetemplate"
julien zhang [Wed, 13 Sep 2017 01:22:30 +0000 (01:22 +0000)]
Merge "Fix substitution mapping assigned value to nodetemplate"

7 years agoMerge "update verigraph"
julien zhang [Tue, 12 Sep 2017 14:47:37 +0000 (14:47 +0000)]
Merge "update verigraph"

7 years agoFix substitution mapping assigned value to nodetemplate 09/41709/2
shangxdy [Tue, 12 Sep 2017 14:27:15 +0000 (22:27 +0800)]
Fix substitution mapping assigned value to nodetemplate

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>
7 years agoupdate verigraph 83/41283/5
serena.spinoso [Thu, 7 Sep 2017 08:22:39 +0000 (10:22 +0200)]
update verigraph

JIRA: PARSER-154

code optimizations about graph manipulation and formula generation.

Change-Id: Idebef19b128281aa2bc40d1aeab6e208c7ddd93d
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
7 years agoMerge "Update heat-translator requirement"
julien zhang [Sun, 10 Sep 2017 14:47:26 +0000 (14:47 +0000)]
Merge "Update heat-translator requirement"

7 years agoUpdate heat-translator requirement 55/41255/2
shangxdy [Thu, 7 Sep 2017 02:40:13 +0000 (10:40 +0800)]
Update heat-translator requirement

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>
7 years agoMerge "Fix StatefulEntityType when entitytype is not define"
julien zhang [Sun, 10 Sep 2017 14:40:24 +0000 (14:40 +0000)]
Merge "Fix StatefulEntityType when entitytype is not define"

7 years agoMerge "fix costum datatype definition in parameters"
julien zhang [Sun, 10 Sep 2017 14:39:43 +0000 (14:39 +0000)]
Merge "fix costum datatype definition in parameters"

7 years agoMerge "Add debug mode parameter"
julien zhang [Sun, 10 Sep 2017 14:39:04 +0000 (14:39 +0000)]
Merge "Add debug mode parameter"

7 years agoMerge "Refactor heat-translator setup.py"
julien zhang [Sun, 10 Sep 2017 14:37:28 +0000 (14:37 +0000)]
Merge "Refactor heat-translator setup.py"

7 years agoMerge "Package for funectest"
julien zhang [Sun, 10 Sep 2017 14:36:46 +0000 (14:36 +0000)]
Merge "Package for funectest"

7 years agoFix StatefulEntityType when entitytype is not define 79/41379/1
shangxdy [Fri, 8 Sep 2017 08:32:09 +0000 (16:32 +0800)]
Fix StatefulEntityType when entitytype is not define

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>
7 years agofix costum datatype definition in parameters 95/41295/1
shangxdy [Thu, 7 Sep 2017 11:00:35 +0000 (19:00 +0800)]
fix costum datatype definition in parameters

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>
7 years agoAdd debug mode parameter 69/41269/3
shangxdy [Thu, 7 Sep 2017 04:50:34 +0000 (12:50 +0800)]
Add debug mode parameter

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>
7 years agoRefactor heat-translator setup.py 61/41261/1
shangxdy [Thu, 7 Sep 2017 02:54:36 +0000 (10:54 +0800)]
Refactor heat-translator setup.py

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>
7 years agoPackage for funectest 61/41161/4
shangxdy [Thu, 31 Aug 2017 02:22:48 +0000 (10:22 +0800)]
Package for funectest

Modify the install script

JIRA: PARSER-125

Change-Id: Ia43687286fb8ac3b18b816aa5e4928ce9a12beec
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
7 years agoStop installing librairies during tests 15/41115/5
Cédric Ollivier [Tue, 5 Sep 2017 22:25:57 +0000 (00:25 +0200)]
Stop installing librairies during tests

Functest is in charge of installing libraries and it's forbidden by
tests. No syslog service is provided in the container too.

Change-Id: I4de16e091a4eea1b4fad1cb11fcff9abb62f82cd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
7 years agoUpdate the parser's version after publish 0.5.0 for onap 65/41165/1
shangxdy [Wed, 6 Sep 2017 09:48:38 +0000 (17:48 +0800)]
Update the parser's version after publish 0.5.0 for onap

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>
7 years agoMerge "Support version of tosca_simple_yaml_1_1" 0.5.0
julien zhang [Tue, 5 Sep 2017 13:28:08 +0000 (13:28 +0000)]
Merge "Support version of tosca_simple_yaml_1_1"

7 years agoFix exceptions overwritten when nested import service topology 71/40571/4
shangxdy [Tue, 29 Aug 2017 08:42:20 +0000 (16:42 +0800)]
Fix exceptions overwritten when nested import service topology

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>
7 years agoSupport version of tosca_simple_yaml_1_1 89/40989/3
shangxdy [Fri, 1 Sep 2017 07:16:00 +0000 (15:16 +0800)]
Support version of tosca_simple_yaml_1_1

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>
7 years agoMerge "Add import file with suffix of yml testcases"
julien zhang [Fri, 1 Sep 2017 07:11:47 +0000 (07:11 +0000)]
Merge "Add import file with suffix of yml testcases"

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 agoAdd parameter validation in design time 53/40553/1
shangxdy [Tue, 29 Aug 2017 04:45:34 +0000 (12:45 +0800)]
Add parameter validation in design time

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>
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>