Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
In opnfv-toscaparer ver 1.0.1, when passing -nrpv to prohibit the input
parameter validation, i.e.
toscaparser --template-file <file> -nrpv
The exceptions of type MissingRequiredParameterError are still got
raised. Seems that -nrpv parameter is not working.
JIRA: PARSER-181
Change-Id: If44eefcc2b7bdb360eae023ed2c2cd67789c2128
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
If parser Tosca error happens, it may not exist version info;
So it needs a process before print it.
JIRA: PARSER-183
Change-Id: I283d1d794b0db19f83a9abc0eee3962e94e21572
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Add validation for SDC from ONAP when use parse in design time: ignore
nested parameters(inputs and outputs) validation and only print warning
message.
JIRA: PARSER-141
Change-Id: Idd3b35a197594e9a7ff38024f16acfa650728bd1
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Currently the assignment mapped template value to nodetemplate is error,
and additionally debug_mode is not transfered to nested template. So the
patch will fix them.
JIRA: PARSER-155
Change-Id: I8c5801b00ae56b9ba2eb92a6f14357c2f5328718
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
|
|
|
|
Currently, if a entity type is not defined, the defs in
StatefulEntityType will be none, then the access to self.defs will raise
error, finally the parser will be crushed. this patch will enhance it.
JIRA: PARSER-153
Change-Id: I5db50102e9c63428298ce6c8ecbf38e3bd8e57f8
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Currently, support customized datatype in parameters is error when
transfer custom_defs in DataEntity.validate_datatype(self.type, value,
None, datatype), it should be full custom definitions , not only one
definition. the patch will fix it.
JIRA: PARSER-152
Change-Id: If6d59f21fa75cbdf4e8e16f093e3d807910ad234
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
In debug mode, it's not allowed to raise exceptions as possible for
convinient to debug more details, this patch will add parameter to
enable such scenario.
The requirement is from ONAP
JIRA: PARSER-148
Change-Id: Ide8acec333d17331bd6ed400110a141391fd3593
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
|
|
Currently exceptions will be overwritten when import nested service
topology, the patch will fix the issue.
JIRA: PARSER-145
Change-Id: I531755efe55b43aef304fa972773c63613c915ff
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Currently tosca-parser only support tosca_version_1_0, this patch will
enable it to support tosca_version_1_1.
This requirement is from ONAP, but not need to submit to OpenStack
currently
JIRA:PARSER-146
Change-Id: If1bc470e3f2d18a606b312425241f27be33b65b4
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
|
|
Add import file with suffix of yml testcases:
1.normal file with suffix of yml;
2.import file with suffix of yml.
JIRA: PARSER-144
Change-Id: I24368f7248e782df2e57202a3129c677e1bf068f
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Add validation for SDC from ONAP when use parse in design time: ignore
parameter validation and only print warning message.
JIRA: PARSER-142
Change-Id: I9372f20816f2acbda83c5f1e4f673f2ffc3c2e94
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Currently, it's only allowed to define standard parameters in the input
section, this patch support to define custom datatype in parameters.
The patch will be submitted to OpenStack community.
JIRA: PARSER-138
Change-Id: Ie83f446958f6daa301382d21d8a32128bf8dffc9
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
|
|
Currently toscaparser only support service template file with suffix:
yaml, zip and csar, need to support file with suffix of yml.
the patch will be submitted to OpenStack
JIRA: PARSER-137
Change-Id: I039bcfbfeb8e2aae47df133221162a68736ded55
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
When import service template, validata metadata validation in
tosca_type_validation
JIRA: PARSER-136
Change-Id: Ibb4a51e734c43364d92520f14f998ecf54789631
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
|
|
Support custom datatype definition in property for capability,
a scenario if following:
VDU:
type: tosca.nodes.nfv.VDU.Compute
capabilities:
virtual_compute:
properties:
virtual_memory:
virtual_mem_size: 24G
requested_additional_capabilities: {}
virtual_cpu:
num_virtual_cpu: 4
node_types:
tosca.nodes.nfv.VDU.Compute:
derived_from: tosca.nodes.Root
capabilities:
virtual_compute:
type: tosca.capabilities.nfv.VirtualCompute
capability_types:
tosca.capabilities.nfv.VirtualCompute:
derived_from: tosca.capabilities.Root
properties:
virtual_memory:
type: tosca.datatypes.nfv.VirtualMemory
requested_additional_capabilities:
entry_schema:
type: tosca.datatypes.nfv.RequestedAdditionalCapability
required: false
type: map
virtual_cpu:
type: tosca.datatypes.nfv.VirtualCpu
This patch will be submitted to Openstack.
JIAR: PARSER-135
Change-Id: I7b5e3e909e0950de26b37123938fe719004d5417
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
When loading nfv-toscaparser use pbr tool, switch the version of
tosco-parser to nfv-toscaparserf, which will affect the Modeling project
in ONAP.
JIRA: PARSER-134
Change-Id: If5934075af1fa725fea763083fcca7b597043818
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
synchronize tosca-parser with version of 0.81
JIRA: PARSER-128
Change-Id: Ib00e391bd6c1f4c69776796eb7b28062f14b92fc
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
|
|
Currently the test about nested import list is not enough, the patch
enhance the test.
Change-Id: Ica25345062d316b9a32f4efb8c5c2a98b8bda497
JIRA: PARSER-127
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Currently _get_node_type_by_cap in nodetype definition is only concerned
standard node, not consider custom node, the patch will support to get
node by custom node.
JIRA: PARSER-126
Change-Id: I822acc8bfb747562dc084783d863adf31603e794
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
When import list yaml in top service template, and the nested template
import also list yaml, the result type definition is not complete
JIRA: PARSER-124
Change-Id: I0ee7f4367d7fabd27641e93c498646d1d0b127b8
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
Sync upstream project of tosca-parser
Change-Id: Ic707844203ea05007b3c02e9dcadb52389eb3149
JIRA:PARSER-118
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
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>
|
|
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>
|
|
|
|
Add attributes in rnc.nodes.VNF definition.
JIRA:PARSER-114
Change-Id: I8578cc89dc58202893370d367dc9923ddc1c111a
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
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>
|
|
Delete not used property from vRNC,such as activestatus
and id.
Change-Id: I14b4563663d220c241440dff0244ccbadff7912b
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
|
|
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>
|
|
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>
|