From 9c1cb6a1db4a290ceccb09c003ad2c131aa91bc9 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Mon, 20 Jun 2022 22:27:19 +0200 Subject: Aligned attributes of CDS components Issue-ID: CCSDK-3698 Signed-off-by: Lukasz Rajewski Change-Id: Ie5c78a9a347373b5faf588627e42138806d69c0c (cherry picked from commit ea1c8b477e615f4dd45204b221fe7eacfe5474af) --- .../services/execution/ComponentRemoteScriptExecutor.kt | 1 + .../services/execution/ComponentRemoteScriptExecutorDSL.kt | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'ms/blueprintsprocessor/modules/services/execution-service') diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutor.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutor.kt index 2581e5628..be9ddb8c2 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutor.kt +++ b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutor.kt @@ -54,6 +54,7 @@ open class ComponentRemoteScriptExecutor( const val ATTRIBUTE_RESPONSE_DATA = "response-data" const val ATTRIBUTE_STATUS = "status" + const val OUTPUT_RESPONSE_DATA = "response-data" const val OUTPUT_STATUS = "status" } diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutorDSL.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutorDSL.kt index 7bb071501..6f3cc3ac5 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutorDSL.kt +++ b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/ComponentRemoteScriptExecutorDSL.kt @@ -83,6 +83,10 @@ fun BluePrintTypes.nodeTypeComponentRemoteScriptExecutor(): NodeType { ) } outputs { + property( + ComponentRemoteScriptExecutor.OUTPUT_RESPONSE_DATA, BluePrintConstants.DATA_TYPE_JSON, + false, "Output Response" + ) property( ComponentRemoteScriptExecutor.OUTPUT_STATUS, BluePrintConstants.DATA_TYPE_STRING, true, "Status of the Component Execution ( success or failure )" @@ -161,7 +165,13 @@ class ComponentRemoteScriptExecutorNodeTemplateBuilder(id: String, description: fun status(status: String) = status(status.asJsonPrimitive()) fun status(status: JsonNode) { - property(ComponentRemoteScriptExecutor.OUTPUT_STATUS, status) + property(ComponentScriptExecutor.OUTPUT_STATUS, status) + } + + fun responseData(responseData: String) = responseData(responseData.asJsonType()) + + fun responseData(responseData: JsonNode) { + property(ComponentScriptExecutor.OUTPUT_RESPONSE_DATA, responseData) } } } -- cgit 1.2.3-korg