diff options
author | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-04-12 22:25:17 -0400 |
---|---|---|
committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-04-16 10:38:51 -0400 |
commit | 6fcfbc12e20e5a853c9204469dac6867b7eb6ccb (patch) | |
tree | 22b09b1636831c9c30c672101e46b8e8a81978ae /components/model-catalog | |
parent | 5a47fe8d6a7c665db048e1959f484af297a74315 (diff) |
Integration Test - Component Executor
Change-Id: Icbe745b30c7bbb973bc9bb29bf547340b32f1b0f
Issue-ID: CCSDK-1164
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'components/model-catalog')
3 files changed, 27 insertions, 35 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json index 84d5b5dd3..d7002cdea 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/node_types.json @@ -3,6 +3,12 @@ "component-remote-python-executor": { "description": "This is Remote Python Execution Component.", "version": "1.0.0", + "attributes": { + "execution-logs": { + "required": true, + "type": "string" + } + }, "capabilities": { "component-node": { "type": "tosca.capabilities.Node" @@ -17,25 +23,13 @@ "description": "Remote Container or Server selector name.", "required": false, "type": "string", - "default": "default" + "default": "remote-python" }, "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": "json" - }, - "status": { - "description": "Status of the Component Execution ( success or failure )", - "required": true, - "type": "string" - } } } } diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json index b978506d2..7c279010d 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json +++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/remote_scripts.json @@ -39,7 +39,18 @@ ] } }, - "inputs": {} + "inputs": {}, + "outputs": { + "logs": { + "type": "json", + "value": { + "get_attribute": [ + "execute-remote-python", + "execution-logs" + ] + } + } + } } }, "node_templates": { @@ -52,15 +63,8 @@ "implementation": { "primary": "component-script", "dependencies": [ - "ncclient" + "pyaml" ] - }, - "inputs": { - "endpoint-selector": "default" - }, - "outputs": { - "response-data": "", - "status": "success" } } } diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json index 25ada665a..9c3c90ba8 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json +++ b/components/model-catalog/definition-type/starter-type/node_type/component-remote-python-executor.json @@ -1,6 +1,12 @@ { "description": "This is Remote Python Execution Component.", "version": "1.0.0", + "attributes": { + "execution-logs": { + "required": true, + "type": "string" + } + }, "capabilities": { "component-node": { "type": "tosca.capabilities.Node" @@ -15,25 +21,13 @@ "description": "Remote Container or Server selector name.", "required": false, "type": "string", - "default": "default" + "default": "remote-python" }, "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": "json" - }, - "status": { - "description": "Status of the Component Execution ( success or failure )", - "required": true, - "type": "string" - } } } } |