diff options
Diffstat (limited to 'openecomp-be')
14 files changed, 0 insertions, 241 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java index 459c44e117..3455204b69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java @@ -30,7 +30,6 @@ import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -60,7 +59,6 @@ import java.util.function.Predicate; abstract class BaseResourceConnection<T> { protected static Logger logger = (Logger) LoggerFactory.getLogger(BaseResourceConnection.class); - protected static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage(); protected TranslateTo translateTo; FileData nestedFileData; NodeTemplate substitutionNodeTemplate; @@ -132,10 +130,6 @@ abstract class BaseResourceConnection<T> { nestedHeatOrchestrationTemplate, String nestedHeatFileName, Map.Entry<String, T> connectionPointEntry) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> connectionParameterNameList = new ArrayList<>(); String mappedTranslatedResourceId = getMappedNodeTranslatedResourceId(nestedServiceTemplate, connectionPointEntry); @@ -177,13 +171,9 @@ abstract class BaseResourceConnection<T> { } } } - - mdcDataDebugMessage.debugExitMessage(null, null); return connectionParameterNameList; } } - - mdcDataDebugMessage.debugExitMessage(null, null); return null; } @@ -191,10 +181,6 @@ abstract class BaseResourceConnection<T> { HeatOrchestrationTemplate nestedHeatOrchestrationTemplate, String nestedHeatFileName) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> params = new ArrayList<>(); Optional<List<Map.Entry<String, Resource>>> heatResources = getResourceByTranslatedResourceId(translatedResourceId, nestedHeatOrchestrationTemplate); @@ -209,8 +195,6 @@ abstract class BaseResourceConnection<T> { } } } - - mdcDataDebugMessage.debugExitMessage(null, null); return params; } @@ -236,8 +220,6 @@ abstract class BaseResourceConnection<T> { RequirementAssignment createRequirementAssignment(Map.Entry<String, RequirementDefinition> requirementEntry, String node, NodeTemplate nodeTemplate) { - - mdcDataDebugMessage.debugEntryMessage(null, null); RequirementAssignment requirementAssignment = null; if (Objects.nonNull(node)) { requirementAssignment = new RequirementAssignment(); @@ -247,7 +229,6 @@ abstract class BaseResourceConnection<T> { DataModelUtil .addRequirementAssignment(nodeTemplate, requirementEntry.getKey(), requirementAssignment); } - mdcDataDebugMessage.debugExitMessage(null, null); return requirementAssignment; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java index 65b1d469ab..d906ff1401 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java @@ -76,10 +76,6 @@ public class ContrailV2VlanToInterfaceResourceConnection HeatOrchestrationTemplate nestedHeatOrchestrationTemplate, String nestedHeatFileName) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> interfaces = new ArrayList<>(); Object interfaceRefs = heatResource.getProperties().get(HeatConstants.VMI_REFS_PROPERTY_NAME); if (Objects.isNull(interfaceRefs) || !(interfaceRefs instanceof List) @@ -104,8 +100,6 @@ public class ContrailV2VlanToInterfaceResourceConnection && attachedInterfaceResource.get().getEntityId() instanceof String) { interfaces.add((String) attachedInterfaceResource.get().getEntityId()); } - - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(interfaces); } @@ -118,10 +112,6 @@ public class ContrailV2VlanToInterfaceResourceConnection protected void addRequirementToConnectResources( Map.Entry<String, RequirementDefinition> requirementDefinitionEntry, List<String> paramNames) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (paramNames == null || paramNames.isEmpty()) { return; } @@ -135,8 +125,6 @@ public class ContrailV2VlanToInterfaceResourceConnection addRequirementToConnectResource(requirementDefinitionEntry, paramName, paramValue, supportedInterfaceTypes); } - - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -145,10 +133,6 @@ public class ContrailV2VlanToInterfaceResourceConnection String connectionPointId, Resource connectedResource, List<String> supportedTypes) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (!resourceTranslationBase.isResourceTypeSupported(connectedResource, supportedTypes) || (new ContrailV2VirtualMachineInterfaceHelper() .isVlanSubInterfaceResource(connectedResource))) { @@ -160,12 +144,8 @@ public class ContrailV2VlanToInterfaceResourceConnection + "' that connect vmi vlan sub interface to interface. Supported types are: '" + supportedTypes.toString() + "' (excluding Vlan), therefore, this TOSCA requirement will" + " not be connected."); - - mdcDataDebugMessage.debugExitMessage(null, null); return false; } - - mdcDataDebugMessage.debugExitMessage(null, null); return true; } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java index 5afbf5be54..69983e4b9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java @@ -76,10 +76,6 @@ public class ContrailV2VmInterfaceToNetResourceConnection HeatOrchestrationTemplate nestedHeatOrchestrationTemplate, String nestedHeatFileName) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> networks = new ArrayList<>(); Object virtualNetworkRefs = heatResource.getProperties().get("virtual_network_refs"); if (Objects.isNull(virtualNetworkRefs) || !(virtualNetworkRefs instanceof List) @@ -103,8 +99,6 @@ public class ContrailV2VmInterfaceToNetResourceConnection && network.get().getEntityId() instanceof String) { networks.add((String) network.get().getEntityId()); } - - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(networks); } @@ -117,10 +111,6 @@ public class ContrailV2VmInterfaceToNetResourceConnection protected void addRequirementToConnectResources( Map.Entry<String, RequirementDefinition> requirementDefinitionEntry, List<String> paramNames) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (paramNames == null || paramNames.isEmpty()) { return; } @@ -133,8 +123,6 @@ public class ContrailV2VmInterfaceToNetResourceConnection addRequirementToConnectResource(requirementDefinitionEntry, paramName, paramValue, supportedNetworkTypes); } - - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -143,10 +131,6 @@ public class ContrailV2VmInterfaceToNetResourceConnection String connectionPointId, Resource connectedResource, List<String> supportedTypes) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (!resourceTranslationBase.isResourceTypeSupported(connectedResource, supportedTypes)) { logger.warn("Nested resource '" + nestedResourceId + "' property '" + nestedPropertyName + "' is pointing to a resource with type '" + connectedResource.getType() @@ -154,12 +138,8 @@ public class ContrailV2VmInterfaceToNetResourceConnection + "' that connect virtual machine interface to network. Supported types are: '" + supportedTypes.toString() + "', therefore, this TOSCA requirement will not be connected."); - - mdcDataDebugMessage.debugExitMessage(null, null); return false; } - - mdcDataDebugMessage.debugExitMessage(null, null); return true; } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java index 496341e11f..f1b64a195c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java @@ -95,17 +95,14 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp String nestedHeatFileName) { - mdcDataDebugMessage.debugEntryMessage(null, null); Optional<AttachedResourceId> volumeId = HeatToToscaUtil .extractAttachedResourceId(nestedFileData.getFile(), nestedHeatOrchestrationTemplate, translateTo.getContext(), heatResource.getProperties().get("volume_id")); if (volumeId.isPresent() && volumeId.get().isGetParam() && volumeId.get().getEntityId() instanceof String) { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(Collections.singletonList((String) volumeId.get().getEntityId())); } else { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.empty(); } } @@ -121,7 +118,6 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp List<String> paramNames) { - mdcDataDebugMessage.debugEntryMessage(null, null); if (paramNames == null || paramNames.isEmpty()) { return; @@ -136,7 +132,6 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp supportedVolumeTypes); } - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -147,7 +142,6 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp List<String> supportedTypes) { - mdcDataDebugMessage.debugEntryMessage(null, null); if (!resourceTranslationBase.isResourceTypeSupported(connectedResource, supportedTypes)) { logger.warn("Nested resource '" + nestedResourceId + "' property '" + nestedPropertyName @@ -157,11 +151,9 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp + supportedTypes.toString() + "', therefore, this TOSCA requirement will not be connected."); - mdcDataDebugMessage.debugExitMessage(null, null); return false; } - mdcDataDebugMessage.debugExitMessage(null, null); return true; } @@ -170,7 +162,6 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp String translatedResourceId, HeatOrchestrationTemplate nestedHeatOrchestrationTemplate) { - mdcDataDebugMessage.debugEntryMessage(null, null); List<Predicate<Map.Entry<String, Resource>>> predicates = buildPredicates(nestedFileData.getFile(), nestedHeatOrchestrationTemplate, @@ -183,10 +174,8 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp .allMatch(p -> p.test(entry))) .collect(Collectors.toList()); if (CollectionUtils.isEmpty(list)) { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.empty(); } else { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(list); } } @@ -197,7 +186,6 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp List<String> supportedTargetNodeTypes) { - mdcDataDebugMessage.debugEntryMessage(null, null); Optional<String> targetTranslatedNodeId = super .getConnectionTranslatedNodeUsingGetParamFunc(requirementDefinitionEntry, paramName, @@ -225,14 +213,12 @@ class NovaToVolResourceConnection extends ResourceConnectionUsingRequirementHelp .getFileDataContainingVolume(fileData.get().getData(), (String) resourceId.getEntityId(), translateTo, FileData.Type.HEAT_VOL); if (fileDataContainingResource.isPresent()) { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(fileDataContainingResource.get().getTranslatedResourceId()); } } } } - mdcDataDebugMessage.debugExitMessage(null, null); 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/impl/resourcetranslation/PortToNetResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java index 25a604469e..06d338d6d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java @@ -72,10 +72,6 @@ public class PortToNetResourceConnection extends ResourceConnectionUsingRequirem HeatOrchestrationTemplate nestedHeatOrchestrationTemplate, String nestedHeatFileName) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - Optional<AttachedResourceId> network = HeatToToscaUtil .extractAttachedResourceId(nestedHeatFileName, nestedHeatOrchestrationTemplate, translateTo.getContext(), heatResource.getProperties().get("network")); @@ -89,10 +85,8 @@ public class PortToNetResourceConnection extends ResourceConnectionUsingRequirem if (network.isPresent() && network.get().isGetParam() && network.get().getEntityId() instanceof String) { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(Collections.singletonList((String) network.get().getEntityId())); } else { - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.empty(); } } @@ -107,10 +101,6 @@ public class PortToNetResourceConnection extends ResourceConnectionUsingRequirem protected void addRequirementToConnectResources( Map.Entry<String, RequirementDefinition> requirementDefinitionEntry, List<String> paramNames) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (paramNames == null || paramNames.isEmpty()) { return; } @@ -125,8 +115,6 @@ public class PortToNetResourceConnection extends ResourceConnectionUsingRequirem addRequirementToConnectResource(requirementDefinitionEntry, paramName, paramValue, supportedNetworkTypes); - - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -135,22 +123,14 @@ public class PortToNetResourceConnection extends ResourceConnectionUsingRequirem String connectionPointId, Resource connectedResource, List<String> supportedTypes) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (!resourceTranslationBase.isResourceTypeSupported(connectedResource, supportedTypes)) { logger.warn("Nested resource '" + nestedResourceId + "' property '" + nestedPropertyName + "' is pointing to a resource with type '" + connectedResource.getType() + "' which is not supported for requirement '" + connectionPointId + "' that connect port to network. Supported types are: '" + supportedTypes.toString() + "', therefore, this TOSCA requirement will not be connected."); - - mdcDataDebugMessage.debugExitMessage(null, null); return false; } - - mdcDataDebugMessage.debugExitMessage(null, null); return true; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java index 3a3a7c7817..2bc0de6888 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java @@ -58,15 +58,9 @@ public abstract class ResourceConnectionUsingCapabilityHelper String getMappedNodeTranslatedResourceId(ServiceTemplate nestedServiceTemplate, Map.Entry<String, CapabilityDefinition> connectionPointEntry) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> substitutionMapping = nestedServiceTemplate.getTopology_template().getSubstitution_mappings().getCapabilities() .get(connectionPointEntry.getKey()); - - mdcDataDebugMessage.debugExitMessage(null, null); return substitutionMapping.get(0); } @@ -74,10 +68,6 @@ public abstract class ResourceConnectionUsingCapabilityHelper Map.Entry<String, CapabilityDefinition> getMappedConnectionPointEntry( ServiceTemplate nestedServiceTemplate, Map.Entry<String, CapabilityDefinition> connectionPointEntry) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> substitutionMapping = nestedServiceTemplate.getTopology_template().getSubstitution_mappings().getCapabilities() .get(connectionPointEntry.getKey()); @@ -91,8 +81,6 @@ public abstract class ResourceConnectionUsingCapabilityHelper .get(mappedNodeTemplate.getType()); Optional<CapabilityDefinition> capabilityDefinition = DataModelUtil.getCapabilityDefinition(substituteNodeType, mappedCapabilityId); - - mdcDataDebugMessage.debugExitMessage(null, null); return new Map.Entry<String, CapabilityDefinition>() { @Override public String getKey() { @@ -113,10 +101,6 @@ public abstract class ResourceConnectionUsingCapabilityHelper @Override protected List<Map<String, CapabilityDefinition>> getAllConnectionPoints() { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<Map<String, CapabilityDefinition>> exposedRequirementsList = new ArrayList<>(); List<Predicate<CapabilityDefinition>> predicates = getPredicatesListForConnectionPoints(); Map<String, CapabilityDefinition> capabilities = this.nodeType.getCapabilities(); @@ -133,23 +117,16 @@ public abstract class ResourceConnectionUsingCapabilityHelper exposedRequirementsMap.put(entry.getKey(), entry.getValue()); exposedRequirementsList.add(exposedRequirementsMap); }); - - mdcDataDebugMessage.debugExitMessage(null, null); return exposedRequirementsList; } void addRequirementToConnectResource(Map.Entry<String, CapabilityDefinition> connectionPointEntry, List<String> supportedSourceNodeTypes, String paramName) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - Object paramValue = translateTo.getResource().getProperties().get(paramName); if (paramValue == null) { logger.warn("'" + paramName + "' property is not define in nested resource '" + translateTo.getResourceId() + "' for the nested heat file, therefore, '" + connectionPointEntry.getKey() + "' TOSCA capability will not be connected."); - mdcDataDebugMessage.debugExitMessage(null, null); return; } @@ -201,8 +178,6 @@ public abstract class ResourceConnectionUsingCapabilityHelper requirementAssignment); } } - - mdcDataDebugMessage.debugExitMessage(null, null); } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java index d1962d8196..9d16502689 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java @@ -48,15 +48,9 @@ public abstract class ResourceConnectionUsingRequirementHelper String getMappedNodeTranslatedResourceId(ServiceTemplate nestedServiceTemplate, Map.Entry<String, RequirementDefinition> connectionPointEntry) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> substitutionMapping = nestedServiceTemplate.getTopology_template().getSubstitution_mappings().getRequirements() .get(connectionPointEntry.getKey()); - - mdcDataDebugMessage.debugExitMessage(null, null); return substitutionMapping.get(0); } @@ -64,10 +58,6 @@ public abstract class ResourceConnectionUsingRequirementHelper Map.Entry<String, RequirementDefinition> getMappedConnectionPointEntry( ServiceTemplate nestedServiceTemplate, Map.Entry<String, RequirementDefinition> connectionPointEntry) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<String> substitutionMapping = nestedServiceTemplate.getTopology_template().getSubstitution_mappings().getRequirements() .get(connectionPointEntry.getKey()); @@ -81,8 +71,6 @@ public abstract class ResourceConnectionUsingRequirementHelper .get(mappedNodeTemplate.getType()); Optional<RequirementDefinition> requirementDefinition = DataModelUtil.getRequirementDefinition(substituteNodeType, mappedReqId); - - mdcDataDebugMessage.debugExitMessage(null, null); return new Map.Entry<String, RequirementDefinition>() { @Override public String getKey() { @@ -103,10 +91,6 @@ public abstract class ResourceConnectionUsingRequirementHelper @Override List<Map<String, RequirementDefinition>> getAllConnectionPoints() { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<Map<String, RequirementDefinition>> exposedRequirementsList = new ArrayList<>(); List<Predicate<RequirementDefinition>> predicates = getPredicatesListForConnectionPoints(); List<Map<String, RequirementDefinition>> requirements = this.nodeType.getRequirements(); @@ -124,18 +108,12 @@ public abstract class ResourceConnectionUsingRequirementHelper exposedRequirementsMap.put(entry.getKey(), entry.getValue()); exposedRequirementsList.add(exposedRequirementsMap); })); - - mdcDataDebugMessage.debugExitMessage(null, null); return exposedRequirementsList; } void addRequirementToConnectResource( Map.Entry<String, RequirementDefinition> requirementDefinitionEntry, String paramName, Object paramValue, List<String> supportedNetworkTypes) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - if (paramValue == null) { logger.warn("'" + paramName + "' property is not define in nested resource '" + translateTo.getResourceId() + "' for the nested heat file, therefore, '" @@ -156,7 +134,5 @@ public abstract class ResourceConnectionUsingRequirementHelper .ifPresent(targetTranslatedId -> createRequirementAssignment(requirementDefinitionEntry, targetTranslatedId, substitutionNodeTemplate)); } - - mdcDataDebugMessage.debugExitMessage(null, null); } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java index 78d09577d9..6593cfbb9f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java @@ -36,10 +36,6 @@ public class ResourceTranslationCinderVolumeImpl extends ResourceTranslationBase @Override public void translate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - NodeTemplate nodeTemplate = new NodeTemplate(); nodeTemplate.setType(ToscaNodeType.CINDER_VOLUME); nodeTemplate.setProperties(TranslatorHeatToToscaPropertyConverter @@ -57,16 +53,10 @@ public class ResourceTranslationCinderVolumeImpl extends ResourceTranslationBase } DataModelUtil.addNodeTemplate(translateTo.getServiceTemplate(), translateTo.getTranslatedId(), nodeTemplate); - - mdcDataDebugMessage.debugExitMessage(null, null); } private void handleSizeProperty(Map<String, Object> nodeTemplateProperties) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - Object size = nodeTemplateProperties.get("size"); if (size == null) { return; @@ -77,14 +67,10 @@ public class ResourceTranslationCinderVolumeImpl extends ResourceTranslationBase for (Map.Entry entry : propMap.entrySet()) { String val = "(" + entry.getKey() + " : " + entry.getValue() + ") * 1024"; nodeTemplateProperties.put("size", val); - - mdcDataDebugMessage.debugExitMessage(null, null); return; } } else { nodeTemplateProperties.put("size", size + "*1024"); } - - mdcDataDebugMessage.debugExitMessage(null, null); } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java index 8b862e585f..49bcdd0d83 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java @@ -53,15 +53,10 @@ public class ResourceTranslationContrailServiceTemplateImpl extends ResourceTran @Override public void translate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - ServiceTemplate globalSubstitutionServiceTemplate = getGlobalSubstitutionTypesServiceTemplate(translateTo); addSubstitutedNodeType(translateTo, globalSubstitutionServiceTemplate); addComputeNodeType(translateTo, globalSubstitutionServiceTemplate, translateTo.getContext()); - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -80,7 +75,6 @@ public class ResourceTranslationContrailServiceTemplateImpl extends ResourceTran private void addComputeNodeType(TranslateTo translateTo, ServiceTemplate globalSubstitutionServiceTemplate, TranslationContext context) { - mdcDataDebugMessage.debugEntryMessage(null, null); NodeType computeNodeType = new NodeType(); computeNodeType.setDerived_from(ToscaNodeType.CONTRAIL_COMPUTE); String computeNodeTypeId = new ContrailTranslationHelper() @@ -88,23 +82,15 @@ public class ResourceTranslationContrailServiceTemplateImpl extends ResourceTran translateTo.getTranslatedId(), context); DataModelUtil .addNodeType(globalSubstitutionServiceTemplate, computeNodeTypeId, computeNodeType); - - mdcDataDebugMessage.debugExitMessage(null, null); } private void addSubstitutedNodeType(TranslateTo translateTo, ServiceTemplate globalSubstitutionServiceTemplate) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - NodeType substitutedNodeType = new NodeType(); substitutedNodeType .setDerived_from(ToscaNodeType.CONTRAIL_ABSTRACT_SUBSTITUTE); DataModelUtil.addNodeType(globalSubstitutionServiceTemplate, getContrailSubstitutedNodeTypeId(translateTo.getTranslatedId()), substitutedNodeType); - - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -114,10 +100,6 @@ public class ResourceTranslationContrailServiceTemplateImpl extends ResourceTran } private ServiceTemplate getGlobalSubstitutionTypesServiceTemplate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - ServiceTemplate globalSubstitutionServiceTemplate = translateTo.getContext().getTranslatedServiceTemplates().get( Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME); @@ -133,8 +115,6 @@ public class ResourceTranslationContrailServiceTemplateImpl extends ResourceTran .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME, globalSubstitutionServiceTemplate); } - - mdcDataDebugMessage.debugExitMessage(null, null); return globalSubstitutionServiceTemplate; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java index d12075de27..d7342fca7d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java @@ -35,10 +35,6 @@ public class ResourceTranslationContrailV2NetworkPolicyImpl extends ResourceTran @Override protected void translate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - NodeTemplate nodeTemplate = new NodeTemplate(); nodeTemplate.setType(ToscaNodeType.CONTRAILV2_NETWORK_RULE); nodeTemplate.setProperties(TranslatorHeatToToscaPropertyConverter @@ -49,7 +45,5 @@ public class ResourceTranslationContrailV2NetworkPolicyImpl extends ResourceTran nodeTemplate, translateTo.getContext())); DataModelUtil.addNodeTemplate(translateTo.getServiceTemplate(), translateTo.getTranslatedId(), nodeTemplate); - - mdcDataDebugMessage.debugExitMessage(null, null); } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java index 10ccf0f560..5d44ba1555 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java @@ -52,10 +52,6 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra @Override public void translate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - NodeTemplate nodeTemplate = new NodeTemplate(); nodeTemplate.setType(ToscaNodeType.CONTRAILV2_VIRTUAL_NETWORK); nodeTemplate.setProperties(TranslatorHeatToToscaPropertyConverter @@ -67,15 +63,9 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra DataModelUtil.addNodeTemplate(translateTo.getServiceTemplate(), translateTo.getTranslatedId(), nodeTemplate); linkToPolicyNodeTemplate(translateTo); - - mdcDataDebugMessage.debugExitMessage(null, null); } private void linkToPolicyNodeTemplate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<AttachedResourceId> networkPolicyIdList = extractNetworkPolicyIdList(translateTo); if (CollectionUtils.isEmpty(networkPolicyIdList)) { return; @@ -88,31 +78,19 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra .addRequirementAssignment(policyNodeTemplate, ToscaConstants.NETWORK_REQUIREMENT_ID, createRequirementAssignment(translateTo.getTranslatedId())); } - - mdcDataDebugMessage.debugExitMessage(null, null); } private List<AttachedResourceId> extractNetworkPolicyIdList(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - Object propertyValue = translateTo.getResource().getProperties().get("network_policy_refs"); if (propertyValue != null) { - mdcDataDebugMessage.debugExitMessage(null, null); return extractNetworkPolicyId(propertyValue, translateTo); } else { - mdcDataDebugMessage.debugExitMessage(null, null); return null; } } private List<AttachedResourceId> extractNetworkPolicyId(Object propertyValue, TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - List<AttachedResourceId> attachedResourceIdList = new ArrayList<>(); if (propertyValue instanceof List) { @@ -125,20 +103,13 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra attachedResourceIdList.add(resourceId); } } - - mdcDataDebugMessage.debugExitMessage(null, null); return attachedResourceIdList; } private AttachedResourceId parsNetworkPolicyId(Object propertyValue, TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - Optional<String> translatedPolicyResourceId; String policyResourceId = extractResourceId(propertyValue, translateTo); if (policyResourceId == null) { - mdcDataDebugMessage.debugExitMessage(null, null); return null; } @@ -147,7 +118,6 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra translateTo.getHeatFileName()); if (!policyResource.getType() .equals(HeatResourcesTypes.CONTRAIL_V2_NETWORK_RULE_RESOURCE_TYPE.getHeatResource())) { - mdcDataDebugMessage.debugExitMessage(null, null); return null; } translatedPolicyResourceId = ResourceTranslationFactory.getInstance(policyResource) @@ -159,13 +129,11 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra + translateTo.getResource().getType() + "' property network_policy_refs is referenced to an unsupported resource the " + "connection will be ignored in TOSCA translation."); - mdcDataDebugMessage.debugExitMessage(null, null); return null; } AttachedResourceId attachedResourceId = new AttachedResourceId(translatedPolicyResourceId.get(), policyResourceId, ReferenceType.GET_ATTR); - mdcDataDebugMessage.debugExitMessage(null, null); return attachedResourceId; } @@ -223,15 +191,10 @@ public class ResourceTranslationContrailV2VirtualNetworkImpl extends ResourceTra } private RequirementAssignment createRequirementAssignment(String translatedNetworkResourceId) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - RequirementAssignment requirement = new RequirementAssignment(); requirement.setCapability(ToscaCapabilityType.NATIVE_ATTACHMENT); requirement.setNode(translatedNetworkResourceId); requirement.setRelationship(ToscaRelationshipType.ATTACHES_TO); - mdcDataDebugMessage.debugExitMessage(null, null); return requirement; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java index 49fdcaafa9..2b96b7f714 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java @@ -33,10 +33,6 @@ public class ResourceTranslationNeutronNetImpl extends ResourceTranslationBase { @Override public void translate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - NodeTemplate nodeTemplate = new NodeTemplate(); nodeTemplate.setType(ToscaNodeType.NEUTRON_NET); nodeTemplate.setProperties(TranslatorHeatToToscaPropertyConverter @@ -55,8 +51,6 @@ public class ResourceTranslationNeutronNetImpl extends ResourceTranslationBase { DataModelUtil.addNodeTemplate(translateTo.getServiceTemplate(), translateTo.getTranslatedId(), nodeTemplate); - - mdcDataDebugMessage.debugExitMessage(null, null); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java index 94c853f750..b3eed8e8d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java @@ -31,10 +31,6 @@ public class ResourceTranslationNeutronSecurityGroupImpl extends ResourceTransla @Override public void translate(TranslateTo translateTo) { - - - mdcDataDebugMessage.debugEntryMessage(null, null); - NodeTemplate nodeTemplate = new NodeTemplate(); nodeTemplate.setType(ToscaNodeType.NEUTRON_SECURITY_RULES); nodeTemplate.setProperties(TranslatorHeatToToscaPropertyConverter @@ -46,8 +42,6 @@ public class ResourceTranslationNeutronSecurityGroupImpl extends ResourceTransla DataModelUtil.addNodeTemplate(translateTo.getServiceTemplate(), translateTo.getTranslatedId(), nodeTemplate); - - mdcDataDebugMessage.debugExitMessage(null, null); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java index b32ea2d9de..a74d410dfb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java @@ -73,7 +73,6 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab String nestedHeatFileName) { - mdcDataDebugMessage.debugEntryMessage(null, null); Object securityGroups = heatResource.getProperties().get(Constants.SECURITY_GROUPS_PROPERTY_NAME); @@ -90,11 +89,9 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab } }); - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.of(paramsList); } - mdcDataDebugMessage.debugExitMessage(null, null); return Optional.empty(); } @@ -108,7 +105,6 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab Map.Entry<String, CapabilityDefinition> connectionPointEntry, List<String> paramNames) { - mdcDataDebugMessage.debugEntryMessage(null, null); if (paramNames == null || paramNames.isEmpty()) { return; @@ -120,7 +116,6 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab addRequirementToConnectResource(connectionPointEntry, supportedSecurityRulesTypes, paramName); } - mdcDataDebugMessage.debugExitMessage(null, null); } @Override @@ -131,7 +126,6 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab List<String> supportedTypes) { - mdcDataDebugMessage.debugEntryMessage(null, null); if (!resourceTranslationBase.isResourceTypeSupported(connectedResource, supportedTypes)) { logger.warn("Nested resource '" + nestedResourceId + "' property '" + nestedPropertyName @@ -141,11 +135,9 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab + supportedTypes.toString() + "', therefore, this TOSCA capability will not be " + "connected."); - mdcDataDebugMessage.debugExitMessage(null, null); return false; } - mdcDataDebugMessage.debugExitMessage(null, null); return true; } @@ -153,12 +145,10 @@ class SecurityRulesToPortResourceConnection extends ResourceConnectionUsingCapab Map.Entry<String, RequirementDefinition> createRequirementDefinition(String capabilityKey) { - mdcDataDebugMessage.debugEntryMessage(null, null); RequirementDefinition definition = new RequirementDefinition(); definition.setCapability(capabilityKey); definition.setRelationship(ToscaRelationshipType.ATTACHES_TO); - mdcDataDebugMessage.debugExitMessage(null, null); return new Map.Entry<String, RequirementDefinition>() { @Override public String getKey() { |