Add remote scripts cba

Change-Id: Icc11ed1f2e229c92a7b46611087bb868ccd265b4
Issue-ID: CCSDK-1215
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt
index 31eb38ca4..feadfbbd4 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt
@@ -70,7 +70,7 @@ open class ComponentRemotePythonExecutor(private val remoteScriptExecutionServic
         val dynamicProperties = getOperationInput(INPUT_DYNAMIC_PROPERTIES)
 
         // TODO("Python execution command and Resolve some expressions with dynamic properties")
-        val scriptCommand: String = "python ${pythonScript.absolutePath}"
+        val scriptCommand = "${pythonScript.absolutePath}"
 
         val dependencies = operationAssignment.implementation?.dependencies
 
@@ -79,16 +79,14 @@ open class ComponentRemotePythonExecutor(private val remoteScriptExecutionServic
             remoteScriptExecutionService.init(endPointSelector.asText())
 
             // If dependencies are defined, then install in remote server
-            if (dependencies != null && !dependencies.isEmpty()) {
-                val prepareEnvInput = PrepareRemoteEnvInput(
-                    requestId = processId,
-                    remoteIdentifier = RemoteIdentifier(blueprintName = blueprintName, blueprintVersion = blueprintVersion),
-                    remoteScriptType = RemoteScriptType.PYTHON,
-                    packages = dependencies
+            if (dependencies != null && dependencies.isNotEmpty()) {
+                val prepareEnvInput = PrepareRemoteEnvInput(requestId = processId,
+                        remoteScriptType = RemoteScriptType.PYTHON,
+                        packages = dependencies
                 )
                 val prepareEnvOutput = remoteScriptExecutionService.prepareEnv(prepareEnvInput)
-                checkNotNull(prepareEnvOutput) {
-                    "failed to get prepare remote env response for requestId(${prepareEnvInput.requestId})"
+                checkNotNull(prepareEnvOutput.status) {
+                    "failed to get prepare remote env response status for requestId(${prepareEnvInput.requestId})"
                 }
             }
 
@@ -98,8 +96,8 @@ open class ComponentRemotePythonExecutor(private val remoteScriptExecutionServic
                     remoteScriptType = RemoteScriptType.PYTHON,
                     command = scriptCommand)
             val remoteExecutionOutput = remoteScriptExecutionService.executeCommand(remoteExecutionInput)
-            checkNotNull(remoteExecutionOutput) {
-                "failed to get prepare remote command response for requestId(${remoteExecutionOutput.requestId})"
+            checkNotNull(remoteExecutionOutput.status) {
+                "failed to get prepare remote command response status for requestId(${remoteExecutionOutput.requestId})"
             }
         } finally {
             remoteScriptExecutionService.close()