diff options
Diffstat (limited to 'openecomp-be/lib')
93 files changed, 629 insertions, 527 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java index 87c578cd5d..675a2c5e96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java @@ -62,7 +62,7 @@ public class TranslationContext { private static Map<String, ImplementationConfiguration> nameExtractorImplMap; private static Map<String, ImplementationConfiguration> supportedConsolidationComputeResources; private static Map<String, ImplementationConfiguration> supportedConsolidationPortResources; - private static List enrichPortResourceProperties; + private static List<String> enrichPortResourceProperties; static { Configuration config = ConfigurationManager.lookup(); @@ -90,7 +90,7 @@ public class TranslationContext { private ManifestFile manifest; - public static List getEnrichPortResourceProperties() { + public static List<String> getEnrichPortResourceProperties() { return enrichPortResourceProperties; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java index c95db52b95..2aeb0c95bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java @@ -3,7 +3,6 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolid import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Set; /** * The type Type compute consolidation data. @@ -25,7 +24,7 @@ public class TypeComputeConsolidationData { * * @return the all compute node template ids */ - public Set<String> getAllComputeNodeTemplateIds() { + public Collection<String> getAllComputeNodeTemplateIds() { return computeTemplateConsolidationData.keySet(); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java index 628186e9d7..3fef3f91a1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java @@ -3,7 +3,6 @@ package org.openecomp.sdc.translator.services.heattotosca; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.openecomp.sdc.common.errors.CoreException; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.ToscaConstants; @@ -30,14 +29,15 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.function.Predicate; public class ConsolidationService { - private MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage(); private UnifiedCompositionService unifiedCompositionService; public ConsolidationService(UnifiedCompositionService unifiedCompositionService) { @@ -73,7 +73,7 @@ public class ConsolidationService { if (preConditionResult) { boolean consolidationRuleCheckResult = checkConsolidationRules(serviceTemplate, typeComputeConsolidationData, - consolidationData, translationContext); + consolidationData); unifiedCompositionService.createUnifiedComposition( serviceTemplate, null, unifiedCompositionDataList, @@ -90,8 +90,8 @@ public class ConsolidationService { } - public static Map<String, String> getConsolidationEntityIdToType(ServiceTemplate serviceTemplate, - ConsolidationData consolidationData) { + static Map<String, String> getConsolidationEntityIdToType(ServiceTemplate serviceTemplate, + ConsolidationData consolidationData) { Map<String, String> consolidationEntityIdToType = new HashMap<>(); String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate); @@ -101,11 +101,11 @@ public class ConsolidationService { FilePortConsolidationData filePortConsolidationData = consolidationData.getPortConsolidationData() .getFilePortConsolidationData(serviceTemplateFileName); - if(Objects.nonNull(fileComputeConsolidationData)) { + if (Objects.nonNull(fileComputeConsolidationData)) { for (String computeType : fileComputeConsolidationData.getAllComputeTypes()) { TypeComputeConsolidationData typeComputeConsolidationData = fileComputeConsolidationData.getTypeComputeConsolidationData(computeType); - Set<String> computeNodeTemplateIds = + Collection<String> computeNodeTemplateIds = typeComputeConsolidationData.getAllComputeNodeTemplateIds(); for (String computeNodeTemplateId : computeNodeTemplateIds) { consolidationEntityIdToType.put(computeNodeTemplateId, computeType); @@ -113,7 +113,7 @@ public class ConsolidationService { } } - if(Objects.nonNull(filePortConsolidationData)) { + if (Objects.nonNull(filePortConsolidationData)) { Set<String> portNodeTemplateIds = filePortConsolidationData.getAllPortNodeTemplateIds(); for (String portNodeTemplateId : portNodeTemplateIds) { consolidationEntityIdToType @@ -127,11 +127,10 @@ public class ConsolidationService { private boolean checkConsolidationRules(ServiceTemplate serviceTemplate, TypeComputeConsolidationData typeComputeConsolidationData, - ConsolidationData consolidationData, - TranslationContext context) { + ConsolidationData consolidationData) { return checkComputeConsolidation(serviceTemplate, typeComputeConsolidationData) && checkPortConsolidation(serviceTemplate, typeComputeConsolidationData, - consolidationData, context) + consolidationData) && !checkGetAttrBetweenEntityConsolidationOfTheSameType(serviceTemplate, typeComputeConsolidationData, consolidationData); } @@ -140,13 +139,13 @@ public class ConsolidationService { ServiceTemplate serviceTemplate, TypeComputeConsolidationData typeComputeConsolidationData, ConsolidationData consolidationData) { - List<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = - new ArrayList(typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); + Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = + typeComputeConsolidationData.getAllComputeTemplateConsolidationData(); - Set<String> computeNodeTemplateIds = + Collection<String> computeNodeTemplateIds = typeComputeConsolidationData.getAllComputeNodeTemplateIds(); - Map<String, Set<String>> portTypeToIds = UnifiedCompositionUtil + Map<String, List<String>> portTypeToIds = UnifiedCompositionUtil .collectAllPortsFromEachTypesFromComputes(computeTemplateConsolidationDataList); return @@ -156,66 +155,11 @@ public class ConsolidationService { } - private boolean checkGetAttrInEntityConsolidationWithPortIsLegal( - List entityConsolidationDatas, - TypeComputeConsolidationData typeComputeConsolidationData) { - Map<String, Set<String>> portTypeToIds = - UnifiedCompositionUtil.collectAllPortsFromEachTypesFromComputes( - typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); - - Set<String> startingPortTypesPointByGetAttr = - getPortTypesPointedByGetAttrFromEntity( - (EntityConsolidationData) entityConsolidationDatas.get(0), portTypeToIds); - - for (int i = 1; i < entityConsolidationDatas.size(); i++) { - Set<String> currentPortTypesPointByGetAttr = - getPortTypesPointedByGetAttrFromEntity( - (EntityConsolidationData) entityConsolidationDatas.get(i), portTypeToIds); - if (!startingPortTypesPointByGetAttr.equals(currentPortTypesPointByGetAttr)) { - return false; - } - } - - return true; - } - - private Set<String> getPortTypesPointedByGetAttrFromEntity( - EntityConsolidationData entity, - Map<String, Set<String>> portTypeToIds) { - return getPortTypeToIdPointByGetAttrInOrOut( - entity.getNodesGetAttrIn(), portTypeToIds, entity).keySet(); - } - - private boolean checkGetAttrInToPortIsLegal( - ServiceTemplate serviceTemplate, - TypeComputeConsolidationData typeComputeConsolidationData, - ConsolidationData consolidationData) { - - Map<String, Set<String>> portTypeToIds = UnifiedCompositionUtil - .collectAllPortsFromEachTypesFromComputes( - typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); - - for (Set<String> portIdsFromSameType : portTypeToIds.values()) { - List<PortTemplateConsolidationData> portTemplateConsolidationDataList = - collectAllPortsTemplateConsolidationData( - portIdsFromSameType, ToscaUtil.getServiceTemplateFileName(serviceTemplate), - consolidationData); - - if (!checkGetAttrInEntityConsolidationWithPortIsLegal( - portTemplateConsolidationDataList, typeComputeConsolidationData)) { - return false; - } - } - - return true; - } - - private boolean checkGetAttrOutFromPortLegal(String serviceTemplateName, - Set<String> computeNodeTemplateIds, - Map<String, Set<String>> portTypeToIds, + Collection<String> computeNodeTemplateIds, + Map<String, List<String>> portTypeToIds, ConsolidationData consolidationData) { - for (Set<String> portIdsFromSameType : portTypeToIds.values()) { + for (List<String> portIdsFromSameType : portTypeToIds.values()) { List<PortTemplateConsolidationData> portTemplateConsolidationDataList = collectAllPortsTemplateConsolidationData(portIdsFromSameType, serviceTemplateName, consolidationData); @@ -230,18 +174,17 @@ public class ConsolidationService { return true; } - private boolean checkGetAttrOutFromEntityToPortIsLegal(List entityConsolidationDataList, - Map<String, Set<String>> portTypeToIds) { + private boolean checkGetAttrOutFromEntityToPortIsLegal(Collection entities, + Map<String, List<String>> portTypeToIds) { for (String portType : portTypeToIds.keySet()) { Set<GetAttrFuncData> startingGetAttrFunc = getEntityGetAttrFuncAsSet(portType, - (EntityConsolidationData) entityConsolidationDataList.get(0)); - for (int i = 1; i < entityConsolidationDataList.size(); i++) { - Object entity = entityConsolidationDataList.get(i); + (EntityConsolidationData) entities.iterator().next()); + for (Object entity : entities) { + EntityConsolidationData currentEntity = (EntityConsolidationData) entity; Set<GetAttrFuncData> currentGetAttrFuncData = - getEntityGetAttrFuncAsSet(portType, - (EntityConsolidationData) entity); + getEntityGetAttrFuncAsSet(portType, currentEntity); if (!(startingGetAttrFunc.equals(currentGetAttrFuncData))) { return false; } @@ -253,7 +196,7 @@ public class ConsolidationService { private boolean checkGetAttrOutFromPortToComputeIsLegal( List<PortTemplateConsolidationData> portTemplateConsolidationDataList, - Set<String> computeNodeTemplateIds) { + Collection<String> computeNodeTemplateIds) { PortTemplateConsolidationData startingPortTemplate = portTemplateConsolidationDataList.get(0); Map<String, Set<GetAttrFuncData>> startingComputeGetAttrOutFuncData = @@ -283,11 +226,9 @@ public class ConsolidationService { return false; } - if (MapUtils.isEmpty(firstMap) && MapUtils.isEmpty(secondMap)) { - return true; - } + return (MapUtils.isEmpty(firstMap) && MapUtils.isEmpty(secondMap)) || + (new ArrayList<>(firstMap.values()).equals(new ArrayList<>(secondMap.values()))); - return new ArrayList<>(firstMap.values()).equals(new ArrayList<>(secondMap.values())); } private Set<GetAttrFuncData> getEntityGetAttrFuncAsSet( @@ -313,7 +254,7 @@ public class ConsolidationService { private Map<String, Set<GetAttrFuncData>> getComputeGetAttrOutFuncData( Map<String, List<GetAttrFuncData>> nodesGetAttrOut, - Set<String> computeNodeTemplateIds) { + Collection<String> computeNodeTemplateIds) { Map<String, Set<GetAttrFuncData>> computeGetAttrFuncData = new HashMap<>(); if (MapUtils.isEmpty(nodesGetAttrOut)) { @@ -330,35 +271,6 @@ public class ConsolidationService { return computeGetAttrFuncData; } - private Map<String, List<String>> getPortTypeToIdPointByGetAttrInOrOut( - Map<String, List<GetAttrFuncData>> getAttr, - Map<String, Set<String>> portTypeToIds, - EntityConsolidationData entityConsolidationData) { - Map<String, List<String>> portIdToType = new HashMap<>(); - - if (MapUtils.isEmpty(getAttr)) { - return portIdToType; - } - - for (String getAttrId : getAttr.keySet()) { - if (isNodeTemplateIdIsInComputeConsolidationData(getAttrId, portTypeToIds)) { - String portType = ConsolidationDataUtil.getPortType(getAttrId); - portIdToType.putIfAbsent(portType, new ArrayList<>()); - portIdToType.get(portType).add(getAttrId); - } - } - - return portIdToType; - - } - - - private boolean isNodeTemplateIdIsInComputeConsolidationData( - String getAttrInId, - Map<String, Set<String>> portTypeToIds) { - return portTypeToIds.keySet().contains(ConsolidationDataUtil.getPortType(getAttrInId)); - } - private boolean checkGetAttrBetweenEntityConsolidationOfTheSameType( ServiceTemplate serviceTemplate, TypeComputeConsolidationData typeComputeConsolidationData, @@ -372,13 +284,13 @@ public class ConsolidationService { private boolean checkGetAttrRelationsBetweenComputesOfSameType( TypeComputeConsolidationData typeComputeConsolidationData) { - Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDatas = + Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationEntities = typeComputeConsolidationData.getAllComputeTemplateConsolidationData(); - Set<String> computeNodeTemplateIds = + Collection<String> computeNodeTemplateIds = typeComputeConsolidationData.getAllComputeNodeTemplateIds(); return checkGetAttrRelationsForEntityConsolidationData( - computeTemplateConsolidationDatas, computeNodeTemplateIds); + computeTemplateConsolidationEntities, computeNodeTemplateIds); } private boolean checkGetAttrRelationsBetweenPortsOfTheSameType( @@ -386,16 +298,16 @@ public class ConsolidationService { TypeComputeConsolidationData typeComputeConsolidationData, ConsolidationData consolidationData) { - Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDatas = + Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationEntities = typeComputeConsolidationData.getAllComputeTemplateConsolidationData(); - Map<String, Set<String>> portTypeToPortIds = UnifiedCompositionUtil - .collectAllPortsFromEachTypesFromComputes(computeTemplateConsolidationDatas); + Map<String, List<String>> portTypeToPortIds = UnifiedCompositionUtil + .collectAllPortsFromEachTypesFromComputes(computeTemplateConsolidationEntities); FilePortConsolidationData filePortConsolidationData = consolidationData.getPortConsolidationData().getFilePortConsolidationData(ToscaUtil .getServiceTemplateFileName(serviceTemplate)); - for (Set<String> portsOfTheSameTypeIds : portTypeToPortIds.values()) { + for (List<String> portsOfTheSameTypeIds : portTypeToPortIds.values()) { List<PortTemplateConsolidationData> portTemplateConsolidationDataOfSameType = getAllPortTemplateConsolidationData(portsOfTheSameTypeIds, filePortConsolidationData); if (!checkGetAttrRelationsForEntityConsolidationData(portTemplateConsolidationDataOfSameType, @@ -408,7 +320,7 @@ public class ConsolidationService { } private List<PortTemplateConsolidationData> getAllPortTemplateConsolidationData( - Set<String> portsIds, + List<String> portsIds, FilePortConsolidationData filePortConsolidationData) { List<PortTemplateConsolidationData> portTemplateConsolidationDataOfSameType = new ArrayList<>(); @@ -425,15 +337,12 @@ public class ConsolidationService { private boolean checkGetAttrRelationsForEntityConsolidationData( Collection entities, - Set<String> nodeTemplateIdsOfTheSameType) { - - List<EntityConsolidationData> entityConsolidationDataList = - new ArrayList(entities); - - for (EntityConsolidationData entityConsolidationData : entityConsolidationDataList) { + Collection<String> nodeTemplateIdsOfTheSameType) { + for (Object entity : entities) { + EntityConsolidationData currentEntity = (EntityConsolidationData) entity; Set<String> getAttrInNodeIds = - entityConsolidationData.getNodesGetAttrIn() == null ? new HashSet<>() - : entityConsolidationData.getNodesGetAttrIn().keySet(); + currentEntity.getNodesGetAttrIn() == null ? new HashSet<>() + : currentEntity.getNodesGetAttrIn().keySet(); for (String nodeId : getAttrInNodeIds) { if (nodeTemplateIdsOfTheSameType.contains(nodeId)) { return true; @@ -448,31 +357,29 @@ public class ConsolidationService { private boolean checkComputeConsolidation( ServiceTemplate serviceTemplate, TypeComputeConsolidationData typeComputeConsolidationData) { - List<String> computeNodeTemplateIds = - new ArrayList(typeComputeConsolidationData.getAllComputeNodeTemplateIds()); + Collection<String> computeNodeTemplateIds = + typeComputeConsolidationData.getAllComputeNodeTemplateIds(); List<String> propertiesWithIdenticalVal = getComputePropertiesWithIdenticalVal(); - return arePropertiesSimilarBetweenComputeNodeTemplates( - serviceTemplate, computeNodeTemplateIds, propertiesWithIdenticalVal) + return arePropertiesSimilarBetweenComputeNodeTemplates(serviceTemplate, computeNodeTemplateIds, + propertiesWithIdenticalVal) && checkComputeRelations( typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); } private boolean checkComputeRelations( - Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDatas) { + Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationEntities) { - return checkEntityConsolidationDataRelations(computeTemplateConsolidationDatas) - && checkComputesRelationsToVolume(computeTemplateConsolidationDatas); + return checkEntityConsolidationDataRelations(computeTemplateConsolidationEntities) + && checkComputesRelationsToVolume(computeTemplateConsolidationEntities); } private boolean checkEntityConsolidationDataRelations(Collection entities) { - List<EntityConsolidationData> entityConsolidationDataList = - new ArrayList(entities); - EntityConsolidationData startingEntity = entityConsolidationDataList.get(0); + EntityConsolidationData startingEntity = (EntityConsolidationData) entities.iterator().next(); - for (int i = 1; i < entityConsolidationDataList.size(); i++) { - EntityConsolidationData currentEntity = entityConsolidationDataList.get(i); + for (Object entity : entities) { + EntityConsolidationData currentEntity = (EntityConsolidationData) entity; if (!(checkNodesConnectedInRelations(startingEntity, currentEntity) && (checkNodesConnectedOutRelations(startingEntity, currentEntity)) && (checkGroupIdsRelations(startingEntity, currentEntity)))) { @@ -510,27 +417,23 @@ public class ConsolidationService { private boolean checkGroupIdsRelations(EntityConsolidationData startingEntity, EntityConsolidationData currentEntity) { - if (CollectionUtils.isEmpty(startingEntity.getGroupIds()) - && CollectionUtils.isEmpty(currentEntity.getGroupIds())) { - return true; - } + return CollectionUtils.isEmpty(startingEntity.getGroupIds()) && + CollectionUtils.isEmpty(currentEntity.getGroupIds()) || + startingEntity.getGroupIds().equals(currentEntity.getGroupIds()); - return startingEntity.getGroupIds().equals(currentEntity.getGroupIds()); } private boolean checkComputesRelationsToVolume( - Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDatas) { - - Set<String> volumeRelationsFromComputes = new HashSet<>(); - List<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = - new ArrayList(computeTemplateConsolidationDatas); + Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationEntities) { + Iterator<ComputeTemplateConsolidationData> iterator = + computeTemplateConsolidationEntities.iterator(); Map<String, List<RequirementAssignmentData>> startingVolumes = - computeTemplateConsolidationDataList.get(0).getVolumes(); + iterator.next().getVolumes(); - for (int i = 1; i < computeTemplateConsolidationDataList.size(); i++) { + for (ComputeTemplateConsolidationData compute : computeTemplateConsolidationEntities) { Map<String, List<RequirementAssignmentData>> currentVolumes = - computeTemplateConsolidationDataList.get(i).getVolumes(); + compute.getVolumes(); if (!compareNodeConnectivity(startingVolumes, currentVolumes)) { return false; } @@ -541,28 +444,28 @@ public class ConsolidationService { private boolean checkPortConsolidation(ServiceTemplate serviceTemplate, TypeComputeConsolidationData typeComputeConsolidationData, - ConsolidationData consolidationData, - TranslationContext context) { - return isWantedPortPropertiesUsageIsSimilarInAllPorts(serviceTemplate, - typeComputeConsolidationData, context) + ConsolidationData consolidationData) { + return validateWantedPortProperties(serviceTemplate, + typeComputeConsolidationData) && checkPortRelations(ToscaUtil.getServiceTemplateFileName(serviceTemplate), typeComputeConsolidationData, consolidationData); } - private boolean isWantedPortPropertiesUsageIsSimilarInAllPorts(ServiceTemplate serviceTemplate, - TypeComputeConsolidationData typeComputeConsolidationData, - TranslationContext context) { + private boolean validateWantedPortProperties(ServiceTemplate serviceTemplate, + TypeComputeConsolidationData typeComputeConsolidationData) { Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDataCollection = typeComputeConsolidationData.getAllComputeTemplateConsolidationData(); - List<String> propertiesThatNeedHaveUsage = getPortPropertiesWithIdenticalVal(context); - Map<String, Set<String>> portTypeToIds = UnifiedCompositionUtil + Map<String, List<String>> portTypeToIds = UnifiedCompositionUtil .collectAllPortsFromEachTypesFromComputes(computeTemplateConsolidationDataCollection); + List<String> propertiesWithIdenticalVal = getPortPropertiesWithIdenticalVal(); + List<String> propertiesThatNeedToHaveSameUsage = + getPortPropertiesThatNeedToHaveSameUsage(); - for (Set<String> portsIds : portTypeToIds.values()) { - if (!areAllPortsFromSameTypeHaveIdenticalValForProperties( - serviceTemplate, portsIds, propertiesThatNeedHaveUsage)) { + for (List<String> portsIds : portTypeToIds.values()) { + if (!arePortPropertiesValid(serviceTemplate, propertiesWithIdenticalVal, + propertiesThatNeedToHaveSameUsage, portsIds)) { return false; } } @@ -570,15 +473,36 @@ public class ConsolidationService { return true; } + private boolean arePortPropertiesValid(ServiceTemplate serviceTemplate, + List<String> propertiesWithIdenticalVal, + List<String> propertiesThatNeedToHaveSameUsage, + List<String> portsIds) { + Map<String, NodeTemplate> nodeTemplates = + serviceTemplate.getTopology_template().getNode_templates(); + + Predicate<String> similar = property -> + isPropertyValueSimilarBetweenNodeTemplates(property, + portsIds, nodeTemplates); + + Predicate<String> exists = property -> + isPropertyUsageSimilarBetweenAllNodeTemplates(property, + portsIds, nodeTemplates); + + return areWantedPortPropertiesValid( + propertiesWithIdenticalVal, similar) + && areWantedPortPropertiesValid( + propertiesThatNeedToHaveSameUsage, exists); + } + private boolean checkPortRelations(String serviceTemplateName, TypeComputeConsolidationData typeComputeConsolidationData, ConsolidationData consolidationData) { Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDataCollection = typeComputeConsolidationData.getAllComputeTemplateConsolidationData(); - Map<String, Set<String>> portTypeToIds = UnifiedCompositionUtil + Map<String, List<String>> portTypeToIds = UnifiedCompositionUtil .collectAllPortsFromEachTypesFromComputes(computeTemplateConsolidationDataCollection); - for (Set<String> portIds : portTypeToIds.values()) { + for (List<String> portIds : portTypeToIds.values()) { List<PortTemplateConsolidationData> portTemplateConsolidationDataList = collectAllPortsTemplateConsolidationData( portIds, serviceTemplateName, consolidationData); @@ -592,7 +516,7 @@ public class ConsolidationService { } private List<PortTemplateConsolidationData> - collectAllPortsTemplateConsolidationData(Set<String> portIds, + collectAllPortsTemplateConsolidationData(List<String> portIds, String serviceTemplateName, ConsolidationData consolidationData) { @@ -612,62 +536,23 @@ public class ConsolidationService { return portTemplateConsolidationDataList; } - private boolean areAllPortsFromSameTypeHaveIdenticalValForProperties( - ServiceTemplate serviceTemplate, - Set<String> portNodeTemplateIds, - List<String> propertiesThatNeedToHaveUsage) { - Map<String, NodeTemplate> nodeTemplates = - serviceTemplate.getTopology_template().getNode_templates(); + private boolean areWantedPortPropertiesValid(List<String> propertiesToCheck, + Predicate<String> condition) { - for (String property : propertiesThatNeedToHaveUsage) { - if (!areAllPortsHaveIdenticalValForProperties(property, portNodeTemplateIds, nodeTemplates)) { - return false; - } - } - - return true; - } - - private boolean areAllPortsHaveIdenticalValForProperties( - String propertyToCheck, - Set<String> portNodeTemplateIds, - Map<String, NodeTemplate> nodeTemplates) { - - List<String> portNodeTemplateIdList = new ArrayList(portNodeTemplateIds); - NodeTemplate startingPortNodeTemplate = nodeTemplates.get(portNodeTemplateIdList.get(0)); - - if (Objects.isNull(startingPortNodeTemplate)) { - throw new CoreException( - new DuplicateResourceIdsInDifferentFilesErrorBuilder(portNodeTemplateIdList.get(0)).build()); - } - - for (int i = 1; i < portNodeTemplateIdList.size(); i++) { - NodeTemplate portNodeTemplate = nodeTemplates.get(portNodeTemplateIdList.get(i)); - - if (Objects.isNull(portNodeTemplate)) { - throw new CoreException( - new DuplicateResourceIdsInDifferentFilesErrorBuilder(portNodeTemplateIdList.get(i)).build()); - } - - if (!isPropertySimilarBetweenNodeTemplates(propertyToCheck, portNodeTemplateIdList, nodeTemplates)) { - return false; - } - } - - return true; + return propertiesToCheck.stream().allMatch(condition); } private boolean arePropertiesSimilarBetweenComputeNodeTemplates( ServiceTemplate serviceTemplate, - List<String> computeNodeTemplateIds, + Collection<String> computeNodeTemplateIds, List<String> propertiesThatNeedToBeSimilar) { Map<String, NodeTemplate> idToNodeTemplate = serviceTemplate.getTopology_template().getNode_templates(); for (String property : propertiesThatNeedToBeSimilar) { - if (!isPropertySimilarBetweenNodeTemplates(property, computeNodeTemplateIds, + if (!isPropertyValueSimilarBetweenNodeTemplates(property, computeNodeTemplateIds, idToNodeTemplate)) { return false; } @@ -675,43 +560,82 @@ public class ConsolidationService { return true; } - private boolean isPropertySimilarBetweenNodeTemplates( - String propertyToCheck, - List<String> entityNodeTemplateIds, - Map<String, NodeTemplate> idToNodeTemplate) { - + private boolean isPropertyUsageSimilarBetweenAllNodeTemplates(String propertyToCheck, + List<String> entityNodeTemplateIds, + Map<String, NodeTemplate> idToNodeTemplate) { NodeTemplate startingNodeTemplate = idToNodeTemplate.get(entityNodeTemplateIds.get(0)); + if (Objects.isNull(startingNodeTemplate)) { + throw new CoreException( + new DuplicateResourceIdsInDifferentFilesErrorBuilder(entityNodeTemplateIds.get(0)) + .build()); + } + boolean propertyExistCondition = isPropertyExistInNodeTemplate(propertyToCheck, startingNodeTemplate); - Set<Object> propertiesValues = new HashSet<>(); - propertiesValues - .add(startingNodeTemplate.getProperties().get(propertyToCheck)); - for (int i = 1; i < entityNodeTemplateIds.size(); i++) { NodeTemplate currentNodeTemplate = idToNodeTemplate.get(entityNodeTemplateIds.get(i)); if (Objects.isNull(currentNodeTemplate)) { throw new CoreException( - new DuplicateResourceIdsInDifferentFilesErrorBuilder(entityNodeTemplateIds.get(i)).build()); + new DuplicateResourceIdsInDifferentFilesErrorBuilder(entityNodeTemplateIds.get(i)) + .build()); } - if(propertyExistCondition != isPropertyExistInNodeTemplate(propertyToCheck, currentNodeTemplate)){ + if (propertyExistCondition != + isPropertyExistInNodeTemplate(propertyToCheck, currentNodeTemplate)) { return false; } - propertiesValues - .add(currentNodeTemplate.getProperties().get(propertyToCheck)); + } + + return true; + + } + + private boolean isPropertyValueSimilarBetweenNodeTemplates(String propertyToCheck, + Collection<String> entityNodeTemplateIds, + Map<String, NodeTemplate> idToNodeTemplate) { + + Set<Object> propertiesValues = new HashSet<>(); + Iterator<String> iterator = entityNodeTemplateIds.iterator(); + + handlePropertyValue(propertyToCheck, idToNodeTemplate, propertiesValues, iterator.next()); + + while (iterator.hasNext()) { + handlePropertyValue(propertyToCheck, idToNodeTemplate, propertiesValues, iterator.next()); } return propertiesValues.size() == 1; } - private boolean isPropertyExistInNodeTemplate(String propertyToCheck, NodeTemplate nodeTemplate){ - return !(nodeTemplate.getProperties() == null || nodeTemplate.getProperties().get(propertyToCheck) == null); + private void handlePropertyValue(String propertyToCheck, + Map<String, NodeTemplate> idToNodeTemplate, + Set<Object> propertiesValues, String nodeId) { + NodeTemplate startingNodeTemplate = idToNodeTemplate.get(nodeId); + if (Objects.isNull(startingNodeTemplate)) { + throw new CoreException( + new DuplicateResourceIdsInDifferentFilesErrorBuilder(nodeId) + .build()); + } + + addPropertyValue(propertyToCheck, startingNodeTemplate, propertiesValues); + } + + private void addPropertyValue(String property, + NodeTemplate nodeTemplate, + Set<Object> propertiesValues) { + propertiesValues.add( + isPropertyExistInNodeTemplate(property, nodeTemplate) ? nodeTemplate.getProperties() + .get(property) : ""); } - public void substitutionServiceTemplateConsolidation(String substituteNodeTemplateId, - ServiceTemplate serviceTemplate, - ServiceTemplate substitutionServiceTemplate, - TranslationContext translationContext) { + private boolean isPropertyExistInNodeTemplate(String propertyToCheck, NodeTemplate nodeTemplate) { + return !(nodeTemplate.getProperties() == null || + nodeTemplate.getProperties().get(propertyToCheck) == null); + } + + void substitutionServiceTemplateConsolidation(String substituteNodeTemplateId, + ServiceTemplate serviceTemplate, + ServiceTemplate substitutionServiceTemplate, + TranslationContext translationContext) { ConsolidationData consolidationData = translationContext.getConsolidationData(); @@ -748,10 +672,9 @@ public class ConsolidationService { ServiceTemplate nestedServiceTemplate, FileComputeConsolidationData fileComputeConsolidationData, TranslationContext context) { - if (Objects.isNull(fileComputeConsolidationData)) { - return false; - } - return isNumberOfComputeTypesLegal(fileComputeConsolidationData) + + return Objects.nonNull(fileComputeConsolidationData) + && isNumberOfComputeTypesLegal(fileComputeConsolidationData) && isNumberOfComputeConsolidationDataPerTypeLegal( fileComputeConsolidationData.getAllTypeComputeConsolidationData().iterator().next()) && !isThereMoreThanOneNestedLevel(nestedServiceTemplate, context.getConsolidationData()); @@ -779,11 +702,8 @@ public class ConsolidationService { : consolidationData.getNestedConsolidationData() .getFileNestedConsolidationData(nestedServiceTemplateName); - if (Objects.isNull(fileNestedConsolidationData)) { - return false; - } - - return !CollectionUtils.isEmpty(fileNestedConsolidationData.getAllNestedNodeTemplateIds()); + return Objects.nonNull(fileNestedConsolidationData) + && !CollectionUtils.isEmpty(fileNestedConsolidationData.getAllNestedNodeTemplateIds()); } @@ -864,17 +784,12 @@ public class ConsolidationService { private boolean isNumberOfPortsEqualsBetweenComputeNodes( TypeComputeConsolidationData typeComputeConsolidationData) { - - ArrayList<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = - new ArrayList(typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); int startingNumberOfPorts = - getNumberOfPortsPerCompute(computeTemplateConsolidationDataList.get(0)); - + getNumberOfPortsPerCompute(typeComputeConsolidationData + .getAllComputeTemplateConsolidationData().iterator().next()); - for (int i = 1; i < computeTemplateConsolidationDataList.size(); i++) { - int currNumberOfPorts = - getNumberOfPortsPerCompute(computeTemplateConsolidationDataList.get(i)); - if (currNumberOfPorts != startingNumberOfPorts) { + for (ComputeTemplateConsolidationData compute : typeComputeConsolidationData.getAllComputeTemplateConsolidationData()) { + if (getNumberOfPortsPerCompute(compute) != startingNumberOfPorts) { return false; } } @@ -886,8 +801,8 @@ public class ConsolidationService { private boolean isNumberOfPortFromEachTypeLegal( TypeComputeConsolidationData typeComputeConsolidationData) { - ArrayList<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = - new ArrayList(typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); + Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = + typeComputeConsolidationData.getAllComputeTemplateConsolidationData(); for (ComputeTemplateConsolidationData computeTemplate : computeTemplateConsolidationDataList) { Map<String, List<String>> currPortsMap = computeTemplate.getPorts(); @@ -906,37 +821,30 @@ public class ConsolidationService { private boolean isPortTypesEqualsBetweenComputeNodes( TypeComputeConsolidationData typeComputeConsolidationData) { + Set<String> staringPortIds = getPortsIds(typeComputeConsolidationData.getAllComputeTemplateConsolidationData().iterator().next()); - ArrayList<ComputeTemplateConsolidationData> computeTemplateConsolidationDataList = - new ArrayList(typeComputeConsolidationData.getAllComputeTemplateConsolidationData()); - Set<String> staringPortIds = getPortsIds(computeTemplateConsolidationDataList.get(0)); - - for (int i = 1; i < computeTemplateConsolidationDataList.size(); i++) { - Set<String> currentPortIds = getPortsIds(computeTemplateConsolidationDataList.get(i)); + for (ComputeTemplateConsolidationData compute : typeComputeConsolidationData.getAllComputeTemplateConsolidationData()) { + Set<String> currentPortIds = getPortsIds(compute); if (!currentPortIds.equals(staringPortIds)) { return false; } } - return true; } private int getNumberOfPortsPerCompute( ComputeTemplateConsolidationData computeTemplateConsolidationData) { - return getPortsIds(computeTemplateConsolidationData) == null ? 0 : - getPortsIds(computeTemplateConsolidationData).size(); + return getPortsIds(computeTemplateConsolidationData).size(); } private Set<String> getPortsIds( ComputeTemplateConsolidationData computeTemplateConsolidationData) { - return computeTemplateConsolidationData.getPorts() == null ? new HashSet<>() - : computeTemplateConsolidationData - .getPorts().keySet(); + return MapUtils.isEmpty(computeTemplateConsolidationData.getPorts()) ? new HashSet<>() + : computeTemplateConsolidationData.getPorts().keySet(); } - public List<String> getPropertiesWithIdenticalVal(UnifiedCompositionEntity entity, - TranslationContext context){ - switch (entity){ + List<String> getPropertiesWithIdenticalVal(UnifiedCompositionEntity entity) { + switch (entity) { case Compute: return getComputePropertiesWithIdenticalVal(); @@ -944,7 +852,7 @@ public class ConsolidationService { return getComputePropertiesWithIdenticalVal(); case Port: - return getPortPropertiesWithIdenticalVal(context); + return getPortPropertiesWithIdenticalVal(); default: return new ArrayList<>(); @@ -958,15 +866,26 @@ public class ConsolidationService { return propertyWithIdenticalValue; } - private List<String> getPortPropertiesWithIdenticalVal(TranslationContext context) { - List<String> propertiesThatNeedToHaveUsage = new ArrayList<>(); - propertiesThatNeedToHaveUsage.add(ToscaConstants.PORT_FIXED_IPS); - propertiesThatNeedToHaveUsage.add(ToscaConstants.PORT_ALLOWED_ADDRESS_PAIRS); - propertiesThatNeedToHaveUsage.add(ToscaConstants.MAC_ADDRESS); + private List<String> getPortPropertiesWithIdenticalVal() { + List<String> propertiesThatNeedToHaveIdenticalVal = new ArrayList<>(); + propertiesThatNeedToHaveIdenticalVal.add(ToscaConstants.PORT_ALLOWED_ADDRESS_PAIRS); + propertiesThatNeedToHaveIdenticalVal.add(ToscaConstants.MAC_ADDRESS); + + propertiesThatNeedToHaveIdenticalVal + .addAll(TranslationContext.getEnrichPortResourceProperties()); + + return propertiesThatNeedToHaveIdenticalVal; + } + + private List<String> getPortPropertiesThatNeedToHaveSameUsage() { + List<String> propertiesThatNeedToHaveSameUsage = new ArrayList<>(); + propertiesThatNeedToHaveSameUsage.add(ToscaConstants.PORT_FIXED_IPS); + propertiesThatNeedToHaveSameUsage.add(ToscaConstants.PORT_ALLOWED_ADDRESS_PAIRS); + propertiesThatNeedToHaveSameUsage.add(ToscaConstants.MAC_ADDRESS); - propertiesThatNeedToHaveUsage.addAll(context.getEnrichPortResourceProperties()); + propertiesThatNeedToHaveSameUsage.addAll(TranslationContext.getEnrichPortResourceProperties()); - return propertiesThatNeedToHaveUsage; + return propertiesThatNeedToHaveSameUsage; } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java index bd0fbcb47a..e79aaaeb9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java @@ -112,7 +112,7 @@ public class UnifiedCompositionService { private ConsolidationService consolidationService = new ConsolidationService(); private static List<EntityConsolidationData> getPortConsolidationDataList( - Set<String> portIds, + List<String> portIds, List<UnifiedCompositionData> unifiedCompositionDataList) { List<EntityConsolidationData> portConsolidationDataList = new ArrayList<>(); for (UnifiedCompositionData unifiedCompositionData : unifiedCompositionDataList) { @@ -325,23 +325,24 @@ public class UnifiedCompositionService { } } - public void updateSubstitutionNodeTypePrefix(ServiceTemplate substitutionServiceTemplate){ + public void updateSubstitutionNodeTypePrefix(ServiceTemplate substitutionServiceTemplate) { Map<String, NodeTemplate> node_templates = substitutionServiceTemplate.getTopology_template().getNode_templates(); - for(Map.Entry<String,NodeTemplate> nodeTemplateEntry : node_templates.entrySet()){ + for (Map.Entry<String, NodeTemplate> nodeTemplateEntry : node_templates.entrySet()) { String nodeTypeId = nodeTemplateEntry.getValue().getType(); NodeType origNodeType = substitutionServiceTemplate.getNode_types().get(nodeTypeId); - if(Objects.nonNull(origNodeType) + if (Objects.nonNull(origNodeType) && nodeTypeId.startsWith(ToscaNodeType.VFC_TYPE_PREFIX) - && origNodeType.getDerived_from().equals(ToscaNodeType.NOVA_SERVER)){ + && origNodeType.getDerived_from().equals(ToscaNodeType.NOVA_SERVER)) { substitutionServiceTemplate.getNode_types().remove(nodeTypeId); String newNodeTypeId = nodeTypeId.replace(ToscaNodeType.VFC_TYPE_PREFIX, ToscaNodeType.COMPUTE_TYPE_PREFIX); nodeTemplateEntry.getValue().setType(newNodeTypeId); DataModelUtil - .addNodeTemplate(substitutionServiceTemplate, nodeTemplateEntry.getKey(), nodeTemplateEntry.getValue()); + .addNodeTemplate(substitutionServiceTemplate, nodeTemplateEntry.getKey(), + nodeTemplateEntry.getValue()); substitutionServiceTemplate.getNode_types().put(newNodeTypeId, origNodeType); } } @@ -676,7 +677,8 @@ public class UnifiedCompositionService { ServiceTemplate nestedServiceTemplate, UnifiedCompositionData unifiedCompositionData, TranslationContext context) { - NestedTemplateConsolidationData nestedTemplateConsolidationData = unifiedCompositionData.getNestedTemplateConsolidationData(); + NestedTemplateConsolidationData nestedTemplateConsolidationData = + unifiedCompositionData.getNestedTemplateConsolidationData(); Map<String, List<RequirementAssignmentData>> nodesConnectedOut = Objects.isNull(nestedTemplateConsolidationData) ? new HashMap<>() : nestedTemplateConsolidationData.getNodesConnectedOut(); @@ -685,18 +687,18 @@ public class UnifiedCompositionService { context.getConsolidationData().getComputeConsolidationData().getFileComputeConsolidationData (ToscaUtil.getServiceTemplateFileName(nestedServiceTemplate)); - if(Objects.isNull(nestedFileComputeConsolidationData)){ + if (Objects.isNull(nestedFileComputeConsolidationData)) { return; } TypeComputeConsolidationData computeType = nestedFileComputeConsolidationData.getAllTypeComputeConsolidationData().iterator().next(); - if(Objects.isNull(computeType)){ + if (Objects.isNull(computeType)) { return; } String singleComputeId = computeType.getAllComputeNodeTemplateIds().iterator().next(); - if(Objects.nonNull(singleComputeId)) { + if (Objects.nonNull(singleComputeId)) { updateRequirementInNestedNodeTemplate(serviceTemplate, nestedTemplateConsolidationData, singleComputeId, nodesConnectedOut); } @@ -1124,7 +1126,7 @@ public class UnifiedCompositionService { requirementAssignmentDataMap) { ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl(); - if(MapUtils.isEmpty(requirementAssignmentDataMap)){ + if (MapUtils.isEmpty(requirementAssignmentDataMap)) { return; } @@ -1331,8 +1333,8 @@ public class UnifiedCompositionService { } Set<Map.Entry<String, Object>> entries = ((Map<String, Object>) valueObject).entrySet(); - for(Map.Entry<String, Object> valueObjectEntry : entries){ - if(isIncludeToscaFunc(valueObjectEntry.getValue(), toscaFunction)){ + for (Map.Entry<String, Object> valueObjectEntry : entries) { + if (isIncludeToscaFunc(valueObjectEntry.getValue(), toscaFunction)) { return true; } } @@ -1734,7 +1736,7 @@ public class UnifiedCompositionService { Collection<ComputeTemplateConsolidationData> computeConsolidationDataList = (Collection) getComputeConsolidationDataList(unifiedCompositionDataList); - Map<String, Set<String>> portIdsPerPortType = UnifiedCompositionUtil + Map<String, List<String>> portIdsPerPortType = UnifiedCompositionUtil .collectAllPortsFromEachTypesFromComputes(computeConsolidationDataList); for (String portType : portIdsPerPortType.keySet()) { @@ -1776,7 +1778,7 @@ public class UnifiedCompositionService { .getNodeTemplateId(), connectedComputeNodeType, computeTemplateConsolidationData); //Update requirements for relationships between the consolidation entities - handleConsolidationEntitiesRequirementConnectivity(newPortNodeTemplateId, newPortNodeTemplate, + handleConsolidationEntitiesRequirementConnectivity(newPortNodeTemplate, serviceTemplate, context); DataModelUtil.addNodeTemplate(substitutionServiceTemplate, newPortNodeTemplateId, newPortNodeTemplate); @@ -1836,7 +1838,7 @@ public class UnifiedCompositionService { return computeNodeTypeId; } - private String getComputeNodeType(String nodeType){ + private String getComputeNodeType(String nodeType) { String computeTypeSuffix = getComputeTypeSuffix(nodeType); return ToscaNodeType.COMPUTE_TYPE_PREFIX + "." + computeTypeSuffix; } @@ -1864,7 +1866,7 @@ public class UnifiedCompositionService { String newComputeNodeTemplateId = getNewComputeNodeTemplateId(serviceTemplate, computeTemplateConsolidationData.getNodeTemplateId()); //Update requirements for relationships between the consolidation entities - handleConsolidationEntitiesRequirementConnectivity(newComputeNodeTemplateId, + handleConsolidationEntitiesRequirementConnectivity( newComputeNodeTemplate, serviceTemplate, context); DataModelUtil @@ -1911,7 +1913,7 @@ public class UnifiedCompositionService { List<UnifiedCompositionData> unifiedCompositionDataList, TranslationContext context) { List<String> propertiesWithIdenticalVal = - consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity, context); + consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity); nodeTemplate.setProperties(new HashedMap()); handleNodeTemplateProperties(serviceTemplate, nodeTemplate, substitutionServiceTemplate, unifiedCompositionEntity, entityConsolidationDataList, computeTemplateConsolidationData, @@ -1934,7 +1936,7 @@ public class UnifiedCompositionService { List<UnifiedCompositionData> unifiedCompositionDataList, TranslationContext context) { List<String> propertiesWithIdenticalVal = - consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity, context); + consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity); for (EntityConsolidationData entityConsolidationData : entityConsolidationDataList) { String nodeTemplateId = entityConsolidationData.getNodeTemplateId(); @@ -1969,9 +1971,10 @@ public class UnifiedCompositionService { unifiedCompositionDataList, context); //todo - define list of type which will match the node property type (instead of string) - addPropertyInputParameter(propertyType, substitutionServiceTemplate, propertyDefinition - .getEntry_schema(), - parameterId, unifiedCompositionEntity, context); + parameterId.ifPresent( + parameterIdValue -> addPropertyInputParameter(propertyType, + substitutionServiceTemplate, + propertyDefinition.getEntry_schema(), parameterIdValue, context)); } } } @@ -2048,7 +2051,7 @@ public class UnifiedCompositionService { addPropertyInputParameter(propertyType, substitutionServiceTemplate, enrichNodeType .getProperties().get(enrichPropertyName).getEntry_schema(), - Optional.of(inputParamId), compositionEntity, context); + inputParamId, context); } } @@ -2079,39 +2082,27 @@ public class UnifiedCompositionService { private void addPropertyInputParameter(String propertyType, ServiceTemplate substitutionServiceTemplate, - EntrySchema entrySchema, Optional<String> parameterId, - UnifiedCompositionEntity unifiedCompositionEntity, + EntrySchema entrySchema, String parameterId, TranslationContext context) { - if (parameterId.isPresent() && - isParameterBelongsToEnrichedPortProperties(parameterId.get(), context)) { - addInputParameter(parameterId.get(), + if (isParameterBelongsToEnrichedPortProperties(parameterId, context)) { + addInputParameter(parameterId, propertyType, propertyType.equals(PropertyType.LIST.getDisplayName()) ? entrySchema : null, substitutionServiceTemplate); } else if (isPropertySimpleType(propertyType)) { - parameterId - .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue, - PropertyType.LIST.getDisplayName(), - DataModelUtil - .createEntrySchema(propertyType.toLowerCase(), null, null), - substitutionServiceTemplate)); + addInputParameter(parameterId, PropertyType.LIST.getDisplayName(), + DataModelUtil.createEntrySchema(propertyType.toLowerCase(), null, null), + substitutionServiceTemplate); } else if (propertyType.equals(PropertyTypeExt.JSON.getDisplayName()) || (Objects.nonNull(entrySchema) && isPropertySimpleType(entrySchema.getType()))) { - parameterId - .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue, - PropertyType.LIST.getDisplayName(), - DataModelUtil - .createEntrySchema(PropertyTypeExt.JSON.getDisplayName(), null, null), - substitutionServiceTemplate)); + addInputParameter(parameterId, PropertyType.LIST.getDisplayName(), + DataModelUtil.createEntrySchema(PropertyTypeExt.JSON.getDisplayName(), null, null), + substitutionServiceTemplate); } else { - parameterId - .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue, - analyzeParameterType(propertyType), - DataModelUtil - .createEntrySchema(analyzeEntrySchemaType(propertyType, entrySchema), - null, null), - substitutionServiceTemplate)); + addInputParameter(parameterId, analyzeParameterType(propertyType), DataModelUtil + .createEntrySchema(analyzeEntrySchemaType(propertyType, entrySchema), null, null), + substitutionServiceTemplate); } } @@ -2146,11 +2137,9 @@ public class UnifiedCompositionService { entrySchema.getType() : null; } - private void handleConsolidationEntitiesRequirementConnectivity(String nodeTemplateId, - NodeTemplate nodeTemplate, + private void handleConsolidationEntitiesRequirementConnectivity(NodeTemplate nodeTemplate, ServiceTemplate serviceTemplate, TranslationContext context) { - Map<String, RequirementAssignment> updatedNodeTemplateRequirements = new HashMap<>(); List<Map<String, RequirementAssignment>> nodeTemplateRequirements = DataModelUtil .getNodeTemplateRequirementList(nodeTemplate); if (CollectionUtils.isEmpty(nodeTemplateRequirements)) { @@ -2585,12 +2574,10 @@ public class UnifiedCompositionService { getIdenticalValuePropertyName(substitutionTemplateInputName, inputUnifiedCompositionEntity, context); - if (identicalValuePropertyName.isPresent()) { - updateIdenticalPropertyValue(identicalValuePropertyName.get(), - substitutionTemplateInputName, computeType, inputUnifiedCompositionEntity, - unifiedCompositionDataList.get(0), serviceTemplate, abstractSubstituteProperties, - context); - } + identicalValuePropertyName.ifPresent(propertyName -> updateIdenticalPropertyValue(propertyName, + substitutionTemplateInputName, computeType, inputUnifiedCompositionEntity, + unifiedCompositionDataList.get(0), serviceTemplate, abstractSubstituteProperties, + context)); } continue; } @@ -2840,15 +2827,15 @@ public class UnifiedCompositionService { } private void updateSubstitutableNodeTemplateRequirements(ServiceTemplate serviceTemplate, - ServiceTemplate substitutionServiceTemplate){ - if(Objects.isNull(substitutionServiceTemplate.getTopology_template())){ + ServiceTemplate substitutionServiceTemplate) { + if (Objects.isNull(substitutionServiceTemplate.getTopology_template())) { return; } SubstitutionMapping substitution_mappings = substitutionServiceTemplate.getTopology_template().getSubstitution_mappings(); - if(Objects.isNull(substitution_mappings)){ + if (Objects.isNull(substitution_mappings)) { return; } @@ -2968,10 +2955,11 @@ public class UnifiedCompositionService { private void updateNestedNodeTemplateRequirement(String nestedNodeTemplateId, ServiceTemplate mainServiceTemplate, ServiceTemplate nestedServiceTemplate, - TranslationContext context){ + TranslationContext context) { NestedTemplateConsolidationData nestedTemplateConsolidationData = ConsolidationDataUtil - .getNestedTemplateConsolidationData(context, mainServiceTemplate, null, nestedNodeTemplateId); + .getNestedTemplateConsolidationData(context, mainServiceTemplate, null, + nestedNodeTemplateId); FileComputeConsolidationData fileComputeConsolidationData = context.getConsolidationData().getComputeConsolidationData().getFileComputeConsolidationData @@ -2981,14 +2969,14 @@ public class UnifiedCompositionService { TypeComputeConsolidationData compute = fileComputeConsolidationData.getAllTypeComputeConsolidationData().iterator().next(); - if(Objects.isNull(nestedTemplateConsolidationData)){ + if (Objects.isNull(nestedTemplateConsolidationData)) { return; } Map<String, List<RequirementAssignmentData>> nodesConnectedOut = nestedTemplateConsolidationData.getNodesConnectedOut(); - if(MapUtils.isEmpty(nodesConnectedOut)){ + if (MapUtils.isEmpty(nodesConnectedOut)) { return; } @@ -3003,9 +2991,10 @@ public class UnifiedCompositionService { NodeTemplate nodeTemplate = DataModelUtil.getNodeTemplate(mainServiceTemplate, nestedNodeTemplateId); - for(List<RequirementAssignmentData> requirementAssignmentDataList : nodesConnectedOut.values()){ - for(RequirementAssignmentData data : requirementAssignmentDataList){ - if(!data.getRequirementId().equals("dependency")){ + for (List<RequirementAssignmentData> requirementAssignmentDataList : nodesConnectedOut + .values()) { + for (RequirementAssignmentData data : requirementAssignmentDataList) { + if (!data.getRequirementId().equals("dependency")) { DataModelUtil.addRequirementAssignment(nodeTemplate, data.getRequirementId(), cloneRequirementAssignment(data.getRequirementAssignment())); updateRequirementInSubMapping(nestedServiceTemplate, compute, data); @@ -3027,7 +3016,7 @@ public class UnifiedCompositionService { } - private RequirementAssignment cloneRequirementAssignment(RequirementAssignment reqToClone){ + private RequirementAssignment cloneRequirementAssignment(RequirementAssignment reqToClone) { RequirementAssignment requirementAssignment = new RequirementAssignment(); requirementAssignment.setRelationship(reqToClone.getRelationship()); @@ -3039,7 +3028,8 @@ public class UnifiedCompositionService { private void removeUneccessaryRequirements(NodeTemplate nodeTemplate) { List<Map<String, RequirementAssignment>> reqsToRemove = new ArrayList<>(); - for(Map<String, RequirementAssignment> requirementDefinitionMap : nodeTemplate.getRequirements()) { + for (Map<String, RequirementAssignment> requirementDefinitionMap : nodeTemplate + .getRequirements()) { if (requirementDefinitionMap.containsKey("dependency")) { reqsToRemove.add(requirementDefinitionMap); } @@ -3052,12 +3042,12 @@ public class UnifiedCompositionService { Map.Entry<String, RequirementDefinition> requirementDefinitionEntry) { RequirementAssignment requirementAssignment = new RequirementAssignment(); - if(requirementDefinitionEntry.getValue() instanceof RequirementDefinition) { + if (requirementDefinitionEntry.getValue() instanceof RequirementDefinition) { requirementAssignment.setCapability(requirementDefinitionEntry.getValue().getCapability()); requirementAssignment.setNode(requirementDefinitionEntry.getValue().getNode()); - requirementAssignment.setRelationship(requirementDefinitionEntry.getValue().getRelationship()); - } - else if(requirementDefinitionEntry.getValue() instanceof Map){ + requirementAssignment + .setRelationship(requirementDefinitionEntry.getValue().getRelationship()); + } else if (requirementDefinitionEntry.getValue() instanceof Map) { Map<String, Object> reqAsMap = (Map<String, Object>) requirementDefinitionEntry.getValue(); requirementAssignment.setCapability((String) reqAsMap.get("capability")); requirementAssignment.setNode((String) reqAsMap.get("node")); @@ -3100,7 +3090,7 @@ public class UnifiedCompositionService { SubstitutionMapping substitutionMappings = nestedServiceTemplate.getTopology_template().getSubstitution_mappings(); - if(!relatedNestedNodeTypeIds.contains(substitutionMappings.getNode_type())) { + if (!relatedNestedNodeTypeIds.contains(substitutionMappings.getNode_type())) { substitutionMappings.setNode_type(newNestedNodeType); } } @@ -3435,7 +3425,7 @@ public class UnifiedCompositionService { TranslationContext context) { List<String> identicalValuePropertyList = - consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity, context); + consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity); StringBuilder builder = getPropertyValueStringBuilder(unifiedCompositionEntity); @@ -3520,7 +3510,7 @@ public class UnifiedCompositionService { case Port: return getPortPropertyNameFromInput(input, consolidationService - .getPropertiesWithIdenticalVal(unifiedCompositionEntity, context)); + .getPropertiesWithIdenticalVal(unifiedCompositionEntity)); default: return Optional.empty(); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java index 5586574669..7f3025408f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java @@ -5,19 +5,18 @@ import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; /** * Utility class for consolidation data collection helper methods. */ public class UnifiedCompositionUtil { - protected static Logger logger = (Logger) LoggerFactory.getLogger(UnifiedCompositionUtil.class); + protected static Logger logger = LoggerFactory.getLogger(UnifiedCompositionUtil.class); /** * Gets all ports per port type, which are connected to the computes from the input @@ -27,9 +26,9 @@ public class UnifiedCompositionUtil { * consolidation data * @return set of port ids, per port type */ - public static Map<String, Set<String>> collectAllPortsFromEachTypesFromComputes( + static Map<String, List<String>> collectAllPortsFromEachTypesFromComputes( Collection<ComputeTemplateConsolidationData> computeTemplateConsolidationDataCollection) { - Map<String, Set<String>> portTypeToIds = new HashMap<>(); + Map<String, List<String>> portTypeToIds = new HashMap<>(); for (ComputeTemplateConsolidationData compute : computeTemplateConsolidationDataCollection) { Map<String, List<String>> ports = compute.getPorts(); @@ -41,10 +40,10 @@ public class UnifiedCompositionUtil { return portTypeToIds; } - private static void addPortsToMap(Map<String, Set<String>> portTypeToIds, + private static void addPortsToMap(Map<String, List<String>> portTypeToIds, Map<String, List<String>> ports) { for (Map.Entry<String, List<String>> portTypeToIdEntry : ports.entrySet()) { - portTypeToIds.putIfAbsent(portTypeToIdEntry.getKey(), new HashSet<>()); + portTypeToIds.putIfAbsent(portTypeToIdEntry.getKey(), new ArrayList<>()); portTypeToIds.get(portTypeToIdEntry.getKey()).addAll(portTypeToIdEntry.getValue()); } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index dcfe1270ea..02a4cc6671 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -65,6 +65,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -300,7 +301,7 @@ public class BaseResourceTranslationTest { .getTypeComputeConsolidationData(computeType); Assert.assertNotNull(typeComputeConsolidationData); - Set<String> computeNodeTemplateIds = typeComputeConsolidationData + Collection<String> computeNodeTemplateIds = typeComputeConsolidationData .getAllComputeNodeTemplateIds(); Assert.assertNotNull(computeNodeTemplateIds); Assert.assertNotEquals(computeNodeTemplateIds.size(), 0); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml index 1e5d74c9ac..6025cd8344 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml @@ -441,9 +441,6 @@ resources: - fixed_ips - 0 - ip_address - fixed_ips: - - - ip_address: {get_param: [plt_oam_ips, 0]} security_groups: # get_param: plt_security_groups get_param: oam_security_groups @@ -795,15 +792,10 @@ resources: ip_address: get_attr: - 'network:io:vip:m004:m003' -# - 'network_io_vip_m004_m003' - fixed_ips - 0 - ip_address - fixed_ips: - - - ip_address: {get_param: [iox_oam_ips, 0]} security_groups: -# get_param: iox_security_groups get_param: oam_security_groups metadata: os_net: { get_param: oam_net_id } @@ -1162,9 +1154,6 @@ resources: get_param: vnf_name network: { get_param: oam_net_id } replacement_policy: AUTO - fixed_ips: - - - ip_address: {get_param: [app_oam_ips, 0]} security_groups: # get_param: app_security_groups @@ -1481,9 +1470,6 @@ resources: get_param: vnf_name network: { get_param: data_net_id } replacement_policy: AUTO - fixed_ips: - - - ip_address: {get_param: [app_data_v6_ips, 2]} security_groups: # get_param: app_security_groups get_param: data_security_groups 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 22ad2137d2..e26a807c29 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 @@ -631,11 +631,6 @@ topology_template: - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - port_app_data_0_port_fixed_ips: - - ip_address: - get_input: - - app_data_v6_ips - - 2 vm_image_name: get_input: app_image_name port_app_oam_0_port_name: @@ -666,9 +661,9 @@ topology_template: vf_module_name: get_input: vf_module_name port_app_data_0_port_ip_requirements: - - ip_version: 6 + - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_app_internal_0_port_allowed_address_pairs: @@ -834,11 +829,6 @@ topology_template: params: $vnf_name: get_input: vnf_name - port_iox_oam_0_port_fixed_ips: - - ip_address: - get_input: - - iox_oam_ips - - 0 compute_iox_name: - get_input: - iox_names @@ -882,7 +872,7 @@ topology_template: port_iox_oam_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_iox_data_0_port_network_role_tag: data @@ -1097,7 +1087,7 @@ topology_template: port_app_oam_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_app_internal_0_port_network: @@ -1117,11 +1107,6 @@ topology_template: params: $vnf_name: get_input: vnf_name - port_app_oam_0_port_fixed_ips: - - ip_address: - get_input: - - app_oam_ips - - 0 port_app_data_0_port_replacement_policy: - AUTO compute_app_name: @@ -1203,7 +1188,7 @@ topology_template: port_plt_oam_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_plt_data_0_port_mac_requirements: @@ -1246,11 +1231,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: true - port_plt_oam_0_port_fixed_ips: - - ip_address: - get_input: - - plt_oam_ips - - 0 port_plt_oam_0_port_network_role_tag: oam port_plt_internal_0_port_name: - str_replace: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml index 815fcb5582..6b96a09918 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml @@ -324,7 +324,9 @@ topology_template: subnetpoolid: get_input: port_app_oam_0_port_subnetpoolid fixed_ips: - get_input: port_app_oam_0_port_fixed_ips + get_input: + - port_app_oam_0_port_fixed_ips + - index_value name: get_input: - port_app_oam_0_port_name @@ -366,7 +368,9 @@ topology_template: subnetpoolid: get_input: port_app_data_0_port_subnetpoolid fixed_ips: - get_input: port_app_data_0_port_fixed_ips + get_input: + - port_app_data_0_port_fixed_ips + - index_value name: get_input: - port_app_data_0_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml index 1527056307..993bf81e24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml @@ -254,7 +254,9 @@ topology_template: subnetpoolid: get_input: port_iox_data_0_port_subnetpoolid fixed_ips: - get_input: port_iox_data_0_port_fixed_ips + get_input: + - port_iox_data_0_port_fixed_ips + - index_value name: get_input: - port_iox_data_0_port_name @@ -329,7 +331,9 @@ topology_template: subnetpoolid: get_input: port_iox_oam_0_port_subnetpoolid fixed_ips: - get_input: port_iox_oam_0_port_fixed_ips + get_input: + - port_iox_oam_0_port_fixed_ips + - index_value name: get_input: - port_iox_oam_0_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml index 1365084d4d..0b2fd5b0af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml @@ -296,7 +296,9 @@ topology_template: subnetpoolid: get_input: port_plt_data_0_port_subnetpoolid fixed_ips: - get_input: port_plt_data_0_port_fixed_ips + get_input: + - port_plt_data_0_port_fixed_ips + - index_value name: get_input: - port_plt_data_0_port_name @@ -371,7 +373,9 @@ topology_template: subnetpoolid: get_input: port_plt_oam_0_port_subnetpoolid fixed_ips: - get_input: port_plt_oam_0_port_fixed_ips + get_input: + - port_plt_oam_0_port_fixed_ips + - index_value name: get_input: - port_plt_oam_0_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 6384eaff7d..32b40f3146 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -156,7 +156,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t1_port_subnetpoolid fixed_ips: - get_input: port_1c1_t1_port_fixed_ips + get_input: + - port_1c1_t1_port_fixed_ips + - index_value name: get_input: - port_1c1_t1_port_name @@ -217,7 +219,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t2_port_subnetpoolid fixed_ips: - get_input: port_1c1_t2_port_fixed_ips + get_input: + - port_1c1_t2_port_fixed_ips + - index_value name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml index 87432d3911..b287b62a17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_3_subnetpoolid fixed_ips: - get_input: port_pcm_port_3_fixed_ips + get_input: + - port_pcm_port_3_fixed_ips + - index_value network: get_input: - port_pcm_port_3_network @@ -221,7 +223,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_2_subnetpoolid fixed_ips: - get_input: port_pcm_port_2_fixed_ips + get_input: + - port_pcm_port_2_fixed_ips + - index_value network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml index 4f927ee3a8..7cc130e234 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -178,7 +178,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_0_subnetpoolid fixed_ips: - get_input: port_pcm_port_0_fixed_ips + get_input: + - port_pcm_port_0_fixed_ips + - index_value network: get_input: - port_pcm_port_0_network @@ -212,7 +214,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_1_subnetpoolid fixed_ips: - get_input: port_pcm_port_1_fixed_ips + get_input: + - port_pcm_port_1_fixed_ips + - index_value network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 045f907605..048b1411a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -151,7 +151,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t1_port_subnetpoolid fixed_ips: - get_input: port_1c1_t1_port_fixed_ips + get_input: + - port_1c1_t1_port_fixed_ips + - index_value name: get_input: - port_1c1_t1_port_name @@ -208,7 +210,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t2_port_subnetpoolid fixed_ips: - get_input: port_1c1_t2_port_fixed_ips + get_input: + - port_1c1_t2_port_fixed_ips + - index_value name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 87432d3911..b287b62a17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_3_subnetpoolid fixed_ips: - get_input: port_pcm_port_3_fixed_ips + get_input: + - port_pcm_port_3_fixed_ips + - index_value network: get_input: - port_pcm_port_3_network @@ -221,7 +223,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_2_subnetpoolid fixed_ips: - get_input: port_pcm_port_2_fixed_ips + get_input: + - port_pcm_port_2_fixed_ips + - index_value network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index eda475a577..c38b966352 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -178,7 +178,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_0_subnetpoolid fixed_ips: - get_input: port_pcm_port_0_fixed_ips + get_input: + - port_pcm_port_0_fixed_ips + - index_value network: get_input: - port_pcm_port_0_network @@ -212,7 +214,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_1_subnetpoolid fixed_ips: - get_input: port_pcm_port_1_fixed_ips + get_input: + - port_pcm_port_1_fixed_ips + - index_value network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 045f907605..048b1411a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -151,7 +151,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t1_port_subnetpoolid fixed_ips: - get_input: port_1c1_t1_port_fixed_ips + get_input: + - port_1c1_t1_port_fixed_ips + - index_value name: get_input: - port_1c1_t1_port_name @@ -208,7 +210,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t2_port_subnetpoolid fixed_ips: - get_input: port_1c1_t2_port_fixed_ips + get_input: + - port_1c1_t2_port_fixed_ips + - index_value name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml index 87432d3911..b287b62a17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_3_subnetpoolid fixed_ips: - get_input: port_pcm_port_3_fixed_ips + get_input: + - port_pcm_port_3_fixed_ips + - index_value network: get_input: - port_pcm_port_3_network @@ -221,7 +223,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_2_subnetpoolid fixed_ips: - get_input: port_pcm_port_2_fixed_ips + get_input: + - port_pcm_port_2_fixed_ips + - index_value network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml index 4f927ee3a8..7cc130e234 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -178,7 +178,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_0_subnetpoolid fixed_ips: - get_input: port_pcm_port_0_fixed_ips + get_input: + - port_pcm_port_0_fixed_ips + - index_value network: get_input: - port_pcm_port_0_network @@ -212,7 +214,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_1_subnetpoolid fixed_ips: - get_input: port_pcm_port_1_fixed_ips + get_input: + - port_pcm_port_1_fixed_ips + - index_value network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 8bac2de625..988cd5e3b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -131,7 +131,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t1_port_subnetpoolid fixed_ips: - get_input: port_1c1_t1_port_fixed_ips + get_input: + - port_1c1_t1_port_fixed_ips + - index_value name: get_input: - port_1c1_t1_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index f4efa55581..b371d54354 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -108,7 +108,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t1_port_subnetpoolid fixed_ips: - get_input: port_1c1_t1_port_fixed_ips + get_input: + - port_1c1_t1_port_fixed_ips + - index_value name: get_input: - port_1c1_t1_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml index 87432d3911..b287b62a17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_3_subnetpoolid fixed_ips: - get_input: port_pcm_port_3_fixed_ips + get_input: + - port_pcm_port_3_fixed_ips + - index_value network: get_input: - port_pcm_port_3_network @@ -221,7 +223,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_2_subnetpoolid fixed_ips: - get_input: port_pcm_port_2_fixed_ips + get_input: + - port_pcm_port_2_fixed_ips + - index_value network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml index 4f927ee3a8..7cc130e234 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -178,7 +178,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_0_subnetpoolid fixed_ips: - get_input: port_pcm_port_0_fixed_ips + get_input: + - port_pcm_port_0_fixed_ips + - index_value network: get_input: - port_pcm_port_0_network @@ -212,7 +214,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_1_subnetpoolid fixed_ips: - get_input: port_pcm_port_1_fixed_ips + get_input: + - port_pcm_port_1_fixed_ips + - index_value network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml index eac65fb38a..6d9fc2d984 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index d89d169c09..833b7db72f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 8955ed13c6..8e4cc7a853 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index 176b539e5f..4df9815884 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_main_1b_port_fixed_ips + get_input: + - port_pd_server_main_1b_port_fixed_ips + - index_value network: get_input: - port_pd_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index ee5a1265f3..aebce2e03e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_main_1b_port_fixed_ips + get_input: + - port_pd_server_main_1b_port_fixed_ips + - index_value network: get_input: - port_pd_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 717221622a..4001321f04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_nested2_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_nested2_1b_port_fixed_ips + get_input: + - port_pd_server_nested2_1b_port_fixed_ips + - index_value network: get_input: - port_pd_server_nested2_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 157bc91ac1..a548689251 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_main_1b_port_fixed_ips + get_input: + - port_ps_server_main_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index bc7ddf35ac..441619e55a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_main_1b_port_fixed_ips + get_input: + - port_ps_server_main_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index 7038b40920..321073a360 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_nested2_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_nested2_1b_port_fixed_ips + get_input: + - port_ps_server_nested2_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_nested2_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml index 9080572950..04d15b6c5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_oam_server_port_network_role fixed_ips: - get_input: port_oam_server_port_fixed_ips + get_input: + - port_oam_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_oam_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml index c07fb4f39c..0acd6bd36f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_pd_server_port_network_role fixed_ips: - get_input: port_pd_server_port_fixed_ips + get_input: + - port_pd_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_pd_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml index 03780b84ee..81ff505e41 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml @@ -109,7 +109,9 @@ topology_template: network_role: get_input: port_ps_server_port_network_role fixed_ips: - get_input: port_ps_server_port_fixed_ips + get_input: + - port_ps_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_ps_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml index 4a43a24d9a..430a3a7d6c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_sm_server_port_network_role fixed_ips: - get_input: port_sm_server_port_fixed_ips + get_input: + - port_sm_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_sm_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index 24d5919d63..7a52164ac8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -109,7 +109,9 @@ topology_template: network_role: get_input: port_cmaui02_port_network_role fixed_ips: - get_input: port_cmaui02_port_fixed_ips + get_input: + - port_cmaui02_port_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui02_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 04bbb80287..23b20bfb0b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -109,7 +109,9 @@ topology_template: network_role: get_input: port_cmaui01_port_network_role fixed_ips: - get_input: port_cmaui01_port_fixed_ips + get_input: + - port_cmaui01_port_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui01_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index 89de9a58c7..b8f2ec2212 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -109,7 +109,9 @@ topology_template: network_role: get_input: port_oam02_port_network_role fixed_ips: - get_input: port_oam02_port_fixed_ips + get_input: + - port_oam02_port_fixed_ips + - index_value subnetpoolid: get_input: port_oam02_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index e3171800fb..1a18291c07 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -109,7 +109,9 @@ topology_template: network_role: get_input: port_oam01_port_network_role fixed_ips: - get_input: port_oam01_port_fixed_ips + get_input: + - port_oam01_port_fixed_ips + - index_value subnetpoolid: get_input: port_oam01_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index 416a517339..a873bba30a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_pd02_port_network_role fixed_ips: - get_input: port_pd02_port_fixed_ips + get_input: + - port_pd02_port_fixed_ips + - index_value subnetpoolid: get_input: port_pd02_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 4da339f039..6140c8d750 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_pd01_port_network_role fixed_ips: - get_input: port_pd01_port_fixed_ips + get_input: + - port_pd01_port_fixed_ips + - index_value subnetpoolid: get_input: port_pd01_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml index 72933b0307..73e9ca5745 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_BE_port_subnetpoolid fixed_ips: - get_input: port_BE_port_fixed_ips + get_input: + - port_BE_port_fixed_ips + - index_value network: get_input: - port_BE_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml index 03ec9f9166..1ff72bd1dc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml index f774f9a51b..d4e29804b6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -126,7 +126,9 @@ topology_template: subnetpoolid: get_input: port_oam_port_subnetpoolid fixed_ips: - get_input: port_oam_port_fixed_ips + get_input: + - port_oam_port_fixed_ips + - index_value network: get_input: - port_oam_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml index 3e11ea8a55..03a4b2139e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml @@ -107,7 +107,9 @@ topology_template: subnetpoolid: get_input: port_osm_port_subnetpoolid fixed_ips: - get_input: port_osm_port_fixed_ips + get_input: + - port_osm_port_fixed_ips + - index_value network: get_input: - port_osm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml index b6c2df19ef..113a7b3042 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_1b_port_fixed_ips + get_input: + - port_ps_server_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 61cb8462b1..ab151d515e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_1b_port_fixed_ips + get_input: + - port_pd_server_1b_port_fixed_ips + - index_value network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml index 0f083eeeb2..0cd9331bfd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_rd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_rd_server_1b_port_fixed_ips + get_input: + - port_rd_server_1b_port_fixed_ips + - index_value network: get_input: - port_rd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml index 37cc3ce481..560eb84fe9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_1b_port_fixed_ips + get_input: + - port_ps_server_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml index 26286c35f5..b43eaf085c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml index 039859ab0b..19588bd520 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_oam_port_subnetpoolid fixed_ips: - get_input: port_oam_port_fixed_ips + get_input: + - port_oam_port_fixed_ips + - index_value network: get_input: - port_oam_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml index fbb8c1912d..53bc450834 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_1b_port_fixed_ips + get_input: + - port_pd_server_1b_port_fixed_ips + - index_value network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml index 9f026f4b2e..6a2ec1c378 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_1b_port_fixed_ips + get_input: + - port_ps_server_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index 26286c35f5..b43eaf085c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index bd75e5b23f..f3d73a7950 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_oam_port_subnetpoolid fixed_ips: - get_input: port_oam_port_fixed_ips + get_input: + - port_oam_port_fixed_ips + - index_value network: get_input: - port_oam_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index fbb8c1912d..53bc450834 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_1b_port_fixed_ips + get_input: + - port_pd_server_1b_port_fixed_ips + - index_value network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index 9f026f4b2e..6a2ec1c378 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_1b_port_fixed_ips + get_input: + - port_ps_server_1b_port_fixed_ips + - index_value network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml index 788c99afe7..22d5751be7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml @@ -39,7 +39,6 @@ resources: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} - fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO cmaui_port_2: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index 628e583cdc..eb78053558 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 25ae9137c2..7e77e65af5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -80,11 +80,6 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 port_cmaui_port_network: - packet_internal_network vm_flavor_name: @@ -105,7 +100,7 @@ topology_template: port_cmaui_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index 628e583cdc..eb78053558 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_cmaui_port_subnetpoolid fixed_ips: - get_input: port_cmaui_port_fixed_ips + get_input: + - port_cmaui_port_fixed_ips + - index_value network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml index 599c465504..7e85a3b36c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_port_subnetpoolid fixed_ips: - get_input: port_pd_server_port_fixed_ips + get_input: + - port_pd_server_port_fixed_ips + - index_value network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml index f69a2c1f2b..c4f91c67a1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_port_subnetpoolid fixed_ips: - get_input: port_ps_server_port_fixed_ips + get_input: + - port_ps_server_port_fixed_ips + - index_value network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml index 81e7332182..faffcfb4aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_oam_server_port_subnetpoolid fixed_ips: - get_input: port_oam_server_port_fixed_ips + get_input: + - port_oam_server_port_fixed_ips + - index_value network: get_input: - port_oam_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml index 599c465504..7e85a3b36c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_pd_server_port_subnetpoolid fixed_ips: - get_input: port_pd_server_port_fixed_ips + get_input: + - port_pd_server_port_fixed_ips + - index_value network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml index f69a2c1f2b..c4f91c67a1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml @@ -102,7 +102,9 @@ topology_template: subnetpoolid: get_input: port_ps_server_port_subnetpoolid fixed_ips: - get_input: port_ps_server_port_fixed_ips + get_input: + - port_ps_server_port_fixed_ips + - index_value network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml index bdb3a94e06..57d6ce0980 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml @@ -117,7 +117,9 @@ topology_template: subnetpoolid: get_input: port_sm_server_port_subnetpoolid fixed_ips: - get_input: port_sm_server_port_fixed_ips + get_input: + - port_sm_server_port_fixed_ips + - index_value network: get_input: - port_sm_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml index 9080572950..04d15b6c5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_oam_server_port_network_role fixed_ips: - get_input: port_oam_server_port_fixed_ips + get_input: + - port_oam_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_oam_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml index c07fb4f39c..0acd6bd36f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_pd_server_port_network_role fixed_ips: - get_input: port_pd_server_port_fixed_ips + get_input: + - port_pd_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_pd_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml index 03780b84ee..81ff505e41 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml @@ -109,7 +109,9 @@ topology_template: network_role: get_input: port_ps_server_port_network_role fixed_ips: - get_input: port_ps_server_port_fixed_ips + get_input: + - port_ps_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_ps_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml index 4a43a24d9a..430a3a7d6c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml @@ -124,7 +124,9 @@ topology_template: network_role: get_input: port_sm_server_port_network_role fixed_ips: - get_input: port_sm_server_port_fixed_ips + get_input: + - port_sm_server_port_fixed_ips + - index_value subnetpoolid: get_input: port_sm_server_port_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index fc9676cc7a..4f2606ad61 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_cdi_ims_core_0_port_subnetpoolid fixed_ips: - get_input: port_cdi_ims_core_0_port_fixed_ips + get_input: + - port_cdi_ims_core_0_port_fixed_ips + - index_value name: get_input: - port_cdi_ims_core_0_port_name @@ -258,7 +260,9 @@ topology_template: subnetpoolid: get_input: port_cdi_internal_0_port_subnetpoolid fixed_ips: - get_input: port_cdi_internal_0_port_fixed_ips + get_input: + - port_cdi_internal_0_port_fixed_ips + - index_value name: get_input: - port_cdi_internal_0_port_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/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index b543f90372..ab2fb23db2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_cdi_internal_1_port_subnetpoolid fixed_ips: - get_input: port_cdi_internal_1_port_fixed_ips + get_input: + - port_cdi_internal_1_port_fixed_ips + - index_value name: get_input: - port_cdi_internal_1_port_name @@ -258,7 +260,9 @@ topology_template: subnetpoolid: get_input: port_cdi_ims_core_1_port_subnetpoolid fixed_ips: - get_input: port_cdi_ims_core_1_port_fixed_ips + get_input: + - port_cdi_ims_core_1_port_fixed_ips + - index_value name: get_input: - port_cdi_ims_core_1_port_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/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index 3c3da4e997..d413c1ff9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -377,7 +377,9 @@ topology_template: subnetpoolid: get_input: port_cif_internal_0_port_subnetpoolid fixed_ips: - get_input: port_cif_internal_0_port_fixed_ips + get_input: + - port_cif_internal_0_port_fixed_ips + - index_value name: get_input: - port_cif_internal_0_port_name @@ -417,7 +419,9 @@ topology_template: subnetpoolid: get_input: port_cif_ims_li_0_port_subnetpoolid fixed_ips: - get_input: port_cif_ims_li_0_port_fixed_ips + get_input: + - port_cif_ims_li_0_port_fixed_ips + - index_value name: get_input: - port_cif_ims_li_0_port_name @@ -457,7 +461,9 @@ topology_template: subnetpoolid: get_input: port_cif_ims_core_0_port_subnetpoolid fixed_ips: - get_input: port_cif_ims_core_0_port_fixed_ips + get_input: + - port_cif_ims_core_0_port_fixed_ips + - index_value name: get_input: - port_cif_ims_core_0_port_name @@ -497,7 +503,9 @@ topology_template: subnetpoolid: get_input: port_cif_oam_0_port_1_subnetpoolid fixed_ips: - get_input: port_cif_oam_0_port_1_fixed_ips + get_input: + - port_cif_oam_0_port_1_fixed_ips + - index_value name: get_input: - port_cif_oam_0_port_1_name @@ -537,7 +545,9 @@ topology_template: subnetpoolid: get_input: port_cif_oam_0_port_3_subnetpoolid fixed_ips: - get_input: port_cif_oam_0_port_3_fixed_ips + get_input: + - port_cif_oam_0_port_3_fixed_ips + - index_value name: get_input: - port_cif_oam_0_port_3_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/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index f1e5cf1023..380440f67c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -377,7 +377,9 @@ topology_template: subnetpoolid: get_input: port_cif_ims_li_1_port_subnetpoolid fixed_ips: - get_input: port_cif_ims_li_1_port_fixed_ips + get_input: + - port_cif_ims_li_1_port_fixed_ips + - index_value name: get_input: - port_cif_ims_li_1_port_name @@ -417,7 +419,9 @@ topology_template: subnetpoolid: get_input: port_cif_internal_1_port_subnetpoolid fixed_ips: - get_input: port_cif_internal_1_port_fixed_ips + get_input: + - port_cif_internal_1_port_fixed_ips + - index_value name: get_input: - port_cif_internal_1_port_name @@ -457,7 +461,9 @@ topology_template: subnetpoolid: get_input: port_cif_oam_1_port_1_subnetpoolid fixed_ips: - get_input: port_cif_oam_1_port_1_fixed_ips + get_input: + - port_cif_oam_1_port_1_fixed_ips + - index_value name: get_input: - port_cif_oam_1_port_1_name @@ -497,7 +503,9 @@ topology_template: subnetpoolid: get_input: port_cif_ims_core_1_port_subnetpoolid fixed_ips: - get_input: port_cif_ims_core_1_port_fixed_ips + get_input: + - port_cif_ims_core_1_port_fixed_ips + - index_value name: get_input: - port_cif_ims_core_1_port_name @@ -537,7 +545,9 @@ topology_template: subnetpoolid: get_input: port_cif_oam_1_port_3_subnetpoolid fixed_ips: - get_input: port_cif_oam_1_port_3_fixed_ips + get_input: + - port_cif_oam_1_port_3_fixed_ips + - index_value name: get_input: - port_cif_oam_1_port_3_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/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index a2c4af5daf..4e544f5c9c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -235,7 +235,9 @@ topology_template: subnetpoolid: get_input: port_lbd_ims_core_1_port_subnetpoolid fixed_ips: - get_input: port_lbd_ims_core_1_port_fixed_ips + get_input: + - port_lbd_ims_core_1_port_fixed_ips + - index_value name: get_input: - port_lbd_ims_core_1_port_name @@ -275,7 +277,9 @@ topology_template: subnetpoolid: get_input: port_lbd_dpdk_1_port_subnetpoolid fixed_ips: - get_input: port_lbd_dpdk_1_port_fixed_ips + get_input: + - port_lbd_dpdk_1_port_fixed_ips + - index_value name: get_input: - port_lbd_dpdk_1_port_name @@ -311,7 +315,9 @@ topology_template: network_role: get_input: port_lbd_internal_1_port_network_role fixed_ips: - get_input: port_lbd_internal_1_port_fixed_ips + get_input: + - port_lbd_internal_1_port_fixed_ips + - index_value subnetpoolid: get_input: port_lbd_internal_1_port_subnetpoolid 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/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 64e5bdd8eb..86141e1fb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -235,7 +235,9 @@ topology_template: subnetpoolid: get_input: port_lbd_ims_core_0_port_subnetpoolid fixed_ips: - get_input: port_lbd_ims_core_0_port_fixed_ips + get_input: + - port_lbd_ims_core_0_port_fixed_ips + - index_value name: get_input: - port_lbd_ims_core_0_port_name @@ -275,7 +277,9 @@ topology_template: subnetpoolid: get_input: port_lbd_dpdk_0_port_subnetpoolid fixed_ips: - get_input: port_lbd_dpdk_0_port_fixed_ips + get_input: + - port_lbd_dpdk_0_port_fixed_ips + - index_value name: get_input: - port_lbd_dpdk_0_port_name @@ -311,7 +315,9 @@ topology_template: network_role: get_input: port_lbd_internal_0_port_network_role fixed_ips: - get_input: port_lbd_internal_0_port_fixed_ips + get_input: + - port_lbd_internal_0_port_fixed_ips + - index_value subnetpoolid: get_input: port_lbd_internal_0_port_subnetpoolid 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/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index ec7944d0f8..0925522b81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_oam_oam_0_port_subnetpoolid fixed_ips: - get_input: port_oam_oam_0_port_fixed_ips + get_input: + - port_oam_oam_0_port_fixed_ips + - index_value name: get_input: - port_oam_oam_0_port_name @@ -227,7 +229,9 @@ topology_template: subnetpoolid: get_input: port_oam_internal_0_port_subnetpoolid fixed_ips: - get_input: port_oam_internal_0_port_fixed_ips + get_input: + - port_oam_internal_0_port_fixed_ips + - index_value name: get_input: - port_oam_internal_0_port_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/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index f9da32d654..44fd3f4e6c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_oam_internal_1_port_subnetpoolid fixed_ips: - get_input: port_oam_internal_1_port_fixed_ips + get_input: + - port_oam_internal_1_port_fixed_ips + - index_value name: get_input: - port_oam_internal_1_port_name @@ -227,7 +229,9 @@ topology_template: subnetpoolid: get_input: port_oam_oam_1_port_subnetpoolid fixed_ips: - get_input: port_oam_oam_1_port_fixed_ips + get_input: + - port_oam_oam_1_port_fixed_ips + - index_value name: get_input: - port_oam_oam_1_port_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/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index 21a53aedc7..d5e960758c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_oam_internal_2_port_subnetpoolid fixed_ips: - get_input: port_oam_internal_2_port_fixed_ips + get_input: + - port_oam_internal_2_port_fixed_ips + - index_value name: get_input: - port_oam_internal_2_port_name @@ -227,7 +229,9 @@ topology_template: subnetpoolid: get_input: port_oam_oam_2_port_subnetpoolid fixed_ips: - get_input: port_oam_oam_2_port_fixed_ips + get_input: + - port_oam_oam_2_port_fixed_ips + - index_value name: get_input: - port_oam_oam_2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml index c73e74aaca..c457e4de3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml @@ -157,7 +157,9 @@ topology_template: network_role: get_input: port_cmaui_port_5_network_role fixed_ips: - get_input: port_cmaui_port_5_fixed_ips + get_input: + - port_cmaui_port_5_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui_port_5_subnetpoolid network: @@ -195,7 +197,9 @@ topology_template: network_role: get_input: port_cmaui_port_6_network_role fixed_ips: - get_input: port_cmaui_port_6_fixed_ips + get_input: + - port_cmaui_port_6_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui_port_6_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml index cea4ae985c..88e7795e76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml @@ -157,7 +157,9 @@ topology_template: network_role: get_input: port_cmaui_port_4_network_role fixed_ips: - get_input: port_cmaui_port_4_fixed_ips + get_input: + - port_cmaui_port_4_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui_port_4_subnetpoolid network: @@ -195,7 +197,9 @@ topology_template: network_role: get_input: port_cmaui_port_3_network_role fixed_ips: - get_input: port_cmaui_port_3_fixed_ips + get_input: + - port_cmaui_port_3_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui_port_3_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml index 3c0a520290..2b0f9eec43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml @@ -157,7 +157,9 @@ topology_template: network_role: get_input: port_cmaui_port_1_network_role fixed_ips: - get_input: port_cmaui_port_1_fixed_ips + get_input: + - port_cmaui_port_1_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui_port_1_subnetpoolid network: @@ -195,7 +197,9 @@ topology_template: network_role: get_input: port_cmaui_port_2_network_role fixed_ips: - get_input: port_cmaui_port_2_fixed_ips + get_input: + - port_cmaui_port_2_fixed_ips + - index_value subnetpoolid: get_input: port_cmaui_port_2_subnetpoolid network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml index 4252b6221d..0db0a41bd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml @@ -135,7 +135,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_subnetpoolid fixed_ips: - get_input: port_pcm_port_fixed_ips + get_input: + - port_pcm_port_fixed_ips + - index_value network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 4252b6221d..0db0a41bd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -135,7 +135,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_subnetpoolid fixed_ips: - get_input: port_pcm_port_fixed_ips + get_input: + - port_pcm_port_fixed_ips + - index_value network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 8d5b37f4cb..8b9d88dd85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -135,7 +135,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_subnetpoolid fixed_ips: - get_input: port_pcm_port_fixed_ips + get_input: + - port_pcm_port_fixed_ips + - index_value network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index d27e8377ac..41ee8c066f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -448,7 +448,9 @@ topology_template: subnetpoolid: get_input: port_pd01_port_subnetpoolid fixed_ips: - get_input: port_pd01_port_fixed_ips + get_input: + - port_pd01_port_fixed_ips + - index_value name: get_input: - port_pd01_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index ced7dda003..ad54850b6d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -233,7 +233,9 @@ topology_template: subnetpoolid: get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB1_OAM_fixed_ips + get_input: + - port_FSB1_OAM_fixed_ips + - index_value network: get_input: - port_FSB1_OAM_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index 275c862d1c..3adeccc7b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -227,7 +227,9 @@ topology_template: subnetpoolid: get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB1_OAM_fixed_ips + get_input: + - port_FSB1_OAM_fixed_ips + - index_value network: get_input: - port_FSB1_OAM_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index 75d268da56..a39d91f6d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -227,7 +227,9 @@ topology_template: subnetpoolid: get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB1_OAM_fixed_ips + get_input: + - port_FSB1_OAM_fixed_ips + - index_value network: get_input: - port_FSB1_OAM_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index 843fe6c3b9..169b232c23 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -212,7 +212,9 @@ topology_template: subnetpoolid: get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB1_OAM_fixed_ips + get_input: + - port_FSB1_OAM_fixed_ips + - index_value network: get_input: - port_FSB1_OAM_network |