diff options
| author |   eleonorali <eleonoral@amdocs.com> | 2018-02-13 14:39:39 +0200 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-02-14 11:25:33 +0000 |
| commit | 2f7a38f772b9479e5d0af265993f6ea476d7544a (patch) | |
| tree | f1249c89fc57afc0ca8d4587c9c92e8ee45a7bba | |
| parent | 9f33060362b6bf8b3a7cdcdab6ce3d1c81946300 (diff) | |
SRIOV - add annotations add fix
SRIOV - add annotation - set param_name mandatory
Change-Id: I2b75c4b0db8205166205fe86f59f70067720f7e5
Issue-ID: SDC-996
Signed-off-by: eleonorali <eleonoral@amdocs.com>
| -rw-r--r-- | common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml | 2 | ||||
| -rw-r--r-- | openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature | 7 | ||||
| -rw-r--r-- | openecomp-bdd/resources/uploads/inputsForNestedHeat.zip | bin | 3576 -> 3588 bytes |
3 files changed, 7 insertions, 2 deletions
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml index bfbf1c2d32..962522ca90 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml @@ -38,5 +38,5 @@ annotation_types: type: string param_name: type: string - required: false + required: true description: Source parameter name
\ No newline at end of file diff --git a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature index 2757381d91..6915e7b374 100644 --- a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature +++ b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature @@ -33,22 +33,27 @@ Feature: Tosca Validation Flow When I want to load the yaml content of the entry "Definitions/MainServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" to context Then I want to check property "topology_template.inputs.pcm_flavor_name.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.pcm_flavor_name.annotations.source.properties.source_type" for value "HEAT" Then I want to check property "topology_template.inputs.pcm_flavor_name.annotations.source.properties.vf_module_label" to have length 2 Then I want to check property "topology_template.inputs.pcm_flavor_name.annotations.source.properties.vf_module_label[0]" for value "main-heat2" Then I want to check property "topology_template.inputs.pcm_flavor_name.annotations.source.properties.vf_module_label[1]" for value "main-heat1" Then I want to check property "topology_template.inputs.pcm_flavor_name.annotations.source.properties.param_name" for value "pcm_flavor_name" - Then I want to check property "topology_template.inputs.sm_server_names.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.sm_server_names.annotations.source.properties.source_type" for value "HEAT" Then I want to check property "topology_template.inputs.sm_server_names.annotations.source.properties.vf_module_label" to have length 1 Then I want to check property "topology_template.inputs.sm_server_names.annotations.source.properties.vf_module_label[0]" for value "main-heat1" Then I want to check property "topology_template.inputs.sm_server_names.annotations.source.properties.param_name" for value "sm_server_names" Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.source_type" for value "HEAT" Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.vf_module_label" to have length 1 Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.vf_module_label[0]" for value "main-heat2" Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.param_name" for value "dummy_net_netmask_1" + Then I want to check property "topology_template.inputs.OS::stack_name" exists + Then I want to check property "topology_template.inputs.OS::stack_name.annotations" does not exist + When I want to load the yaml content of the entry "Definitions/nested-pcm_v0.1ServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" to context Then I want to check property "topology_template.inputs.port_pcm_port_0_network_role.annotations" does not exist Then I want to check property "topology_template.inputs.availabilityzone_name.annotations" does not exist diff --git a/openecomp-bdd/resources/uploads/inputsForNestedHeat.zip b/openecomp-bdd/resources/uploads/inputsForNestedHeat.zip Binary files differindex f00ff56655..f1569ee4a4 100644 --- a/openecomp-bdd/resources/uploads/inputsForNestedHeat.zip +++ b/openecomp-bdd/resources/uploads/inputsForNestedHeat.zip |