summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/ManualVspDataCollectionService.java13
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java21
2 files changed, 0 insertions, 34 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/ManualVspDataCollectionService.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/ManualVspDataCollectionService.java
index 73b9491e73..96c56c50e8 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/ManualVspDataCollectionService.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/ManualVspDataCollectionService.java
@@ -11,7 +11,6 @@ import org.openecomp.sdc.generator.datatypes.tosca.MultiFlavorVfcImage;
import org.openecomp.sdc.generator.datatypes.tosca.VendorInfo;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
import org.openecomp.sdc.logging.types.LoggerConstants;
import org.openecomp.sdc.logging.types.LoggerErrorCode;
import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
@@ -307,10 +306,6 @@ public class ManualVspDataCollectionService {
} catch (Exception ex) {
log.debug("", ex);
computeQuestionnaire = null;
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.COLLECT_MANUAL_VSP_TOSCA_DATA, ErrorLevel.INFO.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(), "Failed to get compute questionnaire : "
- + ex.getMessage());
}
if (Objects.nonNull(computeQuestionnaire)) {
String computeQuestionnaireData = computeQuestionnaire.getQuestionnaireData();
@@ -321,10 +316,6 @@ public class ManualVspDataCollectionService {
} catch (Exception ex) {
log.debug("", ex);
compute = null;
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.COLLECT_MANUAL_VSP_TOSCA_DATA, ErrorLevel.INFO.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(), "Unable to parse compute questionnaire : "
- + ex.getMessage());
}
if (compute != null && Objects.nonNull(compute.getVmSizing())) {
computeFlavor = new ComputeFlavor();
@@ -385,10 +376,6 @@ public class ManualVspDataCollectionService {
} catch (Exception ex) {
log.debug("", ex);
imageDetails = null;
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.COLLECT_MANUAL_VSP_TOSCA_DATA, ErrorLevel.INFO.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(), "Unable to parse image questionnaire : "
- + ex.getMessage());
}
if (Objects.nonNull(imageDetails)
&& Objects.nonNull(imageDetails.getVersion())) {
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java
index b11deca656..c10a153114 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java
@@ -27,7 +27,6 @@ import org.openecomp.sdc.common.errors.CoreException;
import org.openecomp.sdc.datatypes.error.ErrorLevel;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
import org.openecomp.sdc.logging.types.LoggerConstants;
import org.openecomp.sdc.logging.types.LoggerErrorCode;
import org.openecomp.sdc.logging.types.LoggerErrorDescription;
@@ -133,10 +132,6 @@ public class CompositionDataExtractorImpl implements CompositionDataExtractor {
Optional<String> substituteServiceTemplateFileName = toscaAnalyzerService
.getSubstituteServiceTemplateName(substitutableNodeTemplateId, substitutableNodeTemplate);
if (!substituteServiceTemplateFileName.isPresent()) {
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.EXTRACT_COMPOSITION_DATA, ErrorLevel.ERROR.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(),
- LoggerErrorDescription.EXTRACT_COMPOSITION_DATA);
throw new CoreException(
new ToscaInvalidSubstituteNodeTemplateErrorBuilder(substitutableNodeTemplateId).build());
}
@@ -179,10 +174,6 @@ public class CompositionDataExtractorImpl implements CompositionDataExtractor {
.getSubstitutionMappedNodeTemplateByExposedReq(
substituteServiceTemplateFileName.get(), substituteServiceTemplate, reqId);
if (!mappedNodeTemplate.isPresent()) {
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.EXTRACT_COMPOSITION_DATA, ErrorLevel.ERROR.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(),
- LoggerErrorDescription.EXTRACT_COMPOSITION_DATA);
throw new CoreException(new ToscaMissingSubstitutionMappingForReqCapErrorBuilder(
ToscaMissingSubstitutionMappingForReqCapErrorBuilder.MappingExposedEntry
.REQUIREMENT, connectedNodeId).build());
@@ -201,10 +192,6 @@ public class CompositionDataExtractorImpl implements CompositionDataExtractor {
}
}
} else if (!connectedNodeTemplate.isPresent()) {
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.EXTRACT_COMPOSITION_DATA, ErrorLevel.ERROR.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(),
- LoggerErrorDescription.EXTRACT_COMPOSITION_DATA);
throw new CoreException(
new ToscaInvalidEntryNotFoundErrorBuilder("Node Template", connectedNodeId).build());
}
@@ -402,10 +389,6 @@ public class CompositionDataExtractorImpl implements CompositionDataExtractor {
connectPortToNetwork(port, portNodeTemplate.get());
return port;
} else {
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.EXTRACT_COMPOSITION_DATA, ErrorLevel.ERROR.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(),
- LoggerErrorDescription.EXTRACT_COMPOSITION_DATA);
throw new CoreException(
new ToscaInvalidEntryNotFoundErrorBuilder("Node Template", portNodeTemplateId).build());
}
@@ -472,10 +455,6 @@ public class CompositionDataExtractorImpl implements CompositionDataExtractor {
return Optional.of(Boolean.valueOf(inputParameterDefinition.get_default().toString()));
}
} else {
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_API,
- LoggerTragetServiceName.EXTRACT_COMPOSITION_DATA, ErrorLevel.ERROR.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(),
- LoggerErrorDescription.EXTRACT_COMPOSITION_DATA);
throw new CoreException(
new ToscaInvalidEntryNotFoundErrorBuilder("Input Parameter", inputParameterName)
.build());