diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-04-24 13:39:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-24 13:39:55 +0000 |
| commit | 7f15996a7b250760d1d3ecb32520ce4e8755964e (patch) | |
| tree | f702330b81e808359510d0bdcac1cebdbe0f86c0 /components | |
| parent | 8f9a20b2908124655712b7688ba6b1b641b1608a (diff) | |
| parent | 5a82232d3502a566466fac1f8d6f6aadc50fbc6e (diff) | |
Merge "Support for dynamic property in command args"
Diffstat (limited to 'components')
3 files changed, 26 insertions, 3 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 640a4ebee..e5b8b3062 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 @@ -34,6 +34,11 @@ "required": false, "type": "json" }, + "argument-properties": { + "description": "Argument Json Content or DSL Json reference.", + "required": false, + "type": "json" + }, "command": { "description": "Command to execute.", "required": true, 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 d78176f4c..48992bd72 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 @@ -25,6 +25,13 @@ "file": "Definitions/policy_types.json" } ], + "dsl_definitions": { + "execute-argument-properties": { + "input": { + "get_input": "input" + } + } + }, "topology_template": { "workflows": { "execute-remote-python": { @@ -39,7 +46,12 @@ ] } }, - "inputs": {}, + "inputs": { + "input": { + "required": false, + "type": "string" + } + }, "outputs": { "prepare-environment-logs": { "type": "string", @@ -107,7 +119,7 @@ "primary": "component-script" }, "inputs": { - "command": "python SamplePython.py blah", + "command": "python SamplePython.py $input", "packages": [ { "type": "pip", @@ -115,7 +127,8 @@ "pyaml" ] } - ] + ], + "argument-properties": "*execute-argument-properties" } } } 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 5c9503fc3..09b371c22 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 @@ -32,6 +32,11 @@ "required": false, "type": "json" }, + "argument-properties": { + "description": "Argument Json Content or DSL Json reference.", + "required": false, + "type": "json" + }, "command": { "description": "Command to execute.", "required": true, |