Merge "ResourceResolution should fail if required resource did not resolve -edge...
authorKAPIL SINGAL <ks220y@att.com>
Mon, 14 Dec 2020 19:05:52 +0000 (19:05 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 14 Dec 2020 19:05:52 +0000 (19:05 +0000)
ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt

index 38c5c99..79a00b1 100644 (file)
@@ -150,8 +150,11 @@ open class ResourceResolutionServiceImpl(
 
             val failedResolution = resourceAssignmentList.filter { it.status != "success" && it.property?.required == true }.map { it.name }
             if (failedResolution.isNotEmpty()) {
-                log.error("Failed to resolve required resources($failedResolution)")
-                bluePrintRuntimeService.setBluePrintError(resourceAssignmentRuntimeService.getBluePrintError())
+                // The following error message is returned by default to handle a scenario when
+                // error message comes empty even when resolution has actually failed.
+                // Example: input-source type resolution seems to fail with no error code.
+                bluePrintRuntimeService.getBluePrintError().errors.add("Failed to resolve required resources($failedResolution)")
+                bluePrintRuntimeService.getBluePrintError().errors.addAll(resourceAssignmentRuntimeService.getBluePrintError().errors)
             }
         }
         return ResourceResolutionResult(templateMap, assignmentMap)