diff options
Diffstat (limited to 'components')
26 files changed, 22 insertions, 387 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json index 4484d550e..e1d9be006 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json @@ -3318,7 +3318,7 @@ "version": "1.0.0", "derived_from": "tosca.nodes.Root" }, - "tosca.nodes.DG": { + "tosca.nodes.Workflow": { "description": "This is Directed Graph Node Type", "version": "1.0.0", "derived_from": "tosca.nodes.Root" @@ -3459,7 +3459,7 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" }, "artifact-config-template": { "description": "This is Configuration Velocity Template", 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 68a8ae6bd..3658a260d 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 @@ -203,7 +203,7 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" }, "source-input": { "description": "This is Input Resource Source Node Type", @@ -341,7 +341,7 @@ "version": "1.0.0", "derived_from": "tosca.nodes.Root" }, - "tosca.nodes.DG": { + "tosca.nodes.Workflow": { "description": "This is Directed Graph Node Type", "version": "1.0.0", "derived_from": "tosca.nodes.Root" diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json index b40c8cb34..7e78a42c8 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json @@ -139,7 +139,7 @@ } } }, - "derived_from" : "tosca.nodes.DG" + "derived_from" : "tosca.nodes.Workflow" }, "source-input" : { "description" : "This is Input Resource Source Node Type", @@ -164,7 +164,7 @@ "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" }, - "tosca.nodes.DG" : { + "tosca.nodes.Workflow" : { "description" : "This is Directed Graph Node Type", "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json index ed7c580bc..4a0041773 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json @@ -155,7 +155,7 @@ } } }, - "derived_from" : "tosca.nodes.DG" + "derived_from" : "tosca.nodes.Workflow" }, "source-input" : { "description" : "This is Input Resource Source Node Type", @@ -180,7 +180,7 @@ "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" }, - "tosca.nodes.DG" : { + "tosca.nodes.Workflow" : { "description" : "This is Directed Graph Node Type", "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json deleted file mode 100644 index eadc848be..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "artifact_types" : { } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json deleted file mode 100644 index 9e040b85d..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "tosca_definitions_version": "controller_blueprint_1_0_0", - "metadata": { - "template_author": "Brinda Santh <brindasanth@in.ibm.com>", - "template_name": "component_invoke", - "template_version": "1.0.0", - "template_tags": "brinda, component_invoke" - }, - "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": { - "component-invoke": { - "steps": { - "activate-process": { - "description": "Sample Component Invocation flow", - "target": "sample-component", - "activities": [ - { - "call_operation": "sample-component" - } - ] - } - }, - "inputs": { - "request-id": { - "required": true, - "type": "string" - }, - "action-name": { - "required": true, - "type": "string" - }, - "scope-type": { - "required": true, - "type": "string" - }, - "hostname": { - "required": true, - "type": "string" - } - }, - "outputs": { - "response-property1": { - "type": "string", - "value": "executed" - }, - "response-property2": { - "type": "string", - "value": { - "get_input": "action-name" - } - } - } - } - }, - "node_templates": { - "sample-component": { - "type": "component-sample-executor", - "interfaces": { - "ComponentSampleExecutor": { - "operations": { - "process": { - "inputs": { - "sample-property": "sample-value", - "sample-list-property": [ - "json-parser-service" - ], - "dynamic-properties": { - "prop1": "prop1-value", - "prop2": "prop2-value" - } - }, - "outputs": { - "response-data": "", - "status": "" - } - } - } - } - } - } - } - } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json deleted file mode 100644 index 8c304c40b..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "data_types" : { } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json deleted file mode 100644 index 1e02cef4a..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "node_types": { - "component-sample-executor": { - "description": "This is Sample Component API", - "version": "1.0.0", - "interfaces": { - "ComponentSampleExecutor": { - "operations": { - "process": { - "inputs": { - "sample-property": { - "description": "Sample Property.", - "required": true, - "type": "string" - }, - "sample-list-property": { - "description": "Dependent Step Components NodeTemplate name.", - "required": true, - "type": "list", - "entry_schema": { - "type": "string" - } - }, - "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": "string" - }, - "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/component_invoke/Definitions/policy_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/policy_types.json deleted file mode 100644 index 1e44cc70a..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/policy_types.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "policy_types" : { } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json deleted file mode 100644 index 4ddd7a57c..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "relationship_types" : { } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json deleted file mode 100644 index 6f31cf5a2..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json +++ /dev/null @@ -1 +0,0 @@ -{ }
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta deleted file mode 100644 index a7c130a23..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta +++ /dev/null @@ -1,5 +0,0 @@ -TOSCA-Meta-File-Version: 1.0.0 -CSAR-Version: 1.0 -Created-By: Brinda Santh <brindasanth@in.ibm.com> -Entry-Definitions: Definitions/component_invoke.json -Template-Tags: Brinda Santh, component_invoke
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json index f143e560b..c1cded219 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json @@ -162,7 +162,7 @@ } } }, - "derived_from" : "tosca.nodes.DG" + "derived_from" : "tosca.nodes.Workflow" }, "source-capability" : { "description" : "This is Component Resource Source Node Type", @@ -353,7 +353,7 @@ "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" }, - "tosca.nodes.DG" : { + "tosca.nodes.Workflow" : { "description" : "This is Directed Graph Node Type", "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" diff --git a/components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json b/components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json deleted file mode 100644 index af99d75b8..000000000 --- a/components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json +++ /dev/null @@ -1,37 +0,0 @@ -{
- "description": "This is Configuration Velocity Template",
- "version": "1.0.0",
- "properties": {
- "action-names": {
- "required": true,
- "type": "list",
- "entry_schema": {
- "type": "string"
- }
- }
- },
- "capabilities": {
- "content": {
- "type": "tosca.capabilities.Content",
- "properties": {
- "content": {
- "required": true,
- "type": "string"
- }
- }
- },
- "mapping": {
- "type": "tosca.capabilities.Mapping",
- "properties": {
- "mapping": {
- "required": false,
- "type": "list",
- "entry_schema": {
- "type": "datatype-resource-assignment"
- }
- }
- }
- }
- },
- "derived_from": "tosca.nodes.Artifact"
-}
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json b/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json deleted file mode 100644 index 263882ad7..000000000 --- a/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json +++ /dev/null @@ -1,72 +0,0 @@ -{
- "description": "This is Generate Configuration Component API",
- "version": "1.0.0",
- "capabilities": {
- "component-node": {
- "type": "tosca.capabilities.Node"
- }
- },
- "interfaces": {
- "ConfigGeneratorComponent": {
- "operations": {
- "process": {
- "inputs": {
- "template-data": {
- "description": "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",
- "required": false,
- "type": "string"
- },
- "template-content": {
- "description": "Conditional : Dynamic Template used to generate Configuration.",
- "required": false,
- "type": "string"
- },
- "resource-type": {
- "description": "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",
- "required": false,
- "type": "string"
- },
- "request-id": {
- "description": "Request Id used to store the generated configuration, in the database along with the template-name",
- "required": true,
- "type": "string"
- },
- "resource-id": {
- "description": "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",
- "required": false,
- "type": "string"
- },
- "action-name": {
- "description": "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
- "required": false,
- "type": "string"
- },
- "template-name": {
- "description": "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",
- "required": true,
- "type": "string"
- }
- },
- "outputs": {
- "generated-config": {
- "description": "Generated Configuration for the Template adn Resource Data",
- "required": true,
- "type": "string"
- },
- "mask-info": {
- "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.cds.controllerblueprints.core.data.custom.MaskInfo ",
- "required": false,
- "type": "string"
- },
- "status": {
- "description": "Status of the Component Execution ( success or failure )",
- "required": true,
- "type": "string"
- }
- }
- }
- }
- }
- },
- "derived_from": "tosca.nodes.Component"
-}
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json index 5a024a7d6..b78a7c63a 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json +++ b/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json @@ -41,5 +41,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-sample-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-sample-executor.json deleted file mode 100644 index 68b3ebde2..000000000 --- a/components/model-catalog/definition-type/starter-type/node_type/component-sample-executor.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "description": "This is Sample Component API", - "version": "1.0.0", - "interfaces": { - "ComponentSampleExecutor": { - "operations": { - "process": { - "inputs": { - "sample-property": { - "description": "Sample Property.", - "required": true, - "type": "string" - }, - "sample-list-property": { - "required": true, - "description": "Dependent Step Components NodeTemplate name.", - "type": "list", - "entry_schema": { - "type": "string" - } - }, - "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": "string" - }, - "status": { - "description": "Status of the Component Execution ( success or failure )", - "required": true, - "type": "string" - } - } - } - } - } - }, - "derived_from": "tosca.nodes.Component" -}
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json b/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json index ec9904bf5..23aa63ea2 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json +++ b/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json @@ -15,5 +15,5 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" }
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-default.json b/components/model-catalog/definition-type/starter-type/node_type/source-default.json index 13e234e1b..3e7d14ce8 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/source-default.json +++ b/components/model-catalog/definition-type/starter-type/node_type/source-default.json @@ -1,18 +1,6 @@ { "description": "This is Default Resource Source Node Type", "version": "1.0.0", - "properties": { - "key": { - "required": false, - "type": "string" - }, - "key-dependencies": { - "required": true, - "type": "list", - "entry_schema": { - "type": "string" - } - } - }, + "properties": { }, "derived_from": "tosca.nodes.ResourceSource" }
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-input.json b/components/model-catalog/definition-type/starter-type/node_type/source-input.json index 126ea30bd..bf84481bd 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/source-input.json +++ b/components/model-catalog/definition-type/starter-type/node_type/source-input.json @@ -1,18 +1,6 @@ { "description": "This is Input Resource Source Node Type", "version": "1.0.0", - "properties": { - "key": { - "required": false, - "type": "string" - }, - "key-dependencies": { - "required": true, - "type": "list", - "entry_schema": { - "type": "string" - } - } - }, + "properties": { }, "derived_from": "tosca.nodes.ResourceSource" }
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json index 702748f8a..6f03dbfc4 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json +++ b/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json @@ -4,12 +4,12 @@ "properties": { "type": { "required": true, + "default": "SQL", "type": "string", "constraints": [ { "valid_values": [ - "SQL", - "PLSQL" + "SQL" ] } ] diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-rest.json b/components/model-catalog/definition-type/starter-type/node_type/source-rest.json index b28e9341d..f9995a883 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/source-rest.json +++ b/components/model-catalog/definition-type/starter-type/node_type/source-rest.json @@ -3,7 +3,7 @@ "version": "1.0.0", "properties": { "type": { - "required": false, + "required": true, "type": "string", "default": "JSON", "constraints": [ @@ -15,7 +15,7 @@ ] }, "verb": { - "required": false, + "required": true, "type": "string", "default": "GET", "constraints": [ diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.DG.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.Workflow.json index 86728cf2f..eb8cac0ae 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.DG.json +++ b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.Workflow.json @@ -1,5 +1,5 @@ -{
- "description": "This is Directed Graph Node Type",
- "version": "1.0.0",
- "derived_from": "tosca.nodes.Root"
+{ + "description": "This is Directed Graph Node Type", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" }
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json deleted file mode 100644 index 8e194f6dd..000000000 --- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json +++ /dev/null @@ -1,5 +0,0 @@ -{
- "description": "This is Jython Component",
- "version": "1.0.0",
- "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json deleted file mode 100644 index 381ed59e2..000000000 --- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "description": "This is Kotlin Component", - "version": "1.0.0", - "derived_from": "tosca.nodes.Root" -}
\ No newline at end of file diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json deleted file mode 100644 index 7b67c8cb2..000000000 --- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json +++ /dev/null @@ -1,5 +0,0 @@ -{
- "description": "This is Python Component",
- "version": "1.0.0",
- "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file |