diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-06-25 18:58:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-25 18:58:51 +0000 |
| commit | c8d2615d7e44b40db5358408f01a1ee83195e1df (patch) | |
| tree | 90ff08e1c00b8e0243a24794437e72eb616a157c /components | |
| parent | ed124819a2c928d895ba275d51eadc97afdf5a09 (diff) | |
| parent | c974b0293789c2b74d73dfb19e08fd233270f407 (diff) | |
Merge "python-executor will provide output line-by-line"
Diffstat (limited to 'components')
3 files changed, 13 insertions, 7 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 ddbccac93..4945da889 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 @@ -8,9 +8,12 @@ "required" : false, "type" : "string" }, - "execute-command-logs" : { - "required" : false, - "type" : "string" + "execute-command-logs": { + "required": false, + "type": "list", + "entry_schema": { + "type": "string" + } } }, "capabilities" : { @@ -179,4 +182,4 @@ "derived_from" : "tosca.nodes.Root" } } -}
\ No newline at end of file +} 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 e14b63e58..caab5f7ac 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 @@ -8,7 +8,10 @@ }, "execute-command-logs": { "required": false, - "type": "string" + "type": "list", + "entry_schema": { + "type": "string" + } } }, "capabilities": { @@ -56,4 +59,4 @@ } }, "derived_from": "tosca.nodes.Component" -}
\ No newline at end of file +} diff --git a/components/model-catalog/proto-definition/proto/CommandExecutor.proto b/components/model-catalog/proto-definition/proto/CommandExecutor.proto index bc175dbc1..fd2d4f305 100644 --- a/components/model-catalog/proto-definition/proto/CommandExecutor.proto +++ b/components/model-catalog/proto-definition/proto/CommandExecutor.proto @@ -37,7 +37,7 @@ message Identifiers { message ExecutionOutput { string requestId = 1; - string response = 2; + repeated string response = 2; ResponseStatus status = 3; google.protobuf.Timestamp timestamp = 4; } |