From 7dae646e5b5f1168fa395394254664f27a3493f3 Mon Sep 17 00:00:00 2001 From: eleonorali Date: Mon, 16 Apr 2018 09:45:17 +0300 Subject: [PATCH] SIROV - add parent heat name for volume SIROV - add parent heat name for parameter came from volume HEAT Change-Id: I5592dc8b292037e740a1d7ac11e7ee0576cc2ec8 Issue-ID: SDC-996 Signed-off-by: eleonorali --- .../features/TOSCA/HeatToToscaTranslation.feature | 48 +++++++++++++ .../resources/uploads/annotationMultVolume.zip | Bin 0 -> 7469 bytes .../services/heattotosca/TranslationService.java | 41 ++++++++--- .../ResourceTranslationNestedImpl.java | 4 +- .../TranslatorHeatToToscaParameterConverter.java | 19 +++-- .../out/MainServiceTemplate.yaml | 7 +- .../duplicateReqs/out/MainServiceTemplate.yaml | 8 +-- .../out/MainServiceTemplate.yaml | 80 +++++++-------------- .../expectedoutputfiles/MainServiceTemplate.yaml | 4 +- .../out/MainServiceTemplate.yaml | 18 ++--- .../expectedoutputfiles/MainServiceTemplate.yaml | 10 +-- .../expectedoutputfiles/MainServiceTemplate.yaml | 4 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 14 ++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 4 +- 14 files changed, 143 insertions(+), 118 deletions(-) create mode 100644 openecomp-bdd/resources/uploads/annotationMultVolume.zip diff --git a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature index db5ac80923..3eca1235b1 100644 --- a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature +++ b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature @@ -55,6 +55,54 @@ Feature: Tosca Validation Flow Then I want to create a VF for this Item + Scenario: Validate Input parameter for volume file + When I want to create a VSP with onboarding type "NetworkPackage" + + Then I want to upload a NetworkPackage for this VSP from path "resources/uploads/annotationMultVolume.zip" + And I want to process the NetworkPackage file for this VSP + + Then I want to commit this Item + And I want to submit this VSP + And I want to package this VSP + + Then I want to get the package for this Item to path "resources/downloads/VSPPackage.zip" + 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.pcrf_oam_vol_size.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.pcrf_oam_vol_size.annotations.source.properties.source_type" for value "HEAT" + Then I want to check property "topology_template.inputs.pcrf_oam_vol_size.annotations.source.properties.vf_module_label" to have length 1 + Then I want to check property "topology_template.inputs.pcrf_oam_vol_size.annotations.source.properties.vf_module_label[0]" for value "hot-nimbus-oam_v1.0" + Then I want to check property "topology_template.inputs.pcrf_oam_vol_size.annotations.source.properties.param_name" for value "pcrf_oam_vol_size" + + Then I want to check property "topology_template.inputs.pcrf_pcm_vol_size.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.pcrf_pcm_vol_size.annotations.source.properties.source_type" for value "HEAT" + Then I want to check property "topology_template.inputs.pcrf_pcm_vol_size.annotations.source.properties.vf_module_label" to have length 1 + Then I want to check property "topology_template.inputs.pcrf_pcm_vol_size.annotations.source.properties.vf_module_label[0]" for value "hot-nimbus-pcm_v1.0" + Then I want to check property "topology_template.inputs.pcrf_pcm_vol_size.annotations.source.properties.param_name" for value "pcrf_pcm_vol_size" + + + Then I want to check property "topology_template.inputs.pcm-volumes_and_pcm_main_param.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.pcm-volumes_and_pcm_main_param.annotations.source.properties.source_type" for value "HEAT" + Then I want to check property "topology_template.inputs.pcm-volumes_and_pcm_main_param.annotations.source.properties.vf_module_label" to have length 1 + Then I want to check property "topology_template.inputs.pcm-volumes_and_pcm_main_param.annotations.source.properties.vf_module_label[0]" for value "hot-nimbus-pcm_v1.0" + Then I want to check property "topology_template.inputs.pcm-volumes_and_pcm_main_param.annotations.source.properties.param_name" for value "pcm-volumes_and_pcm_main_param" + + Then I want to check property "topology_template.inputs.oam-volumes_pcm_main_param.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.oam-volumes_pcm_main_param.annotations.source.properties.source_type" for value "HEAT" + Then I want to check property "topology_template.inputs.oam-volumes_pcm_main_param.annotations.source.properties.vf_module_label" to have length 2 + Then I want to check property "topology_template.inputs.oam-volumes_pcm_main_param.annotations.source.properties.vf_module_label[0]" for value "hot-nimbus-pcm_v1.0" + Then I want to check property "topology_template.inputs.oam-volumes_pcm_main_param.annotations.source.properties.vf_module_label[1]" for value "hot-nimbus-oam_v1.0" + Then I want to check property "topology_template.inputs.oam-volumes_pcm_main_param.annotations.source.properties.param_name" for value "oam-volumes_pcm_main_param" + + Then I want to check property "topology_template.inputs.oam-volumes_pcm-volumes_and_oam_main_param.annotations.source.type" for value "org.openecomp.annotations.Source" + Then I want to check property "topology_template.inputs.oam-volumes_pcm-volumes_and_oam_main_param.annotations.source.properties.source_type" for value "HEAT" + Then I want to check property "topology_template.inputs.oam-volumes_pcm-volumes_and_oam_main_param.annotations.source.properties.vf_module_label" to have length 2 + Then I want to check property "topology_template.inputs.oam-volumes_pcm-volumes_and_oam_main_param.annotations.source.properties.vf_module_label[0]" for value "hot-nimbus-pcm_v1.0" + Then I want to check property "topology_template.inputs.oam-volumes_pcm-volumes_and_oam_main_param.annotations.source.properties.vf_module_label[1]" for value "hot-nimbus-oam_v1.0" + Then I want to check property "topology_template.inputs.oam-volumes_pcm-volumes_and_oam_main_param.annotations.source.properties.param_name" for value "oam-volumes_pcm-volumes_and_oam_main_param" + + Then I want to create a VF for this Item + Scenario: Validate Input parameter - annotation was not added When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/openecomp-bdd/resources/uploads/annotationMultVolume.zip b/openecomp-bdd/resources/uploads/annotationMultVolume.zip new file mode 100644 index 0000000000000000000000000000000000000000..8dc3f7863dd0e1a4eb92d266b4ee173b606288b2 GIT binary patch literal 7469 zcmb_hbx@RTyI&eay1ToPMn&n4r8}3BknWO_ZV*Ab+oc;NL}2NZTpAG&5LO8}>zQv} z6@Ab5&zYTjW}lh8e$Tb{6~8Ogm5`7L0f+!}K$J$JGGH<5oEZTC$VUMHumAvn%41ap zSs6_&ZhJRpr+&=`PkMQAmocw#B;BmC!?>5lNbkQOH%KW?&HFGnZ>AudY%Dn#RC|>s zl2-nT&T4W`6_&FizW4cSFz$9LLZGY&(M#Ufy)n#L!O z1#^v9RUzZQU!FtiB&;pv@~+(Alh;djv|_qUn3|0R z#Ft7_&xL!a=-#l#9{Nc85z3n{uMFBBm(q&v;$`!mbT&V689cPPQ(+Q&{mxYVp9^)j z^j8`~7Bet`U!*Dg;KPrTouh?^8yCpk7Ub##a_6$~a&y5tb@y!4R#4#D*m6CA;b5Sj z;2bwYhR2k)woXptyv|{m7$>k}7Y~H!V^<$kk+v4(g$gTT0LWO%pDMJ|QTqg_&1kL#Ste+06-KT z06_TT#UM9#kQLWcOGi^rK5kxaA9F_sh@Miyq7ZHuPu-1q9lEQVBa0nQ2iINX1M?J_ zCV3p0$GrF;0*)j^nV|*b??+U?BeXeJ>PP-y!Bfb)Zz7cO{%a%Zz4iA&5mU+glB^1A zGuD^Bjo$*!KAxS;oN155$j2;sPa)uq)Amq))-5_F<5>%YLAgEwv-mK=%_jJFDmmd{|9v-JoyBy^`3l7yffAbd6ge!k= zK8I)hG-t;)LX}G?84NT|*FnKJKC8-0jyEZI%YTBd!ym#Y!#*-a!j!=ziW>ekH1OdT zD^J;`HQvVIcZ6|R*%!;_4x^wRh7%<{>A;9WS5jW9D({Z4-fy|)c1HITEEX*KS5{YE zY5w?;o5}0I=lcC6*hmrA$M~J+^X&1T_F}Cb)FRA{tx$P|DTQ;zYU1(GRV*&64w7b# z%Hd$)Mi@PCdBae7{CuKQN61u*3Jdu@qZaLU&*C~g zS=x3uSZrN;s{Z7eW7@0K%9v{gJ9cW%ZNgwaGAyRp}>jifmASqb*~-$ zWKQK}6|K$oBQuCf19wjJotB!p*A=tIRWkTYmqfymDm1Z}Yhnc9?RPK{g|j49I$FuZ z%V^6A4 zW#LjKyhUPj4KDI~y|xAJ5!%Q!PB)pPeo8Mf7Ar>va8@Vg(e=hqK6_NzfOd6NGZq?L zTLj7FkX;kb&GrNs-rf@)wQcUVp|)h9iso@0S|_dNN?-BoeS>L!qv~?6mn{2xmQv8= z#?(El(2> zV#YYcOb^cy?}zW)9Ek%Z*rJ+dJYJaM$EfDT#Y`$|nV(SuUi3}YH5-9-9VMf0w^Eb-R z>ki`@Cb)0D$V4w*qE#^mBz|0A5khlu_wJGo-?0&}4=zlcSoevFc$2GPN2e26!4fa` zOlwDq@6z9}7upQ_{Pj3c)|Pr&d$TypQtfCDk{K!@mLcQr>Q(}fGxyR13yM3apuTU0l^8cYp6 z@qO1iDY>Z@<4C@OsP0@V8JAVgp4HlF$|#~*<(Nz3v?}r5m`R(5o&_+zi@C@gb+zq> z18XXIrFU)YEF$*s{5%tn_Eg?R&OB35XMX_k-ig#_-roQYlvt*|;KJ8bQJ~j`XA)DV zZdGD5ZpaHNE$f(Gn4}oJ5CNh;#ZJ9R9ku9`Ce>ntr(QWxJSOx(jbBVD6^ZJSXyNsC z&}&k^@~prd0`hmH&MtcpxhXB`aiEmceO)C7Y!h1F!b7Xb4vCV!%srg=AnZ}g?n{Y> zrM+HBK^ar6h6j=12}q*(22-}VXI??M5x!N}y}mVF2f-_`Uy!<3lCj6pQr-i1ja;WA z0Y}$)(e0IG0S7Fgg~eL;xTR696EES0T2}?p*&V$bPFt8nsno7I|?yc{U|RaBPWfGE7`K zLc*z=j1A_M*d!Z?OnwJ?0yj>kKA3HJ=^)nOf3lp2V?V>p^dm%N}K-JWr@R+nKwqiI3PI0?0fI^MY_ zb`oYC`J53&@EudN;8%=HioX46tr2SIoZ6TsLmzF@=sI2m*)bmdb9rzFCz;t^6C~V( z#hNsazWOG>2*MyS=Y+}s789JwFmo_Ml@V@eTbq-esQkFI!Tg&-yN$e}aqe^#rdwff zY0;r_y_7R1v-Ot`HmzRQqXu@hra5bFNd~WuG=$%Kh$~2yab8)WY$bcE?G@oxXU&Ur z_cC8*TenlpFr?3>Z>!GCTv1y-vHqAcDz1Cr(A1r&PrNGsKGtvQNsyf|Y~eaBx+0Fl zn4^U2=zvW4h^yoAUXJ#n@YN%%??_e>&@l-+#GSZ$TJ$h#1G{H5k5&lQJV|XH@r9Dt z?LqB~2;QaoMj{^^@P8U?Aj=ygqa=j8|YPm+J}O^}l(C~4R! zlowY9mUM!170lI*o?tvv0W8ATw$oYG8z8kJs(XTDcX<{rP^6IP;C$HXW^-RhWTH$} zG`B|gu~{)kYZ?}82y5urlQ4k1<0zN^>Y^n`b|Z@}%vo>wx#FvFffuyYy^I)ddZCHt z&uPPRCn?{@6<76}EiGs&$#>a9+54I0?@G?m&ov%)1u2W`Izec;1&hu)w3qdVlxqT< zt6ivQ=~P+gpB)?qw>pUjuCowxEq#cuhdzG<4)MPKf;&<6Yk~l+Ir`3}>A>^twy5Pr zLTZN3h`0};z@HEh||N+zxl(9Wd=5cHr`KcJOcn zx&7=~UTF^7!<*s`iYuH;q>%f&GR?_ucKPF#>Yr5T?H?r0Ml@}%Rz|)Oa3K)xBs&-x z9r5)_cqWn$j-%bA661-p1`L0*5X_PoNv{O6Vsd1w%jXXbAp#t>nwE5;y-J`affj+N zc{nk5-7AH5FG^({>dfoX+hox~#@WLL_x1%Zh7^<(GR|93t+Tqu^epYDjE?(TTUc1m z4vnrr*8;3^L(W49E5om_N5TO7bJD$r&zHh9RQ5gX6XRYy2}v=dc@efqhgB6 z#pSkFmIUZ&^uc)6toANhpH7An>;CXeP#}oY^sc3I=>e9O4X0T0E}CQ;KdLEiQ?;6S zm%Yf{T@(IcBc@lX8-20n&U>2#@n6BbTnp*ocNBJVNK}^h>IhW)2x&@0n<(Lh48`xE zGKwT00fd{z7k+5|i;3VN!y(V9IHJO(z{TFQz6DfgmFHHB;gKJW;~5@{;u)<{Yy|QO zKFVN)sGtmOr4|$GvmuAt-L3X{B(;H6O&F~S#PWE|PlQSm zV%kRJHU|2rlw@W)=cW~(giG?52qT7{z41T4rtVq}K+w?Vww0RlIFJX*C|Oqxxr+c2 z%MFsF)1~i$ilgcV1`y58lU3-dhmwo0oaK9&Jd-dJa)4UfoLhKJ5&U#-;G)5m3 zt@R;Koku4ak*GKg2>Tfj#~D{B@`Jwa`2wI~3XFVA=l;|$c(FO6r&C~S8UTjvY)cGG~JVIU^83^1g2YI&bbJzDQ*GPVk!{EDW zY2olxi3uO<+@h?193LKk9?8S;i?oChaLU3C3=VEV{p>VdF)0secxgR@^_G-gYq8}k zzhiC}<14Fyc=k7lqc>C!aXS@CJPMVhT9*lBoKxl|8hoGHc`A6dilp|#b`sF8&U#N- z!n*HM;=XM^!`2_q7i94Y8D6KH#Aok+(|hdQgZubS(1)*JX@AS@7bckllIN9tdz79o0#RWgDV)aH&P?M{Y68@<4JzK`h zefQMyHErT2x>2N!<;$5Yu!8nrZOP6!4?^HvyE08RJN=uSKB)a!wc!50H9vf8d}tN@HcW88fvP)dWb9i^N z+!#lTz`@+VebXddOdAh5#E;UVYJT7+;b<>XWO!x4L zDu>M@C3G@lzqH6IMA7Zj4rxPg#M{U{F!#iNFK##6w8Yn{NPM``mnnxd#5;Fb-wNSj-N9F}E&GbFSs&odw0ijd37QPvO?;>b z0@K!~4zg-%w{Ql&cpb}C6cUsXB@lC9XcRd8fED=2xTN?+m-u~&hX;@Zx5|mC*50i< zrv5b!YX}ji;Wv6AP?2u%E2;WGADN1nV7V;5iRau3XYy73V9b_zP5gbng&}SylB|QO zfSq+t>O;@=8&u&GD_YtJs2E#bP6JalyDO_OY^|6Nu&NZMla6`!3v3H@d~>TaE!%F! zLqClKI{=2Eu7rR{2%lj6+fD_30RV*mtu23i`)$MWtLWdh2R}tM;8*$QF5$NP?Ro!C z`PDz=Zwud^+5Z&QgI7C$o8aF@xINMPiQtd=55hlG@nZ+@E5hG8_MZqVcmBP9{}ttL zz12??U-**iZ&Ltxg!~Hfx5nTn2qN64e+T(9gZ_&4L#5j_>`$~}cp3SBq1{sLZx!fI zFah|! data.getType() == FileData.Type.HEAT_VOL) - .forEach(data -> translateHeatFile(serviceTemplate, data, context)); + .forEach(data -> translateHeatFile(serviceTemplate, data, heatFileData.getFile(), context)); } } @@ -232,7 +245,7 @@ public class TranslationService { private void translateInputParameters(ServiceTemplate serviceTemplate, HeatOrchestrationTemplate heatOrchestrationTemplate, FileData heatFileData, TranslationContext context, - String heatFileName) { + String heatFileName, String parentHeatFileName) { if (heatOrchestrationTemplate.getParameters() == null) { return; } @@ -240,7 +253,7 @@ public class TranslationService { Map parameterDefinitionMap = TranslatorHeatToToscaParameterConverter .parameterConverter(serviceTemplate, heatOrchestrationTemplate.getParameters(), - heatOrchestrationTemplate, heatFileName, context); + heatOrchestrationTemplate, heatFileName, parentHeatFileName, context); Environment heatEnvFile = getHeatEnvFile(heatFileData, context); Map parameters = heatEnvFile.getParameters(); Object parameterValue; @@ -276,13 +289,19 @@ public class TranslationService { private void updateAnnotations(Map inputParameters, Map newParameters) { - if (Objects.nonNull(newParameters.entrySet())) { newParameters.entrySet().stream().filter(stringParameterDefinitionEntry -> inputParameters.containsKey(stringParameterDefinitionEntry.getKey()) && - isHasAnnotation(inputParameters, stringParameterDefinitionEntry)). - forEach(stringParameterDefinitionEntry -> getVFModulesList(stringParameterDefinitionEntry.getValue()). - addAll(getVFModulesList(inputParameters.get(stringParameterDefinitionEntry.getKey())))); - } + isHasAnnotation(inputParameters, stringParameterDefinitionEntry)). + forEach(stringParameterDefinitionEntry -> { + List inputParamVFModuleList = getVFModulesList(inputParameters.get(stringParameterDefinitionEntry.getKey())); + List newParamVFModuleList = getVFModulesList(stringParameterDefinitionEntry.getValue()); + if(inputParamVFModuleList.contains(newParamVFModuleList.get(0))){ + newParamVFModuleList.remove(0); + } + newParamVFModuleList.addAll(inputParamVFModuleList); + + }); + } private boolean isHasAnnotation(Map inputParameters, Map.Entry newParameterSet) { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java index 00acb66706..1da1738101 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java @@ -181,8 +181,8 @@ public class ResourceTranslationNestedImpl extends ResourceTranslationBase { translateTo.getContext() .addNestedHeatFileName(ToscaUtil.getServiceTemplateFileName(templateName), translateTo.getResource().getType()); - new TranslationService().translateHeatFile(nestedSubstitutionServiceTemplate, nestedFileData, - translateTo.getContext()); + new TranslationService().translateHeatFile(nestedSubstitutionServiceTemplate, + nestedFileData, translateTo.getContext()); return nestedSubstitutionServiceTemplate; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java index 930a2dee58..3b9497644c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 European Support Limited + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,14 +65,14 @@ public class TranslatorHeatToToscaParameterConverter { */ public static Map parameterConverter(ServiceTemplate serviceTemplate, Map parameters, HeatOrchestrationTemplate heatOrchestrationTemplate, - String heatFileName, TranslationContext context) { + String heatFileName, String parentHeatFileName, TranslationContext context) { Map parameterDefinitionMap = new HashMap<>(); for (Map.Entry entry : parameters.entrySet()) { String heatParamName = entry.getKey(); parameterDefinitionMap.put(heatParamName, getToscaParameter(serviceTemplate,heatParamName, entry.getValue(), heatOrchestrationTemplate, - heatFileName, context)); + heatFileName, parentHeatFileName, context)); } return parameterDefinitionMap; } @@ -110,12 +110,13 @@ public class TranslatorHeatToToscaParameterConverter { * @param context the context * @return the tosca parameter */ - public static ParameterDefinitionExt getToscaParameter(ServiceTemplate serviceTemplate, + private static ParameterDefinitionExt getToscaParameter(ServiceTemplate serviceTemplate, String heatParameterName, Parameter heatParameter, HeatOrchestrationTemplate heatOrchestrationTemplate, String heatFileName, + String parentHeatFileName, TranslationContext context) { ParameterDefinitionExt toscaParameter = new ParameterDefinitionExt(); @@ -129,14 +130,18 @@ public class TranslatorHeatToToscaParameterConverter { toscaParameter.setHidden(heatParameter.isHidden()); toscaParameter.setImmutable(heatParameter.isImmutable()); toscaParameter.setConstraints(getToscaConstrains(heatParameter.getConstraints())); - Optional> annotations = getToscaAnnotations(context, serviceTemplate, heatFileName, heatParameterName); + Optional> annotations = getToscaAnnotations(context, serviceTemplate, heatFileName, parentHeatFileName, heatParameterName); annotations.ifPresent(ant->toscaParameter.setAnnotations(annotations.get())); return toscaParameter; } - private static Optional > getToscaAnnotations (TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName, String heatParameterName){ + private static Optional > getToscaAnnotations (TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName, String parentHeatFileName, String heatParameterName){ + + if(parentHeatFileName != null){ + heatFileName = parentHeatFileName; + } if(!isAnnotationRequired(context, serviceTemplate, heatFileName)){ return Optional.empty(); @@ -162,7 +167,7 @@ public class TranslatorHeatToToscaParameterConverter { private static boolean isNestedServiceTemplate(TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName) { String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate.getMetadata()); - return HeatToToscaUtil.isHeatFileNested(context, heatFileName) || context.getNestedHeatFileName().containsKey(serviceTemplateFileName); + return HeatToToscaUtil.isHeatFileNested(context, heatFileName); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 1d355386cf..bc241a4c9c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_vIECCF_volume + - base_vIECCF source_type: HEAT param_name: app_volume_size_0 type: float @@ -190,7 +190,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_vIECCF_volume + - base_vIECCF source_type: HEAT param_name: plt_servicedata2_volume_size_0 type: float @@ -221,7 +221,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_vIECCF_volume + - base_vIECCF source_type: HEAT param_name: plt_servicedata1_volume_size_0 type: float @@ -389,7 +389,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_vIECCF_volume - base_vIECCF source_type: HEAT param_name: vnf_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index c3d07be8f3..d63fd0632c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -230,7 +230,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_cscf_volume + - base_cscf source_type: HEAT param_name: oam_volume_size_0 type: float @@ -551,7 +551,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_cscf_volume - base_cscf source_type: HEAT param_name: vnf_name @@ -689,7 +688,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_cscf_volume - base_cscf source_type: HEAT param_name: availability_zone_0 @@ -703,7 +701,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_cscf_volume - base_cscf source_type: HEAT param_name: availability_zone_1 @@ -1156,7 +1153,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_cscf_volume + - base_cscf source_type: HEAT param_name: cif_volume_size_0 type: float @@ -1612,7 +1609,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_cscf_volume - base_cscf source_type: HEAT param_name: vcscf_name_delimeter diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index 7c80b6149d..f0d049faf7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -63,7 +63,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_1_vson_mon_volume + - module_1_vson_mon source_type: HEAT param_name: vson_mon_volume_name_0 type: string @@ -78,7 +78,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_6_vson_dbs_volume + - module_6_vson_dbs source_type: HEAT param_name: vson_dbs_volume_name_0 type: string @@ -92,7 +92,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_6_vson_dbs_volume + - module_6_vson_dbs source_type: HEAT param_name: vson_dbs_volume_size_1 type: float @@ -121,7 +121,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_0_vson_mgt_volume + - module_0_vson_mgt source_type: HEAT param_name: vson_mgt_volume_name_0 type: string @@ -136,7 +136,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_6_vson_dbs_volume + - module_6_vson_dbs source_type: HEAT param_name: vson_dbs_volume_name_1 type: string @@ -150,7 +150,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_6_vson_dbs_volume + - module_6_vson_dbs source_type: HEAT param_name: vson_dbs_volume_size_0 type: float @@ -179,7 +179,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_1_vson_mon_volume + - module_1_vson_mon source_type: HEAT param_name: vson_mon_volume_size_0 type: float @@ -194,7 +194,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_1_vson_mon_volume + - module_1_vson_mon source_type: HEAT param_name: vson_mon_image_name type: string @@ -302,7 +302,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_7_vson_app_volume + - module_7_vson_app source_type: HEAT param_name: vson_app_volume_size_0 type: float @@ -357,7 +357,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_0_vson_mgt_volume + - module_0_vson_mgt source_type: HEAT param_name: vson_mgt_volume_size_0 type: float @@ -429,7 +429,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_0_vson_mgt_volume + - module_0_vson_mgt source_type: HEAT param_name: vson_mgt_image_name type: string @@ -643,7 +643,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_5_vson_dbg_volume + - module_5_vson_dbg source_type: HEAT param_name: vson_dbg_volume_size_0 type: float @@ -783,24 +783,15 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_0_vson_mgt_volume - module_0_vson_mgt - - module_1_vson_mon_volume - module_1_vson_mon - - module_4_vson_dbc_volume - module_4_vson_dbc - - module_7_vson_app_volume - module_7_vson_app - - module_3_vson_cll_volume - module_3_vson_cll - - module_2_vson_mdr_volume - module_2_vson_mdr - module_9_vson_clm - - module_5_vson_dbg_volume - module_5_vson_dbg - - module_6_vson_dbs_volume - module_6_vson_dbs - - module_8_vson_dcl_volume - module_8_vson_dcl - base_vson source_type: HEAT @@ -858,24 +849,15 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_0_vson_mgt_volume - module_0_vson_mgt - - module_1_vson_mon_volume - module_1_vson_mon - - module_4_vson_dbc_volume - module_4_vson_dbc - - module_7_vson_app_volume - module_7_vson_app - - module_3_vson_cll_volume - module_3_vson_cll - - module_2_vson_mdr_volume - module_2_vson_mdr - module_9_vson_clm - - module_5_vson_dbg_volume - module_5_vson_dbg - - module_6_vson_dbs_volume - module_6_vson_dbs - - module_8_vson_dcl_volume - module_8_vson_dcl - base_vson source_type: HEAT @@ -937,24 +919,15 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_0_vson_mgt_volume - module_0_vson_mgt - - module_1_vson_mon_volume - module_1_vson_mon - - module_4_vson_dbc_volume - module_4_vson_dbc - - module_7_vson_app_volume - module_7_vson_app - - module_3_vson_cll_volume - module_3_vson_cll - - module_2_vson_mdr_volume - module_2_vson_mdr - module_9_vson_clm - - module_5_vson_dbg_volume - module_5_vson_dbg - - module_6_vson_dbs_volume - module_6_vson_dbs - - module_8_vson_dcl_volume - module_8_vson_dcl - base_vson source_type: HEAT @@ -970,11 +943,8 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_3_vson_cll_volume - module_3_vson_cll - - module_6_vson_dbs_volume - module_6_vson_dbs - - module_8_vson_dcl_volume - module_8_vson_dcl source_type: HEAT param_name: availability_zone_1 @@ -1004,7 +974,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_4_vson_dbc_volume + - module_4_vson_dbc source_type: HEAT param_name: vson_dbc_volume_name_0 type: string @@ -1018,7 +988,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_2_vson_mdr_volume + - module_2_vson_mdr source_type: HEAT param_name: vson_mdr_image_name type: string @@ -1359,7 +1329,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_8_vson_dcl_volume + - module_8_vson_dcl source_type: HEAT param_name: vson_dcl_volume_size_1 type: float @@ -1375,7 +1345,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_8_vson_dcl_volume + - module_8_vson_dcl source_type: HEAT param_name: vson_dcl_volume_size_0 type: float @@ -1391,7 +1361,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_8_vson_dcl_volume + - module_8_vson_dcl source_type: HEAT param_name: vson_dcl_volume_size_2 type: float @@ -1500,7 +1470,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_4_vson_dbc_volume + - module_4_vson_dbc source_type: HEAT param_name: vson_dbc_volume_size_0 type: float @@ -1726,7 +1696,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_2_vson_mdr_volume + - module_2_vson_mdr source_type: HEAT param_name: vson_mdr_volume_size_0 type: float @@ -1795,7 +1765,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_2_vson_mdr_volume + - module_2_vson_mdr source_type: HEAT param_name: vson_mdr_volume_name_0 type: string @@ -1810,7 +1780,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_5_vson_dbg_volume + - module_5_vson_dbg source_type: HEAT param_name: vson_dbg_volume_name_0 type: string @@ -1996,7 +1966,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_3_vson_cll_volume + - module_3_vson_cll source_type: HEAT param_name: vson_cll_volume_size_2 type: float @@ -2011,7 +1981,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_3_vson_cll_volume + - module_3_vson_cll source_type: HEAT param_name: vson_cll_volume_size_1 type: float @@ -2026,7 +1996,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_3_vson_cll_volume + - module_3_vson_cll source_type: HEAT param_name: vson_cll_volume_size_0 type: float @@ -2055,7 +2025,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - module_7_vson_app_volume + - module_7_vson_app source_type: HEAT param_name: vson_app_volume_name_0 type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml index 86c5446952..40dd74f458 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml @@ -68,7 +68,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - base_pronghorn_volume + - base_pronghorn source_type: HEAT param_name: db_volume_size_0 type: float @@ -682,4 +682,4 @@ topology_template: name: data server group container_type: host targets: - - db_server_group_group + - db_server_group_group \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml index 681aa78d01..e0c3cb4af2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml @@ -78,7 +78,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-oam-volumes_v1.0 + - hot-nimbus-oam_v1.0 source_type: HEAT param_name: pcrf_oam_vol_size type: float @@ -93,7 +93,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-oam-volumes_v1.0 + - hot-nimbus-oam_v1.0 source_type: HEAT param_name: pcrf_oam_vol_name_2 type: string @@ -152,7 +152,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-oam-volumes_v1.0 + - hot-nimbus-oam_v1.0 source_type: HEAT param_name: pcrf_oam_vol_name_1 type: string @@ -182,7 +182,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-pcm-volumes_v1.0 + - hot-nimbus-pcm_v1.0 source_type: HEAT param_name: pcrf_pcm_vol_size type: float @@ -309,7 +309,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-pcm-volumes_v1.0 + - hot-nimbus-pcm_v1.0 source_type: HEAT param_name: pcrf_pcm_volume_silver type: string @@ -390,7 +390,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-oam-volumes_v1.0 + - hot-nimbus-oam_v1.0 source_type: HEAT param_name: pcrf_oam_volume_silver-2 type: string @@ -405,7 +405,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-oam-volumes_v1.0 + - hot-nimbus-oam_v1.0 source_type: HEAT param_name: pcrf_oam_volume_silver-1 type: string @@ -564,7 +564,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - hot-nimbus-pcm-volumes_v1.0 + - hot-nimbus-pcm_v1.0 source_type: HEAT param_name: pcrf_pcm_vol_name_1 type: string @@ -2103,4 +2103,4 @@ topology_template: value: pcrf_oam_volume_id_22 pcrf_pcm_volume_id_1: description: the pcrf_pcm_volume_id - value: pcrf_pcm_volume_id_1 + value: pcrf_pcm_volume_id_1 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml index 773101be16..d2d5a928dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml @@ -29,8 +29,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vol_b - - vol_a - main source_type: HEAT param_name: cmaui_cinder_volume_size @@ -55,8 +53,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vol_b - - vol_a - main source_type: HEAT param_name: contrail_net_name @@ -70,8 +66,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vol_b - - vol_a - main source_type: HEAT param_name: CMAUI_volume_type @@ -84,8 +78,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vol_b - - vol_a - main source_type: HEAT param_name: jsa_name @@ -219,4 +211,4 @@ topology_template: p2: value: test_vol2 exposed_vol1: - value: test_vol1 + value: test_vol1 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml index 0f6b7e72c0..0c89037b87 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml @@ -32,7 +32,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - a_vol - main source_type: HEAT param_name: cmaui_cinder_volume_size @@ -256,7 +255,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - a_vol - main source_type: HEAT param_name: CMAUI_volume_type @@ -325,4 +323,4 @@ topology_template: inner_cmaui_volume_b3: value: inner_cmaui_volume_a1 inner_cmaui_volume_a1: - value: inner_cmaui_volume_a1 + value: inner_cmaui_volume_a1 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml index 7ca5c8d941..44df0e1b00 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml @@ -181,7 +181,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vmme_small_create_fsb + - vmme_small source_type: HEAT param_name: FSB_1_image type: string @@ -687,7 +687,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vmme_small_create_fsb + - vmme_small source_type: HEAT param_name: FSB_2_image type: string @@ -755,7 +755,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vmme_small_create_fsb + - vmme_small source_type: HEAT param_name: FSB1_volume_name type: string @@ -919,7 +919,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vmme_small_create_fsb + - vmme_small source_type: HEAT param_name: FSB2_volume_name type: string @@ -1163,7 +1163,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vmme_small_create_fsb + - vmme_small source_type: HEAT param_name: volume_size type: float @@ -1248,7 +1248,7 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - vmme_small_create_fsb + - vmme_small source_type: HEAT param_name: volume_type type: string @@ -2286,4 +2286,4 @@ topology_template: description: server template for vMME members: - FSB1_volume - - FSB2_volume + - FSB2_volume \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml index 57a526f5bc..ec0ce2e7e2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml @@ -47,7 +47,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - a_vol - hot_template source_type: HEAT param_name: cmaui_cinder_volume_size @@ -229,7 +228,6 @@ topology_template: type: org.openecomp.annotations.Source properties: vf_module_label: - - a_vol - hot_template source_type: HEAT param_name: CMAUI_volume_type @@ -316,4 +314,4 @@ topology_template: - cmaui_port_0 outputs: exposed_cmaui_volume: - value: cmaui_volume + value: cmaui_volume \ No newline at end of file -- 2.16.6