diff options
| author |   Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2020-02-27 13:52:25 -0500 |
|---|---|---|
| committer |   KAPIL SINGAL <ks220y@att.com> | 2020-02-28 14:50:57 +0000 |
| commit | dc3e41335d7ceb42901b8fd4ccace72825552302 (patch) | |
| tree | d30450927b05167a2dc5121dfedffe3e4f7bb674 /ms | |
| parent | 6567f41b63f14a2c81577af7a89b86c0306c61f6 (diff) | |
Fix - ResolutionSummary should contain resolved request-payload
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: I87db63edcef6157da1f498bc9ab1af3cddf8c49a
Issue-ID: CCSDK-2038
Diffstat (limited to 'ms')
3 files changed, 3 insertions, 2 deletions
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt index 10233404c..5d9226876 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt @@ -83,6 +83,7 @@ open class RestResourceResolutionProcessor(private val blueprintRestLibPropertyS // Resolving content Variables val payload = resolveFromInputKeyMapping(nullToEmpty(sourceProperties.payload), resolvedInputKeyMapping) + resourceSourceProperties["resolved-payload"] = JacksonUtils.jsonNode(payload) val urlPath = resolveFromInputKeyMapping(checkNotNull(sourceProperties.urlPath), resolvedInputKeyMapping) val verb = resolveFromInputKeyMapping(nullToEmpty(sourceProperties.verb), resolvedInputKeyMapping) diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt index 7101735ae..6922192c6 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt @@ -204,7 +204,7 @@ class ResourceAssignmentUtils { ): String { val resolutionSummaryList = resourceAssignments.map { val payload = resourceDefinitions[it.name] - ?.sources?.get(it.dictionarySource)?.properties?.get("payload") + ?.sources?.get(it.dictionarySource)?.properties?.get("resolved-payload") ResolutionSummary( it.name, it.property?.value, it.property?.required, it.property?.type, it.keyIdentifiers, it.dictionaryName, diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt index 8ca401664..da3b9c23b 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt @@ -164,7 +164,7 @@ class ResourceAssignmentUtilsTest { val resourceAssignment = createResourceAssignmentForTest(null) val resourceDefinition = ResourceDefinition() val nodeTemplate = NodeTemplate().apply { - properties = mutableMapOf("payload" to JacksonUtils.jsonNode("{\"mock\": true}")) + properties = mutableMapOf("resolved-payload" to JacksonUtils.jsonNode("{\"mock\": true}")) } resourceDefinition.sources = mutableMapOf("input" to nodeTemplate) |