Merge "blueprint scripting services"

20 files changed, 388 insertions, 54 deletions

diff --git a/.gitignore b/.gitignore
index 5d835f55..993ab740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,8 @@
 **/tokens/*

 

 # Added for Intellij IDEA IDE

-**/*.ipr
-**/*.iws
+**/*.ipr

+**/*.iws

 **/debug-logs/*

 **/.idea/*

 **/*.iml

@@ -20,7 +20,10 @@
 **/blackDuckHub*

 **/*.jsonld

 **/.checkstyle

-**/.gitignore
-
-**/*py.class
+**/.gitignore

+

+**/*py.class

 **/.DS_Store

+

+# To Remove Kotlin Script Generated Jars

+**/*cba-kts.jar
\ No newline at end of file
diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
index 4ef0e82b..b1a7daad 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/BluePrintConstants.kt
@@ -27,13 +27,13 @@ object BluePrintConstants {
     const val RESPONSE_HEADER_TRANSACTION_ID: String = "X-ONAP-RequestID"

     const val RESPONSE_HEADER_MINOR_VERSION: String = "X-MinorVersion"

     const val RESPONSE_HEADER_PATCH_VERSION: String = "X-PatchVersion"

-    const val RESPONSE_HEADER_LATEST_VERSION: String = "X-LatestVersion"
-
-    const val STATUS_SUCCESS: String = "success"
-    const val STATUS_PROCESSING: String = "processing"
-    const val STATUS_FAILURE: String = "failure"
-
-    const val TYPE_DEFAULT: String = "default"
+    const val RESPONSE_HEADER_LATEST_VERSION: String = "X-LatestVersion"

+

+    const val STATUS_SUCCESS: String = "success"

+    const val STATUS_PROCESSING: String = "processing"

+    const val STATUS_FAILURE: String = "failure"

+

+    const val TYPE_DEFAULT: String = "default"

 

     const val DATA_TYPE_STRING: String = "string"

     const val DATA_TYPE_INTEGER: String = "integer"

@@ -102,6 +102,7 @@ object BluePrintConstants {
     const val MODEL_TYPE_NODES_COMPONENT_SCRIPT: String = "tosca.nodes.component.Script"

     const val MODEL_TYPE_NODES_COMPONENT_PYTHON: String = "tosca.nodes.component.Python"

     const val MODEL_TYPE_NODES_COMPONENT_JYTHON: String = "tosca.nodes.component.Jython"

+    const val MODEL_TYPE_NODES_COMPONENT_KOTLIN: String = "tosca.nodes.component.Kotlin"

     const val MODEL_TYPE_NODES_COMPONENT_JAVA_SCRIPT: String = "tosca.nodes.component.JavaScript"

 

     const val MODEL_TYPE_ARTIFACT_TYPE_IMPLEMENTATION = "tosca.artifacts.Implementation"

@@ -148,6 +149,7 @@ object BluePrintConstants {
     const val TOSCA_SCRIPTS_DIR: String = "Scripts"

     const val TOSCA_MAPPINGS_DIR: String = "Mappings"

     const val TOSCA_TEMPLATES_DIR: String = "Templates"

+    const val TOSCA_SCRIPTS_KOTLIN_DIR: String = "$TOSCA_SCRIPTS_DIR/kotlin"

 

     const val METADATA_USER_GROUPS = "user-groups"

     const val METADATA_TEMPLATE_NAME = "template_name"

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt
new file mode 100644
index 00000000..124c167a
--- /dev/null
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/interfaces/BluePrintScriptsService.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.apps.controllerblueprints.core.interfaces
+
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+
+interface BluePrintScriptsService{
+
+    fun <T> scriptInstance(blueprintContext: BluePrintContext, scriptClassName: String,
+                           reCompile: Boolean): T
+}
\ No newline at end of file
diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt
index 1a6d096d..79360451 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContext.kt
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and

  * limitations under the License.

  */

+@file:Suppress("unused")

 

 package org.onap.ccsdk.apps.controllerblueprints.core.service

 

 import com.att.eelf.configuration.EELFLogger

 import com.att.eelf.configuration.EELFManager

 import com.fasterxml.jackson.databind.JsonNode

+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants

 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException

 import org.onap.ccsdk.apps.controllerblueprints.core.data.*

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils

@@ -55,6 +57,15 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) {
         return JacksonUtils.getJson(serviceTemplate, pretty)

     }

 

+    fun name(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_NAME)

+            ?: throw BluePrintException("could't get template name from meta data")

+

+    fun version(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_VERSION)

+            ?: throw BluePrintException("could't get template version from meta data")

+

+    fun author(): String = metadata?.get(BluePrintConstants.METADATA_TEMPLATE_AUTHOR)

+            ?: throw BluePrintException("could't get template author from meta data")

+

     // Workflow

     val workflows: MutableMap<String, Workflow>? = serviceTemplate.topologyTemplate?.workflows

 

@@ -148,7 +159,7 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) {
     val nodeTemplates: MutableMap<String, NodeTemplate>? = serviceTemplate.topologyTemplate?.nodeTemplates

 

     fun nodeTemplateByName(name: String): NodeTemplate =

-            nodeTemplates?.get(name) ?: throw BluePrintException("could't get node template for the name($name)")
+            nodeTemplates?.get(name) ?: throw BluePrintException("could't get node template for the name($name)")

 

     fun nodeTemplateForNodeType(name: String): MutableMap<String, NodeTemplate>? {

         return nodeTemplates?.filterValues { nodeTemplate -> nodeTemplate.type == name }?.toMutableMap()

diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts
new file mode 100644
index 00000000..f1da6140
--- /dev/null
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.
+ */
+
+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.processor.*
+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintScriptsService
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive
+
+open class ScriptResourceAssignmentProcessor : ResourceAssignmentProcessor() {
+
+    lateinit var resourceAssignment: ResourceAssignment
+
+    override fun getName(): String {
+        return "resource-assignment-processor-custom-capability"
+    }
+
+    override fun process(resourceAssignment: ResourceAssignment) {
+        this.resourceAssignment = resourceAssignment
+    }
+
+    override fun prepareResponse(): ResourceAssignment {
+        return resourceAssignment
+    }
+
+    override fun recover(runtimeException: RuntimeException, resourceAssignment: ResourceAssignment) {
+        TODO("To Implement")
+    }
+
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts
new file mode 100644
index 00000000..184c4933
--- /dev/null
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.
+ */
+
+import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode
+
+open class SampleKotlinComponent : BlueprintFunctionNode<String, String> {
+
+    override fun getName(): String {
+        return "my Name"
+    }
+
+    override fun prepareRequest(executionRequest: String): String {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun process(executionRequest: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun recover(runtimeException: RuntimeException, executionRequest: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun prepareResponse(): String {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun apply(t: String): String {
+        return "Successfully Executed Scripts"
+    }
+}
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-capability.json b/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
index e4eb90e7..2bdd7d57 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
@@ -17,10 +17,18 @@
       ]
     },
     "instance-name": {
-      "description": "Capability component instance reference name.",
+      "description": "Capability component instance reference name for JAVA-COMPONENT, Script Class name for KOTLIN-COMPONENT.",
       "required": true,
       "type": "string"
     },
+    "instance-dependencies": {
+      "required": false,
+      "description": "Instance dependency Names to Inject to Kotlin / Jython Script.",
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
     "input-key-mapping": {
       "description": "Context name to input parameters name mapping.",
       "required": false,
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml
index 925f9e33..b29149d8 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml
+++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml
@@ -35,6 +35,10 @@
             <version>${project.version}</version>
         </dependency>-->
         <dependency>
+            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+            <artifactId>blueprint-scripts</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt
index 9bad0998..a44d366c 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("unused")
 
 package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution
 
-open class ResourceSourceProperties {
-
-}
+open class ResourceSourceProperties
 
 open class InputResourceSource : ResourceSourceProperties() {
     lateinit var key: String
@@ -51,6 +50,7 @@ open class RestResourceSource : ResourceSourceProperties() {
 open class CapabilityResourceSource : ResourceSourceProperties() {
     lateinit var type: String
     lateinit var instanceName: String
+    var instanceDependencies: List<String>? = null
     lateinit var path: String
     lateinit var expressionType: String
     var inputKeyMapping: MutableMap<String, String>? = null
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessor.kt
index 6c235599..1370a479 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessor.kt
@@ -18,14 +18,16 @@ package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.pr
 
 import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintScriptsService
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.stereotype.Service
 
 @Service("resource-assignment-processor-capability")
-open class CapabilityResourceAssignmentProcessor : ResourceAssignmentProcessor() {
+open class CapabilityResourceAssignmentProcessor(private var applicationContext: ApplicationContext,
+                                                 private val bluePrintScriptsService: BluePrintScriptsService) :
+        ResourceAssignmentProcessor() {
 
     companion object {
         const val CAPABILITY_TYPE_KOTLIN_COMPONENT = "KOTLIN-COMPONENT"
@@ -33,9 +35,6 @@ open class CapabilityResourceAssignmentProcessor : ResourceAssignmentProcessor()
         const val CAPABILITY_TYPE_JYTHON_COMPONENT = "JYTHON-COMPONENT"
     }
 
-    @Autowired
-    private lateinit var applicationContext: ApplicationContext
-
     override fun getName(): String {
         return "resource-assignment-processor-capability"
     }
@@ -46,20 +45,25 @@ open class CapabilityResourceAssignmentProcessor : ResourceAssignmentProcessor()
                 ?: throw BluePrintProcessorException("couldn't get resource definition for ${resourceAssignment.dictionaryName}")
 
         val resourceSource = resourceDefinition.sources[resourceAssignment.dictionarySource]
-                ?: throw BluePrintProcessorException("couldn't get resource definition ${resourceAssignment.dictionaryName} source(${resourceAssignment.dictionarySource})")
+                ?: throw BluePrintProcessorException("couldn't get resource definition " +
+                        "${resourceAssignment.dictionaryName} source(${resourceAssignment.dictionarySource})")
 
         val resourceSourceProps = checkNotNull(resourceSource.properties) { "failed to get $resourceSource properties" }
-        val capabilityResourceSourceProperty = JacksonUtils.getInstanceFromMap(resourceSourceProps, CapabilityResourceSource::class.java)
+        /**
+         * Get the Capability Resource Source Info from Property Definitions.
+         */
+        val capabilityResourceSourceProperty = JacksonUtils
+                .getInstanceFromMap(resourceSourceProps, CapabilityResourceSource::class.java)
 
         val instanceType = capabilityResourceSourceProperty.type
         val instanceName = capabilityResourceSourceProperty.instanceName
 
-
         var componentResourceAssignmentProcessor: ResourceAssignmentProcessor? = null
 
         when (instanceType) {
-            CAPABILITY_TYPE_KOTLIN_COMPONENT ->{
-                TODO("NO implementation")
+            CAPABILITY_TYPE_KOTLIN_COMPONENT -> {
+                componentResourceAssignmentProcessor = getKotlinResourceAssignmentProcessorInstance(instanceName,
+                        capabilityResourceSourceProperty.instanceDependencies)
             }
             CAPABILITY_TYPE_JAVA_COMPONENT -> {
                 // Initialize Capability Resource Assignment Processor
@@ -84,4 +88,36 @@ open class CapabilityResourceAssignmentProcessor : ResourceAssignmentProcessor()
 
         TODO("To Implement")
     }
+
+    private fun getKotlinResourceAssignmentProcessorInstance(scriptClassName: String,
+                                                             instanceNames: List<String>? = null): ResourceAssignmentProcessor {
+        var scriptPropertyInstances: MutableMap<String, Any>? = null
+
+        if (instanceNames != null && instanceNames.isNotEmpty()) {
+            scriptPropertyInstances = hashMapOf()
+            instanceNames.forEach {
+                scriptPropertyInstances[it] = applicationContext.getBean(it)
+                        ?: throw BluePrintProcessorException("couldn't get the dependency instance($it)")
+            }
+        }
+
+        return getKotlinResourceAssignmentProcessorInstance(scriptClassName, scriptPropertyInstances)
+
+    }
+
+    fun getKotlinResourceAssignmentProcessorInstance(scriptClassName: String,
+                                                     scriptPropertyInstances: MutableMap<String, Any>? = null):
+            ResourceAssignmentProcessor {
+
+        val resourceAssignmentProcessor = bluePrintScriptsService
+                .scriptInstance<ResourceAssignmentProcessor>(raRuntimeService.bluePrintContext(),
+                        scriptClassName, false)
+
+        // Add additional Instance
+        if (scriptPropertyInstances != null) {
+            resourceAssignmentProcessor.scriptPropertyInstances = scriptPropertyInstances
+        }
+
+        return resourceAssignmentProcessor
+    }
 }
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt
index 43238a53..d6f46a6f 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt
@@ -31,6 +31,16 @@ abstract class ResourceAssignmentProcessor : BlueprintFunctionNode<ResourceAssig
     lateinit var raRuntimeService: ResourceAssignmentRuntimeService
     lateinit var resourceDictionaries: Map<String, ResourceDefinition>
 
+    var scriptPropertyInstances: Map<String, Any> = hashMapOf()
+
+    /**
+     * This will be called from the scripts to serve instance from runtime to scripts.
+     */
+    open fun <T> scriptPropertyInstanceType(name: String): T {
+        return scriptPropertyInstances as? T
+                ?: throw BluePrintProcessorException("couldn't get script property instance ($name)")
+    }
+
     open fun resourceDefinition(name: String): ResourceDefinition {
         return resourceDictionaries[name]
                 ?: throw BluePrintProcessorException("couldn't get resource definition for ($name)")
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessorTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessorTest.kt
new file mode 100644
index 00000000..ce05c34b
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceAssignmentProcessorTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.apps.blueprintsprocessor.functions.resource.resolution.processor
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.ResourceAssignmentRuntimeService
+import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import org.onap.ccsdk.apps.controllerblueprints.scripts.BluePrintScriptsServiceImpl
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.junit4.SpringRunner
+import kotlin.test.assertNotNull
+
+@RunWith(SpringRunner::class)
+@ContextConfiguration(classes = [CapabilityResourceAssignmentProcessor::class, BluePrintScriptsServiceImpl::class,
+    MockCapabilityService::class])
+class CapabilityResourceAssignmentProcessorTest {
+
+    @Autowired
+    lateinit var capabilityResourceAssignmentProcessor: CapabilityResourceAssignmentProcessor
+
+    @Test
+    fun `test kotlin capability`() {
+
+        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(
+                "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+
+        val resourceAssignmentRuntimeService = ResourceAssignmentRuntimeService("1234", bluePrintContext)
+
+        capabilityResourceAssignmentProcessor.raRuntimeService = resourceAssignmentRuntimeService
+        capabilityResourceAssignmentProcessor.resourceDictionaries = hashMapOf()
+
+
+        val scriptPropertyInstances: MutableMap<String, Any> = mutableMapOf()
+        scriptPropertyInstances["mock-service1"] = MockCapabilityService()
+        scriptPropertyInstances["mock-service2"] = MockCapabilityService()
+
+        val resourceAssignmentProcessor = capabilityResourceAssignmentProcessor
+                .getKotlinResourceAssignmentProcessorInstance(
+                        "ResourceAssignmentProcessor_cba\$ScriptResourceAssignmentProcessor", scriptPropertyInstances)
+
+        assertNotNull(resourceAssignmentProcessor, "couldn't get kotlin script resource assignment processor")
+
+        val resourceAssignment = ResourceAssignment().apply {
+            name = "ra-name"
+            dictionaryName = "ra-dict-name"
+            dictionarySource = "capability"
+            property = PropertyDefinition().apply {
+                type = "string"
+            }
+        }
+
+        val processorName = resourceAssignmentProcessor.apply(resourceAssignment)
+        assertNotNull(processorName, "couldn't get kotlin script resource assignment processor name")
+        println(processorName)
+    }
+
+}
+
+open class MockCapabilityService {
+
+}
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 472b466b..0de4b429 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -18,7 +18,7 @@
   ~  limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
@@ -327,6 +327,11 @@
                 <artifactId>core</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+                <artifactId>blueprint-scripts</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Database -->
             <dependency>
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/pom.xml b/ms/controllerblueprints/modules/blueprint-scripts/pom.xml
index 46c88b4c..e0858d20 100644
--- a/ms/controllerblueprints/modules/blueprint-scripts/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-scripts/pom.xml
@@ -54,6 +54,10 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-script-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintCompilerProxy.kt b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintCompilerProxy.kt
index 7e9e8688..ce9553c0 100644
--- a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintCompilerProxy.kt
+++ b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintCompilerProxy.kt
@@ -16,7 +16,6 @@
 
 package org.onap.ccsdk.apps.controllerblueprints.scripts
 
-import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
 import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
@@ -28,6 +27,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler
 import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
+import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.config.*
 import org.slf4j.LoggerFactory
 import java.io.File
@@ -94,13 +94,11 @@ open class BluePrintsCompilerProxy(private val hostConfiguration: ScriptingHostC
                 // Compile Kotlin Sources
                 val compiled = KotlinToJVMBytecodeCompiler.compileBunchOfSources(environment)
 
-                log.info("Generated jar(${compiledJarFile.absolutePath}) status : $compiled}")
-
                 val analyzerWithCompilerReport = AnalyzerWithCompilerReport(messageCollector,
                         environment.configuration.languageVersionSettings)
 
                 if (analyzerWithCompilerReport.hasErrors()) {
-                    return failure()
+                    return ResultWithDiagnostics.Failure(messageCollector.diagnostics)
                 }
             }
 
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BlueprintScriptingHost.kt b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptingHost.kt
index 59ce4abb..df721e0f 100644
--- a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BlueprintScriptingHost.kt
+++ b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptingHost.kt
@@ -41,12 +41,14 @@ open class BlueprintScriptingHost(evaluator: ScriptEvaluator) : BasicScriptingHo
                 compiler(script, scriptCompilationConfiguration)
                         .onSuccess {
                             evaluator(it, configuration)
+                        }.onFailure { failedResult ->
+                            val messages = failedResult.reports?.joinToString("\n")
+                            throw BluePrintProcessorException(messages)
                         }
             }
 }
 
-
-open class BluePrintScriptEvaluator<T>(private val scriptClassName: String) : ScriptEvaluator {
+open class BluePrintScriptEvaluator(private val scriptClassName: String) : ScriptEvaluator {
 
     private val log = LoggerFactory.getLogger(BluePrintScriptEvaluator::class.java)!!
 
@@ -55,7 +57,7 @@ open class BluePrintScriptEvaluator<T>(private val scriptClassName: String) : Sc
             scriptEvaluationConfiguration: ScriptEvaluationConfiguration?
     ): ResultWithDiagnostics<EvaluationResult> =
             try {
-                log.info("Getting class name($scriptClassName) of type() from the compiled sources ")
+                log.debug("Getting script class name($scriptClassName) from the compiled sources ")
                 val bluePrintCompiledScript = compiledScript as BluePrintCompiledScript
                 bluePrintCompiledScript.scriptClassFQName = scriptClassName
 
@@ -76,10 +78,10 @@ open class BluePrintScriptEvaluator<T>(private val scriptClassName: String) : Sc
                             args.addAll(it)
                         }
 
-                        val instance = scriptClass.java.newInstance() as? T
+                        val instance = scriptClass.java.constructors.single().newInstance(*args.toArray())
                                 ?: throw BluePrintProcessorException("failed to create instance from the script")
 
-                        log.info("Created script instance successfully....")
+                        log.info("Created script instance of type ${instance.javaClass}")
 
                         ResultWithDiagnostics.Success(EvaluationResult(ResultValue.Value(scriptClass.qualifiedName!!,
                                 instance, "", instance),
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptConfiguration.kt b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptsConfiguration.kt
index 3b3a5907..c4e2cfba 100644
--- a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptConfiguration.kt
+++ b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptsConfiguration.kt
@@ -18,11 +18,9 @@ package org.onap.ccsdk.apps.controllerblueprints.scripts
 
 import java.io.File
 import kotlin.script.experimental.annotations.KotlinScript
-import kotlin.script.experimental.api.ScriptCompilationConfiguration
-import kotlin.script.experimental.api.SourceCode
-import kotlin.script.experimental.api.defaultImports
+import kotlin.script.experimental.api.*
 import kotlin.script.experimental.jvm.jvm
-import kotlin.script.experimental.jvm.util.classpathFromClassloader
+import kotlin.script.experimental.jvm.util.classpathFromClasspathProperty
 
 @KotlinScript(
         fileExtension = "cba.kts",
@@ -33,15 +31,14 @@ abstract class BluePrintKotlinScript
 
 object BluePrintScripCompilationConfiguration : ScriptCompilationConfiguration(
         {
-            defaultImports(
-                    "org.onap.ccsdk.apps.controllerblueprints.core.*",
-                    "org.onap.ccsdk.apps.controllerblueprints.core.data.*",
-                    "org.onap.ccsdk.apps.controllerblueprints.core.interfaces.*",
-                    "org.onap.ccsdk.apps.controllerblueprints.core.services.*",
-                    "org.onap.ccsdk.apps.controllerblueprints.core.utils.*")
             jvm {
-                classpathFromClassloader(BluePrintScripCompilationConfiguration::class.java.classLoader)
+                //classpathFromClassloader(BluePrintScripCompilationConfiguration::class.java.classLoader)
+                classpathFromClasspathProperty()
             }
+            ide{
+                acceptedLocations(ScriptAcceptedLocation.Everywhere)
+            }
+
         }
 )
 
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptsServiceImpl.kt b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptsServiceImpl.kt
new file mode 100644
index 00000000..e1365523
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-scripts/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BluePrintScriptsServiceImpl.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.apps.controllerblueprints.scripts
+
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintScriptsService
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
+import org.springframework.stereotype.Service
+import java.io.File
+import kotlin.script.experimental.api.ResultValue
+import kotlin.script.experimental.api.resultOrNull
+import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
+
+@Service
+open class BluePrintScriptsServiceImpl : BluePrintScriptsService {
+
+    override fun <T> scriptInstance(blueprintContext: BluePrintContext, scriptClassName: String,
+                                    reCompile: Boolean): T {
+
+        val kotlinScriptPath = blueprintContext.rootPath.plus(File.separator)
+                .plus(BluePrintConstants.TOSCA_SCRIPTS_KOTLIN_DIR)
+
+        val compiledJar = kotlinScriptPath.plus(File.separator)
+                .plus(getBluePrintScriptsJarName(blueprintContext))
+
+        val scriptSource = BluePrintSourceCode()
+
+        val sources: MutableList<String> = arrayListOf()
+        sources.add(kotlinScriptPath)
+        scriptSource.blueprintKotlinSources = sources
+        scriptSource.moduleName = "${blueprintContext.name()}-${blueprintContext.version()}-cba-kts"
+        scriptSource.targetJarFile = File(compiledJar)
+        scriptSource.regenerate = reCompile
+
+        val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<BluePrintKotlinScript>()
+        val scriptEvaluator = BluePrintScriptEvaluator(scriptClassName)
+
+        val compiledResponse = BlueprintScriptingHost(scriptEvaluator).eval(scriptSource, compilationConfiguration,
+                null)
+
+        val returnValue = compiledResponse.resultOrNull()?.returnValue as? ResultValue.Value
+
+        return returnValue?.value!! as T
+    }
+
+}
+
+fun getBluePrintScriptsJarName(blueprintContext: BluePrintContext): String {
+    return "${blueprintContext.name()}-${blueprintContext.version()}-cba-kts.jar"
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/src/main/resources/META-INF/kotlin/script/templates/org.onap.ccsdk.apps.controllerblueprints.scripts.BluePrintKotlinScript b/ms/controllerblueprints/modules/blueprint-scripts/src/main/resources/META-INF/kotlin/script/templates/org.onap.ccsdk.apps.controllerblueprints.scripts.BluePrintKotlinScript
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/ms/controllerblueprints/modules/blueprint-scripts/src/main/resources/META-INF/kotlin/script/templates/org.onap.ccsdk.apps.controllerblueprints.scripts.BluePrintKotlinScript
diff --git a/ms/controllerblueprints/modules/blueprint-scripts/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BlueprintScriptingHostTest.kt b/ms/controllerblueprints/modules/blueprint-scripts/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BlueprintScriptingHostTest.kt
index 4b6f2a47..e84347d2 100644
--- a/ms/controllerblueprints/modules/blueprint-scripts/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BlueprintScriptingHostTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-scripts/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/scripts/BlueprintScriptingHostTest.kt
@@ -18,9 +18,7 @@ package org.onap.ccsdk.apps.controllerblueprints.scripts
 
 
 import org.apache.commons.io.FileUtils
-import org.junit.Ignore
 import org.junit.Test
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode
 import java.io.File
 import kotlin.script.experimental.jvm.util.classpathFromClass
 import kotlin.script.experimental.jvm.util.classpathFromClassloader
@@ -29,9 +27,7 @@ import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT
 
 class BlueprintScriptingHostTest {
 
-    @Test
-    @Ignore
-    fun `test classpaths`() {
+    private fun viewClassPathInfo() {
 
         println(" *********** classpathFromClass  *********** ")
         classpathFromClass(BlueprintScriptingHostTest::class.java.classLoader,
@@ -65,7 +61,7 @@ class BlueprintScriptingHostTest {
 
         val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<BluePrintKotlinScript>()
 
-        val scriptEvaluator = BluePrintScriptEvaluator<BlueprintFunctionNode<String, String>>(scriptClassName)
+        val scriptEvaluator = BluePrintScriptEvaluator(scriptClassName)
 
         val scriptSource2 = BluePrintSourceCode()
         scriptSource2.moduleName = "blueprint-test-script"