From 3eca902eaac525c64b5ad61e378e4fe09ec3848c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Tue, 26 Mar 2019 14:39:07 -0400 Subject: [PATCH] Update starter-type MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ib9ed9aaa75896ad7870778420cd09e997dbbf592 Issue-ID: CCSDK-1181 Signed-off-by: Alexis de Talhouët --- .../vFW/Definitions/vFW_spinup.json | 4 +- .../baseconfiguration/Definitions/node_types.json | 4 +- .../capability_python/Definitions/node_types.json | 4 +- .../Definitions/node_types.json | 4 +- .../Definitions/artifact_types.json | 3 - .../Definitions/component_invoke.json | 100 --------------------- .../component_invoke/Definitions/data_types.json | 3 - .../component_invoke/Definitions/node_types.json | 54 ----------- .../component_invoke/Definitions/policy_types.json | 3 - .../Definitions/relationship_types.json | 3 - .../Definitions/resources_definition_types.json | 1 - .../component_invoke/TOSCA-Metadata/TOSCA.meta | 5 -- .../golden/Definitions/node_types.json | 4 +- .../node_type/artifact-config-template.json | 37 -------- .../node_type/component-config-generator.json | 72 --------------- .../node_type/component-jython-executor.json | 2 +- .../node_type/component-sample-executor.json | 45 ---------- .../starter-type/node_type/dg-generic.json | 2 +- .../starter-type/node_type/source-default.json | 14 +-- .../starter-type/node_type/source-input.json | 14 +-- .../starter-type/node_type/source-primary-db.json | 4 +- .../starter-type/node_type/source-rest.json | 4 +- ...sca.nodes.DG.json => tosca.nodes.Workflow.json} | 8 +- .../node_type/tosca.nodes.component.Jython.json | 5 -- .../node_type/tosca.nodes.component.Kotlin.json | 5 -- .../node_type/tosca.nodes.component.Python.json | 5 -- .../commons/db-lib/src/test/resources/test-cba.zip | Bin 9302 -> 9554 bytes .../src/test/resources/test-cba.zip | Bin 9302 -> 9554 bytes .../BluePrintWorkflowExecutionServiceImpl.kt | 2 +- .../model_type/node_type/dg-activate-netconf.json | 2 +- .../model_type/node_type/dg-config-generator.json | 2 +- .../node_type/dg-resource-assign-activate.json | 2 +- .../node_type/dg-resource-assignment.json | 2 +- .../core/BluePrintConstants.kt | 2 +- .../controllerblueprints/core/BluePrintTypes.kt | 2 +- .../validation/BluePrintWorkflowValidatorImpl.kt | 4 +- .../BluePrintDesignTimeValidatorServiceTest.kt | 2 +- .../enhancer/BluePrintWorkflowEnhancerImpl.kt | 2 +- .../service_template/default_netconf.json | 4 +- .../enhancer/BluePrintEnhancerServiceImplTest.kt | 7 -- 40 files changed, 35 insertions(+), 407 deletions(-) delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/policy_types.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/component-sample-executor.json rename components/model-catalog/definition-type/starter-type/node_type/{tosca.nodes.DG.json => tosca.nodes.Workflow.json} (95%) delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json 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 ", - "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 -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 similarity index 95% rename from components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.DG.json rename to 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 diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip index 907482400002f162ee35814a1a5a98d06a4fc31a..785ec6c00a26d4097cfe6abaeda335405c31a3f6 100644 GIT binary patch delta 3637 zcmbVP3piA182;xHlWNB_l-$OcwC)>alXP*5i8QH1co;Qmq%kp)N@tNSXk{l>ZnaiY z(cPuB?QWZDB~P{4^28Lmt#V1IRcQZ1nsdUb-Sa$W=A38dd%yR8|L^c7=i+!-?Sm1<)1n8EKQ>LU#O=kxOfLRel)1xs`Vj4vE#41%w(P$ZQ2`kIO(KGZ@sH_bcDh^QEjMRxoqgT-(I7Q;-qo`v*T1nZG*rPuk6 zw;Uz3C6o1Ac-Ibn}Ec{bcO*5)|Gr$3`$+5z_I}7$${~mQ}wLI z?<(NsgYU^Z^?k|?FntpZ01X)aPFIU4J;HP%xs9|1D#Bl9ki-qJEfS^<#p6T}1#b}e zN+QI9P}9KBV9`)8RuxNUlti3~Bojtg7qt>ratNrx3bf@`c-PM_W z0nOe2Y$eZDH80y->b@!0w=QYs%t`ALC!{=?6JL1uz&&c3QN?kcE=jVO(zC!ZDos&* z!$M)2o#jIpy>r=fPF%e8TD#C-VA0zz2f074TxVF7QcTuwj8d5vE1UYAM?)u)VXDN{ zK3`RrUm%GnF-rK$yX^kD-YSpFZ^?6SFpaN;FaDX^UD+aPwN3EIvQo}{;<~oG=~P&I zPUylJn|CMHhvf*Gt@G!Sx_zP!zH@$7s-H~Pc=zYVil?VA8uvZTfMSzt(X- zus!2GrLXdvcw3fvg(%g=@1%;EwK!cRB>u><@?g7Z7o(DjtXSnL3pf=A8YE@WqDP2o z?v$L!2G3Nh+PEMW$NOU0x7j70O+_p0tQ-g3ddwPUzag!qt!=D7lz1W%WYL()$iVW=(Q|+6Dw0X2ROt94czAZl71v9=mGQ+IyH4=w@%CC?@6vkj z)%}s`wxOSK?{BAVcaPkv{o+@{9qtM%%qlPJe!DQ`u17%kz~e`;f#y9`{fI2(@z0Hl zUn7@l{5d@@=nC^0UHjYfYuPQaiowCs!PG0pesQuFhhIk?U1M{(y3~ss+cc~6mBBAH zSD##9ZZSXd{Yh2`>uGeFGf%oNkGDrZ+Em@7!7TGZQ_{Uii?e9Yj5Giskf__)NvI2!l{pun8kSs0d_GQVR37dL#t2Q5m9G}_h3o1 z)3byr{KDdTMY?fZH`Jr!JpxXknRPl_btd#9r7G)9>W6m)2;>yF_whEd^& z136J#0HEtYRuch@%}xQwZYhKtF(5=(@@Ea!elQH)gAJ3~O9H4Hu_a_BN5UHs?CSPO zy;$0x3xoF~SeO{;S(f4F!r*NQ7G}4Ut~2}pNKL~@UGN3KcoibC$J#gq0Okicv;sOY za5&>age(^y?^>|SwT8ZM#8a)}Lo*`aMMySDd35Ig(Lm_~X|x%_m0>er49@3q9kDk| z9a#HpT*;M6bJ=>I!)vt98D290C@%{Jz&-HSpe2kx;m7aLp#~lHJkv)^4_3yV41ii7 z;_{R4G~WGSf!;`u>3&HJBi~lM3&O&9N(XdV#7Ygrj5b49m~QwdtUnxOjR=LC2{&-~ x6$(GZu^IBECpZT7gfm1g8-8?SVUB45bdZ~j3p4?~f1pjp1alMtn5d23{R^G2>Q(>% delta 3334 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 delta 3334 zcmb7G4K$N$9Di+WFQ!d4HO0&%V`zOyrC1UXItX>$GMXZ>d{^AHR3|j0H{Dz*b(fUG zA>BT%>!W*0NlGe-R-=Xw6m|NpCZX>eY<$`!Aw z0iiG5r9SQ>U%q^hAqwQ};pM=ya1%uHH}IqRR;&F;&=iu;-}YUE|DXyLLcvrB22Ylo zJeUqqkW_z~Q|K?#5Tbzetb+AK*e%~N@*EJssX!wPNwXiT-FOXVbPH4z@_H!wPmgP;JlQQh&K>wVMZ1x1I%@}mW-A|rwXQBjtG!Y$$G z4q&O9RP*uXM7Wq7n3RWyAUatYwF$771Dh(^>wu5r0EeT_>q}X{o}W^C9Kf;F&{C13 zQ}Z^CPlO-kW*w^r9GwJZTML6FdId#>2&2c}+|dJ3JW?H?%w^Iz@;jiU28;n9g=wN- z70D#G1rgz##8;Iqpa`mz7J&v@gMux>FmMdxdmaA}nLxUc!cvr`X&VWMuvxP~1OrGL zg7;YY&vTcrU=omCCI}7*4~Y(mz*Hdt)W7oDX8`eGBPJ@2sr{1s+H4hY%#v_vg9%vl zK2>a~D5|pn#}u6z_J9Kw{3@E7rUon%VRq?CEr5r>Q7busX@I1LrLSnDK*t$1a<_em z;s}h$;D6(w(DX&}i-Bamt{%Xjkk`}YM16F;`lMn4FzJaTGoq64*>)Iw< zZHCPAVEhkd?S!tlG~7IL+y2cY&R$`mD6^?@UiO0Zhs)pRxwXH4Y}fA*DyjE8dGR-G zdrPvk$TZB=IZ#qD=T}qXZPz9zrRLVl+6!m-L}}kOf9SPE_DZvEsz(vEb+~U~?fetX z^?RlkbG91ZuE<_z_2`jg^TzC#)qVpzND)RBUN88k)sMc`2>VnrkiC)LQlFS{_RuMb zXwa|NchiPk{BEzHc#h|rUAGwSqIE0TLs8;F>4nado_ba{8krrmZSKLH%?_F_)K4`9 zEf;M1^k&7~`B-&9qv5_I$sj+_hN@Myur)?g?`3~cvs3mapG6LrVdfm~2=l9cXSI6> z%-Eph1$uSH$??bT;fE}Crus8x*Mw*C0z}DFuC1`NTBhrjaj-Sqp0m8Eu{*3Iy6YGA znJc+0-RS$4+ybV4==}vZS8to~z)8BB{ z3ZEsF;2PC9>Ru0ohdpgM%Ri{H=Tz8Q8mZqfT!E(z$2)g-SD##QSCZ3pb~SxrW!MJM zk=?@7oSXMz3=*uux3{h6pmGOy@6e;F95|O?yJE-+6x) zwFIxLc;;k%p)`T@wvSApYjvnMuPJu0j3PgMVlvF$v8Iw*DpP0tX=0ufSsZui(Bzu$ zV{5$(Fo z6E6=gN!ci)dz751K(D!OZ=0t-7%Mv`gMKyfu$=+!xx{#;;yu@(A5{hSoR0+eWPoOY zSIS`yILh=b+!VTd{_~D=qb>vNqv6M&+hm9Y{xR~hN4N&M)_(A} z%rJ@@YuVT&K*!*u;>Ad^0cbiPSbUk|$|MOGXfJOGI#Ip^hl!=JVStUnOU04j@W^6@ zG3w##z*n@7o%(um9C2uKAMr4Lh?tlYn*vM#r`FfKl#1hE2#pWuhEC)NJO4Ryj$)Ar z!&(1a%=l*rW1zjfvy&i9Tu|K7iNeBI6-dRcUlk$p_l|7u?Y z1MTIlr$BNULU93O<%kUiObmxq{No4*(o8X&$b;elCt>itJeoG75GF=lpmSZZs;~ip zfnkw~Jpc>xmysd5h4S}ebPcEnY%*ZUq3e+V)=U)oHBcxDV*|l7Ip}<(n#Hi0Ko!l2 zV~q-e { + derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, true) -> { dgWorkflowExecutionService .executeBluePrintWorkflow(bluePrintRuntimeService, executionServiceInput, properties) } diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json index 57667de98..c17a36c1b 100644 --- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json +++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json @@ -48,5 +48,5 @@ } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" } \ No newline at end of file diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json index 679c4641c..4d5343c3a 100644 --- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json +++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json @@ -47,5 +47,5 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" } \ No newline at end of file diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json index 87b052b61..f44486416 100644 --- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json +++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json @@ -52,5 +52,5 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" } \ No newline at end of file diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json index 9de599b01..d13668aaf 100644 --- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json +++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json @@ -47,5 +47,5 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" } \ No newline at end of file diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt index e30c1b4c9..23c52b4b3 100644 --- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt +++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt @@ -98,7 +98,7 @@ object BluePrintConstants { const val MODEL_TYPE_RELATIONSHIPS_ATTACH_TO = "tosca.relationships.AttachesTo" const val MODEL_TYPE_RELATIONSHIPS_ROUTES_TO = "tosca.relationships.RoutesTo" - const val MODEL_TYPE_NODE_DG = "tosca.nodes.DG" + const val MODEL_TYPE_NODE_WORKFLOW = "tosca.nodes.Workflow" const val MODEL_TYPE_NODE_COMPONENT = "tosca.nodes.Component" const val MODEL_TYPE_NODE_VNF = "tosca.nodes.Vnf" const val MODEL_TYPE_NODE_RESOURCE_SOURCE = "tosca.nodes.ResourceSource" diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt index 4e89907b2..30ac68abd 100644 --- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt +++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt @@ -29,7 +29,7 @@ object BluePrintTypes { @JvmStatic val validNodeTypeDerivedFroms: MutableList = arrayListOf( BluePrintConstants.MODEL_TYPE_NODES_ROOT, - BluePrintConstants.MODEL_TYPE_NODE_DG, + BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, BluePrintConstants.MODEL_TYPE_NODE_COMPONENT, BluePrintConstants.MODEL_TYPE_NODE_VNF, BluePrintConstants.MODEL_TYPE_NODE_RESOURCE_SOURCE, diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt index a7dbbf846..13307fdfa 100644 --- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt +++ b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt @@ -66,10 +66,10 @@ open class BluePrintWorkflowValidatorImpl(private val bluePrintTypeValidatorServ val nodeTypeDerivedFrom = bluePrintRuntimeService.bluePrintContext().nodeTemplateNodeType(it).derivedFrom - check(nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_DG + check(nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW || nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_COMPONENT) { "NodeType(${nodeTemplate.type}) derived from is '$nodeTypeDerivedFrom', Expected " + - "'${BluePrintConstants.MODEL_TYPE_NODE_DG}' or '${BluePrintConstants.MODEL_TYPE_NODE_COMPONENT}'" + "'${BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW}' or '${BluePrintConstants.MODEL_TYPE_NODE_COMPONENT}'" } } catch (e: Exception) { bluePrintRuntimeService.getBluePrintError() diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt index e12236d80..9dbd19e22 100644 --- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt +++ b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt @@ -92,7 +92,7 @@ class BluePrintDesignTimeValidatorServiceTest { assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size) assertEquals("Failed to validate Workflow(resource-assignment)'s step(test)'s definition : " + "resource-assignment/steps/test : NodeType(TestNodeType) derived from is 'tosca.nodes.TEST', " + - "Expected 'tosca.nodes.DG' or 'tosca.nodes.Component'", bluePrintRuntime.getBluePrintError().errors[0]) + "Expected 'tosca.nodes.Workflow' or 'tosca.nodes.Component'", bluePrintRuntime.getBluePrintError().errors[0]) } @Test diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt index 8379e5032..02e1052b9 100644 --- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt +++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt @@ -103,7 +103,7 @@ open class BluePrintWorkflowEnhancerImpl(private val bluePrintRepoService: BlueP derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_COMPONENT, true) -> { // DO Nothing } - derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_DG, true) -> { + derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, true) -> { enhanceDGStepTargets(name, workflow, firstNodeTemplateName) } else -> { diff --git a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json index 5b5332fce..c482b9b30 100644 --- a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json +++ b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json @@ -426,7 +426,7 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" }, "dg-activate-netconf": { "description": "This is Download Netconf Directed Graph", @@ -477,7 +477,7 @@ } } }, - "derived_from": "tosca.nodes.DG" + "derived_from": "tosca.nodes.Workflow" }, "artifact-config-template": { "description": "This is Configuration Velocity Template", diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt index 677dd45ad..23c541d76 100644 --- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt +++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt @@ -68,13 +68,6 @@ class BluePrintEnhancerServiceImplTest { testComponentInvokeEnhancementAndValidation(basePath, "base-enhance") } - @Test - @Throws(Exception::class) - fun testComponentInvokeEnhancementAndValidation() { - val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/component_invoke" - testComponentInvokeEnhancementAndValidation(basePath, "component-enhance") - } - @Test @Throws(Exception::class) fun testGoldenEnhancementAndValidation() { -- 2.16.6