diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-04-24 18:09:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-24 18:09:46 +0000 |
| commit | 535002fbb8b2ffeb81564b4ed8858889ac6404d4 (patch) | |
| tree | e3b54f266aca62a5209f46bf51253df81db2c85b /components/model-catalog | |
| parent | fb8d3807fe21a575bfe918687ed0ae971b4367c8 (diff) | |
| parent | f79ef8c3f922e6d467d74c2ac3e8bec9cb2b991a (diff) | |
Merge "Rework remote command arguments"
Diffstat (limited to 'components/model-catalog')
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 e5b8b3062..a66e3bc9d 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 @@ -46,7 +46,7 @@ }, "packages": { "description": "Packages to install based on type.", - "required": true, + "required": false, "type" : "list", "entry_schema" : { "type" : "dt-system-packages" 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 48992bd72..4c3ece381 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 @@ -27,9 +27,14 @@ ], "dsl_definitions": { "execute-argument-properties": { - "input": { - "get_input": "input" - } + "input": "data" + }, + "remote-argument-properties": { + "arg-0": "-a", + "arg-1": "sample-data 1", + "arg-4": "sample-data 4", + "arg-3": "sample-data 3", + "arg-2": "-b" } }, "topology_template": { @@ -119,7 +124,7 @@ "primary": "component-script" }, "inputs": { - "command": "python SamplePython.py $input", + "command": "python SamplePython.py", "packages": [ { "type": "pip", @@ -128,7 +133,8 @@ ] } ], - "argument-properties": "*execute-argument-properties" + "argument-properties": "*remote-argument-properties", + "dynamic-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 09b371c22..e14b63e58 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 @@ -44,7 +44,7 @@ }, "packages": { "description": "Packages to install based on type.", - "required": true, + "required": false, "type" : "list", "entry_schema" : { "type" : "dt-system-packages" |