From fbe84fcf298679761d12859fcb95cb4d721385a1 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 9 Oct 2018 13:59:17 -0400
Subject: Fix DDs, blueprint and template for vFW CDS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia52b9717df2ef67dd5bf667515c55816b750a199
Issue-ID: CCSDK-601
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../load/blueprints/vFW/Templates/vsn.vtl          | 40 ++--------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

(limited to 'ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl')

diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
index 4336f40a..c681de5f 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
@@ -36,14 +36,6 @@
       "param-name": "aic-cloud-region",
       "param-value": "${aic-cloud-region}"
     },
-    {
-      "param-name": "aic_clli",
-      "param-value": "${aic_clli}"
-    },
-    {
-      "param-name": "availability_zone_0",
-      "param-value": "${availability_zone_0}"
-    },
     {
       "param-name": "vm-type",
       "param-value": "${vm-type}"
@@ -177,7 +169,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}_vnfc_name"
+              "param-value": "${vf-module-id}_vsn_name_0"
             },
             {
               "param-name": "policy-instance-name",
@@ -219,7 +211,7 @@
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}"
+              "param-value": "${vf-module-id}_vf_module_name"
             },
             {
               "param-name": "policy-instance-name",
@@ -238,7 +230,7 @@
               "param-value": "${vnf-name}"
             },
             {
-              "param-name": "VF_MODULE_LABLE",
+              "param-name": "VF_MODULE_LABEL",
               "param-value": "${vf-module-label}"
             },
             {
@@ -283,32 +275,6 @@
               "resource-value": "${vsn_private_ip_1}"
             }
           ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${protected-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vsn_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_private_ip_0",
-              "resource-value": "${vsn_private_ip_0}"
-            }
-          ]
         }
       ]
     },
-- 
cgit 1.2.3-korg