summaryrefslogtreecommitdiffstats
path: root/components/model-catalog
diff options
context:
space:
mode:
authorMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>2019-02-15 09:15:35 -0500
committerAlexis de Talhouƫt <adetalhouet89@gmail.com>2019-02-17 09:46:44 -0500
commit69a0884d638631452dcbb2989adc39c07b097409 (patch)
tree11fd0b8ad5171a60a964909625da370f17209fd9 /components/model-catalog
parent3daf7d0156076f868ae566f4503135757a4afd4d (diff)
restconf kotlin script support
Change-Id: I07eaa4a2422b461e1b7eb13ec04bf7d10ea08770 Issue-ID: CCSDK-1080 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
Diffstat (limited to 'components/model-catalog')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json2
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json2
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json24
3 files changed, 24 insertions, 4 deletions
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 527307048..65271838e 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
@@ -89,7 +89,7 @@
}
}
},
- "derived_from": "tosca.nodes.component.Jython"
+ "derived_from": "tosca.nodes.Component"
},
"component-resource-resolution": {
"description": "This is Resource Assignment Component API",
diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
index 9565f6611..0bbcba97c 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
@@ -43,5 +43,5 @@
}
}
},
- "derived_from": "tosca.nodes.component.Jython"
+ "derived_from": "tosca.nodes.Component"
} \ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json
index 884be5dc6..192ed2566 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json
@@ -1,5 +1,5 @@
{
- "description": "This is Netconf Transaction Configuration Component API",
+ "description": "This is Restconf Transaction Configuration Component API",
"version": "1.0.0",
"capabilities": {
"component-node": {
@@ -11,9 +11,29 @@
"operations": {
"process": {
"inputs": {
+ "script-type": {
+ "description": "Script type, kotlin type is supported",
+ "required": true,
+ "type": "string",
+ "default": "internal",
+ "constraints": [
+ {
+ "valid_values": [
+ "kotlin",
+ "jython",
+ "internal"
+ ]
+ }
+ ]
+ },
+ "script-class-reference": {
+ "description": "Kotlin Script class name or jython script name.",
+ "required": true,
+ "type": "string"
+ },
"instance-dependencies": {
"required": true,
- "description": "Instance Names to Inject to Jython Script.",
+ "description": "Instance names to inject to Jython or Kotlin Script.",
"type": "list",
"entry_schema": {
"type": "string"