From 9aa527e48dc4ee5d4284385a8081782f87691a79 Mon Sep 17 00:00:00 2001
From: Michal Chabiera <michal.chabiera@orange.com>
Date: Mon, 18 Oct 2021 16:42:46 +0200
Subject: [vFW CNF CDS] vf_module and vnf name generation improvment in CBA

During service deletion generation of vf_module and vnf name causes SDNC error.

Issue-ID: INT-1960
Signed-off-by: Michal Chabiera <michal.chabiera@orange.com>
Change-Id: I88f92e32982dca2054dde7055f40785159d8ec39
(cherry picked from commit 734b3d2134b4e1dd3cd946b8badd2baf83f97110)
---
 .../templates/cba/Templates/vfw-template.vtl       | 51 ++--------------------
 1 file changed, 4 insertions(+), 47 deletions(-)

(limited to 'heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl')

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
index 4702f15c..491e9f84 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -1,52 +1,5 @@
 {
     "capability-data": [
-        {
-            "capability-name": "generate-name",
-            "key-mapping": [
-                {
-                    "output-key-mapping": [
-                        {
-                            "resource-name": "vf_module_name",
-                            "resource-value": "${vf-module-name}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "VF_MODULE_TYPE",
-                            "param-value": "vfmt"
-                        },
-                        {
-                            "param-name": "resource-name",
-                            "param-value": "vf_module_name"
-                        },
-                        {
-                            "param-name": "resource-value",
-                            "param-value": "${vf-module-name}"
-                        },
-                        {
-                            "param-name": "external-key",
-                            "param-value": "${vf-module-id}_vf-module-name"
-                        },
-                        {
-                            "param-name": "policy-instance-name",
-                            "param-value": "${vf-naming-policy}"
-                        },
-                        {
-                            "param-name": "naming-type",
-                            "param-value": "VF-MODULE"
-                        },
-                        {
-                            "param-name": "VNF_NAME",
-                            "param-value": "${vnf_name}"
-                        },
-                        {
-                            "param-name": "VF_MODULE_LABEL",
-                            "param-value": "${vf-module-label}"
-                        }
-                    ]
-                }
-            ]
-        },
         {
             "capability-name": "netbox-ip-assign",
             "key-mapping": [
@@ -110,6 +63,10 @@
             "param-name": "vnf_name",
             "param-value": "${vnf_name}"
         },
+        {
+            "param-name": "vf-module-name",
+            "param-value": "${vf-module-name}"
+        },
 ##RB name
         {
             "param-name": "vf-module-model-invariant-uuid",
-- 
cgit 1.2.3-korg