From: Dan Timoney <dtimoney@att.com>
Date: Mon, 12 Aug 2019 13:14:12 +0000 (+0000)
Subject: Merge "Resource resolution should return a string"
X-Git-Tag: 0.5.2~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d9034b6d720df4718b8d455949c17051ecae0558;p=ccsdk%2Fcds.git

Merge "Resource resolution should return a string"
---

d9034b6d720df4718b8d455949c17051ecae0558
diff --cc ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt
index d3b69c713,6514df249..641175ca2
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt
@@@ -93,17 -83,17 +93,17 @@@ open class ResourceResolutionServiceImp
  
      override suspend fun resolveResources(bluePrintRuntimeService: BluePrintRuntimeService<*>, nodeTemplateName: String,
                                            artifactNames: List<String>,
-                                           properties: Map<String, Any>): MutableMap<String, JsonNode> {
+                                           properties: Map<String, Any>): MutableMap<String, String> {
  
          val resourceAssignmentRuntimeService =
 -            ResourceAssignmentUtils.transformToRARuntimeService(bluePrintRuntimeService, artifactNames.toString())
 +                ResourceAssignmentUtils.transformToRARuntimeService(bluePrintRuntimeService, artifactNames.toString())
  
-         val resolvedParams: MutableMap<String, JsonNode> = hashMapOf()
+         val resolvedParams: MutableMap<String, String> = hashMapOf()
          artifactNames.forEach { artifactName ->
              val resolvedContent = resolveResources(resourceAssignmentRuntimeService, nodeTemplateName,
 -                artifactName, properties)
 +                    artifactName, properties)
  
-             resolvedParams[artifactName] = resolvedContent.asJsonType()
+             resolvedParams[artifactName] = resolvedContent
          }
          return resolvedParams
      }