diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceConsolidationDataHandler.java')
1 files changed, 57 insertions, 95 deletions
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/SubInterfaceConsolidationDataHandler.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceConsolidationDataHandler.java index d1b4148672..dc79cf91c9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceConsolidationDataHandler.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceConsolidationDataHandler.java @@ -13,13 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation; import java.util.Map; import java.util.Objects; import java.util.Optional; - import org.apache.commons.collections4.MapUtils; import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; @@ -41,56 +39,42 @@ public class SubInterfaceConsolidationDataHandler implements ConsolidationDataHa @Override public void addNodesConnectedOut(TranslateTo translateTo, String nodeTemplateId, String requirementId, - RequirementAssignment requirementAssignment) { + RequirementAssignment requirementAssignment) { ServiceTemplate serviceTemplate = translateTo.getServiceTemplate(); - if (Objects.nonNull( - serviceTemplate.getTopology_template().getNode_templates().get(translateTo.getTranslatedId()))) { - Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = - getSubInterfaceTemplateConsolidationData(translateTo, translateTo.getTranslatedId()); - - subInterfaceTemplateConsolidationData.ifPresent(consolidationData -> - consolidationData.addNodesConnectedOut(nodeTemplateId, requirementId, requirementAssignment)); + if (Objects.nonNull(serviceTemplate.getTopology_template().getNode_templates().get(translateTo.getTranslatedId()))) { + Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = getSubInterfaceTemplateConsolidationData( + translateTo, translateTo.getTranslatedId()); + subInterfaceTemplateConsolidationData + .ifPresent(consolidationData -> consolidationData.addNodesConnectedOut(nodeTemplateId, requirementId, requirementAssignment)); } } @Override - public void addNodesConnectedIn(TranslateTo translateTo, String sourceNodeTemplateId, - String dependentNodeTemplateId, String targetResourceId, - String requirementId, RequirementAssignment requirementAssignment) { + public void addNodesConnectedIn(TranslateTo translateTo, String sourceNodeTemplateId, String dependentNodeTemplateId, String targetResourceId, + String requirementId, RequirementAssignment requirementAssignment) { ServiceTemplate serviceTemplate = translateTo.getServiceTemplate(); TranslationContext translationContext = translateTo.getContext(); Resource targetResource = translateTo.getHeatOrchestrationTemplate().getResources().get(targetResourceId); - TranslateTo subInterfaceTo = new TranslateTo(translateTo.getHeatFileName(), serviceTemplate, - translateTo.getHeatOrchestrationTemplate(), targetResource, - targetResourceId, null, translationContext); - Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = - getSubInterfaceTemplateConsolidationData(subInterfaceTo, targetResourceId); - - subInterfaceTemplateConsolidationData.ifPresent(consolidationData -> - consolidationData.addNodesConnectedIn(sourceNodeTemplateId, requirementId, requirementAssignment)); - + TranslateTo subInterfaceTo = new TranslateTo(translateTo.getHeatFileName(), serviceTemplate, translateTo.getHeatOrchestrationTemplate(), + targetResource, targetResourceId, null, translationContext); + Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = getSubInterfaceTemplateConsolidationData( + subInterfaceTo, targetResourceId); + subInterfaceTemplateConsolidationData + .ifPresent(consolidationData -> consolidationData.addNodesConnectedIn(sourceNodeTemplateId, requirementId, requirementAssignment)); } @Override - public void removeParamNameFromAttrFuncList(ServiceTemplate serviceTemplate, - HeatOrchestrationTemplate heatOrchestrationTemplate, - String paramName, String contrailSharedResourceId, - String sharedTranslatedResourceId) { - - - throw new UnsupportedOperationException( - "API removeParamNameFromAttrFuncList doesn't supported for SubInterfaceConsolidationDataHandler"); + public void removeParamNameFromAttrFuncList(ServiceTemplate serviceTemplate, HeatOrchestrationTemplate heatOrchestrationTemplate, + String paramName, String contrailSharedResourceId, String sharedTranslatedResourceId) { + throw new UnsupportedOperationException("API removeParamNameFromAttrFuncList doesn't supported for SubInterfaceConsolidationDataHandler"); } @Override - public void addNodesGetAttrOut(FunctionTranslator functionTranslator, String nodeTemplateId, - String resourceTranslatedId, String propertyName, String attributeName) { - TranslateTo subInterfaceTo = createTranslateTo(functionTranslator, functionTranslator.getResourceId(), - resourceTranslatedId); - - Optional<SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData = - getSubInterfaceTemplateConsolidationData(subInterfaceTo, resourceTranslatedId); - + public void addNodesGetAttrOut(FunctionTranslator functionTranslator, String nodeTemplateId, String resourceTranslatedId, String propertyName, + String attributeName) { + TranslateTo subInterfaceTo = createTranslateTo(functionTranslator, functionTranslator.getResourceId(), resourceTranslatedId); + Optional<SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData = getSubInterfaceTemplateConsolidationData(subInterfaceTo, + resourceTranslatedId); subInterfaceConsolidationData.ifPresent(consolidationData -> { GetAttrFuncData getAttrFuncData = createGetAttrFuncData(propertyName, attributeName); consolidationData.addNodesGetAttrOut(nodeTemplateId, getAttrFuncData); @@ -98,15 +82,11 @@ public class SubInterfaceConsolidationDataHandler implements ConsolidationDataHa } @Override - public void addNodesGetAttrIn(FunctionTranslator functionTranslator,String nodeTemplateId, String targetResourceId, - String targetResourceTranslatedId, String propertyName, String attributeName) { - - TranslateTo subInterfaceTo = createTranslateTo(functionTranslator, targetResourceId, - targetResourceTranslatedId); - - Optional<SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData = - getSubInterfaceTemplateConsolidationData(subInterfaceTo, targetResourceTranslatedId); - + public void addNodesGetAttrIn(FunctionTranslator functionTranslator, String nodeTemplateId, String targetResourceId, + String targetResourceTranslatedId, String propertyName, String attributeName) { + TranslateTo subInterfaceTo = createTranslateTo(functionTranslator, targetResourceId, targetResourceTranslatedId); + Optional<SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData = getSubInterfaceTemplateConsolidationData(subInterfaceTo, + targetResourceTranslatedId); subInterfaceConsolidationData.ifPresent(consolidationData -> { GetAttrFuncData getAttrFuncData = createGetAttrFuncData(propertyName, attributeName); consolidationData.addNodesGetAttrIn(nodeTemplateId, getAttrFuncData); @@ -114,14 +94,11 @@ public class SubInterfaceConsolidationDataHandler implements ConsolidationDataHa } @Override - public void addOutputParamGetAttrIn(FunctionTranslator functionTranslator, String targetResourceId, - String targetResourceTranslatedId, String propertyName, String attributeName) { - TranslateTo subInterfaceTo = createTranslateTo(functionTranslator, targetResourceId, - targetResourceTranslatedId); - - Optional<SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData = - getSubInterfaceTemplateConsolidationData(subInterfaceTo, targetResourceTranslatedId); - + public void addOutputParamGetAttrIn(FunctionTranslator functionTranslator, String targetResourceId, String targetResourceTranslatedId, + String propertyName, String attributeName) { + TranslateTo subInterfaceTo = createTranslateTo(functionTranslator, targetResourceId, targetResourceTranslatedId); + Optional<SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData = getSubInterfaceTemplateConsolidationData(subInterfaceTo, + targetResourceTranslatedId); subInterfaceConsolidationData.ifPresent(consolidationData -> { GetAttrFuncData getAttrFuncData = createGetAttrFuncData(propertyName, attributeName); consolidationData.addOutputParamGetAttrIn(getAttrFuncData); @@ -129,77 +106,62 @@ public class SubInterfaceConsolidationDataHandler implements ConsolidationDataHa } public void setNetworkRole(TranslateTo translateTo, String translatedId, String networkRole) { - Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = - getSubInterfaceTemplateConsolidationData(translateTo, translatedId); - - subInterfaceTemplateConsolidationData.ifPresent( - consolidationData -> consolidationData.setNetworkRole(networkRole)); + Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = getSubInterfaceTemplateConsolidationData(translateTo, + translatedId); + subInterfaceTemplateConsolidationData.ifPresent(consolidationData -> consolidationData.setNetworkRole(networkRole)); } - public void setResourceGroupCount(TranslateTo translateTo, String translatedId, - Object resourceGroupCount) { - Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = - getSubInterfaceTemplateConsolidationData(translateTo, translatedId); - - subInterfaceTemplateConsolidationData.ifPresent( - consolidationData -> consolidationData.setResourceGroupCount(resourceGroupCount)); + public void setResourceGroupCount(TranslateTo translateTo, String translatedId, Object resourceGroupCount) { + Optional<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationData = getSubInterfaceTemplateConsolidationData(translateTo, + translatedId); + subInterfaceTemplateConsolidationData.ifPresent(consolidationData -> consolidationData.setResourceGroupCount(resourceGroupCount)); } - private Optional<SubInterfaceTemplateConsolidationData> getSubInterfaceTemplateConsolidationData( - TranslateTo subInterfaceTo, String subInterfaceNodeTemplateId) { - Optional<String> parentPortNodeTemplateId = - HeatToToscaUtil.getSubInterfaceParentPortNodeTemplateId(subInterfaceTo); - return parentPortNodeTemplateId.map(s -> getSubInterfaceTemplateConsolidationData(subInterfaceTo, - s, subInterfaceNodeTemplateId)); + private Optional<SubInterfaceTemplateConsolidationData> getSubInterfaceTemplateConsolidationData(TranslateTo subInterfaceTo, + String subInterfaceNodeTemplateId) { + Optional<String> parentPortNodeTemplateId = HeatToToscaUtil.getSubInterfaceParentPortNodeTemplateId(subInterfaceTo); + return parentPortNodeTemplateId.map(s -> getSubInterfaceTemplateConsolidationData(subInterfaceTo, s, subInterfaceNodeTemplateId)); } private SubInterfaceTemplateConsolidationData getSubInterfaceTemplateConsolidationData(TranslateTo subInterfaceTo, - String parentPortNodeTemplateId, String subInterfaceNodeTemplateId) { + String parentPortNodeTemplateId, + String subInterfaceNodeTemplateId) { String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(subInterfaceTo.getServiceTemplate()); Resource resource = subInterfaceTo.getResource(); Optional<String> portResourceId = getPortResourceId(subInterfaceTo, parentPortNodeTemplateId); - if (portResourceId.isPresent()) { String portResourceType = getPortResourceType(subInterfaceTo, portResourceId.get()); return portConsolidationData - .addSubInterfaceTemplateConsolidationData(serviceTemplateFileName, resource, - subInterfaceNodeTemplateId, parentPortNodeTemplateId, - portResourceId.get(), portResourceType); + .addSubInterfaceTemplateConsolidationData(serviceTemplateFileName, resource, subInterfaceNodeTemplateId, parentPortNodeTemplateId, + portResourceId.get(), portResourceType); } else { return portConsolidationData - .addSubInterfaceTemplateConsolidationData(serviceTemplateFileName, resource, - subInterfaceNodeTemplateId, parentPortNodeTemplateId); + .addSubInterfaceTemplateConsolidationData(serviceTemplateFileName, resource, subInterfaceNodeTemplateId, parentPortNodeTemplateId); } } private String getPortResourceType(TranslateTo subInterfaceTo, String portResourceId) { - return HeatToToscaUtil.getResourceType(portResourceId, subInterfaceTo - .getHeatOrchestrationTemplate(), subInterfaceTo.getHeatFileName()); + return HeatToToscaUtil.getResourceType(portResourceId, subInterfaceTo.getHeatOrchestrationTemplate(), subInterfaceTo.getHeatFileName()); } private Optional<String> getPortResourceId(TranslateTo subInterfaceTo, String parentPortNodeTemplateId) { - Map<String, String> resourceIdTranslatedResourceIdMap = - subInterfaceTo.getContext().getTranslatedIds().get(subInterfaceTo.getHeatFileName()); - return getSubInterfaceParentPortResourceId(parentPortNodeTemplateId, - resourceIdTranslatedResourceIdMap); + Map<String, String> resourceIdTranslatedResourceIdMap = subInterfaceTo.getContext().getTranslatedIds().get(subInterfaceTo.getHeatFileName()); + return getSubInterfaceParentPortResourceId(parentPortNodeTemplateId, resourceIdTranslatedResourceIdMap); } private Optional<String> getSubInterfaceParentPortResourceId(String parentPortNodeTemplateId, - Map<String, String> resourceIdTranslatedResourceIdMap) { + Map<String, String> resourceIdTranslatedResourceIdMap) { if (MapUtils.isEmpty(resourceIdTranslatedResourceIdMap)) { return Optional.empty(); } - return resourceIdTranslatedResourceIdMap.entrySet().stream() - .filter(entry -> entry.getValue().equals(parentPortNodeTemplateId)) - .findFirst().map(Map.Entry::getKey); + return resourceIdTranslatedResourceIdMap.entrySet().stream().filter(entry -> entry.getValue().equals(parentPortNodeTemplateId)).findFirst() + .map(Map.Entry::getKey); } - private TranslateTo createTranslateTo(FunctionTranslator functionTranslator, String resourceId, - String resourceTranslatedId) { + private TranslateTo createTranslateTo(FunctionTranslator functionTranslator, String resourceId, String resourceTranslatedId) { Resource resource = functionTranslator.getHeatOrchestrationTemplate().getResources().get(resourceId); - return new TranslateTo(ToscaUtil.getServiceTemplateFileName(functionTranslator.getServiceTemplate()), - functionTranslator.getServiceTemplate(), functionTranslator.getHeatOrchestrationTemplate(), - resource, resourceId, resourceTranslatedId, functionTranslator.getContext()); + return new TranslateTo(ToscaUtil.getServiceTemplateFileName(functionTranslator.getServiceTemplate()), functionTranslator.getServiceTemplate(), + functionTranslator.getHeatOrchestrationTemplate(), resource, resourceId, resourceTranslatedId, functionTranslator.getContext()); } private GetAttrFuncData createGetAttrFuncData(String propertyName, String attributeName) { |