Add remote python executor DSL properties

[ccsdk/cds.git] / ms / blueprintsprocessor / modules / services / execution-service / src / main / kotlin / org / onap / ccsdk / cds / blueprintsprocessor / services / execution / RemoteScriptExecutionService.kt

diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/RemoteScriptExecutionService.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/RemoteScriptExecutionService.kt
index d4195ae..b0e3e47 100644 (file)
--- a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/RemoteScriptExecutionService.kt
+++ b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/RemoteScriptExecutionService.kt
@@ -41,7 +41,7 @@ interface RemoteScriptExecutionService {
 
 @Service(ExecutionServiceConstant.SERVICE_GRPC_REMOTE_SCRIPT_EXECUTION)
 @ConditionalOnProperty(prefix = "blueprintprocessor.remoteScriptCommand", name = arrayOf("enabled"),
-    havingValue = "true", matchIfMissing = false)
+        havingValue = "true", matchIfMissing = false)
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 class GrpcRemoteScriptExecutionService(private val bluePrintGrpcLibPropertyService: BluePrintGrpcLibPropertyService)
     : RemoteScriptExecutionService {
@@ -74,11 +74,11 @@ class GrpcRemoteScriptExecutionService(private val bluePrintGrpcLibPropertyServi
         val grpResponse = commandExecutorServiceGrpc.prepareEnv(prepareEnvInput.asGrpcData())
 
         checkNotNull(grpResponse.status) {
-            "failed to get GRPC prepare env response status for requestId($prepareEnvInput.requestId)"
+            "failed to get GRPC prepare env response status for requestId(${prepareEnvInput.requestId})"
         }
 
         val remoteScriptExecutionOutput = grpResponse.asJavaData()
-        log.debug("Received prepare env response from command server for requestId($prepareEnvInput.requestId)")
+        log.debug("Received prepare env response from command server for requestId(${prepareEnvInput.requestId})")
 
         return remoteScriptExecutionOutput
     }
@@ -89,11 +89,11 @@ class GrpcRemoteScriptExecutionService(private val bluePrintGrpcLibPropertyServi
         val grpResponse = commandExecutorServiceGrpc.executeCommand(remoteExecutionInput.asGrpcData())
 
         checkNotNull(grpResponse.status) {
-            "failed to get GRPC response status for requestId($remoteExecutionInput.requestId)"
+            "failed to get GRPC response status for requestId(${remoteExecutionInput.requestId})"
         }
 
         val remoteScriptExecutionOutput = grpResponse.asJavaData()
-        log.debug("Received response from command server for requestId($remoteExecutionInput.requestId)")
+        log.debug("Received response from command server for requestId(${remoteExecutionInput.requestId})")
 
         return remoteScriptExecutionOutput
     }
@@ -115,33 +115,33 @@ class GrpcRemoteScriptExecutionService(private val bluePrintGrpcLibPropertyServi
         }
 
         return PrepareEnvInput.newBuilder()
-            .setIdentifiers(this.remoteIdentifier!!.asGrpcData())
-            .setRequestId(this.requestId)
-            .setCorrelationId(correlationId)
-            .setTimeOut(this.timeOut.toInt())
-            .addAllPackages(packageList)
-            .setProperties(this.properties.asGrpcData())
-            .build()
+                .setIdentifiers(this.remoteIdentifier!!.asGrpcData())
+                .setRequestId(this.requestId)
+                .setCorrelationId(correlationId)
+                .setTimeOut(this.timeOut.toInt())
+                .addAllPackages(packageList)
+                .setProperties(this.properties.asGrpcData())
+                .build()
     }
 
     fun RemoteScriptExecutionInput.asGrpcData(): ExecutionInput {
         val correlationId = this.correlationId ?: this.requestId
         return ExecutionInput.newBuilder()
-            .setRequestId(this.requestId)
-            .setCorrelationId(correlationId)
-            .setIdentifiers(this.remoteIdentifier!!.asGrpcData())
-            .setCommand(this.command)
-            .setTimeOut(this.timeOut.toInt())
-            .setProperties(this.properties.asGrpcData())
-            .setTimestamp(Timestamp.getDefaultInstance())
-            .build()
+                .setRequestId(this.requestId)
+                .setCorrelationId(correlationId)
+                .setIdentifiers(this.remoteIdentifier!!.asGrpcData())
+                .setCommand(this.command)
+                .setTimeOut(this.timeOut.toInt())
+                .setProperties(this.properties.asGrpcData())
+                .setTimestamp(Timestamp.getDefaultInstance())
+                .build()
     }
 
     fun RemoteIdentifier.asGrpcData(): Identifiers? {
         return Identifiers.newBuilder()
-            .setBlueprintName(this.blueprintName)
-            .setBlueprintVersion(this.blueprintVersion)
-            .build()
+                .setBlueprintName(this.blueprintName)
+                .setBlueprintVersion(this.blueprintVersion)
+                .build()
     }
 
     fun Map<String, JsonNode>.asGrpcData(): Struct {
@@ -152,9 +152,9 @@ class GrpcRemoteScriptExecutionService(private val bluePrintGrpcLibPropertyServi
 
     fun ExecutionOutput.asJavaData(): RemoteScriptExecutionOutput {
         return RemoteScriptExecutionOutput(
-            requestId = this.requestId,
-            response = this.responseList,
-            status = StatusType.valueOf(this.status.name)
+                requestId = this.requestId,
+                response = this.responseList,
+                status = StatusType.valueOf(this.status.name)
         )
     }