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>
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>
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>
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>
xiaodong shang [Fri, 9 Dec 2016 15:21:33 +0000 (15:21 +0000)]
Merge "Add output in vRNC for substitution mappings"
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>
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>
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>
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>
shangxdy [Thu, 29 Sep 2016 17:01:31 +0000 (17:01 +0000)]
Merge "Add ip output in compute translation"
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>
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>
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>
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>
shangxdy [Mon, 19 Sep 2016 14:24:09 +0000 (14:24 +0000)]
Merge "Provide file list about the difference between parser and upstreams."
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"
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>
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>
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>
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>
shangxdy [Mon, 12 Sep 2016 15:20:00 +0000 (15:20 +0000)]
Merge "Add keys validation testcase in substitution_mapping class"
shangxdy [Mon, 12 Sep 2016 14:55:04 +0000 (14:55 +0000)]
Merge "Replace test file from test_tosca_nfv_sample with vRNC"
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
zhipengh [Sat, 10 Sep 2016 02:03:20 +0000 (02:03 +0000)]
Merge "index and intro docs update for Rel C"
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>
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>
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>
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>
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>
shangxdy [Wed, 7 Sep 2016 16:08:51 +0000 (16:08 +0000)]
Merge "Create translation test code for vRNC"
shangxdy [Wed, 7 Sep 2016 16:08:00 +0000 (16:08 +0000)]
Merge "Add deployment scripts for vRNC"
shangxdy [Wed, 7 Sep 2016 16:07:04 +0000 (16:07 +0000)]
Merge "Fix network info output about compute node"
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>
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>
Zhipeng (Howard) Huang [Wed, 7 Sep 2016 00:31:15 +0000 (00:31 +0000)]
Merge "policy2tosca doc patch set-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>
xiaodong shang [Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)]
Merge "[NFV] Reduce instance requirements"
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>
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>
julien zhang [Thu, 1 Sep 2016 02:20:06 +0000 (02:20 +0000)]
Merge "Fix BlockStorageAttachment bug when translate compute node"
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>
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>
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>
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>
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>
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>
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>
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>
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>
julien zhang [Mon, 22 Aug 2016 13:54:03 +0000 (13:54 +0000)]
Merge "Remove the cyclic dependencies in vRNC definition"
julien zhang [Mon, 22 Aug 2016 13:52:23 +0000 (13:52 +0000)]
Merge "Add high_availability test case"
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>
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>
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>
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>
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"
julien zhang [Fri, 19 Aug 2016 15:07:17 +0000 (15:07 +0000)]
Merge "Judge volume node is error when translate compute node"
julien zhang [Fri, 19 Aug 2016 15:04:30 +0000 (15:04 +0000)]
Merge "JIRA:PARSER-1 -XSLT script for YANG to TOSCA"
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>
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>
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>
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>
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>
julien zhang [Mon, 15 Aug 2016 15:08:34 +0000 (15:08 +0000)]
Merge "Add required definition in class of Input."
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>
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>
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>
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>
shangxdy [Thu, 11 Aug 2016 03:41:41 +0000 (03:41 +0000)]
Merge "Add heat stack validation in integration with functest about vRNC"
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>
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>
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>
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>
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>
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>
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>
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"
julien zhang [Wed, 3 Aug 2016 08:10:39 +0000 (08:10 +0000)]
Merge "Use the real yaml file in testcase of system.yaml"
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>
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"
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>
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>
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>
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>
shangxdy [Fri, 29 Jul 2016 12:54:07 +0000 (12:54 +0000)]
Merge "Add transaction subsystem definition in the use case of substitution_mappings"
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>
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>
julien zhang [Fri, 29 Jul 2016 01:43:28 +0000 (01:43 +0000)]
Merge "Parser integration with functest."
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"
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>
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>
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>
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>
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>
xiaodong shang [Mon, 18 Jul 2016 03:33:14 +0000 (03:33 +0000)]
Merge "Initial release documents"
julien zhang [Tue, 12 Jul 2016 00:49:16 +0000 (00:49 +0000)]
Merge "fix import and vRNC Ctrl_net definition error"
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>
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>
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>
julien zhang [Fri, 8 Jul 2016 06:06:58 +0000 (06:06 +0000)]
Merge "netsted template validate type error"