From 22861e62057c835b6bb3ac18308a98abc3c79715 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Mon, 11 Feb 2019 17:23:48 -0500 Subject: Fixes: manual integration test of CDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - support to overwrite cba - fix map to json - finish meshing - fix python context not having the bluePrintRuntimeService injected - load all properties in the properties store Issue-ID: CCSDK-414 Change-Id: I6b65201529d0ffd9c3e18023a33e0081236b01de Signed-off-by: Alexis de Talhouët --- .../Definitions/activation-blueprint.json | 10 +-- .../baseconfiguration/Definitions/node_types.json | 6 +- .../node_type/component-jython-executor.json | 2 +- .../node_type/component-resource-assignment.json | 82 ---------------------- .../node_type/component-resource-resolution.json | 82 ++++++++++++++++++++++ 5 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json create mode 100644 components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json (limited to 'components') 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 822cc68b..5af64caa 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 @@ -106,9 +106,9 @@ } }, "resource-assignment": { - "type": "component-resource-assignment", + "type": "component-resource-resolution", "interfaces": { - "ResourceAssignmentComponent": { + "ResourceResolutionComponent": { "operations": { "process": { "inputs": { @@ -151,9 +151,9 @@ } }, "resource-assignment-py": { - "type": "component-resource-assignment", + "type": "component-resource-resolution", "interfaces": { - "ResourceAssignmentComponent": { + "ResourceResolutionComponent": { "operations": { "process": { "implementation": { @@ -182,7 +182,7 @@ "activate-jython": { "type": "component-jython-executor", "interfaces": { - "JythonExecutorComponent": { + "ComponentJythonExecutor": { "operations": { "process": { "implementation": { 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 f7970bfb..400db435 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 @@ -91,7 +91,7 @@ }, "derived_from": "tosca.nodes.component.Jython" }, - "component-resource-assignment": { + "component-resource-resolution": { "description": "This is Resource Assignment Component API", "version": "1.0.0", "attributes": { @@ -101,7 +101,7 @@ } }, "interfaces": { - "ResourceAssignmentComponent": { + "ResourceResolutionComponent": { "operations": { "process": { "inputs": { @@ -158,7 +158,7 @@ } }, "interfaces": { - "JythonExecutorComponent": { + "ComponentJythonExecutor": { "operations": { "process": { "inputs": { 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 4959a9dd..af8aae12 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 @@ -7,7 +7,7 @@ } }, "interfaces": { - "JythonExecutorComponent": { + "ComponentJythonExecutor": { "operations": { "process": { "inputs": { diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json deleted file mode 100644 index 38fc97d7..00000000 --- a/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "description": "This is Resource Assignment Component API", - "version": "1.0.0", - "attributes": { - "assignment-params": { - "required": true, - "type": "string" - } - }, - "capabilities": { - "component-node": { - "type": "tosca.capabilities.Node" - } - }, - "interfaces": { - "ResourceAssignmentComponent": { - "operations": { - "process": { - "inputs": { - "template-name": { - "description": "Service Template Name.", - "required": true, - "type": "string" - }, - "template-version": { - "description": "Service Template Version.", - "required": true, - "type": "string" - }, - "resource-type": { - "description": "Request type.", - "required": true, - "type": "string" - }, - "template-names": { - "description": "Name of the artifact Node Templates, to get the template Content.", - "required": true, - "type": "list", - "entry_schema": { - "type": "string" - } - }, - "artifact-prefix-names": { - "required": false, - "description": "Template , Resource Assignment Artifact Prefix names", - "type": "list", - "entry_schema": { - "type": "string" - } - }, - "request-id": { - "description": "Request Id, Unique Id for the request.", - "required": true, - "type": "string" - }, - "resource-id": { - "description": "Resource Id.", - "required": true, - "type": "string" - }, - "action-name": { - "description": "Action Name of the process", - "required": true, - "type": "string" - } - }, - "outputs": { - "resource-assignment-params": { - "required": true, - "type": "string" - }, - "status": { - "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-resource-resolution.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json new file mode 100644 index 00000000..d01660ef --- /dev/null +++ b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json @@ -0,0 +1,82 @@ +{ + "description": "This is Resource Assignment Component API", + "version": "1.0.0", + "attributes": { + "assignment-params": { + "required": true, + "type": "string" + } + }, + "capabilities": { + "component-node": { + "type": "tosca.capabilities.Node" + } + }, + "interfaces": { + "ResourceResolutionComponent": { + "operations": { + "process": { + "inputs": { + "template-name": { + "description": "Service Template Name.", + "required": true, + "type": "string" + }, + "template-version": { + "description": "Service Template Version.", + "required": true, + "type": "string" + }, + "resource-type": { + "description": "Request type.", + "required": true, + "type": "string" + }, + "template-names": { + "description": "Name of the artifact Node Templates, to get the template Content.", + "required": true, + "type": "list", + "entry_schema": { + "type": "string" + } + }, + "artifact-prefix-names": { + "required": false, + "description": "Template , Resource Assignment Artifact Prefix names", + "type": "list", + "entry_schema": { + "type": "string" + } + }, + "request-id": { + "description": "Request Id, Unique Id for the request.", + "required": false, + "type": "string" + }, + "resource-id": { + "description": "Resource Id.", + "required": false, + "type": "string" + }, + "action-name": { + "description": "Action Name of the process", + "required": false, + "type": "string" + } + }, + "outputs": { + "resource-assignment-params": { + "required": true, + "type": "string" + }, + "status": { + "required": true, + "type": "string" + } + } + } + } + } + }, + "derived_from": "tosca.nodes.Component" +} \ No newline at end of file -- cgit 1.2.3-korg