summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Csongvai <jozsef.csongvai@bell.ca>2021-04-22 18:04:15 -0400
committerJozsef Csongvai <jozsef.csongvai@bell.ca>2021-04-22 18:15:46 -0400
commit4fc19e99b83b75f4017aceb5111b6f26fd0c6cc0 (patch)
tree118071b84e719c2b2c75cc30a618d975e8467824
parent35450d7ab1a0de49ec0f7cbe0584733ac6d2d267 (diff)
Fix grpcProperties resolution for String values
When a CBA defines a String selector, it will be passed as TextNode. This enables using using application properties to define grpcClientProperties for py executor. Issue-ID: CCSDK-3272 Change-Id: Id4fcd4f43306e385458eb4decbb07f923a957cc0 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
-rw-r--r--ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionService.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionService.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionService.kt
index dadf72e04..e28a8c405 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionService.kt
+++ b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionService.kt
@@ -17,6 +17,7 @@
package org.onap.ccsdk.cds.blueprintsprocessor.services.execution
import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.TextNode
import com.github.marcoferrer.krotoplus.coroutines.client.ClientBidiCallChannel
import com.github.marcoferrer.krotoplus.coroutines.client.clientCallBidiStreaming
import io.grpc.ManagedChannel
@@ -193,8 +194,8 @@ class StreamingRemoteExecutionServiceImpl(private val bluePrintGrpcLibPropertySe
private fun grpcProperties(selector: Any): GrpcClientProperties {
return when (selector) {
- is String -> {
- bluePrintGrpcLibPropertyService.grpcClientProperties(selector.toString())
+ is TextNode -> {
+ bluePrintGrpcLibPropertyService.grpcClientProperties(selector.asText())
}
is JsonNode -> {
bluePrintGrpcLibPropertyService.grpcClientProperties(selector)