From 4427f5028b3807edf24c9c49addb4770a8fbb58e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= <adetalhouet89@gmail.com>
Date: Wed, 4 Sep 2019 15:02:55 -0400
Subject: [PATCH] Do not output StepData information
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This information is for internal processing purposes, it should
not be output to user, as could cause confusion.

Change-Id: I95ead3fbc5e22e3a1751e41d90e567965cc00fa4
Issue-ID: CCSDK-1691
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../uat-blueprints/echo/Tests/uat.yaml             |  6 ---
 .../uat-blueprints/pnf_config/Tests/uat.yaml       | 48 ++++++++--------------
 .../core/api/data/BlueprintProcessorData.kt        |  3 ++
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/components/model-catalog/blueprint-model/uat-blueprints/echo/Tests/uat.yaml b/components/model-catalog/blueprint-model/uat-blueprints/echo/Tests/uat.yaml
index 116230929..5036a6fa2 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/echo/Tests/uat.yaml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/echo/Tests/uat.yaml
@@ -26,9 +26,3 @@ processes:
         message: success
       payload:
         echo-response: {}
-      stepData:
-        name: echo
-        properties:
-          resource-assignment-params:
-            echo: *message
-          status: success
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml
index 3a5903c49..fbdb2eea8 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml
@@ -31,32 +31,6 @@ processes:
         message: success
       payload:
         config-assign-response: {}
-      stepData:
-        name: config-assign
-        properties:
-          resource-assignment-params:
-            config-assign: &assignPatch
-              ietf-restconf:yang-patch:
-                patch-id: patch-1
-                edit:
-                  - edit-id: edit1
-                    operation: merge
-                    target: /
-                    value: { netconflist: { netconf: [ { netconf-id: "10", netconf-param: "1000" }]}}
-                  - edit-id: edit2
-                    operation: merge
-                    target: /
-                    value: { netconflist: { netconf: [ { netconf-id: "20", netconf-param: "2000" }]}}
-                  - edit-id: edit3
-                    operation: merge
-                    target: /
-                    value: { netconflist: { netconf: [ { netconf-id: "30", netconf-param: "3000" }]}}
-          status: success
-    responseNormalizerSpec:
-      stepData:
-        properties:
-          resource-assignment-params:
-            config-assign: ?from-json(.stepData.properties.resource-assignment-params.config-assign)
   - name: config-deploy
     request:
       commonHeader: *commonHeader
@@ -84,11 +58,6 @@ processes:
         errorMessage: null
         eventType: EVENT_COMPONENT_EXECUTED
         message: success
-      stepData:
-        name: config-deploy
-        properties:
-          response-data: ""
-          status: success
 
 external-services:
   - selector: sdncodl
@@ -127,7 +96,22 @@ external-services:
           path: [*configUri, *configletResourcePath]
           headers:
             Content-Type: application/yang.patch+json
-          body: *assignPatch
+          body:
+            ietf-restconf:yang-patch:
+              patch-id: patch-1
+              edit:
+                - edit-id: edit1
+                  operation: merge
+                  target: /
+                  value: { netconflist: { netconf: [ { netconf-id: "10", netconf-param: "1000" }]}}
+                - edit-id: edit2
+                  operation: merge
+                  target: /
+                  value: { netconflist: { netconf: [ { netconf-id: "20", netconf-param: "2000" }]}}
+                - edit-id: edit3
+                  operation: merge
+                  target: /
+                  value: { netconflist: { netconf: [ { netconf-id: "30", netconf-param: "3000" }]}}
       - request:
           method: DELETE
           path: *configUri
diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
index c45ebc127..5a6ba0661 100644
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
+++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
@@ -18,6 +18,7 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.core.api.data
 
 import com.fasterxml.jackson.annotation.JsonFormat
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import io.swagger.annotations.ApiModelProperty
@@ -40,6 +41,7 @@ open class ExecutionServiceInput {
                 " and the input for resource resolution located within the xxx-request block, contained within xxx-properties")
     lateinit var payload: ObjectNode
     @get:ApiModelProperty(hidden = true)
+    @get:JsonIgnore
     var stepData: StepData? = null
 }
 
@@ -56,6 +58,7 @@ open class ExecutionServiceOutput {
                 " and the input for resource resolution located within the xxx-request block, contained within xxx-properties")
     lateinit var payload: ObjectNode
     @get:ApiModelProperty(hidden = true)
+    @get:JsonIgnore
     var stepData: StepData? = null
 }
 
-- 
2.16.6