parser.git
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 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>
8 years agoReplace the policie types with parent type when judging policy node 73/19273/1
shangxdy [Tue, 23 Aug 2016 02:36:25 +0000 (10:36 +0800)]
Replace the policie types with parent type when judging policy node
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>
8 years agopolicy2tosca patch set-6 93/16693/7
shiva-charan.m-s [Wed, 27 Jul 2016 03:34:23 +0000 (22:34 -0500)]
policy2tosca patch set-6

Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com>
8 years agoMerge "Remove the cyclic dependencies in vRNC definition"
julien zhang [Mon, 22 Aug 2016 13:54:03 +0000 (13:54 +0000)]
Merge "Remove the cyclic dependencies in vRNC definition"

8 years agoMerge "Add high_availability test case"
julien zhang [Mon, 22 Aug 2016 13:52:23 +0000 (13:52 +0000)]
Merge "Add high_availability test case"

8 years agoRemove the cyclic dependencies in vRNC definition 63/19163/1
shangxdy [Mon, 22 Aug 2016 07:34:10 +0000 (15:34 +0800)]
Remove the cyclic dependencies in vRNC definition

Current the high_availability definition in vRNC about active MM/CM VDUs
and passive MM/CM VDUs is cyclic dependencies, and the consequence is
deployment of  vRNC may fall into a infinite loop.
The correct definition is passive VDU depend on the active VDU, but the
active VDU doesn't depend on the passive VDU.

JIRA:PARSER-95

Change-Id: I3f2fb8c0ce959878b12d7da49e2dc81596b4b528
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd high_availability test case 61/19161/1
shangxdy [Mon, 22 Aug 2016 07:22:56 +0000 (15:22 +0800)]
Add high_availability test case

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>
8 years agoModify the stack name to template file name when deploy stack use 39/19139/1
shangxdy [Mon, 22 Aug 2016 02:56:23 +0000 (10:56 +0800)]
Modify the stack name to template file name when deploy stack use
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>
8 years agoUpdate the documents in Release C 63/18963/3
shangxdy [Thu, 18 Aug 2016 13:14:39 +0000 (21:14 +0800)]
Update the documents in Release C

As a developer;
I want anybody who cares of project of parser to know what new features
in release C;
So i update the distribution documents.

JIRA:PRASER-87

Change-Id: I0537ba55fa12daa2975f1b794908bca457cfd9c2
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Provide a specific stack_name when deploy a template use heat-translator"
julien zhang [Fri, 19 Aug 2016 15:08:48 +0000 (15:08 +0000)]
Merge "Provide a specific stack_name when deploy a template use heat-translator"

8 years agoMerge "Judge volume node is error when translate compute node"
julien zhang [Fri, 19 Aug 2016 15:07:17 +0000 (15:07 +0000)]
Merge "Judge volume node is error when translate compute node"

8 years agoMerge "JIRA:PARSER-1 -XSLT script for YANG to TOSCA"
julien zhang [Fri, 19 Aug 2016 15:04:30 +0000 (15:04 +0000)]
Merge "JIRA:PARSER-1 -XSLT script for YANG to TOSCA"

8 years agoJudge volume node is error when translate compute node 83/18983/1
shangxdy [Thu, 18 Aug 2016 18:02:46 +0000 (02:02 +0800)]
Judge volume node is error when translate compute node

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>
8 years agoProvide a specific stack_name when deploy a template use heat-translator 81/18981/1
shangxdy [Thu, 18 Aug 2016 17:30:06 +0000 (01:30 +0800)]
Provide a specific stack_name when deploy a template use heat-translator

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>
8 years agoJIRA:PARSER-1 -XSLT script for YANG to TOSCA 59/18859/1
shiva-charan [Wed, 17 Aug 2016 09:37:56 +0000 (04:37 -0500)]
JIRA:PARSER-1 -XSLT script for YANG to TOSCA

Change-Id: I29f80ab21354af452fc95b155c04171001f9577e
Signed-off-by: shiva-charan <shiva-charan.m-s@hpe.com>
8 years agoFix bug: authentication error when deploy vRNC with nfv tosca template 07/18807/3
shangxdy [Wed, 17 Aug 2016 08:09:53 +0000 (16:09 +0800)]
Fix bug: authentication error when deploy vRNC with nfv tosca template

When deploy vRNC, the follow errors occured:
 openstack stack create -t ./vRNC_Hot_Template.yaml vRNC_Stack
The request you have made requires authentication. (HTTP 401)
(Request-ID: req-d0ddd5bd-5291-4b2f-ab92-95618881647a)

The reason is that creating user is before creating project, and the
order will be reverse.

JIRA:PARSER-90

Change-Id: I890be71bfe7b2ec5f393f235c4c79c705340dfaa
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoFix parser test bug with functest in real env. 33/18733/1
shangxdy [Tue, 16 Aug 2016 11:48:25 +0000 (19:48 +0800)]
Fix parser test bug with functest in real env.

Traceback (most recent call last):
  File "/usr/local/bin/heat-translator", line 10, in <module>
    sys.exit(main())
  File "/usr/local/lib/python2.7/dist-packages/translator/shell.py",
line 225, in main
    TranslatorShell().main(args)
  File "/usr/local/lib/python2.7/dist-packages/translator/shell.py",
line 121, in main
    parsed_params, a_file, deploy)
  File "/usr/local/lib/python2.7/dist-packages/translator/shell.py",
line 168, in _translate
    output = translator.translate()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca_translator.py",
line 42, in translate
    self.hot_template.resources = self.node_translator.translate()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/translate_node_templates.py",
line 159, in translate
    return self._translate_nodetemplates()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/translate_node_templates.py",
line 302, in _translate_nodetemplates
    self._recursive_handle_properties(resource)
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/translate_node_templates.py",
line 173, in _recursive_handle_properties
    resource.handle_properties()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca/tosca_compute.py",
line 105, in handle_properties
    self.nodetemplate.get_capability('os'))
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca/tosca_compute.py",
line 134, in translate_compute_flavor_and_image
    image = self._best_image(os_cap_props)
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca/tosca_compute.py",
line 266, in _best_image
    if len(resp.keys()) > 0:
AttributeError: 'NoneType' object has no attribute 'keys'
Traceback (most recent call last):
  File "/usr/local/bin/heat-translator", line 10, in <module>
    sys.exit(main())
  File "/usr/local/lib/python2.7/dist-packages/translator/shell.py",
line 225, in main
    TranslatorShell().main(args)
  File "/usr/local/lib/python2.7/dist-packages/translator/shell.py",
line 121, in main
    parsed_params, a_file, deploy)
  File "/usr/local/lib/python2.7/dist-packages/translator/shell.py",
line 168, in _translate
    output = translator.translate()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca_translator.py",
line 42, in translate
    self.hot_template.resources = self.node_translator.translate()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/translate_node_templates.py",
line 159, in translate
    return self._translate_nodetemplates()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/translate_node_templates.py",
line 302, in _translate_nodetemplates
    self._recursive_handle_properties(resource)
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/translate_node_templates.py",
line 173, in _recursive_handle_properties
    resource.handle_properties()
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca/tosca_compute.py",
line 105, in handle_properties
    self.nodetemplate.get_capability('os'))
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca/tosca_compute.py",
line 134, in translate_compute_flavor_and_image
    image = self._best_image(os_cap_props)
  File
"/usr/local/lib/python2.7/dist-packages/translator/hot/tosca/tosca_compute.py",
line 266, in _best_image
    if len(resp.keys()) > 0:
AttributeError: 'NoneType' object has no attribute 'keys'
The request you have made requires authentication. (HTTP 401)
(Request-ID: req-027940ce-5a5f-4459-9d91-7e65329c4d13)
The request you have made requires authentication. (HTTP 401)
(Request-ID: req-32c378fb-6d3c-46c6-845e-a8dd50975acd)

JIRA:PARSER-89

Change-Id: Id89d2293972cae9f39c0d950fc67fdc6ae520304
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Add required definition in class of Input."
julien zhang [Mon, 15 Aug 2016 15:08:34 +0000 (15:08 +0000)]
Merge "Add required definition in class of Input."

8 years agoAdd required definition in class of Input. 53/18653/1
shangxdy [Mon, 15 Aug 2016 07:43:07 +0000 (15:43 +0800)]
Add required definition in class of Input.

As a template designer;
I want to know if the parameters is missed when deploy a template, but
currently there is not validation about the required parameters;
So i add property in class of Input, and validate the require parameter.
Note: the patch will submit to Openstack community too.

JIRA:PARSER-88

Change-Id: I5763a18da4037b0f81a55b8c8d83414e685b03d2
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoThe definition about the sequence of capabilities and requirements in 43/18643/1
shangxdy [Mon, 15 Aug 2016 01:54:52 +0000 (09:54 +0800)]
The definition about the  sequence of capabilities and requirements in
SubstitutionMappings is error

The definition in SubstitutionMappings about SECTION is below:
  SECTIONS = (NODE_TYPE, CAPABILITIES, REQUIREMENTS) = \
               ('node_type', 'requirements', 'capabilities')
The order of CAPABILITIES and REQUIREMENTS is reserved.

JIRA:PARSER-86

Change-Id: Ib55e737f6ed5b49ea3ab9b5e14f8c57486602e7e
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd input validation in substitution_mapping class 21/18621/4
shangxdy [Sat, 13 Aug 2016 18:16:28 +0000 (02:16 +0800)]
Add input validation in substitution_mapping class

Add input 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) The properties of substituted node template which be mapped must be
in the inputs of nested service template which defines substutition
mappings;
2) The inputs of nested service template which are not in properties of
the substituted node template must have default values.
3) If the properties of node_type is required and no default value,
 must provide inputs for them;
4) Property names and the input names must be the same.

JIRA:PARSER-79

Change-Id: Ie4664fe17c8279ad531ac9acec057f98d4e9281a
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoChange the name of Substitution_mappings to SubstitutionMappings 23/18623/1
shangxdy [Sat, 13 Aug 2016 18:35:34 +0000 (02:35 +0800)]
Change the name of Substitution_mappings to SubstitutionMappings

Change the name  of Substitution_mappings to SubstitutionMappings
consistent to other classes.

JIRA:PARSER-85

Change-Id: I9b27783ccec3f515cfcd2eca9995f09426bbfadd
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Add heat stack validation in integration with functest about vRNC"
shangxdy [Thu, 11 Aug 2016 03:41:41 +0000 (03:41 +0000)]
Merge "Add heat stack validation in integration with functest about vRNC"

8 years agoAdd heat stack validation in integration with functest about vRNC 47/18347/1
shangxdy [Wed, 10 Aug 2016 16:37:34 +0000 (00:37 +0800)]
Add heat stack validation in integration with functest about vRNC

As a tester;
I want to known the functest result of vRNC deploy;
So i add stack validation about vRNC.

JIRA:PARSER-81

Change-Id: I97cb76d8f0a5dcd3ea104023149ed0a282d688c6
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd parser install script for functest 05/18305/4
shangxdy [Wed, 10 Aug 2016 08:21:27 +0000 (16:21 +0800)]
Add parser install script for functest

As a tester;
I want functest prepare the test env for parser;
So it 's necessary to create parser_install.sh script for functest when
building docker image.

JIRA:PARSER-84
Change-Id: I3cc2cbba4d90b676ca362e54242f52afc3387e72
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoCheck the user, role and project existence when reset test env. 93/18193/5
shangxdy [Tue, 9 Aug 2016 05:02:11 +0000 (13:02 +0800)]
Check the user, role and project existence when reset test env.

Currently when deploying stack is error in functest, it will call
reset_parser_test automatically,  but when the reset_parser_test itself
is error, the reset of user/project/role will error again, so t's
necessary to check the user, role and project existence when reset test
env.

JIRA:PARSER-83

Change-Id: If22ba162691ab3e4e7581e381524ac1a09dca2f5
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoReplace -f to --template-file in heat-translator and fix errors 91/18191/1
shangxdy [Tue, 9 Aug 2016 03:57:24 +0000 (11:57 +0800)]
Replace -f to --template-file in heat-translator and fix errors

1. Replace -f to --template-file in heat-translator;
2. Replace heat-translator with openstack template translate later;
3. Modify echo infomations.

JIRA:PARSER-82

Change-Id: I545cb4a38bcdb107c1992b6e02810a46ac9ef201
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoService template with substitution mapping definition can deployed 79/17979/2
shangxdy [Wed, 3 Aug 2016 19:05:47 +0000 (03:05 +0800)]
Service template with substitution mapping definition can deployed
standalone

According to specification of
http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/TOSCA-Simple-Profile-YAML-v1.0.html,the
two main use cases:
1. No matter whether or not the service template has substitution
mapping definition,it can be deployed standalone;
2. Also can be imported and used as nested service template substituted
a node template with substitution mapping definition;
3. substitution mapping will expose node_type,may expose capabilities
and requirements.

JIRA:PARSER-78

Change-Id: I81ac940545f946925f6aa96a1b2ca0ccc9bbb076
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd relationship of node template associated with tosca template in 77/17977/1
shangxdy [Wed, 3 Aug 2016 18:50:00 +0000 (02:50 +0800)]
Add relationship of node template associated with tosca template in
substitution mapping

As a nested template desinger;
I want to known the tosca template which a substituted node template
associated;
So i will create the relationship under node template which is
substituted.

JIRA:PARSER-76

Change-Id: Ifb9883e5c5f630cd7f1b5d1292eddb54ad4c20be
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoDistinguish the mapping and mapped by name. 55/17855/3
shangxdy [Sat, 30 Jul 2016 18:10:03 +0000 (02:10 +0800)]
Distinguish the mapping and mapped by name.

1. Use complete name like nested_topology_tpls here and other places
like get_nested_topology_tpls for better readability;
2. Use "sub_mapped_node_tpl" instead of submaped_node_tpl;
3. Use sub_mapped_  instead of submaped.

Upper changed in substitution_mappings.py, tosca_template.py,
tosca_template.py and others

JIRA:PARSER-73
Change-Id: I21b2d3a35773078d7437bbae9ff5d1522608c4d2
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Parser miss files(*.conf, *.yaml, *.meta, *.sh) when create a distribution"
julien zhang [Wed, 3 Aug 2016 08:11:54 +0000 (08:11 +0000)]
Merge "Parser miss files(*.conf, *.yaml, *.meta, *.sh) when create a distribution"

8 years agoMerge "Use the real yaml file in testcase of system.yaml"
julien zhang [Wed, 3 Aug 2016 08:10:39 +0000 (08:10 +0000)]
Merge "Use the real yaml file in testcase of system.yaml"

8 years agoParser miss files(*.conf, *.yaml, *.meta, *.sh) when create a 45/17945/2
shangxdy [Wed, 3 Aug 2016 03:05:21 +0000 (11:05 +0800)]
Parser miss files(*.conf, *.yaml, *.meta, *.sh) when create a
distribution

when create a source or binary distribution, Parser project miss the
follow files:
1. heat_translator
   1) heat_translator_logging.conf;
   2) translator.conf
   3) all yaml files in tests directories;
   4) all bash script in  tests directories;
   5) all python script in tests directories;
2. toscad-parser
   1) TOSCA_definition_1_0.yaml in elements directory;
   2) TOSCA_nfv_definition_1_0.yaml in nfv directory;
   3) all yaml files in tests directories;
   4) all bash script in  tests directories;
   5) all python script in tests directories;
All the missed files above will cause the parser work failure

JIRA:PARSER-75
Change-Id: I124eeff4b94607a68cbba2f2d7f754cba8671a42
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Doesn't support nested exceptioncollector when implement the nested tosca...
julien zhang [Tue, 2 Aug 2016 21:26:41 +0000 (21:26 +0000)]
Merge "Doesn't support nested exceptioncollector when implement the nested tosca template"

8 years agoClear the test env when it is finished 51/17851/4
shangxdy [Sat, 30 Jul 2016 17:16:21 +0000 (01:16 +0800)]
Clear the test env when it is finished

As a tester;
I want to return the initial state of a test case;
So i will clear the env when a testcase is finished.

Change-Id: Ibeaa24d7fc29bab03d87719239fce965ef4dea26
JIRA:PARSER-71
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoUse the real yaml file in testcase of system.yaml 57/17857/1
shangxdy [Sun, 31 Jul 2016 06:39:16 +0000 (14:39 +0800)]
Use the real yaml file in testcase of system.yaml

As a tester;
I want to make sure of the validation of substitution mappings in system
chain.
So i use the real test yaml file and delete the old.

Change-Id: Id3dee02d8af5b221b654a3ee79e28f0ad5b53868
JIRA:PARSER-74
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoDoesn't support nested exceptioncollector when implement the nested 53/17853/1
shangxdy [Sat, 30 Jul 2016 17:32:11 +0000 (01:32 +0800)]
Doesn't support nested exceptioncollector when implement the nested
tosca template

After the netsted tosca template is implemented, the ExceptionCollector
doesn't work in netsted template, because the exceptions are reset by
upper tosca template.
The solution is judging if support nested node template before starting
or stop exceptioncollector.

Change-Id: Ic48bcb639031391a6771db2f7235b674b22be837
JIRA:PARSER-72
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agotosca-parser support the semantic of substitution mapping 29/17329/5
shangxdy [Thu, 21 Jul 2016 12:02:51 +0000 (20:02 +0800)]
tosca-parser support the semantic of substitution mapping

As a template designer,
I want to using node template substitution for model composition or
chaining subsystems.
So firstly tosca-paser should support the substitution mappings
analysis.

Change-Id: I44371795504415ba8cf5a15f7e1d046e3ff00ade
JIRA: PARSER-43
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Add transaction subsystem definition in the use case of substitution_mappings"
shangxdy [Fri, 29 Jul 2016 12:54:07 +0000 (12:54 +0000)]
Merge "Add transaction subsystem definition in the use case of substitution_mappings"

8 years agoAdd transaction subsystem definition in the use case of 27/17327/2
shangxdy [Thu, 21 Jul 2016 11:50:29 +0000 (19:50 +0800)]
Add transaction subsystem definition in the use case of
substitution_mappings

As a developer;
I want to implement the function of substitution_mapping;
So that will complete the test file about transaction subsystem
definitions for example.

Change-Id: I5e44c2b4933afadf96743641279016af5afc39e0
JIRA: PARSER-68
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd queuing subsystem definition in the use case of substitution_mappings 23/17323/2
shangxdy [Thu, 21 Jul 2016 11:09:16 +0000 (19:09 +0800)]
Add queuing subsystem definition in the use case of substitution_mappings

As a developer;
I want to implement the function of substitution_mapping;
So that will complete the test file about queuing subsystem definitions.

Change-Id: I0602eb915954a4e35ae9e0d8d4c857822e4725d4
JIRA: PARSER-46
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Parser integration with functest."
julien zhang [Fri, 29 Jul 2016 01:43:28 +0000 (01:43 +0000)]
Merge "Parser integration with functest."

8 years agoMerge "Add database subsystem definition in the use case of substitution_mappings"
julien zhang [Fri, 29 Jul 2016 01:11:23 +0000 (01:11 +0000)]
Merge "Add database subsystem definition in the use case of substitution_mappings"

8 years agoParser integration with functest. 59/17459/1
shangxdy [Sat, 23 Jul 2016 15:13:51 +0000 (23:13 +0800)]
Parser integration with functest.

As a nfs tosca template designer;
I want to known wether the parse and translation template is correct.
So i use functest project to deploy the template and validate the output
template file.

Change-Id: Ic2d1dba14cf6bd9544d7a57c83256248630f2047
JIRA:PARSER-69
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd database subsystem definition in the use case of 25/17325/1
shangxdy [Thu, 21 Jul 2016 11:14:31 +0000 (19:14 +0800)]
Add database subsystem definition in the use case of
substitution_mappings

As a developer;
I want to implement the function of substitution_mapping;
So that will complete the test file about database subsystem
definitions.

Change-Id: I197f971cbdc64963b6c41b2ca3aa3fb86b2fae8b
JIRA: PARSER-47
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoSubstitution mappings doesn't supports properties 41/17241/2
shangxdy [Wed, 20 Jul 2016 16:04:19 +0000 (00:04 +0800)]
Substitution mappings doesn't supports properties

According to the simple tosca specification, substitution mapping only
supports key words of node_type, capabilities and requirements, but in
the definition of vRNC, add keywords of properties, so it will be
deleted

Change-Id: I45ca5f6d44410e5a6b8cdb448f3f148d63cc1376
JIRA: PARSER-67
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoTosca-Pacer doesn't support https proxy. 47/16947/2
shangxdy [Fri, 15 Jul 2016 07:27:59 +0000 (15:27 +0800)]
Tosca-Pacer doesn't support https proxy.

When access CSAR file which is URL and the protocol is https by proxy,
it will be error and the information is below:
toscaparser.common.exception.URLException: Failed to reach server
"https://raw.githubusercontent.com/openstack/tosca- parser/master/toscaparser
/tests/data/custom_types/wordpress.yaml". Reason is: Tunnel
connection failed: 503 Service Unavailable.

The reason of the error is urllib doesn't  support https proxy.

JIRA: PARSER-66

Change-Id: I82ec68d533743527fba613cc362e4241494359d4
Signed-off-by: 10013968 <zhang.jun3g@zte.com.cn>
Signed-off-by: shangxdy <shangxdy@shangxdy.local>
8 years agoDisable py34 in tox temporary 43/17143/1
10013968 [Tue, 19 Jul 2016 14:44:21 +0000 (22:44 +0800)]
Disable py34 in tox temporary

Before the CI environment can perform python 3.4 test, temporary
disable tox py34 in tox.ini. Currently all the submits are blocked for
this.

Change-Id: Ic73cab212eb68e35a5855d3229b8cfe801f92817
Signed-off-by: 10013968 <zhang.jun3g@zte.com.cn>
8 years agoMerge "Initial release documents"
xiaodong shang [Mon, 18 Jul 2016 03:33:14 +0000 (03:33 +0000)]
Merge "Initial release documents"

8 years agoMerge "fix import and vRNC Ctrl_net definition error"
julien zhang [Tue, 12 Jul 2016 00:49:16 +0000 (00:49 +0000)]
Merge "fix import and vRNC Ctrl_net definition error"

8 years agofix import and vRNC Ctrl_net definition error 43/16643/1
shangxdy [Sat, 9 Jul 2016 17:44:07 +0000 (01:44 +0800)]
fix import and vRNC Ctrl_net definition error

1. Currently DM_Port_Ctrl requirement definition
    requirements:
      virtualBinding: DM
      virtualLink: CTRL_Net_Host
   shall be below:
      requirements:
        virtualBinding: DM_Host
        virtualLink: CTRL_Net
2. In function of _load_import_template when import vRNC definition, it will
return "None, None" instead of return Null in case of no value return.

Change-Id: I81d2d471eafff8ebd77eef356e6178e1f7701a22
JIRA: PARSER-65
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoFix bug in python3.4: 'dict_keys' object does not support indexing 41/16641/2
shangxdy [Sat, 9 Jul 2016 17:09:02 +0000 (01:09 +0800)]
Fix bug in python3.4: 'dict_keys' object does not support indexing

In python3.4, dictory's function of key() return value is a dict_key object, not list, so the follow code will be error:
    dict x = {1:11, 2:22, 3;33}
    y= x.keys()[0]
 the error is TypeError: 'dict_keys' object does not support indexing, the correct expression is below:
    y = list(x.keys())[0]

So parser's code will be modified refer to above.

Change-Id: I41e0c28167c7823fc735aaf3afc78c1a9a15e9e0
JIRA: PARSER-64
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoSynchronise the openstack bugs 85/16585/3
shangxdy [Fri, 8 Jul 2016 07:15:00 +0000 (15:15 +0800)]
Synchronise the openstack bugs

When run unittests through tox, some test cases are always error,
the errors are already done in openstack community, so it's
necessary to synchronise the fixes.

Change-Id: Ib29078e6cc138a474e89c6a2cc90ad7a1db1bb46
JIRA: PARSER-63
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "netsted template validate type error"
julien zhang [Fri, 8 Jul 2016 06:06:58 +0000 (06:06 +0000)]
Merge "netsted template validate type error"

8 years agoMerge "Affinity and anti-affinity translate to heat resource type"
julien zhang [Fri, 8 Jul 2016 06:06:45 +0000 (06:06 +0000)]
Merge "Affinity and anti-affinity translate to heat resource type"

8 years agofix tox error when run unittest 09/16509/1
sxd [Thu, 7 Jul 2016 07:09:15 +0000 (15:09 +0800)]
fix tox error when run unittest

Currently when run "tox -epep8" it's ok, but it will be error when run
 "tox -epy27" or run "tox -epy34", the reason is no file .testr.conf
and .converagerc in project root directory

Change-Id: Ic6ab721738692c389d63bc2d84a4c2a21b397778
JIRA: PARSER-62
Signed-off-by: sxd <shang.xiaodong@zte.com.cn>
8 years agoAffinity and anti-affinity translate to heat resource type 35/16335/3
shangxdy [Mon, 4 Jul 2016 16:14:21 +0000 (00:14 +0800)]
Affinity and anti-affinity translate to heat resource type

Translate simple tosca policy types of tosca.policy.Placement.Colocate
and tosca.policy.Placement.Antilocate into heat resource
type(nova::servergroup and nova::server)

Change-Id: Icbe8c51c158886608a196951df19e9a503cb786a
JIRA: PARSER-39
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "The grouptype's parent_type definition is error"
julien zhang [Mon, 4 Jul 2016 10:16:29 +0000 (10:16 +0000)]
Merge "The grouptype's parent_type definition is error"

8 years agoMerge "Divide VDU into soft component and VDU for the vRNC case"
julien zhang [Mon, 4 Jul 2016 10:11:59 +0000 (10:11 +0000)]
Merge "Divide VDU into soft component and VDU for the vRNC case"

8 years agoMerge "fix error when run unittest case"
julien zhang [Mon, 4 Jul 2016 10:11:35 +0000 (10:11 +0000)]
Merge "fix error when run unittest case"

8 years agoMerge "EntityTemplate has no property of parent_type"
julien zhang [Mon, 4 Jul 2016 10:05:45 +0000 (10:05 +0000)]
Merge "EntityTemplate has no property of parent_type"

8 years agoMerge "The artifacttype's parent_type definition is error"
julien zhang [Mon, 4 Jul 2016 10:03:58 +0000 (10:03 +0000)]
Merge "The artifacttype's parent_type definition is error"

8 years agoThe grouptype's parent_type definition is error 49/15549/3
shangxdy [Tue, 14 Jun 2016 16:24:41 +0000 (00:24 +0800)]
The grouptype's parent_type definition is error

1. Group type define parent_type, but it shall be statuefulentity, not string,
 so the method of is_derived_from in group entity may be error when it's called.
2. The bug will submit to openstack community.

Change-Id: I6e78b9dbf9ad0593db9246d34be29d8ec6f092ed
JIRA: PARSER-54
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agofix error when run unittest case 31/16231/1
shangxdy [Fri, 1 Jul 2016 02:38:20 +0000 (10:38 +0800)]
fix error when run unittest case

when run tox -epy27, there are errors in function of test_relationship
for key in relation.keys():
    rel_tpl = relation.get(key).get_relationship_template()
    if rel_tpl:
        self.assertEqual(
            rel_tpl[0].type, "tosca.relationships.ConnectsTo")
rel_tpl is a list so real_tpl[0].type can be other value, not only
tosca.relationships.ConnectsTo.

JIRA: PARSER:61

Change-Id: Ibdc7307888f5281ac0bd806088483f8c46416968
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Incorrect inheritance of requirements in NodeType"
julien zhang [Thu, 30 Jun 2016 16:26:05 +0000 (16:26 +0000)]
Merge "Incorrect inheritance of requirements in NodeType"

8 years agoMerge "The relationship type's parent_type definition is not complete"
julien zhang [Thu, 30 Jun 2016 16:25:55 +0000 (16:25 +0000)]
Merge "The relationship type's parent_type definition is not complete"

8 years agoMerge "The policytype's parent_type definition is error"
julien zhang [Thu, 30 Jun 2016 16:25:42 +0000 (16:25 +0000)]
Merge "The policytype's parent_type definition is error"

8 years agoInitial release documents 97/16197/2
Julien [Thu, 30 Jun 2016 16:05:29 +0000 (00:05 +0800)]
Initial release documents

Submit initial release documents according to opnfvdocs project
requirement in Berlin Summit

JIRA: PARSER-60

Change-Id: I6eb650259c4da521aee1918842a6d0bfe06a6a0d
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
8 years agonetsted template validate type error 93/16093/1
shangxdy [Wed, 29 Jun 2016 08:10:49 +0000 (16:10 +0800)]
netsted template validate type error

When import nested template, validate type error, in the
validate list lack the type of "topology_template"

Change-Id: Ic16e02f460dc59936dfc5a361a21b9533f0e5e83
JIRA: PARSER-58
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoDivide VDU into soft component and VDU for the vRNC case 59/15759/2
shangxdy [Thu, 16 Jun 2016 17:04:33 +0000 (01:04 +0800)]
Divide VDU into soft component and VDU for the vRNC case

Currently the heat-translator can't translate the VDU with interface,
so VDU shall be divided into SoftComponent and VDU, and the interface
will be expressed in SoftComponent node.

Change-Id: I1f0e0c6bef88ed66edd39e21e4e6221eb15e3188
JIRA: PARSER-57
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoThe artifacttype's parent_type definition is error 47/15547/6
shangxdy [Tue, 14 Jun 2016 15:37:36 +0000 (23:37 +0800)]
The artifacttype's parent_type definition is error

1. Artifact type  define parent_type, but it shall be statuefulentity,
not string, so the method of is_derived_from in artifact entity may
be error when it's called.
2. The bug will submit to openstack community.

Change-Id: I8e64a28da0287ff5653da69a0cf15016c8ed937f
JIRA: PARSER-53
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoEntityTemplate has no property of parent_type 05/15505/4
shangxdy [Tue, 14 Jun 2016 07:28:35 +0000 (15:28 +0800)]
EntityTemplate has no property of parent_type

1. EntityTemplate is the parent of NodeTemplate,but there is no definition
of parent_type definition, so the method of is_derived_from will be error
when call the parent_type's method.
2. The bug will submit to openstack community.

Change-Id: If6d360932fd610f001934d23aac63e11ac16fddf
JIRA: PARSER-51
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "The definition in test file subsystem.yaml is error"
julien zhang [Thu, 16 Jun 2016 09:25:25 +0000 (09:25 +0000)]
Merge "The definition in test file subsystem.yaml is error"

8 years agoMerge "Nodetype's logical is incomplete"
julien zhang [Thu, 16 Jun 2016 09:25:12 +0000 (09:25 +0000)]
Merge "Nodetype's logical is incomplete"

8 years agoIncorrect inheritance of requirements in NodeType 29/15629/1
shangxdy [Wed, 15 Jun 2016 15:24:44 +0000 (23:24 +0800)]
Incorrect inheritance of requirements in NodeType

1. When define a new NodeType that inherits from a normative
type that has some requirements, and if the reqirement item
name is same as parent's, there will be duplicated requirements,
not override the parent's item.
2. The bug will submit to openstack community.

Change-Id: I22f6e723179a8a8c334d37c1a69b7039dc1f6ae7
JIRA: PARSER-56
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoMerge "Create vRNC test code."
julien zhang [Wed, 15 Jun 2016 08:15:21 +0000 (08:15 +0000)]
Merge "Create vRNC test code."

8 years agoMerge "Create test case about nfv tosca"
julien zhang [Wed, 15 Jun 2016 08:14:08 +0000 (08:14 +0000)]
Merge "Create test case about nfv tosca"

8 years agoMerge "tosco-parser supports importing the other service with topology template"
julien zhang [Wed, 15 Jun 2016 08:11:35 +0000 (08:11 +0000)]
Merge "tosco-parser supports importing the other service with topology template"

8 years agoThe relationship type's parent_type definition is not complete 55/15555/1
shangxdy [Tue, 14 Jun 2016 17:40:50 +0000 (01:40 +0800)]
The relationship type's parent_type definition is not complete

1. Relationship type define parent_type, but it shall include custom def,
so the method of is_derived_from in group entity may be error when it's called.
2. The bug will submit to openstack community.

Change-Id: Ia12b18543e3b1d28bfb946abd11b546a9eba9669
JIRA: PARSER-55
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoThe policytype's parent_type definition is error 11/15511/3
shangxdy [Tue, 14 Jun 2016 09:31:14 +0000 (17:31 +0800)]
The policytype's parent_type definition is error

1. policy type define parent_type, but it shall be statefulentity, not string,
so the method of is_derived_from in policy entity may be error
when it's called.
2. The bug will submit to openstack community.

Change-Id: I25e1cb04e9c13eea6d47ed0bfeac961f59146842
JIRA: PARSER-52
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoCreate vRNC test code. 23/15423/4
shangxdy [Sun, 12 Jun 2016 16:12:51 +0000 (00:12 +0800)]
Create vRNC test code.

Unit test code for vRNC case.

JIRA: PARSER-34

Change-Id: Ie4a0431e3cdfd56d2ef42760da30a8f2bb6fdb5d
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoCreate test case about nfv tosca 19/15419/3
shangxdy [Sun, 12 Jun 2016 14:45:41 +0000 (22:45 +0800)]
Create test case about nfv tosca

As a developer;
I want to known the availability of current nfv tosca
definitions about node types, capabilities types and
relationship types.
So i create some test cases to validate it.

JIRA: PARSER-34

Change-Id: Id57e38c066eea1d2090a816f5129aa95de464d32
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agotosco-parser supports importing the other service with 71/15171/2
shangxdy [Sat, 4 Jun 2016 17:37:11 +0000 (01:37 +0800)]
tosco-parser supports importing the other service with
topology template

As a tosca-parser developer;
I want to implement the function of substitution_mapping;
So that must support the import topology template firstly

Change-Id: Ie26aab712e7870e1ec345ad654460bb84014f207
JIRA: PARSER-48
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoThe definition in test file subsystem.yaml is error 69/15169/1
shangxdy [Sat, 4 Jun 2016 16:48:12 +0000 (00:48 +0800)]
The definition in test file subsystem.yaml is error

1. The input parameter my_cpus in definition of subsystem.yaml
lack the default value, so when the file subsystem.yaml is error
 when used as a node template implementation.
2. The bug will be submitted to openstack community.

Change-Id: I1f912dab47fe3751d0a992b02dd2a2253af6f158
JIRA: PARSER-45
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoNodetype's logical is incomplete 91/14691/4
shangxdy [Thu, 26 May 2016 07:41:41 +0000 (15:41 +0800)]
Nodetype's logical is incomplete

When node is selected by abstract description and the node capability
is customed, None will be return.

JIRA:PARSER-41

Change-Id: I4b3e7233f766aac61a4ffc363c000bb3ebea19ad
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdding two new committers 43/14843/2
Aric Gardner [Mon, 30 May 2016 18:04:07 +0000 (14:04 -0400)]
Adding two new committers

Change-Id: I356c88886d698f4527a65696f17f946aa6d07a32
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
8 years agoMerge "Minor changes for better reading"
Julien [Fri, 27 May 2016 09:29:49 +0000 (09:29 +0000)]
Merge "Minor changes for better reading"

8 years agoMerge "bugs:The code in function of get_all_requirements is duplicated"
julien zhang [Thu, 19 May 2016 08:22:37 +0000 (08:22 +0000)]
Merge "bugs:The code in function of get_all_requirements is duplicated"

8 years agoMerge "Add attributes of address to tosca.nodes.nfv.CP address"
julien zhang [Thu, 19 May 2016 08:21:00 +0000 (08:21 +0000)]
Merge "Add attributes of address to tosca.nodes.nfv.CP address"

8 years agoMerge "Add affinity policy type definition"
julien zhang [Thu, 19 May 2016 08:19:10 +0000 (08:19 +0000)]
Merge "Add affinity policy type definition"

8 years agoMerge "Update the vRNC definition against the latest nfv tosca definition"
julien zhang [Thu, 19 May 2016 08:17:18 +0000 (08:17 +0000)]
Merge "Update the vRNC definition against the latest nfv tosca definition"

8 years agoMerge "Update the vRNC types(node types/relation types) definiton"
julien zhang [Thu, 19 May 2016 08:14:55 +0000 (08:14 +0000)]
Merge "Update the vRNC types(node types/relation types) definiton"

8 years agoMerge "Update the nfv tosca definietion against the latest spec"
julien zhang [Thu, 19 May 2016 08:14:05 +0000 (08:14 +0000)]
Merge "Update the nfv tosca definietion against the latest spec"

8 years agobugs:The code in function of get_all_requirements is duplicated 63/14163/1
shangxdy [Sun, 15 May 2016 18:52:29 +0000 (14:52 -0400)]
bugs:The code in function of get_all_requirements is duplicated

1、The virtualLink requirement of tosca.nodes.nfv.CP defined below:
In nodetype.py, the most code in functon of get_all_requirements is not
needed,becuase the property of requirements has realized the main logical
in current get_all_requirements. So the duplicated code will be deleted.

2、The bug will be submitted to openstack community.

JIRA: PARSER-37

Change-Id: I1a346ffc388546dd9c65a1b8d32e32859150d077
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoAdd attributes of address to tosca.nodes.nfv.CP address 61/14161/1
shangxdy [Sun, 15 May 2016 18:33:58 +0000 (14:33 -0400)]
Add attributes of address to tosca.nodes.nfv.CP address

According to the openstack comments, it's necessary to add the attribute
of address, which was deleted because the IP_address was duplication to
CP's parent's attributes.
The related modifications are refer to:
1. https://gerrit.opnfv.org/gerrit/#/c/12567.
2. https://bugs.launchpad.net/tosca-parser/+bug/1574715.

JIRA: PARSER-36

Change-Id: I6bf894cbba440013175df478cce00fa08906dc19
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoUpdate the vRNC definition against the latest nfv tosca definition 11/12711/2
shangxdy [Wed, 27 Apr 2016 11:43:38 +0000 (07:43 -0400)]
Update the vRNC definition against the latest nfv tosca definition

Update the vRNC definition according to the latest vRNC type.
include node_templates, groups, policies and outputs.

JIRA:PARSER-31

Change-Id: Ie69a8e4480188ffad8247d68e5c15085bbb44848
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
8 years agoUpdate the vRNC types(node types/relation types) definiton 09/12709/3
shangxdy [Wed, 27 Apr 2016 11:29:43 +0000 (07:29 -0400)]
Update the vRNC types(node types/relation types) definiton

Update the vRNC type definition according to the nfv tosca definiton.
include MM, CM, DM and LB.

JIRA:PARSER-35

Change-Id: I3017c93081bc77fc2ac1e4633f4232f130f6b4de
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>