From 2f7a38f772b9479e5d0af265993f6ea476d7544a Mon Sep 17 00:00:00 2001 From: eleonorali Date: Tue, 13 Feb 2018 14:39:39 +0200 Subject: [PATCH] SRIOV - add annotations add fix SRIOV - add annotation - set param_name mandatory Change-Id: I2b75c4b0db8205166205fe86f59f70067720f7e5 Issue-ID: SDC-996 Signed-off-by: eleonorali --- .../resources/globalTypes/openecomp/annotations.yml | 2 +- .../features/TOSCA/HeatToToscaTranslation.feature | 7 ++++++- .../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 index f00ff566559eda659fe00921c0cc39c5b5c8be23..f1569ee4a4881f70fc75294c47eceff0ab488785 100644 GIT binary patch delta 628 zcmV-)0*n3l8-yINdjo$=a!X9&bR6Xs0ssJ_2LJ#M0001OVQFqHXk}q^GA?;xZEWpT z!H(K65WOSu52HOVs{rlA$0GIC7L{X#tl7i_i`b4FCx}-2?;Se?Vo2ESy@!=p&%Alh zk2hv7&~YbJS)dcV5w?;>Ggu_^=5Wt;E!5}qCAcj;iHA&K`=tM|`xd<8}36--_=YymH5oQli4mWwC zU4f0U|HRZn#;AXKRe#B$3u1$kX39dk({H0ccF$YT82@OWLB+LjJU_liwOVh0I*-O4 zAgAmc@iag*(nTpLYf9_8-=Np>pq$l8oq}NcQ&=7Nd{lR=Yx9NNrbufnE&{9il|F)> z<700{WonzA1Ab1tk3*6yBNiCfxc6Dq&eD6q z)>I!g`uu*}+_ZbT;O#H7rv*y~4NP)NOyYDL$6HJoDzg zd71H1pyytwvOq6*Ev%D9Ggu|d^&$L^p#pV6AreU zA1|;eDuo)H$Mh7yC0bO%Q)M=v0hFoYPFP~%n$Fup0Dmb3gVZR6JQIaf(u<52()l)C z;HxND$M6-}3eZ$&6C#b_9L#~#i7P~ElB847i;xO)(P)SyIB%uSM@bt*Q+tGRJSh+z z3apL&C#DuMMKynjh9<`v#2O{ll!f${Uq=63pSPeX{>eOpifiF{e*TDRv)ut@o{c?0 zPP22y%Lvg#7EMW6(X@W}2ZNRe;jB{X(g>zUp*!*Ar0!VP?hCn1BdxKx3Ut*gy+WuH z#@-5NDw}o#-c5WMha_1?ELu1k^+gEP$@B90f~siar8R%0uwGu5tccr+)JxO42&1IJeX9g7_6w__D~_I=0L zH&Y{HyC!YYuhi&+%z0*I9oPdodT+_9zHn)*=ga+7c(1dM$89wZ-L!GP!0-93H^X|P zZdKGR&(JU=iE?*