Merge "Add remote scripts cba"

13 files changed, 269 insertions, 14 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/artifact_types.json
new file mode 100644
index 000000000..445236354
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/artifact_types.json
@@ -0,0 +1,12 @@
+{
+  "artifact_types": {
+    "artifact-script-python": {
+      "description": "Python Script file",
+      "version": "1.0.0",
+      "derived_from": "tosca.artifacts.Implementation",
+      "file_ext": [
+        "py"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/data_types.json
new file mode 100644
index 000000000..b22e30d00
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/data_types.json
@@ -0,0 +1,3 @@
+{
+  "data_types": {}
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json
new file mode 100644
index 000000000..84d5b5dd3
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json
@@ -0,0 +1,52 @@
+{
+  "node_types": {
+    "component-remote-python-executor": {
+      "description": "This is Remote Python Execution Component.",
+      "version": "1.0.0",
+      "capabilities": {
+        "component-node": {
+          "type": "tosca.capabilities.Node"
+        }
+      },
+      "interfaces": {
+        "ComponentRemotePythonExecutor": {
+          "operations": {
+            "process": {
+              "inputs": {
+                "endpoint-selector": {
+                  "description": "Remote Container or Server selector name.",
+                  "required": false,
+                  "type": "string",
+                  "default": "default"
+                },
+                "dynamic-properties": {
+                  "description": "Dynamic Json Content or DSL Json reference.",
+                  "required": false,
+                  "type": "json"
+                }
+              },
+              "outputs": {
+                "response-data": {
+                  "description": "Execution Response Data in JSON format.",
+                  "required": false,
+                  "type": "json"
+                },
+                "status": {
+                  "description": "Status of the Component Execution ( success or failure )",
+                  "required": true,
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from": "tosca.nodes.Component"
+    },
+    "tosca.nodes.Component": {
+      "description": "This is default Component Node",
+      "version": "1.0.0",
+      "derived_from": "tosca.nodes.Root"
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/policy_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/policy_types.json
new file mode 100644
index 000000000..2442ce877
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/policy_types.json
@@ -0,0 +1,3 @@
+{
+  "policy_types": {}
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/relationship_types.json
new file mode 100644
index 000000000..097a30afd
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/relationship_types.json
@@ -0,0 +1,3 @@
+{
+  "relationship_types": {}
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json
new file mode 100644
index 000000000..b978506d2
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json
@@ -0,0 +1,78 @@
+{
+  "tosca_definitions_version": "controller_blueprint_1_0_0",
+  "metadata": {
+    "template_author": "Brinda Santh Muthuramalingam",
+    "author-email": "brindasanth@in.ibm.com",
+    "user-groups": "ADMIN, OPERATION",
+    "template_name": "remote_scripts",
+    "template_version": "1.0.0",
+    "template_tags": "brinda, tosca"
+  },
+  "imports": [
+    {
+      "file": "Definitions/data_types.json"
+    },
+    {
+      "file": "Definitions/relationship_types.json"
+    },
+    {
+      "file": "Definitions/artifact_types.json"
+    },
+    {
+      "file": "Definitions/node_types.json"
+    },
+    {
+      "file": "Definitions/policy_types.json"
+    }
+  ],
+  "topology_template": {
+    "workflows": {
+      "execute-remote-python": {
+        "steps": {
+          "execute-script": {
+            "description": "Execute Remote Python Script",
+            "target": "execute-remote-python",
+            "activities": [
+              {
+                "call_operation": ""
+              }
+            ]
+          }
+        },
+        "inputs": {}
+      }
+    },
+    "node_templates": {
+      "execute-remote-python": {
+        "type": "component-remote-python-executor",
+        "interfaces": {
+          "ComponentRemotePythonExecutor": {
+            "operations": {
+              "process": {
+                "implementation": {
+                  "primary": "component-script",
+                  "dependencies": [
+                    "ncclient"
+                  ]
+                },
+                "inputs": {
+                  "endpoint-selector": "default"
+                },
+                "outputs": {
+                  "response-data": "",
+                  "status": "success"
+                }
+              }
+            }
+          }
+        },
+        "artifacts": {
+          "component-script": {
+            "type": "artifact-script-python",
+            "file": "Scripts/python/SamplePython.py"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/resources_definition_types.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/resources_definition_types.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Scripts/python/SamplePython.py b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Scripts/python/SamplePython.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Scripts/python/SamplePython.py
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/TOSCA-Metadata/TOSCA.meta
new file mode 100644
index 000000000..5ca8aa031
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/TOSCA-Metadata/TOSCA.meta
@@ -0,0 +1,5 @@
+TOSCA-Meta-File-Version: 1.0.0
+CSAR-Version: 1.0
+Created-By: Brinda Santh <brindasanth@in.ibm.com>
+Entry-Definitions: Definitions/remote_scripts.json
+Template-Tags: Brinda Santh, remote_scripts
\ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json
index df2095c7c..25ada665a 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json
@@ -1,5 +1,5 @@
 {
-  "description": "This is Jython Execution Component.",
+  "description": "This is Remote Python Execution Component.",
   "version": "1.0.0",
   "capabilities": {
     "component-node": {
@@ -14,7 +14,8 @@
             "endpoint-selector": {
               "description": "Remote Container or Server selector name.",
               "required": false,
-              "type": "string"
+              "type": "string",
+              "default": "default"
             },
             "dynamic-properties": {
               "description": "Dynamic Json Content or DSL Json reference.",
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()
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutorTest.kt b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutorTest.kt
new file mode 100644
index 000000000..7cd5d5cac
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutorTest.kt
@@ -0,0 +1,91 @@
+/*
+ *  Copyright © 2019 IBM.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.onap.ccsdk.cds.blueprintsprocessor.functions.python.executor
+
+import com.fasterxml.jackson.databind.JsonNode
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.*
+import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.RemoteScriptExecutionService
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.putJsonElement
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+
+class ComponentRemotePythonExecutorTest {
+
+    @Test
+    fun testComponentRemotePythonExecutor() {
+        runBlocking {
+            val remoteScriptExecutionService = MockRemoteScriptExecutionService()
+
+            val componentRemotePythonExecutor = ComponentRemotePythonExecutor(remoteScriptExecutionService)
+
+            val executionServiceInput = JacksonUtils.readValueFromClassPathFile("payload/requests/sample-activate-request.json",
+                    ExecutionServiceInput::class.java)!!
+
+            val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime("123456-1000",
+                    "./../../../../components/model-catalog/blueprint-model/test-blueprint/remote_scripts")
+
+            val stepMetaData: MutableMap<String, JsonNode> = hashMapOf()
+            stepMetaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_NODE_TEMPLATE, "execute-remote-python")
+            stepMetaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_INTERFACE, "ComponentRemotePythonExecutor")
+            stepMetaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_OPERATION, "process")
+            componentRemotePythonExecutor.bluePrintRuntimeService = bluePrintRuntimeService
+            val stepInputData = StepData().apply {
+                name = "execute-remote-python"
+                properties = stepMetaData
+            }
+            executionServiceInput.stepData = stepInputData
+            componentRemotePythonExecutor.applyNB(executionServiceInput)
+        }
+
+    }
+}
+
+class MockRemoteScriptExecutionService : RemoteScriptExecutionService {
+    override suspend fun init(selector: String) {
+    }
+
+    override suspend fun prepareEnv(prepareEnvInput: PrepareRemoteEnvInput): RemoteScriptExecutionOutput {
+        assertEquals(prepareEnvInput.requestId, "123456-1000", "failed to match request id")
+        assertEquals(prepareEnvInput.remoteScriptType, RemoteScriptType.PYTHON, "failed to match script type")
+        assertNotNull(prepareEnvInput.packages, "failed to get packages")
+
+        val remoteScriptExecutionOutput = mockk<RemoteScriptExecutionOutput>()
+        every { remoteScriptExecutionOutput.status } returns StatusType.SUCCESS
+        return remoteScriptExecutionOutput
+    }
+
+    override suspend fun executeCommand(remoteExecutionInput: RemoteScriptExecutionInput): RemoteScriptExecutionOutput {
+        assertEquals(remoteExecutionInput.requestId, "123456-1000", "failed to match request id")
+        assertEquals(remoteExecutionInput.remoteScriptType, RemoteScriptType.PYTHON, "failed to match script type")
+
+        val remoteScriptExecutionOutput = mockk<RemoteScriptExecutionOutput>()
+        every { remoteScriptExecutionOutput.status } returns StatusType.SUCCESS
+        return remoteScriptExecutionOutput
+    }
+
+    override suspend fun close() {
+
+    }
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
index e82ffc458..d06d5db9a 100644
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
@@ -92,6 +92,14 @@ class BluePrintEnhancerServiceImplTest {
 
     }
 
+    @Test
+    @Throws(Exception::class)
+    fun testRemoteScriptsEnhancementAndValidation() {
+        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/remote_scripts"
+        testComponentInvokeEnhancementAndValidation(basePath, "remote_scripts-enhance")
+
+    }
+
     private fun testComponentInvokeEnhancementAndValidation(basePath: String, targetDirName: String) {
         runBlocking {
             val targetPath = normalizedPathName("target/blueprints/enrichment", targetDirName)
@@ -105,7 +113,7 @@ class BluePrintEnhancerServiceImplTest {
             val valid = bluePrintValidatorService.validateBluePrints(targetPath)
             Assert.assertTrue("blueprint($basePath) validation failed ", valid)
 
-//            deleteDir(targetPath)
+            deleteDir(targetPath)
         }
     }