Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
(cherry picked from commit f977b94e012828cd2a905b9b841aff33c4b732f8)
|
|
stable/colorado
|
|
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>
(cherry picked from commit f90be03da41fa8a233ecc84f54fa59d1f2f7021f)
|
|
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>
(cherry picked from commit eaecb94d4361de61a4f276175b8c8099f37a4628)
|
|
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>
(cherry picked from commit 23f466831a8284433609e9f770737830d0b448bf)
|
|
|
|
|
|
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>
(cherry picked from commit 9f460d7068d86dc1320e858ab1d756c88283e6f6)
|
|
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>
(cherry picked from commit 434aa2750f4b74fa46711c930ed46bb81a34f34f)
|
|
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>
(cherry picked from commit 528ed804c77758d8e7270ec5a76cc5279330b086)
|
|
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>
(cherry picked from commit 843b0222bc3171db78d8f5fcf45ff1d0c4a72731)
|
|
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>
(cherry picked from commit aef34ad9a966ca64aa365ee6aaada702b986f68b)
|
|
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>
(cherry picked from commit b284ccc46a966ce1f8a6e59363904d69bb8d081e)
|
|
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>
(cherry picked from commit f567dd66c9517acda42559e2c471d40e3401531e)
|
|
|
|
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>
|
|
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>
|
|
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Use tosca-parser and heat-translator to analyze to the basic
nfv-tosca type definitions, and use simple tosca new feature
such as policy, group and trigger, which are now supported by
the latest version of tosca-parser and heat-translator.
JIRA:PARSER-18
Change-Id: I797bcacbb5b32005d0aeb0f3f32851ac96e30f01
Signed--off-by: shangxdy <shang.xiaodong@zte.com.cn>
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|