Refractor duplicate cli script function

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

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index 5530b7c..135016a 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -310,18 +310,17 @@
         }
       },
       "activate-cli": {
-        "type": "component-cli-executor",
+        "type": "component-script-executor",
         "interfaces": {
-          "ComponentCliExecutor": {
+          "ComponentScriptExecutor": {
             "operations": {
               "process": {
                 "implementation": {
                   "primary": "component-script"
                 },
                 "inputs": {
-                  "script-type": "kotlin",
-                  "script-class-reference": "InternalSimpleCli_cba$TestCliScriptFunction",
-                  "instance-dependencies": []
+                  "script-type": "internal",
+                  "script-class-reference": "internal.scripts.TestCliScriptFunction"
                 },
                 "outputs": {
                   "response-data": "",
@@ -440,7 +439,7 @@
             "target": "activate-cli",
             "activities": [
               {
-                "call_operation": "ComponentCliExecutor.process"
+                "call_operation": "ComponentScriptExecutor.process"
               }
             ]
           }

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index 0af2cd9..6de1fe3 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -1,6 +1,6 @@
 {
   "node_types": {
-    "component-cli-executor": {
+    "component-script-executor": {
       "description": "This is CLI Transaction Configuration Component API",
       "version": "1.0.0",
       "capabilities": {
@@ -9,7 +9,7 @@
         }
       },
       "interfaces": {
-        "ComponentCliExecutor": {
+        "ComponentScriptExecutor": {
           "operations": {
             "process": {
               "inputs": {
@@ -33,14 +33,6 @@
                   "required": true,
                   "type": "string"
                 },
-                "instance-dependencies": {
-                  "description": "Instance names to inject to Jython or Kotlin Script.",
-                  "required": true,
-                  "type": "list",
-                  "entry_schema": {
-                    "type": "string"
-                  }
-                },
                 "dynamic-properties": {
                   "description": "Dynamic Json Content or DSL Json reference.",
                   "required": false,

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Definitions/capability-cli-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Definitions/capability-cli-blueprint.json
index c66bb6e..f091100 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Definitions/capability-cli-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Definitions/capability-cli-blueprint.json
@@ -41,7 +41,7 @@
             "target": "check",
             "activities": [
               {
-                "call_operation": "ComponentCliExecutor.process"
+                "call_operation": "ComponentScriptExecutor.process"
               }
             ]
           }
@@ -50,9 +50,9 @@
     },
     "node_templates": {
       "check": {
-        "type": "component-cli-executor",
+        "type": "component-script-executor",
         "interfaces": {
-          "ComponentCliExecutor": {
+          "ComponentScriptExecutor": {
             "operations": {
               "process": {
                 "implementation": {
@@ -60,8 +60,7 @@
                 },
                 "inputs": {
                   "script-type": "kotlin",
-                  "script-class-reference": "InternalSimpleCli_cba$TestCliScriptFunction",
-                  "instance-dependencies": []
+                  "script-class-reference": "cba.scripts.capability.cli.Check"
                 },
                 "outputs": {
                   "response-data": "",

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.kt
similarity index 96%
rename from components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.cba.kts
rename to components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.kt
index e22fd7e..270184d 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.cba.kts
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.kt
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-
+package cba.scripts.capability.cli
 
 open class Check : CliComponentFunction() {
 

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-cli-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-script-executor.json
similarity index 83%
rename from components/model-catalog/definition-type/starter-type/node_type/component-cli-executor.json
rename to components/model-catalog/definition-type/starter-type/node_type/component-script-executor.json
index 4860dd4..b241aa3 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-cli-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-script-executor.json
@@ -7,7 +7,7 @@
     }
   },
   "interfaces": {
-    "ComponentCliExecutor": {
+    "ComponentScriptExecutor": {
       "operations": {
         "process": {
           "inputs": {
@@ -31,14 +31,6 @@
               "required": true,
               "type": "string"
             },
-            "instance-dependencies": {
-              "required": true,
-              "description": "Instance names to inject to Jython or Kotlin Script.",
-              "type": "list",
-              "entry_schema": {
-                "type": "string"
-              }
-            },
             "dynamic-properties": {
               "description": "Dynamic Json Content or DSL Json reference.",
               "required": false,

diff --git a/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/scripts/InternalSimpleCli.cba.kts b/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/internal/scripts/InternalSimpleCli.kt
similarity index 97%
rename from ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/scripts/InternalSimpleCli.cba.kts
rename to ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/internal/scripts/InternalSimpleCli.kt
index e623747..4c1d92a 100644 (file)
--- a/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/scripts/InternalSimpleCli.cba.kts
+++ b/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/internal/scripts/InternalSimpleCli.kt
@@ -16,6 +16,8 @@
 
 @file:Suppress("unused")
 
+package internal.scripts
+
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
 import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentScriptExecutor
@@ -26,10 +28,10 @@ import org.slf4j.LoggerFactory
 
 open class TestCliScriptFunction : AbstractScriptComponentFunction() {
 
-    private val log = LoggerFactory.getLogger(TestCliScriptFunction::class.java.canonicalName)!!
+    private val log = LoggerFactory.getLogger(TestCliScriptFunction::class.java)!!
 
     override fun getName(): String {
-        return "SimpleCliConfigure"
+        return "TestCliScriptFunction"
     }
 
     override suspend fun processNB(executionRequest: ExecutionServiceInput) {

diff --git a/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutor.kt b/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutor.kt
deleted file mode 100644 (file)
index e1d8825..0000000
--- a/ms/blueprintsprocessor/functions/cli-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  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.cli.executor
-
-import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentFunctionScriptingService
-import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentScriptExecutor
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Component
-
-@Component("component-cli-executor")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class ComponentCliExecutor(private var componentFunctionScriptingService: ComponentFunctionScriptingService)
-    : ComponentScriptExecutor(componentFunctionScriptingService)
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/functions/cli-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutorTest.kt b/ms/blueprintsprocessor/functions/cli-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutorTest.kt
index 658092f..0c538d4 100644 (file)
--- a/ms/blueprintsprocessor/functions/cli-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutorTest.kt
+++ b/ms/blueprintsprocessor/functions/cli-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/cli/executor/ComponentCliExecutorTest.kt
@@ -56,12 +56,12 @@ import kotlin.test.assertNotNull
 class ComponentCliExecutorTest {
 
     @Autowired
-    lateinit var componentCliExecutor: ComponentCliExecutor
+    lateinit var componentScriptExecutor: ComponentScriptExecutor
 
     @Test
     fun `test CLI Component Instance`() {
         runBlocking {
-            assertNotNull(componentCliExecutor, "failed to get ComponentCliExecutor instance")
+            assertNotNull(componentScriptExecutor, "failed to get ComponentCliExecutor instance")
             val executionServiceInput = ExecutionServiceInput().apply {
                 commonHeader = CommonHeader().apply {
                     requestId = "1234"
@@ -72,8 +72,8 @@ class ComponentCliExecutorTest {
                 payload = JacksonUtils.jsonNode("{}") as ObjectNode
             }
             val bluePrintRuntime = mockk<DefaultBluePrintRuntimeService>("1234")
-            componentCliExecutor.bluePrintRuntimeService = bluePrintRuntime
-            componentCliExecutor.stepName = "sample-step"
+            componentScriptExecutor.bluePrintRuntimeService = bluePrintRuntime
+            componentScriptExecutor.stepName = "sample-step"
 
             val operationInputs = hashMapOf<String, JsonNode>()
             operationInputs[BluePrintConstants.PROPERTY_CURRENT_NODE_TEMPLATE] = "activate-cli".asJsonPrimitive()
@@ -81,7 +81,7 @@ class ComponentCliExecutorTest {
             operationInputs[BluePrintConstants.PROPERTY_CURRENT_OPERATION] = "operationName".asJsonPrimitive()
             operationInputs[ComponentScriptExecutor.SCRIPT_TYPE] = BluePrintConstants.SCRIPT_INTERNAL.asJsonPrimitive()
             operationInputs[ComponentScriptExecutor.SCRIPT_CLASS_REFERENCE] =
-                    "InternalSimpleCli_cba\$TestCliScriptFunction".asJsonPrimitive()
+                    "internal.scripts.TestCliScriptFunction".asJsonPrimitive()
 
             val stepInputData = StepData().apply {
                 name = "activate-cli"
@@ -102,7 +102,7 @@ class ComponentCliExecutorTest {
                         "interfaceName", "operationName")
             } returns operationOutputs
 
-            componentCliExecutor.applyNB(executionServiceInput)
+            componentScriptExecutor.applyNB(executionServiceInput)
         }
     }
 }
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/functions/cli-executor/src/test/resources/logback-test.xml b/ms/blueprintsprocessor/functions/cli-executor/src/test/resources/logback-test.xml
index 626b8f9..688a533 100644 (file)
--- a/ms/blueprintsprocessor/functions/cli-executor/src/test/resources/logback-test.xml
+++ b/ms/blueprintsprocessor/functions/cli-executor/src/test/resources/logback-test.xml
@@ -27,6 +27,7 @@
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="info"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
+    <logger name="internal.scripts" level="info"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>