From f6c08adeb3ec6af94fc75eb4e8f0853ce5f38c97 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 19 Apr 2019 09:16:26 -0400
Subject: Update package type name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- split log output: prepare-env and exec-cmd
- fix proxy support when not provided

Change-Id: I40cdf90e7e3ebe31b0152923f8b6a38f6b6e9ca0
Issue-ID: CCCSDK-125
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../remote_scripts/Definitions/data_types.json     |  2 +-
 .../remote_scripts/Definitions/node_types.json     |  8 +++-
 .../remote_scripts/Definitions/remote_scripts.json | 49 ++++++++++++++++------
 3 files changed, 43 insertions(+), 16 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/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/data_types.json
index df594ab9e..25efb3656 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Definitions/data_types.json
@@ -10,7 +10,7 @@
           "constraints": [
             {
               "valid_values": [
-                "ANSIBLE", "PYTHON"
+                "ansible_galaxy", "pip"
               ]
             }
           ]
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 0ee00b3ba..640a4ebee 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
@@ -4,8 +4,12 @@
       "description": "This is Remote Python Execution Component.",
       "version": "1.0.0",
       "attributes": {
-        "execution-logs": {
-          "required": true,
+        "prepare-environment-logs": {
+          "required": false,
+          "type": "string"
+        },
+        "execute-command-logs": {
+          "required": false,
           "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 80ef02f4f..da09e4f39 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
@@ -41,12 +41,21 @@
         },
         "inputs": {},
         "outputs": {
-          "logs": {
-            "type": "json",
+          "prepare-environment-logs": {
+            "type": "string",
             "value": {
               "get_attribute": [
                 "execute-remote-python",
-                "execution-logs"
+                "prepare-environment-logs"
+              ]
+            }
+          },
+          "execute-command-logs": {
+            "type": "string",
+            "value": {
+              "get_attribute": [
+                "execute-remote-python",
+                "execute-command-logs"
               ]
             }
           }
@@ -66,12 +75,21 @@
         },
         "inputs": {},
         "outputs": {
-          "logs": {
-            "type": "json",
+          "prepare-environment-logs": {
+            "type": "string",
+            "value": {
+              "get_attribute": [
+                "execute-remote-ansible",
+                "prepare-environment-logs"
+              ]
+            }
+          },
+          "execute-command-logs": {
+            "type": "string",
             "value": {
               "get_attribute": [
                 "execute-remote-ansible",
-                "execution-logs"
+                "execute-command-logs"
               ]
             }
           }
@@ -86,13 +104,18 @@
             "operations": {
               "process": {
                 "implementation": {
-                  "primary": "component-script",
-                  "dependencies": [
-                    "pyaml"
-                  ]
+                  "primary": "component-script"
                 },
                 "inputs": {
-                  "command": "python SamplePython.py blah"
+                  "command": "python SamplePython.py blah",
+                  "packages": [
+                    {
+                      "type": "pip",
+                      "package": [
+                        "pyaml"
+                      ]
+                    }
+                  ]
                 }
               }
             }
@@ -118,13 +141,13 @@
                   "command": "ansible-playbook first.yaml",
                   "packages": [
                     {
-                      "type": "PYTHON",
+                      "type": "pip",
                       "package": [
                         "ansible"
                       ]
                     },
                     {
-                      "type": "ANSIBLE",
+                      "type": "ansible_galaxy",
                       "package": [
                         "juniper.junos"
                       ]
-- 
cgit 1.2.3-korg