diff options
14 files changed, 143 insertions, 118 deletions
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 Binary files differnew file mode 100644 index 0000000000..8dc3f7863d --- /dev/null +++ b/openecomp-bdd/resources/uploads/annotationMultVolume.zip diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java index c84ed22011..7ca4f78b37 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.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. @@ -89,7 +89,7 @@ public class TranslationService { if (fileDataCollection.getBaseFile() != null) { for (FileData fileData : fileDataCollection.getBaseFile()) { - translateHeatFile(mainServiceTemplate, fileData, translationContext); + translateHeatFile(mainServiceTemplate, fileData, translationContext); } } if (fileDataCollection.getAddOnFiles() != null) { @@ -132,12 +132,25 @@ public class TranslationService { */ public void translateHeatFile(ServiceTemplate serviceTemplate, FileData heatFileData, TranslationContext context) { + translateHeatFile(serviceTemplate, heatFileData, null, context); + } + + /** + * Translate heat file. + * + * @param serviceTemplate the service template + * @param heatFileData the current heat file data + * @param parentHeatFileName the main heat to which associated current heat file (e.g. volume heat) + * @param context the context + */ + public void translateHeatFile(ServiceTemplate serviceTemplate, FileData heatFileData, String parentHeatFileName, + TranslationContext context) { String heatFileName = heatFileData.getFile(); HeatOrchestrationTemplate heatOrchestrationTemplate = new YamlUtil() .yamlToObject(context.getFileContent(heatFileName), HeatOrchestrationTemplate.class); translateInputParameters(serviceTemplate, heatOrchestrationTemplate, heatFileData, context, - heatFileName); + heatFileName, parentHeatFileName); translateResources(heatFileName, serviceTemplate, heatOrchestrationTemplate, context); translateOutputParameters(serviceTemplate, heatOrchestrationTemplate, heatFileData, heatFileName, context); @@ -146,7 +159,7 @@ public class TranslationService { if (Objects.nonNull(heatFileData.getData())) { heatFileData.getData().stream().filter(data -> 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<String, ParameterDefinition> parameterDefinitionMap = TranslatorHeatToToscaParameterConverter .parameterConverter(serviceTemplate, heatOrchestrationTemplate.getParameters(), - heatOrchestrationTemplate, heatFileName, context); + heatOrchestrationTemplate, heatFileName, parentHeatFileName, context); Environment heatEnvFile = getHeatEnvFile(heatFileData, context); Map<String, Object> parameters = heatEnvFile.getParameters(); Object parameterValue; @@ -276,13 +289,19 @@ public class TranslationService { private void updateAnnotations(Map<String, ParameterDefinition> inputParameters, Map<String, ParameterDefinition> 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<String, ParameterDefinition> inputParameters, Map.Entry<String, ParameterDefinition> 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<String, ParameterDefinition> parameterConverter(ServiceTemplate serviceTemplate, Map<String, Parameter> parameters, HeatOrchestrationTemplate heatOrchestrationTemplate, - String heatFileName, TranslationContext context) { + String heatFileName, String parentHeatFileName, TranslationContext context) { Map<String, ParameterDefinition> parameterDefinitionMap = new HashMap<>(); for (Map.Entry<String, Parameter> 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<Map<String, AnnotationDefinition>> annotations = getToscaAnnotations(context, serviceTemplate, heatFileName, heatParameterName); + Optional<Map<String, AnnotationDefinition>> annotations = getToscaAnnotations(context, serviceTemplate, heatFileName, parentHeatFileName, heatParameterName); annotations.ifPresent(ant->toscaParameter.setAnnotations(annotations.get())); return toscaParameter; } - private static Optional<Map<String, AnnotationDefinition> > getToscaAnnotations (TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName, String heatParameterName){ + private static Optional<Map<String, AnnotationDefinition> > 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 |