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>

1 files changed, 12 insertions, 17 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/README b/components/model-catalog/blueprint-model/test-blueprint/golden/README
index 3fba19cfc..a8c49d25d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/README
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/README
@@ -14,7 +14,7 @@ Example
           CREATE TABLE `demo` (
             `id` text DEFAULT NULL,
             `value` text DEFAULT NULL
-          )
+          );
 
           INSERT INTO `demo` VALUES ('1','vsn'),('2','vpg'),('3','vfw');
 
@@ -70,23 +70,24 @@ Example
 
                 resolution-key:   To identify the configlet saved in the DB
                 hostname:         Value defined to be result trough input in the hostname mapping file
+                interface-name:   Name of the interface to configure
+                unit-number:      Unit to configure for the interface
 
               {
                   "config-assign-request": {
                     "resolution-key": "config-assign-demo-123",
                     "config-assign-properties": {
-                      "hostname": "demo-config-assign"
+                      "hostname": "blah"
                     }
                   }
               }
 
             Output:
 
-              {
-                  "config-assign-response": {
-                      "dry-run": {
-                          "hostname": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<configuration xmlns:junos=\"http://xml.juniper.net/junos/17.4R1/junos\">\n   <system xmlns=\"http://yang.juniper.net/junos-qfx/conf/system\">\n      <host-name operation=\"delete\" />\n      <host-name operation=\"create\">demo-config-assign</host-name>\n   </system>\n</configuration>\n"
-                      }
+              "config-assign-response": {
+                  "dry-run": {
+                      "hostname": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<configuration xmlns:junos=\"http://xml.juniper.net/junos/17.4R1/junos\">\n   <system xmlns=\"http://yang.juniper.net/junos-qfx/conf/system\">\n      <host-name operation=\"delete\" />\n      <host-name operation=\"create\">blah</host-name>\n   </system>\n</configuration>\n",
+                      "vfw-interface": "<configuration>\n        <interfaces>\n            <interface>\n                <name>ge-0/0/7</name>\n                <unit operation=\"create\">\n                    <name>0</name>\n                    <description>This is the Virtual Firewall entity</description>\n                    <family>\n                        <inet>\n                            <address>\n                                <name>10.0.101.17/24</name>\n                            </address>\n                        </inet>\n                    </family>\n                </unit>\n            </interface>\n        </interfaces>\n</configuration>"
                   }
               }
 
@@ -94,8 +95,7 @@ Example
 
             This action will run a python script that will retrieved the resolved template
             from previous step using the resolution-key.
-            The script will also resolve another template during its execution: the Interface Template.
-            Finally, this action will push these resolved templates into a device (JUNOS) using NETCONF.
+            This action will push these resolved templates into a device (JUNOS) using NETCONF.
             The python script will make use of utilities classes provided by the platform:
             resolution helper and netconf client.
 
@@ -109,19 +109,14 @@ Example
                 username:         NETCONF device user
                 password:         NETCONF device password
                 ip:               NETCONF device ip
-                interface-name:   Name of the interface to configure
-                unit-number:      Unit to configure for the interface
+
 
               {
                 "config-deploy-request": {
                   "resolution-key": "config-assign-demo-123",
                   "username": "admin",
                   "password": "passwd",
-                  "ip": "10.198.1.35",
-                  "config-deploy-properties": {
-                    "interface-name": "ge-0/0/7",
-                    "unit-number": "0"
-                  }
+                  "ip": "10.198.1.35"
                 }
               }
 
@@ -161,4 +156,4 @@ Example
 
 Postman collection used for this example. 5 requests are provided one per workflow to execute, and 1 to load the CBA in the runtime environment.
 
-    hhttps://www.getpostman.com/collections/4d199ff02a735bd3e680
\ No newline at end of file
+    https://www.getpostman.com/collections/d68b12a60fd6ed336059
\ No newline at end of file