From 5a82232d3502a566466fac1f8d6f6aadc50fbc6e Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Fri, 19 Apr 2019 11:42:47 -0400 Subject: Support for dynamic property in command args MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I47c65557a553c79fefbbc28f8dab54b1c0a4a798 Issue-ID: CCCSDK-125 Signed-off-by: Alexis de Talhouët --- .../remote_scripts/Definitions/node_types.json | 5 +++++ .../remote_scripts/Definitions/remote_scripts.json | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'components/model-catalog/blueprint-model/test-blueprint/remote_scripts') 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" } } } -- cgit 1.2.3-korg