From 9be9c232d6b8f710e1ded6c5cd3b10b858c792b5 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 22 Feb 2019 17:24:22 -0500
Subject: Provide correct output to #process request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7e5ceb6fc46b8b8e6289db9b4efe2f27e3f9ce91
Issue-ID: CCSDK-947
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../services/execution/AbstractComponentFunction.kt                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ms/blueprintsprocessor/modules/services')

diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt
index 930dc074e..7086ebbce 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt
+++ b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt
@@ -29,6 +29,7 @@ import org.onap.ccsdk.apps.controllerblueprints.core.asJsonNode
 import org.onap.ccsdk.apps.controllerblueprints.core.getAsString
 import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode
 import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
 import org.slf4j.LoggerFactory
 
 /**
@@ -100,7 +101,7 @@ abstract class AbstractComponentFunction : BlueprintFunctionNode<ExecutionServic
         log.info("Preparing Response...")
         executionServiceOutput.commonHeader = executionServiceInput.commonHeader
         executionServiceOutput.actionIdentifiers = executionServiceInput.actionIdentifiers
-        executionServiceOutput.payload = executionServiceInput.payload
+
 
         // Resolve the Output Expression
         val stepOutputs = bluePrintRuntimeService
@@ -108,6 +109,8 @@ abstract class AbstractComponentFunction : BlueprintFunctionNode<ExecutionServic
 
         bluePrintRuntimeService.put("$stepName-step-outputs", stepOutputs.asJsonNode())
 
+        executionServiceOutput.payload = JacksonUtils.objectNodeFromObject(stepOutputs)
+
         // Populate Status
         val status = Status()
         status.eventType = "EVENT-COMPONENT-EXECUTED"
-- 
cgit 1.2.3-korg