Multiples fixes

Change-Id: I83782006dc47a224e546b6877070d5e7e56dd2e6
Issue-ID: CCSDK-1215
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Delete the deployed blueprint if overriten

Change-Id: I7e4f3a5c98388a965ef756467497ed31d23bc047
Issue-ID: CCSDK-1215
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Fix enhancement of workflow step for component

Change-Id: I62c7904265495edb2b0a5bec0d64cfecd7573f97
Issue-ID: CCSDK-1168
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Update golden package

Change-Id: I969fe9cf9b563911ebe4500fe8f3211aedb84593
Issue-ID: CCSDK-1231
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Do not fail to get execution property

When prepareEnv fail, we should not fail by saying to property
is not set. So set it as N/A until is get sets further done in
the processing

Change-Id: I06b9fcb9b1cf9e1605cef77864da9dbd18243800
Issue-ID: CCSDK-1215
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

2 files changed, 72 insertions, 87 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
index 8f3b9b4c5..5c0f1b351 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
@@ -1,90 +1,82 @@
 {
-  "data_types": {
-    "dt-resource-assignment-properties": {
-      "description": "Dynamic DataType definition for workflow(resource-assignment).",
-      "version": "1.0.0",
-      "properties": {
-        "vfw_interface_ip": {
-          "type": "dt-netbox-ip"
+  "data_types" : {
+    "dt-config-assign-properties" : {
+      "description" : "Dynamic DataType definition for workflow(config-assign).",
+      "version" : "1.0.0",
+      "properties" : {
+        "hostname" : {
+          "type" : "string"
         },
-        "interface-description": {
-          "type": "string"
+        "vfw_interface_ip" : {
+          "type" : "dt-netbox-ip"
         },
-        "vf-module-type": {
-          "type": "string"
+        "interface-name" : {
+          "type" : "string"
         },
-        "vf-module-number": {
-          "type": "string",
-          "default": "3"
+        "interface-description" : {
+          "type" : "string"
         },
-        "prefix-id": {
-          "type": "integer",
-          "default": 11
+        "unit-number" : {
+          "type" : "string"
+        },
+        "prefix-id" : {
+          "type" : "string",
+          "default" : "6"
+        },
+        "vf-module-type" : {
+          "type" : "string"
+        },
+        "vf-module-number" : {
+          "type" : "string",
+          "default" : "3"
         }
       },
-      "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
     },
-    "dt-config-assign-properties": {
-      "description": "Dynamic DataType definition for workflow(config-assign).",
-      "version": "1.0.0",
-      "properties": {
-        "hostname": {
-          "type": "string"
+    "dt-netbox-ip" : {
+      "description" : "This is Netbox IP Data Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "address" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "id" : {
+          "required" : true,
+          "type" : "integer"
         }
       },
-      "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Root"
     },
-    "dt-config-deploy-properties": {
-      "description": "Dynamic DataType definition for workflow(config-deploy).",
-      "version": "1.0.0",
-      "properties": {
-        "vfw_interface_ip": {
-          "type": "dt-netbox-ip"
-        },
-        "interface-name": {
-          "type": "string"
-        },
-        "interface-description": {
-          "type": "string"
+    "dt-resource-assignment-properties" : {
+      "description" : "Dynamic DataType definition for workflow(resource-assignment).",
+      "version" : "1.0.0",
+      "properties" : {
+        "vfw_interface_ip" : {
+          "type" : "dt-netbox-ip"
         },
-        "unit-number": {
-          "type": "string"
+        "interface-description" : {
+          "type" : "string"
         },
-        "prefix-id": {
-          "type": "string",
-          "default": "11"
+        "vf-module-type" : {
+          "type" : "string"
         },
-        "vf-module-type": {
-          "type": "string"
+        "vf-module-number" : {
+          "type" : "string",
+          "default" : "3"
         },
-        "vf-module-number": {
-          "type": "string",
-          "default": "3"
+        "prefix-id" : {
+          "type" : "integer",
+          "default" : 6
         }
       },
-      "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
     },
-    "dt-rollback-properties": {
-      "description": "Dynamic DataType definition for workflow(rollback).",
-      "version": "1.0.0",
-      "properties": {
-      },
-      "derived_from": "tosca.datatypes.Dynamic"
-    },
-    "dt-netbox-ip": {
-      "description": "This is Netbox IP Data Type",
-      "version": "1.0.0",
-      "properties": {
-        "address": {
-          "required": true,
-          "type": "string"
-        },
-        "id": {
-          "required": true,
-          "type": "integer"
-        }
-      },
-      "derived_from": "tosca.datatypes.Root"
+    "dt-rollback-properties" : {
+      "description" : "Dynamic DataType definition for workflow(rollback).",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.datatypes.Dynamic"
     }
   }
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
index 6a9df9b58..7e1bd8b30 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
@@ -3,7 +3,7 @@
     "template_author": "Alexis de Talhouët",
     "author-email": "adetalhouet89@gmail.com",
     "user-groups": "ADMIN, OPERATION",
-    "template_name": "test",
+    "template_name": "golden",
     "template_version": "1.0.0",
     "template_tags": "test"
   },
@@ -27,7 +27,7 @@
   "dsl_definitions": {
     "ipam-1": {
       "type": "token-auth",
-      "url": "http://localhost:32768",
+      "url": "http://netbox-nginx:8080",
       "token": "Token 0123456789abcdef0123456789abcdef01234567"
     },
     "config-deploy-properties": {
@@ -132,11 +132,6 @@
           "ip": {
             "required": true,
             "type": "string"
-          },
-          "config-deploy-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
-            "required": true,
-            "type": "dt-config-deploy-properties"
           }
         }
       },
@@ -216,7 +211,7 @@
                   },
                   "store-result": true,
                   "artifact-prefix-names": [
-                    "hostname"
+                    "hostname", "vfw-interface"
                   ]
                 }
               }
@@ -231,6 +226,14 @@
           "hostname-mapping": {
             "type": "artifact-mapping-resource",
             "file": "Templates/hostname-mapping.json"
+          },
+          "vfw-interface-template": {
+            "type": "artifact-template-velocity",
+            "file": "Templates/vfw-interface-template.vtl"
+          },
+          "vfw-interface-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Templates/vfw-interface-mapping.json"
           }
         }
       },
@@ -256,16 +259,6 @@
               }
             }
           }
-        },
-        "artifacts": {
-          "vfw-interface-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vfw-interface-template.vtl"
-          },
-          "vfw-interface-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vfw-interface-mapping.json"
-          }
         }
       },
       "rollback": {