diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json | 11 | ||||
| -rw-r--r-- | components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json | 12 | ||||
| -rw-r--r-- | components/model-catalog/blueprint-model/test-blueprint/capability_cli/Definitions/capability-cli-blueprint.json | 9 | ||||
| -rw-r--r-- | components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.kt (renamed from components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/CapabilityCli.cba.kts) | 2 | ||||
| -rw-r--r-- | components/model-catalog/definition-type/starter-type/node_type/component-script-executor.json (renamed from components/model-catalog/definition-type/starter-type/node_type/component-cli-executor.json) | 10 |
5 files changed, 13 insertions, 31 deletions
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 5530b7c71..135016a11 100644 --- 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 0af2cd913..6de1fe320 100644 --- 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 c66bb6ef2..f09110045 100644 --- 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 index e22fd7ef0..270184d34 100644 --- 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 index 4860dd499..b241aa36f 100644 --- 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, |